From aba8d2293fc3e57c8e75ed2732f8b5b715b1b134 Mon Sep 17 00:00:00 2001 From: Alexey Uzhva Date: Thu, 5 Jul 2007 08:49:05 +0000 Subject: fixed font saving in qt4 kvirc git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@644 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/about/about.pro | 9 ++ src/modules/about/aboutdialog.cpp | 4 +- src/modules/action/action.pro | 5 + src/modules/actioneditor/actioneditor.pro | 7 ++ src/modules/addon/addon.pro | 7 ++ src/modules/aliaseditor/aliaseditor.pro | 7 ++ src/modules/avatar/avatar.pro | 7 ++ src/modules/chan/chan.pro | 6 ++ src/modules/chan/libkvichan.cpp | 1 + src/modules/channelsjoin/channelsjoin.pro | 7 ++ src/modules/channelsjoin/channelsjoinwindow.cpp | 4 +- src/modules/channelsjoin/channelsjoinwindow.h | 1 + src/modules/clock/libkviclock.cpp | 1 - src/modules/codetester/codetester.pro | 7 ++ src/modules/config/config.pro | 5 + src/modules/dcc/broker.cpp | 1 - src/modules/dcc/canvas.cpp | 2 - src/modules/dcc/canvaswidget.cpp | 1 - src/modules/dcc/chat.cpp | 1 - src/modules/dcc/dcc.pro | 39 ++++++++ src/modules/dcc/dialogs.cpp | 1 - src/modules/dcc/marshal.cpp | 1 - src/modules/dcc/send.cpp | 1 - src/modules/dcc/voice.cpp | 1 - src/modules/dcc/window.cpp | 1 - src/modules/dialog/dialog.pro | 7 ++ src/modules/dialog/libkvidialog.cpp | 1 - src/modules/dockwidget/dockwidget.pro | 7 ++ src/modules/dockwidget/libkvidockwidget_qt3.cpp | 2 - src/modules/dockwidget/libkvidockwidget_qt4.cpp | 2 - src/modules/editor/editor.pro | 7 ++ src/modules/eventeditor/eventeditor.pro | 7 ++ src/modules/file/file.pro | 5 + .../filetransferwindow/filetransferwindow.cpp | 1 - .../filetransferwindow/filetransferwindow.pro | 7 ++ src/modules/help/help.pro | 7 ++ src/modules/help/helpwidget.cpp | 1 - src/modules/help/helpwindow.cpp | 1 - src/modules/help/index.cpp | 2 - src/modules/http/http.pro | 7 ++ src/modules/http/httpfiletransfer.cpp | 1 - src/modules/ident/ident.pro | 9 ++ src/modules/ident/libkviident.cpp | 2 - src/modules/iograph/libkviiograph.cpp | 1 - src/modules/lag/lag.pro | 6 ++ src/modules/lamerizer/lamerizer.pro | 7 ++ src/modules/lamerizer/libkvilamerizer.cpp | 3 - src/modules/links/links.pro | 7 ++ src/modules/links/linkswindow.cpp | 1 - src/modules/list/list.pro | 7 ++ src/modules/list/listwindow.cpp | 1 - src/modules/log/log.pro | 5 + src/modules/logview/logview.pro | 7 ++ src/modules/logview/logviewmdiwindow.cpp | 1 - src/modules/logview/logviewwidget.cpp | 1 - src/modules/mask/mask.pro | 5 + src/modules/math/libkvimath.cpp | 2 +- src/modules/math/math.pro | 5 + src/modules/mediaplayer/mediaplayer.pro | 22 +++++ src/modules/mircimport/libkvimircimport.cpp | 1 - src/modules/mircimport/mircimport.pro | 7 ++ src/modules/module.pri | 38 ++++++++ src/modules/modules.pro | 7 ++ src/modules/my/idle.cpp | 1 - src/modules/my/my.pro | 7 ++ src/modules/notifier/notifier.pro | 20 ++++ src/modules/notifier/notifierwindow.cpp | 2 - src/modules/notifier/notifierwindowtabs.cpp | 1 - src/modules/objects/class_button.cpp | 2 - src/modules/objects/class_checkbox.cpp | 2 - src/modules/objects/class_combobox.cpp | 2 - src/modules/objects/class_dockwindow.cpp | 2 - src/modules/objects/class_file.cpp | 1 - src/modules/objects/class_lineedit.cpp | 2 - src/modules/objects/class_listbox.cpp | 2 - src/modules/objects/class_listview.cpp | 1 - src/modules/objects/class_listviewitem.cpp | 2 - src/modules/objects/class_multilineedit.cpp | 2 - src/modules/objects/class_painter.cpp | 40 ++++---- src/modules/objects/class_pixmap.cpp | 2 - src/modules/objects/class_popupmenu.cpp | 2 - src/modules/objects/class_process.cpp | 2 - src/modules/objects/class_radiobutton.cpp | 2 - src/modules/objects/class_slider.cpp | 2 - src/modules/objects/class_socket.cpp | 4 +- src/modules/objects/class_spinbox.cpp | 2 - src/modules/objects/class_tabwidget.cpp | 2 - src/modules/objects/class_tbrowser.cpp | 2 - src/modules/objects/class_toolbar.cpp | 2 - src/modules/objects/class_toolbutton.cpp | 2 - src/modules/objects/class_widget.cpp | 1 - src/modules/objects/class_window.cpp | 1 - src/modules/objects/class_wizard.cpp | 1 - src/modules/objects/class_wrapper.cpp | 2 - src/modules/objects/class_xmlreader.cpp | 2 - src/modules/objects/objects.pro | 101 ++++++++++++++++++++ src/modules/objects/pch.h | 8 ++ src/modules/options/container.cpp | 1 - src/modules/options/dialog.cpp | 1 - src/modules/options/instances.cpp | 2 - src/modules/options/options.pro | 104 +++++++++++++++++++++ src/modules/options/optw_antispam.cpp | 1 - src/modules/options/optw_avatar.cpp | 1 - src/modules/options/optw_away.cpp | 1 - src/modules/options/optw_connection.cpp | 1 - src/modules/options/optw_ctcp.cpp | 1 - src/modules/options/optw_ctcpfloodprotection.cpp | 1 - src/modules/options/optw_dcc.cpp | 1 - src/modules/options/optw_generalopt.cpp | 1 - src/modules/options/optw_highlighting.cpp | 1 - src/modules/options/optw_ident.cpp | 1 - src/modules/options/optw_identity.cpp | 1 - src/modules/options/optw_ignore.cpp | 1 - src/modules/options/optw_input.cpp | 1 - src/modules/options/optw_interfacefeatures.cpp | 1 - src/modules/options/optw_interfacelookglobal.cpp | 1 - src/modules/options/optw_irc.cpp | 1 - src/modules/options/optw_ircoutput.cpp | 1 - src/modules/options/optw_ircview.cpp | 1 - src/modules/options/optw_lag.cpp | 1 - src/modules/options/optw_logging.cpp | 1 - src/modules/options/optw_mediatypes.cpp | 1 - src/modules/options/optw_messages.cpp | 1 - src/modules/options/optw_nickserv.cpp | 1 - src/modules/options/optw_notify.cpp | 1 - src/modules/options/optw_protection.cpp | 1 - src/modules/options/optw_proxy.cpp | 2 - src/modules/options/optw_query.cpp | 2 - src/modules/options/optw_servers.cpp | 2 - src/modules/options/optw_sound.cpp | 2 - src/modules/options/optw_ssl.cpp | 2 - src/modules/options/optw_taskbar.cpp | 2 - src/modules/options/optw_textencoding.cpp | 2 - src/modules/options/optw_texticons.cpp | 2 - src/modules/options/optw_theme.cpp | 2 - src/modules/options/optw_tools.cpp | 2 - src/modules/options/optw_topiclabel.cpp | 2 - src/modules/options/optw_transport.cpp | 2 - src/modules/options/optw_tray.cpp | 1 - src/modules/options/optw_uparser.cpp | 1 - src/modules/options/optw_urlhandlers.cpp | 1 - src/modules/options/optw_userlist.cpp | 1 - src/modules/options/pch.h | 11 +++ src/modules/perl/perl.pro | 5 + src/modules/perlcore/perlcore.pro | 11 +++ src/modules/popupeditor/popupeditor.pro | 7 ++ src/modules/raweditor/raweditor.pro | 7 ++ src/modules/regchan/regchan.pro | 5 + src/modules/reguser/dialog.cpp | 3 - src/modules/reguser/edituser.cpp | 1 - src/modules/reguser/reguser.pro | 7 ++ src/modules/reguser/wizard.cpp | 1 - src/modules/rijndael/libkvirijndael.cpp | 3 - src/modules/rijndael/rijndael.pro | 7 ++ src/modules/setup/setup.pro | 9 ++ src/modules/setup/setupwizard.cpp | 1 - src/modules/sharedfile/sharedfile.pro | 5 + .../sharedfileswindow/sharedfileswindow.cpp | 1 - .../sharedfileswindow/sharedfileswindow.pro | 7 ++ src/modules/snd/libkvisnd.cpp | 1 - src/modules/snd/snd.pro | 9 ++ src/modules/socketspy/socketspy.pro | 7 ++ src/modules/socketspy/socketspywindow.cpp | 1 - src/modules/spaste/controller.cpp | 1 - src/modules/spaste/spaste.pro | 7 ++ src/modules/str/str.pro | 8 ++ src/modules/system/system.pro | 7 ++ src/modules/term/termwidget.cpp | 1 - src/modules/term/termwindow.cpp | 1 - src/modules/texticons/texticons.pro | 5 + src/modules/theme/theme.pro | 14 +++ src/modules/tip/libkvitip.cpp | 1 - src/modules/tip/tip.pro | 7 ++ src/modules/tmphighlight/tmphighlight.pro | 5 + src/modules/toolbar/toolbar.pro | 6 ++ src/modules/toolbareditor/toolbareditor.pro | 7 ++ src/modules/torrent/tc_ktorrentdcopinterface.cpp | 1 - src/modules/torrent/tc_statusbarapplet.cpp | 2 - src/modules/url/libkviurl.cpp | 1 - src/modules/url/url.pro | 7 ++ src/modules/window/window.pro | 7 ++ 181 files changed, 734 insertions(+), 190 deletions(-) create mode 100644 src/modules/about/about.pro create mode 100644 src/modules/action/action.pro create mode 100644 src/modules/actioneditor/actioneditor.pro create mode 100644 src/modules/addon/addon.pro create mode 100644 src/modules/aliaseditor/aliaseditor.pro create mode 100644 src/modules/avatar/avatar.pro create mode 100644 src/modules/chan/chan.pro create mode 100644 src/modules/channelsjoin/channelsjoin.pro create mode 100644 src/modules/codetester/codetester.pro create mode 100644 src/modules/config/config.pro create mode 100644 src/modules/dcc/dcc.pro create mode 100644 src/modules/dialog/dialog.pro create mode 100644 src/modules/dockwidget/dockwidget.pro create mode 100644 src/modules/editor/editor.pro create mode 100644 src/modules/eventeditor/eventeditor.pro create mode 100644 src/modules/file/file.pro create mode 100644 src/modules/filetransferwindow/filetransferwindow.pro create mode 100644 src/modules/help/help.pro create mode 100644 src/modules/http/http.pro create mode 100644 src/modules/ident/ident.pro create mode 100644 src/modules/lag/lag.pro create mode 100644 src/modules/lamerizer/lamerizer.pro create mode 100644 src/modules/links/links.pro create mode 100644 src/modules/list/list.pro create mode 100644 src/modules/log/log.pro create mode 100644 src/modules/logview/logview.pro create mode 100644 src/modules/mask/mask.pro create mode 100644 src/modules/math/math.pro create mode 100644 src/modules/mediaplayer/mediaplayer.pro create mode 100644 src/modules/mircimport/mircimport.pro create mode 100644 src/modules/module.pri create mode 100644 src/modules/modules.pro create mode 100644 src/modules/my/my.pro create mode 100644 src/modules/notifier/notifier.pro create mode 100644 src/modules/objects/objects.pro create mode 100644 src/modules/objects/pch.h create mode 100644 src/modules/options/options.pro create mode 100644 src/modules/options/pch.h create mode 100644 src/modules/perl/perl.pro create mode 100644 src/modules/perlcore/perlcore.pro create mode 100644 src/modules/popupeditor/popupeditor.pro create mode 100644 src/modules/raweditor/raweditor.pro create mode 100644 src/modules/regchan/regchan.pro create mode 100644 src/modules/reguser/reguser.pro create mode 100644 src/modules/rijndael/rijndael.pro create mode 100644 src/modules/setup/setup.pro create mode 100644 src/modules/sharedfile/sharedfile.pro create mode 100644 src/modules/sharedfileswindow/sharedfileswindow.pro create mode 100644 src/modules/snd/snd.pro create mode 100644 src/modules/socketspy/socketspy.pro create mode 100644 src/modules/spaste/spaste.pro create mode 100644 src/modules/str/str.pro create mode 100644 src/modules/system/system.pro create mode 100644 src/modules/texticons/texticons.pro create mode 100644 src/modules/theme/theme.pro create mode 100644 src/modules/tip/tip.pro create mode 100644 src/modules/tmphighlight/tmphighlight.pro create mode 100644 src/modules/toolbar/toolbar.pro create mode 100644 src/modules/toolbareditor/toolbareditor.pro create mode 100644 src/modules/url/url.pro create mode 100644 src/modules/window/window.pro (limited to 'src/modules') diff --git a/src/modules/about/about.pro b/src/modules/about/about.pro new file mode 100644 index 000000000..6d2bcbe4c --- /dev/null +++ b/src/modules/about/about.pro @@ -0,0 +1,9 @@ +TARGET = kviabout + +HEADERS += aboutdialog.h \ + libkviabout.h + +SOURCES += aboutdialog.cpp \ + libkviabout.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 1688e09e2..8e80ea6d0 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -161,6 +161,4 @@ void KviAboutDialog::closeEvent(QCloseEvent *e) void KviAboutDialog::closeButtonPressed() { delete this; -} - -#include "aboutdialog.moc" +} \ No newline at end of file diff --git a/src/modules/action/action.pro b/src/modules/action/action.pro new file mode 100644 index 000000000..628337d2d --- /dev/null +++ b/src/modules/action/action.pro @@ -0,0 +1,5 @@ +TARGET = kviaction + +SOURCES += libkviaction.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/actioneditor/actioneditor.pro b/src/modules/actioneditor/actioneditor.pro new file mode 100644 index 000000000..ebc472477 --- /dev/null +++ b/src/modules/actioneditor/actioneditor.pro @@ -0,0 +1,7 @@ +TARGET = kviactioneditor + +HEADERS += actioneditor.h + +SOURCES += libkviactioneditor.cpp actioneditor.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/addon/addon.pro b/src/modules/addon/addon.pro new file mode 100644 index 000000000..93908063b --- /dev/null +++ b/src/modules/addon/addon.pro @@ -0,0 +1,7 @@ +TARGET = kviaddon + +HEADERS += managementdialog.h + +SOURCES += libkviaddon.cpp managementdialog.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/aliaseditor/aliaseditor.pro b/src/modules/aliaseditor/aliaseditor.pro new file mode 100644 index 000000000..d44c242f1 --- /dev/null +++ b/src/modules/aliaseditor/aliaseditor.pro @@ -0,0 +1,7 @@ +TARGET = kvialiaseditor + +HEADERS += aliaseditor.h + +SOURCES += libkvialiaseditor.cpp aliaseditor.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/avatar/avatar.pro b/src/modules/avatar/avatar.pro new file mode 100644 index 000000000..f92929cf7 --- /dev/null +++ b/src/modules/avatar/avatar.pro @@ -0,0 +1,7 @@ +TARGET = kviavatar + +HEADERS += libkviavatar.h + +SOURCES += libkviavatar.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/chan/chan.pro b/src/modules/chan/chan.pro new file mode 100644 index 000000000..16281c16e --- /dev/null +++ b/src/modules/chan/chan.pro @@ -0,0 +1,6 @@ +TARGET = kvichan + + +SOURCES += libkvichan.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index 2373bf876..8796de1a0 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -25,6 +25,7 @@ #include "kvi_module.h" #include "kvi_string.h" +#include "qapplication.h" //broken mingw compiler? #include "kvi_app.h" #include "kvi_channel.h" #include "kvi_locale.h" diff --git a/src/modules/channelsjoin/channelsjoin.pro b/src/modules/channelsjoin/channelsjoin.pro new file mode 100644 index 000000000..71e87468d --- /dev/null +++ b/src/modules/channelsjoin/channelsjoin.pro @@ -0,0 +1,7 @@ +TARGET = kvichannelsjoin + +HEADERS += channelsjoinwindow.h + +SOURCES += libkvichannelsjoin.cpp channelsjoinwindow.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index 00f138597..8139399d2 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -296,6 +296,4 @@ void KviChannelsJoinWindow::closeEvent(QCloseEvent *e) { e->ignore(); delete this; -} - -#include "m_channelsjoinwindow.moc" +} \ No newline at end of file diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h index 27bf5cddf..8719b7459 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.h +++ b/src/modules/channelsjoin/channelsjoinwindow.h @@ -25,6 +25,7 @@ #define _CHANNELSJOIN_H_ #include "kvi_window.h" #include "kvi_string.h" +#include "kvi_tal_groupbox.h" #include diff --git a/src/modules/clock/libkviclock.cpp b/src/modules/clock/libkviclock.cpp index 08e02a66d..ed5961672 100644 --- a/src/modules/clock/libkviclock.cpp +++ b/src/modules/clock/libkviclock.cpp @@ -253,5 +253,4 @@ KVIRC_MODULE( clock_module_cleanup ) #if 0 -#include "libkviclock.moc" #endif diff --git a/src/modules/codetester/codetester.pro b/src/modules/codetester/codetester.pro new file mode 100644 index 000000000..1349bee19 --- /dev/null +++ b/src/modules/codetester/codetester.pro @@ -0,0 +1,7 @@ +TARGET = kvicodetester + +HEADERS += codetester.h + +SOURCES += libkvicodetester.cpp codetester.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/config/config.pro b/src/modules/config/config.pro new file mode 100644 index 000000000..8937cf02b --- /dev/null +++ b/src/modules/config/config.pro @@ -0,0 +1,5 @@ +TARGET = kviconfig + +SOURCES += libkviconfig.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index 52c0abf33..edd6e6b24 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -895,4 +895,3 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename } -#include "m_broker.moc" diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index dfe39e975..43a89f381 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -296,6 +296,4 @@ void KviDccCanvas::connected() } -#include "m_canvas.moc" - #endif diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index ef5d70495..c685a7516 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1596,6 +1596,5 @@ void KviCanvasWidget::resizeEvent(QResizeEvent *) } -#include "m_canvaswidget.moc" #endif diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index a0cb686ba..a9ac8cf54 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -839,4 +839,3 @@ out_of_the_loop: return bRet; } -#include "m_chat.moc" diff --git a/src/modules/dcc/dcc.pro b/src/modules/dcc/dcc.pro new file mode 100644 index 000000000..517e1e58f --- /dev/null +++ b/src/modules/dcc/dcc.pro @@ -0,0 +1,39 @@ +TARGET = kvidcc + +HEADERS += adpcmcodec.h \ + broker.h \ + canvas.h \ + canvaswidget.h \ + chat.h \ + codec.h \ + descriptor.h \ + dialogs.h \ + gsmcodec.h \ + marshal.h \ + send.h \ + thread.h \ + utils.h \ + voice.h \ + window.h + +SOURCES += adpcmcodec.cpp \ + broker.cpp \ + canvas.cpp \ + canvaswidget.cpp \ + chat.cpp \ + codec.cpp \ + descriptor.cpp \ + dialogs.cpp \ + gsmcodec.cpp \ + libkvidcc.cpp \ + marshal.cpp \ + requests.cpp \ + send.cpp \ + thread.cpp \ + utils.cpp \ + voice.cpp \ + window.cpp + +include(../module.pri) + +LIBS += -lws2_32 \ No newline at end of file diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp index c999e53bb..5340e6c3c 100644 --- a/src/modules/dcc/dialogs.cpp +++ b/src/modules/dcc/dialogs.cpp @@ -203,4 +203,3 @@ void KviDccRenameBox::cancelClicked() -#include "m_dialogs.moc" diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index 2aa383434..206d946cd 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -644,4 +644,3 @@ void KviDccMarshal::connectionTimedOut() } -#include "m_marshal.moc" diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index ba4f79f49..5fae23e3c 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -1887,4 +1887,3 @@ void KviDccFileTransferBandwidthDialog::closeEvent(QCloseEvent * e) -#include "m_send.moc" diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index 787d43665..ca0d2c7a0 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -1038,4 +1038,3 @@ void KviDccVoice::focusInEvent(QFocusEvent *e) KviWindow::focusInEvent(e); } -#include "m_voice.moc" diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp index 11fe893fd..e19a87c45 100644 --- a/src/modules/dcc/window.cpp +++ b/src/modules/dcc/window.cpp @@ -50,4 +50,3 @@ const char * KviDccWindow::dccMarshalOutputContextString() return static_context; } -#include "m_window.moc" diff --git a/src/modules/dialog/dialog.pro b/src/modules/dialog/dialog.pro new file mode 100644 index 000000000..9d35186bf --- /dev/null +++ b/src/modules/dialog/dialog.pro @@ -0,0 +1,7 @@ +TARGET = kvidialog + +HEADERS += libkvidialog.h + +SOURCES += libkvidialog.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 3e4e24240..99a8367e9 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -917,4 +917,3 @@ KVIRC_MODULE( dialog_module_cleanup ) -#include "libkvidialog.moc" diff --git a/src/modules/dockwidget/dockwidget.pro b/src/modules/dockwidget/dockwidget.pro new file mode 100644 index 000000000..dfc216ef4 --- /dev/null +++ b/src/modules/dockwidget/dockwidget.pro @@ -0,0 +1,7 @@ +TARGET = kvidockwidget + +HEADERS += libkvidockwidget_qt4.h libkvidockwidget.h + +SOURCES += libkvidockwidget_qt4.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index 50e31cb04..aeeabaf57 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -853,6 +853,4 @@ KVIRC_MODULE( dockwidget_module_cleanup ) -#include "libkvidockwidget_qt3.moc" - #endif \ No newline at end of file diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp index 26d866fba..d769889b7 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp @@ -685,6 +685,4 @@ KVIRC_MODULE( dockwidget_module_cleanup ) -#include "libkvidockwidget_qt4.moc" - #endif diff --git a/src/modules/editor/editor.pro b/src/modules/editor/editor.pro new file mode 100644 index 000000000..b45e490e8 --- /dev/null +++ b/src/modules/editor/editor.pro @@ -0,0 +1,7 @@ +TARGET = kvieditor + +HEADERS += scripteditor.h + +SOURCES += libkvieditor.cpp scripteditor.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/eventeditor/eventeditor.pro b/src/modules/eventeditor/eventeditor.pro new file mode 100644 index 000000000..90a0cff6e --- /dev/null +++ b/src/modules/eventeditor/eventeditor.pro @@ -0,0 +1,7 @@ +TARGET = kvieventeditor + +HEADERS += eventeditor.h + +SOURCES += libkvieventeditor.cpp eventeditor.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/file/file.pro b/src/modules/file/file.pro new file mode 100644 index 000000000..3c3b6d720 --- /dev/null +++ b/src/modules/file/file.pro @@ -0,0 +1,5 @@ +TARGET = kvifile + +SOURCES += libkvifile.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index c607efcb8..875453346 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -765,4 +765,3 @@ void KviFileTransferWindow::applyOptions() KviWindow::applyOptions(); } -#include "m_filetransferwindow.moc" diff --git a/src/modules/filetransferwindow/filetransferwindow.pro b/src/modules/filetransferwindow/filetransferwindow.pro new file mode 100644 index 000000000..89bd04104 --- /dev/null +++ b/src/modules/filetransferwindow/filetransferwindow.pro @@ -0,0 +1,7 @@ +TARGET = kvifiletransferwindow + +HEADERS += filetransferwindow.h + +SOURCES += libkvifiletransferwindow.cpp filetransferwindow.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/help/help.pro b/src/modules/help/help.pro new file mode 100644 index 000000000..0c14b7101 --- /dev/null +++ b/src/modules/help/help.pro @@ -0,0 +1,7 @@ +TARGET = kvihelp + +HEADERS += helpwidget.h helpwindow.h index.h + +SOURCES += libkvihelp.cpp helpwidget.cpp helpwindow.cpp index.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp index c416b714e..8670816ff 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -151,4 +151,3 @@ bool KviHelpWidget::eventFilter(QObject * o, QEvent *e) -#include "helpwidget.moc" diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 197e9e811..b86e21cc9 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -324,4 +324,3 @@ void KviHelpWindow::fillCaptionBuffers() } -#include "helpwindow.moc" diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index 540273d0e..8112f98cb 100755 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -961,5 +961,3 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo } - -#include "index.moc" \ No newline at end of file diff --git a/src/modules/http/http.pro b/src/modules/http/http.pro new file mode 100644 index 000000000..31edf426e --- /dev/null +++ b/src/modules/http/http.pro @@ -0,0 +1,7 @@ +TARGET = kvihttp + +HEADERS += httpfiletransfer.h + +SOURCES += libkvihttp.cpp httpfiletransfer.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index 18ccb5b7d..45313e746 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -486,4 +486,3 @@ bool KviHttpFileTransfer::startDownload() return m_pHttpRequest->start(); } -#include "m_httpfiletransfer.moc" diff --git a/src/modules/ident/ident.pro b/src/modules/ident/ident.pro new file mode 100644 index 000000000..0ede844fd --- /dev/null +++ b/src/modules/ident/ident.pro @@ -0,0 +1,9 @@ +TARGET = kviident + +HEADERS += libkviident.h + +SOURCES += libkviident.cpp + +LIBS += -lws2_32 + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp index 4c3690297..59e10c091 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -611,5 +611,3 @@ KVIRC_MODULE( 0, ident_module_cleanup ) - -#include "libkviident.moc" diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index 2ad73a410..dd7234db1 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -293,5 +293,4 @@ KVIRC_MODULE( ) #if 0 -#include "libkviiograph.moc" #endif diff --git a/src/modules/lag/lag.pro b/src/modules/lag/lag.pro new file mode 100644 index 000000000..e553f5d76 --- /dev/null +++ b/src/modules/lag/lag.pro @@ -0,0 +1,6 @@ +TARGET = kvilag + + +SOURCES += libkvilag.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/lamerizer/lamerizer.pro b/src/modules/lamerizer/lamerizer.pro new file mode 100644 index 000000000..f70bd2d37 --- /dev/null +++ b/src/modules/lamerizer/lamerizer.pro @@ -0,0 +1,7 @@ +TARGET = kvilamerizer + +HEADERS += libkvilamerizer.h + +SOURCES += libkvilamerizer.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp index 5518bd09e..625533f38 100644 --- a/src/modules/lamerizer/libkvilamerizer.cpp +++ b/src/modules/lamerizer/libkvilamerizer.cpp @@ -274,6 +274,3 @@ KVIRC_MODULE( lamerizer_module_cleanup ) -#ifdef COMPILE_CRYPT_SUPPORT - #include "libkvilamerizer.moc" -#endif diff --git a/src/modules/links/links.pro b/src/modules/links/links.pro new file mode 100644 index 000000000..f376d40ed --- /dev/null +++ b/src/modules/links/links.pro @@ -0,0 +1,7 @@ +TARGET = kvilinks + +HEADERS += linkswindow.h + +SOURCES += libkvilinks.cpp linkswindow.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index 7986c70f2..209b16a1c 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -469,4 +469,3 @@ void KviLinksWindow::applyOptions() KviWindow::applyOptions(); } -#include "m_linkswindow.moc" diff --git a/src/modules/list/list.pro b/src/modules/list/list.pro new file mode 100644 index 000000000..e91ac1f2d --- /dev/null +++ b/src/modules/list/list.pro @@ -0,0 +1,7 @@ +TARGET = kvilist + +HEADERS += listwindow.h + +SOURCES += libkvilist.cpp listwindow.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index a4b23510c..b64818b4a 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -531,4 +531,3 @@ void KviListWindow::applyOptions() KviWindow::applyOptions(); } -#include "listwindow.moc" diff --git a/src/modules/log/log.pro b/src/modules/log/log.pro new file mode 100644 index 000000000..13c5667c1 --- /dev/null +++ b/src/modules/log/log.pro @@ -0,0 +1,5 @@ +TARGET = kvilog + +SOURCES += libkvilog.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/logview/logview.pro b/src/modules/logview/logview.pro new file mode 100644 index 000000000..94dfcb3b1 --- /dev/null +++ b/src/modules/logview/logview.pro @@ -0,0 +1,7 @@ +TARGET = kvilogview + +HEADERS += logviewwidget.h logviewmdiwindow.h + +SOURCES += libkvilogview.cpp logviewwidget.cpp logviewmdiwindow.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index da67b5088..c935e90fe 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -474,4 +474,3 @@ void KviLogFile::getText(QString & text,const QString& logDir){ #endif } -#include "logviewmdiwindow.moc" diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp index 29398b8f1..7a0336766 100644 --- a/src/modules/logview/logviewwidget.cpp +++ b/src/modules/logview/logviewwidget.cpp @@ -73,4 +73,3 @@ QString KviLogListViewItemType::text(int col) const }; -#include "logviewwidget.moc" diff --git a/src/modules/mask/mask.pro b/src/modules/mask/mask.pro new file mode 100644 index 000000000..0c18abbf2 --- /dev/null +++ b/src/modules/mask/mask.pro @@ -0,0 +1,5 @@ +TARGET = kvimask + +SOURCES += libkvimask.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/math/libkvimath.cpp b/src/modules/math/libkvimath.cpp index af7152c96..192eb9418 100644 --- a/src/modules/math/libkvimath.cpp +++ b/src/modules/math/libkvimath.cpp @@ -50,7 +50,7 @@ static bool __fncname(KviKvsModuleFunctionCall * c) \ return true; \ } -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) && !defined(__GNUC__) // dobbiamo testare meglio, i risultati. static double cbrt(double x) { diff --git a/src/modules/math/math.pro b/src/modules/math/math.pro new file mode 100644 index 000000000..08d53dbdc --- /dev/null +++ b/src/modules/math/math.pro @@ -0,0 +1,5 @@ +TARGET = kvimath + +SOURCES += libkvimath.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/mediaplayer/mediaplayer.pro b/src/modules/mediaplayer/mediaplayer.pro new file mode 100644 index 000000000..a93e3f2e6 --- /dev/null +++ b/src/modules/mediaplayer/mediaplayer.pro @@ -0,0 +1,22 @@ +TARGET = kvimediaplayer + +HEADERS += mp_amarokinterface.h \ + mp_dcopinterface.h \ + mp_interface.h \ + mp_jukinterface.h \ + mp_mp3.h \ + mp_winampinterface.h \ + mp_xmmsinterface.h \ + mp_amipinterface.h + +SOURCES += libkvimediaplayer.cpp \ + mp_amarokinterface.cpp \ + mp_dcopinterface.cpp \ + mp_interface.cpp \ + mp_jukinterface.cpp \ + mp_mp3.cpp \ + mp_winampinterface.cpp \ + mp_xmmsinterface.cpp \ + mp_amipinterface.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index 7bfa1d340..909503a10 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -380,4 +380,3 @@ KVIRC_MODULE( mircimport_module_cleanup ) -#include "libkvimircimport.moc" diff --git a/src/modules/mircimport/mircimport.pro b/src/modules/mircimport/mircimport.pro new file mode 100644 index 000000000..f5ddbcbad --- /dev/null +++ b/src/modules/mircimport/mircimport.pro @@ -0,0 +1,7 @@ +TARGET = kvimircimport + +HEADERS += libkvimircimport.h + +SOURCES += libkvimircimport.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/module.pri b/src/modules/module.pri new file mode 100644 index 000000000..0a3ef4fe7 --- /dev/null +++ b/src/modules/module.pri @@ -0,0 +1,38 @@ +CONFIG += precompile_header debug_and_release thread dll +LANGUAGE = C++ +TEMPLATE = lib + +QT += core \ + gui \ + qt3support + +DEFINES -= UNICODE + +CONFIG(debug, debug|release) { + DESTDIR = ../../../bin/debug/modules/ + LIBS += -L../../../bin/debug/ + } else { + DESTDIR = ../../../bin/release/modules/ + LIBS += -L../../../bin/release/ + } + +INCLUDEPATH += ../../kvilib/tal/ \ + ../../kvilib/config/ \ + ../../kvilib/core/ \ + ../../kvilib/ext/ \ + ../../kvilib/file/ \ + ../../kvilib/irc/ \ + ../../kvilib/net/ \ + ../../kvilib/system/ + + +INCLUDEPATH += ../../kvirc/kernel/ \ + ../../kvirc/kvs/ \ + ../../kvirc/module/ \ + ../../kvirc/sparser/ \ + ../../kvirc/ui/ + +LIBS += -lkvilib \ + -lkvirc + +RC_FILE = ../../../data/resources/commctrl.rc \ No newline at end of file diff --git a/src/modules/modules.pro b/src/modules/modules.pro new file mode 100644 index 000000000..04ce211d3 --- /dev/null +++ b/src/modules/modules.pro @@ -0,0 +1,7 @@ +TEMPLATE = subdirs +SUBDIRS = about action actioneditor addon aliaseditor avatar chan channelsjoin codetester config \ + dcc dialog dockwidget editor eventeditor file filetransferwindow help http ident lag lamerizer links list log\ + logview mask math mediaplayer mircimport my notifier objects options popupeditor raweditor \ + regchan reguser rijndael setup sharedfile sharedfileswindow snd socketspy spaste str system \ + texticons theme tip tmphighlight toolbar toolbareditor url window perl perlcore + diff --git a/src/modules/my/idle.cpp b/src/modules/my/idle.cpp index 34eef595d..351806d83 100644 --- a/src/modules/my/idle.cpp +++ b/src/modules/my/idle.cpp @@ -130,4 +130,3 @@ void Idle::doCheck() secondsIdle(secondsIdle()); } -#include "idle.moc" diff --git a/src/modules/my/my.pro b/src/modules/my/my.pro new file mode 100644 index 000000000..ba241b667 --- /dev/null +++ b/src/modules/my/my.pro @@ -0,0 +1,7 @@ +TARGET = kvimy + +HEADERS += idle.h + +SOURCES += libkvimy.cpp idle_x11.cpp idle_mac.cpp idle.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/notifier/notifier.pro b/src/modules/notifier/notifier.pro new file mode 100644 index 000000000..408a877c3 --- /dev/null +++ b/src/modules/notifier/notifier.pro @@ -0,0 +1,20 @@ +TARGET = kvinotifier + +HEADERS += \ + notifiersettings.h \ + notifierwindow.h \ + notifiermessage.h \ + notifierwindowtabs.h \ + notifierwindowbody.h \ + notifierwindowborder.h \ + notifierwindowprogressbar.h + +SOURCES += libkvinotifier.cpp \ + notifierwindow.cpp \ + notifiermessage.cpp \ + notifierwindowtabs.cpp \ + notifierwindowbody.cpp \ + notifierwindowborder.cpp \ + notifierwindowprogressbar.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 305053cd9..14b902aaf 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -1424,5 +1424,3 @@ void KviNotifierWindow::progressUpdate() QPainter p(this); m_pProgressBar->draw(&p); } -#include "m_notifierwindow.moc" - diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp index 3b778ecc1..952840323 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -703,4 +703,3 @@ void KviNotifierWindowTabs::closeTab(KviWindow * pWnd, KviNotifierWindowTab * pT } } -#include "m_notifierwindowtabs.moc" diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index fd8a4b3b5..bbb95cdcb 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -174,5 +174,3 @@ void KviKvsObject_button::slotClicked() callFunction(this,"clickEvent",params); } - -#include "m_class_button.moc" diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 1e9260509..6545d8a1b 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -124,5 +124,3 @@ void KviKvsObject_checkbox::toggled(bool b) callFunction(this,"toggleEvent",¶ms); } - -#include "m_class_checkbox.moc" diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index f8c3d3d6b..146a92bed 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -362,5 +362,3 @@ void KviKvsObject_combobox::slotActivated(int i) callFunction(this,"activatedEvent",¶ms); } - -#include "m_class_combobox.moc" diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index a6067a505..fc2276e91 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -227,5 +227,3 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c) else c->warning(__tr2qs("Invalid dock area specified")); return true; } - -#include "m_class_dockwindow.moc" diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index 55bbd4f29..010a51be9 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -485,4 +485,3 @@ bool KviScriptFileObject::functionHexRead(KviCommand * c, KviParameterList * p, } */ -#include "m_class_file.moc" diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index a5e94ebc7..37144e2bf 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -457,5 +457,3 @@ void KviKvsObject_lineedit::slottextChanged(const QString &text) callFunction(this,"textChangedEvent",¶ms); } - -#include "m_class_lineedit.moc" diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp index bf7292773..8a56e2c75 100644 --- a/src/modules/objects/class_listbox.cpp +++ b/src/modules/objects/class_listbox.cpp @@ -386,5 +386,3 @@ kvs_uint_t uIndex; return true; } - -#include "m_class_listbox.moc" diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp index 4a6d03924..9f384cd5d 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -554,4 +554,3 @@ void KviKvsMdmListView::contentsDropEvent(QDropEvent *e) } } -#include "m_class_listview.moc" diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp index 7d193b98f..5136fda10 100644 --- a/src/modules/objects/class_listviewitem.cpp +++ b/src/modules/objects/class_listviewitem.cpp @@ -417,5 +417,3 @@ bool KviKvsObject_listviewitem::function_setPixmap(KviKvsObjectFunctionCall *c) m_pListViewItem->setPixmap(uCol,*pix); return true; } - -#include "m_class_listviewitem.moc" diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index 8be51a018..e3f8d0947 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -1213,5 +1213,3 @@ bool KviKvsObject_mledit::functionselectAll(KviKvsObjectFunctionCall *c) } - -#include "m_class_multilineedit.moc" diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 5c45910d2..fd2c0ab3e 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -956,20 +956,20 @@ bool KviKvsObject_painter::functionresetMatrix(KviKvsObjectFunctionCall *c) } #ifdef COMPILE_USE_QT4 -bool KviKvsObject_painter::functionsetOpacity(KviKvsObjectFunctionCall *c) -{ - if(!m_pPainter)return true; - kvs_real_t dOpacity; - - KVSO_PARAMETERS_BEGIN(c) - KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity) - KVSO_PARAMETERS_END(c) - m_pPainter->setOpacity(dOpacity); - return true; -} +bool KviKvsObject_painter::functionsetOpacity(KviKvsObjectFunctionCall *c) +{ + if(!m_pPainter)return true; + kvs_real_t dOpacity; + + KVSO_PARAMETERS_BEGIN(c) + KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity) + KVSO_PARAMETERS_END(c) + m_pPainter->setOpacity(dOpacity); + return true; +} bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true; + if(!m_pPainter)return true; bool bEnabled; KVSO_PARAMETERS_BEGIN(c) @@ -977,10 +977,10 @@ bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall KVSO_PARAMETERS_END(c) m_pPainter->setRenderHint(QPainter::TextAntialiasing,bEnabled); return true; -} +} bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true; + if(!m_pPainter)return true; bool bEnabled; KVSO_PARAMETERS_BEGIN(c) @@ -988,10 +988,10 @@ bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) m_pPainter->setRenderHint(QPainter::Antialiasing,bEnabled); return true; -} +} bool KviKvsObject_painter::functionsetSmoothPixmapTransform(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true; + if(!m_pPainter)return true; bool bEnabled; KVSO_PARAMETERS_BEGIN(c) @@ -999,9 +999,7 @@ bool KviKvsObject_painter::functionsetSmoothPixmapTransform(KviKvsObjectFunction KVSO_PARAMETERS_END(c) m_pPainter->setRenderHint(QPainter::SmoothPixmapTransform,bEnabled); return true; -} -#endif - - +} +#endif + -#include "m_class_painter.moc" diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index 89247edb9..6028642b6 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -313,5 +313,3 @@ QImage * KviKvsObject_pixmap::getImage() return m_pImage; } - -#include "m_class_pixmap.moc" diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index c32d0f891..d47a1f7bd 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -357,5 +357,3 @@ bool KviKvsObject_popupmenu::functionactivatedEvent(KviKvsObjectFunctionCall *c) return true; } - -#include "m_class_popupmenu.moc" diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index e0951b14e..1ff1544b0 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -313,5 +313,3 @@ void KviKvsObject_process::slotReadStderr() KviKvsVariantList *params=0; callFunction(this,"readyReadStderrEvent",params); } - -#include "m_class_process.moc" diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index 402d24b50..5b2a44b3d 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -134,5 +134,3 @@ void KviKvsObject_radiobutton::toggled(bool b) callFunction(this,"toggleEvent",¶ms); } - -#include "m_class_radiobutton.moc" diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index 54673d610..02d2d5312 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -283,5 +283,3 @@ void KviKvsObject_slider::valueChanged(int value) callFunction(this,"valueChangedEvent",¶ms); } - -#include "m_class_slider.moc" diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 3819ca05b..f0d71edb6 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -1326,6 +1326,4 @@ KviQCString szData8 = szData.utf8(); -//-------------- - -#include "m_class_socket.moc" +//------------- \ No newline at end of file diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index 6b0147f24..bcd6acaf9 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -261,5 +261,3 @@ void KviKvsObject_spinbox::valueChanged(int value) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value)); callFunction(this,"valueChangedEvent",¶ms); } - -#include "m_class_spinbox.moc" diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 998bb3f44..5d6d5ebba 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -537,5 +537,3 @@ void KviKvsObject_tabwidget::slotCurrentChanged(int value) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value)); callFunction(this,"currentChangedEvent",¶ms); } - -#include "m_class_tabwidget.moc" diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index bd46f0803..d3f2aac41 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -139,5 +139,3 @@ bool KviKvsObject_textbrowser::function_linkClickedEvent(KviKvsObjectFunctionCal emitSignal("linkClicked",c,c->params()); return true; } - -#include "m_class_tbrowser.moc" diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index e8e3292e6..a8f1fc05b 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -149,5 +149,3 @@ bool KviKvsObject_toolbar::functionclear(KviKvsObjectFunctionCall *c) return true; } -#include "m_class_toolbar.moc" - diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 3a531da30..a4c5ed7a5 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -337,5 +337,3 @@ void KviKvsObject_toolbutton::slotClicked() callFunction(this,"clickEvent",params); } -#include "m_class_toolbutton.moc" - diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 3d9cb936a..44fb2e77d 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1742,4 +1742,3 @@ bool KviKvsObject_widget::function_setAttribute(KviKvsObjectFunctionCall *c) } #endif -#include "m_class_widget.moc" diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index 7bcbea852..85fb4a7c3 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -155,4 +155,3 @@ bool KviKvsObject_window::functionsetCentralWidget(KviKvsObjectFunctionCall *c) ((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KviKvsObject_widget *)ob,((KviKvsObject_widget *)ob)->widget()); return true; } -#include "m_class_window.moc" diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index 83117af97..c7d8770e8 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -387,4 +387,3 @@ void KviKvsMdmWizard::slotBackClicked() KviKvsMdmWizard::~KviKvsMdmWizard() { } -#include "m_class_wizard.moc" diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 464f10f85..9eb1f6a9b 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -265,5 +265,3 @@ QWidget *KviKvsObject_wrapper::findWidgetToWrap(const char *szClass, const char return 0; #endif } - -#include "m_class_wrapper.moc" diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index e4ac20acf..3690c64e9 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -330,5 +330,3 @@ bool KviKvsObject_xmlreader::function_lastError(KviKvsObjectFunctionCall *c) c->returnValue()->setString(m_szLastError); return true; } - -#include "m_class_xmlreader.moc" diff --git a/src/modules/objects/objects.pro b/src/modules/objects/objects.pro new file mode 100644 index 000000000..eac04a872 --- /dev/null +++ b/src/modules/objects/objects.pro @@ -0,0 +1,101 @@ +QT += xml + +LIBS += -lws2_32 + +PRECOMPILED_HEADER = pch.h + +precompile_header:!isEmpty(PRECOMPILED_HEADER) { + DEFINES += USING_PCH + } + +TARGET = kviobjects + +HEADERS += class_button.h \ + class_buttongroup.h \ + class_checkbox.h \ + class_combobox.h \ + class_dialog.h \ + class_dockwindow.h \ + class_file.h \ + class_groupbox.h \ + class_label.h \ + class_layout.h \ + class_lcd.h \ + class_lineedit.h \ + class_list.h \ + class_listbox.h \ + class_listview.h \ + class_listviewitem.h \ + class_mainwindow.h \ + class_menubar.h \ + class_multilineedit.h \ + class_painter.h \ + class_pixmap.h \ + class_popupmenu.h \ + class_process.h \ + class_progressbar.h \ + class_radiobutton.h \ + class_slider.h \ + class_socket.h \ + class_spinbox.h \ + class_tabwidget.h \ + class_tbrowser.h \ + class_toolbar.h \ + class_toolbutton.h \ + class_urllabel.h \ + class_widget.h \ + class_window.h \ + class_wizard.h \ + class_workspace.h \ + class_wrapper.h \ + class_xmlreader.h \ + class_vbox.h \ + class_hbox.h \ + object_macros.h + + +SOURCES += libkviobjects.cpp \ + class_button.cpp \ + class_buttongroup.cpp \ + class_checkbox.cpp \ + class_combobox.cpp \ + class_dialog.cpp \ + class_dockwindow.cpp \ + class_file.cpp \ + class_groupbox.cpp \ + class_label.cpp \ + class_layout.cpp \ + class_lcd.cpp \ + class_lineedit.cpp \ + class_list.cpp \ + class_listbox.cpp \ + class_listview.cpp \ + class_listviewitem.cpp \ + class_mainwindow.cpp \ + class_menubar.cpp \ + class_multilineedit.cpp \ + class_popupmenu.cpp \ + class_process.cpp \ + class_progressbar.cpp \ + class_radiobutton.cpp \ + class_slider.cpp \ + class_socket.cpp \ + class_spinbox.cpp \ + class_tabwidget.cpp \ + class_toolbar.cpp \ + class_toolbutton.cpp \ + class_painter.cpp \ + class_pixmap.cpp \ + class_tbrowser.cpp \ + class_widget.cpp \ + class_window.cpp \ + class_wizard.cpp \ + class_workspace.cpp \ + class_wrapper.cpp \ + class_urllabel.cpp \ + class_xmlreader.cpp \ + class_vbox.cpp \ + class_hbox.cpp + + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/objects/pch.h b/src/modules/objects/pch.h new file mode 100644 index 000000000..7f94318ca --- /dev/null +++ b/src/modules/objects/pch.h @@ -0,0 +1,8 @@ +#if defined __cplusplus + #include // All moc genereated code has this include + #include + #include "kvi_settings.h" + #include "kvi_app.h" + #include "object_macros.h" + #include "kvi_locale.h" +#endif diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index ca1603afb..6230b0a35 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -120,4 +120,3 @@ void KviOptionsWidgetContainer::cancelClicked() deleteLater(); } -#include "m_container.moc" diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index fb133c852..6939e4a3e 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -672,4 +672,3 @@ void KviOptionsDialog::keyPressEvent( QKeyEvent * e ) e->ignore(); } -#include "m_dialog.moc" diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp index 8ee3f3dc4..6069bd7da 100644 --- a/src/modules/options/instances.cpp +++ b/src/modules/options/instances.cpp @@ -3586,5 +3586,3 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con } -#include "m_instances.moc" - diff --git a/src/modules/options/options.pro b/src/modules/options/options.pro new file mode 100644 index 000000000..d9439513d --- /dev/null +++ b/src/modules/options/options.pro @@ -0,0 +1,104 @@ +TARGET = kvioptions + +PRECOMPILED_HEADER = pch.h + +precompile_header:!isEmpty(PRECOMPILED_HEADER) { + DEFINES += USING_PCH + } + +precompile_header:isEmpty(PRECOMPILED_HEADER) { + DEFINES += CREATING_PCH + } + +HEADERS += container.h \ + dialog.h \ + instances.h \ + optw_antispam.h \ + optw_avatar.h \ + optw_connection.h \ + optw_ctcp.h \ + optw_ctcpfloodprotection.h \ + optw_dcc.h \ + optw_generalopt.h \ + optw_highlighting.h \ + optw_ident.h \ + optw_identity.h \ + optw_ignore.h \ + optw_input.h \ + optw_interfacefeatures.h \ + optw_interfacelookglobal.h \ + optw_irc.h \ + optw_ircoutput.h \ + optw_ircview.h \ + optw_lag.h \ + optw_logging.h \ + optw_mediatypes.h \ + optw_messages.h \ + optw_nickserv.h \ + optw_notify.h \ + optw_protection.h \ + optw_proxy.h \ + optw_query.h \ + optw_servers.h \ + optw_sound.h \ + optw_ssl.h \ + optw_taskbar.h \ + optw_textencoding.h \ + optw_texticons.h \ + optw_theme.h \ + optw_tools.h \ + optw_transport.h \ + optw_topiclabel.h \ + optw_away.h \ + optw_uparser.h \ + optw_urlhandlers.h \ + optw_userlist.h \ + optw_tray.h + +SOURCES += libkvioptions.cpp \ + container.cpp \ + dialog.cpp \ + instances.cpp \ + optw_antispam.cpp \ + optw_avatar.cpp \ + optw_connection.cpp \ + optw_ctcp.cpp \ + optw_ctcpfloodprotection.cpp \ + optw_dcc.cpp \ + optw_generalopt.cpp \ + optw_highlighting.cpp \ + optw_ident.cpp \ + optw_identity.cpp \ + optw_ignore.cpp \ + optw_input.cpp \ + optw_interfacefeatures.cpp \ + optw_interfacelookglobal.cpp \ + optw_irc.cpp \ + optw_ircoutput.cpp \ + optw_ircview.cpp \ + optw_lag.cpp \ + optw_logging.cpp \ + optw_mediatypes.cpp \ + optw_messages.cpp \ + optw_nickserv.cpp \ + optw_notify.cpp \ + optw_protection.cpp \ + optw_proxy.cpp \ + optw_query.cpp \ + optw_servers.cpp \ + optw_sound.cpp \ + optw_ssl.cpp \ + optw_taskbar.cpp \ + optw_textencoding.cpp \ + optw_texticons.cpp \ + optw_theme.cpp \ + optw_tools.cpp \ + optw_transport.cpp \ + optw_topiclabel.cpp \ + optw_away.cpp \ + optw_uparser.cpp \ + optw_urlhandlers.cpp \ + optw_userlist.cpp \ + optw_tray.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp index 48fb565d7..a0317772d 100644 --- a/src/modules/options/optw_antispam.cpp +++ b/src/modules/options/optw_antispam.cpp @@ -61,4 +61,3 @@ void KviAntispamOptionsWidget::reenableStuff(bool) } -#include "m_optw_antispam.moc" diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp index 5e9ae129e..337bd2558 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -128,4 +128,3 @@ KviAvatarAdvancedOptionsWidget::~KviAvatarAdvancedOptionsWidget() } -#include "m_optw_avatar.moc" diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index c23f5c651..a3583416e 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -68,4 +68,3 @@ void KviAwayOptionsWidget::enableCustomAwayText(bool) } -#include "m_optw_away.moc" diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index 44da4e72c..3f04aaab7 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -318,4 +318,3 @@ KviConnectionAdvancedOptionsWidget::~KviConnectionAdvancedOptionsWidget() } -#include "m_optw_connection.moc" diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp index 59d5e7da0..f3bce9a14 100644 --- a/src/modules/options/optw_ctcp.cpp +++ b/src/modules/options/optw_ctcp.cpp @@ -87,4 +87,3 @@ KviCtcpOptionsWidget::~KviCtcpOptionsWidget() } -#include "m_optw_ctcp.moc" diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index 7e1b3a1bf..957cfc8eb 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -113,4 +113,3 @@ KviCtcpFloodProtectionOptionsWidget::~KviCtcpFloodProtectionOptionsWidget() } -#include "m_optw_ctcpfloodprotection.moc" diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index 2d3cbe16b..df2943e20 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -390,4 +390,3 @@ KviDccVoiceOptionsWidget::~KviDccVoiceOptionsWidget() { } -#include "m_optw_dcc.moc" diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp index 64b737659..2604f7b45 100644 --- a/src/modules/options/optw_generalopt.cpp +++ b/src/modules/options/optw_generalopt.cpp @@ -48,4 +48,3 @@ KviGeneralOptOptionsWidget::~KviGeneralOptOptionsWidget() } -#include "m_optw_generalopt.moc" diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index aad2cd974..fa4f4136d 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -123,6 +123,5 @@ KviAlertOptionsWidget::~KviAlertOptionsWidget() } -#include "m_optw_highlighting.moc" #endif //_OPTW_HIGHLIGHTING_CPP_ diff --git a/src/modules/options/optw_ident.cpp b/src/modules/options/optw_ident.cpp index 5a393a695..c6fdcfe18 100644 --- a/src/modules/options/optw_ident.cpp +++ b/src/modules/options/optw_ident.cpp @@ -34,4 +34,3 @@ -#include "m_optw_ident.moc" diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 27186e455..04b759e82 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -726,4 +726,3 @@ void KviIdentityAdvancedOptionsWidget::commit() -#include "m_optw_identity.moc" diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp index e258926fd..a16ee9304 100644 --- a/src/modules/options/optw_ignore.cpp +++ b/src/modules/options/optw_ignore.cpp @@ -59,4 +59,3 @@ void KviIgnoreOptionsWidget::enableVerbose(bool) -#include "m_optw_ignore.moc" diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp index f2a23d8fc..aa03219f5 100644 --- a/src/modules/options/optw_input.cpp +++ b/src/modules/options/optw_input.cpp @@ -153,4 +153,3 @@ KviInputFeaturesOptionsWidget::~KviInputFeaturesOptionsWidget() { } -#include "m_optw_input.moc" diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index 21db72aa2..1c40e44c4 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -85,4 +85,3 @@ void KviInterfaceFeaturesOptionsWidget::commit() } -#include "m_optw_interfacefeatures.moc" diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index f09fc7a0d..d23fed9ff 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -212,4 +212,3 @@ KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget() } -#include "m_optw_interfacelookglobal.moc" diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index 3572fe38b..3e6b4e524 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -217,4 +217,3 @@ void KviChannelAdvancedOptionsWidget::commit() KviOptionsWidget::commit(); } -#include "m_optw_irc.moc" diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp index a7e565f1a..2fbd1e3e7 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -91,4 +91,3 @@ void KviIrcOutputOptionsWidget::commit() KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = i; } -#include "m_optw_ircoutput.moc" diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp index 766a8c772..bc02491c6 100644 --- a/src/modules/options/optw_ircview.cpp +++ b/src/modules/options/optw_ircview.cpp @@ -165,4 +165,3 @@ KviIrcViewFeaturesOptionsWidget::~KviIrcViewFeaturesOptionsWidget() -#include "m_optw_ircview.moc" diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 34e3eb300..95227b173 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -82,4 +82,3 @@ KviLagOptionsWidget::~KviLagOptionsWidget() } -#include "m_optw_lag.moc" diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp index f8a197e82..b6f2cef46 100644 --- a/src/modules/options/optw_logging.cpp +++ b/src/modules/options/optw_logging.cpp @@ -61,4 +61,3 @@ KviLoggingOptionsWidget::~KviLoggingOptionsWidget() -#include "m_optw_logging.moc" diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp index 062b50309..24b69f943 100644 --- a/src/modules/options/optw_mediatypes.cpp +++ b/src/modules/options/optw_mediatypes.cpp @@ -259,4 +259,3 @@ void KviMediaTypesOptionsWidget::commit() g_pMediaManager->unlock(); } -#include "m_optw_mediatypes.moc" diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 2742d6dd8..bcb39e934 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -690,4 +690,3 @@ void KviMessageColorsOptionsWidget::load() } } -#include "m_optw_messages.moc" diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index c6ac75df6..f3291cff8 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -365,4 +365,3 @@ void KviNickServOptionsWidget::commit() KviOptionsWidget::commit(); } -#include "m_optw_nickserv.moc" diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp index 23b4252b3..616097c27 100644 --- a/src/modules/options/optw_notify.cpp +++ b/src/modules/options/optw_notify.cpp @@ -131,4 +131,3 @@ KviNotifierOptionsWidget::~KviNotifierOptionsWidget() } -#include "m_optw_notify.moc" diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp index 137ffbb8b..e82ed5373 100644 --- a/src/modules/options/optw_protection.cpp +++ b/src/modules/options/optw_protection.cpp @@ -47,4 +47,3 @@ KviProtectionOptionsWidget::~KviProtectionOptionsWidget() { } -#include "m_optw_protection.moc" diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index 44c635205..cc1eb1dd4 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -363,5 +363,3 @@ void KviProxyOptionsWidget::removeCurrent() } } } - -#include "m_optw_proxy.moc" diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp index 19963c37f..ceb6f19a9 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -111,5 +111,3 @@ KviQueryOptionsWidget::~KviQueryOptionsWidget() { } - -#include "m_optw_query.moc" diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index ae98e14fc..69c4d73d4 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -1708,5 +1708,3 @@ void KviServerOptionsWidget::detailsClicked() m_pNetworkDetailsDialog = 0; } } - -#include "m_optw_servers.moc" diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index 69f1f4a4a..8e39d3e54 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -306,5 +306,3 @@ KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent) KviSoundsOptionsWidget::~KviSoundsOptionsWidget() { } - -#include "m_optw_sound.moc" diff --git a/src/modules/options/optw_ssl.cpp b/src/modules/options/optw_ssl.cpp index 6242c3c4b..423afc911 100644 --- a/src/modules/options/optw_ssl.cpp +++ b/src/modules/options/optw_ssl.cpp @@ -31,5 +31,3 @@ //#warning "Info tips" - -#include "m_optw_ssl.moc" diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp index 89e16c005..94ad75915 100644 --- a/src/modules/options/optw_taskbar.cpp +++ b/src/modules/options/optw_taskbar.cpp @@ -251,5 +251,3 @@ KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(QWidget * parent) KviClassicTaskBarOptionsWidget::~KviClassicTaskBarOptionsWidget() { } - -#include "m_optw_taskbar.moc" diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp index 067fe0a48..fa418a842 100644 --- a/src/modules/options/optw_textencoding.cpp +++ b/src/modules/options/optw_textencoding.cpp @@ -135,5 +135,3 @@ void KviTextEncodingOptionsWidget::commit() /* if(!KviQString::equalCI(m_pForcedLocaleCombo->text(idx),m_szLanguage)) QMessageBox::information(0,"KVIrc",__tr2qs_ctx("You need to restart KVirc to apply a language changing","options"),QMessageBox::Ok);*/ } - -#include "m_optw_textencoding.moc" diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index 09edb250e..e8b048729 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -240,5 +240,3 @@ void KviTextIconsOptionsWidget::commit() m_pTable->clearCell(i,j); } - -#include "m_optw_texticons.moc" diff --git a/src/modules/options/optw_theme.cpp b/src/modules/options/optw_theme.cpp index 9906b7ec1..861e10a3f 100644 --- a/src/modules/options/optw_theme.cpp +++ b/src/modules/options/optw_theme.cpp @@ -22,5 +22,3 @@ // //============================================================================= - -#include "m_optw_theme.moc" diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp index 1f927b2d3..ce26f7e78 100644 --- a/src/modules/options/optw_tools.cpp +++ b/src/modules/options/optw_tools.cpp @@ -46,5 +46,3 @@ KviToolsOptionsWidget::KviToolsOptionsWidget(QWidget * parent) KviToolsOptionsWidget::~KviToolsOptionsWidget() { } - -#include "m_optw_tools.moc" diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp index 67a5e635f..ebe6a0ade 100644 --- a/src/modules/options/optw_topiclabel.cpp +++ b/src/modules/options/optw_topiclabel.cpp @@ -39,5 +39,3 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOp KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget() { } - -#include "m_optw_topiclabel.moc" diff --git a/src/modules/options/optw_transport.cpp b/src/modules/options/optw_transport.cpp index 656debbbf..54929ae78 100644 --- a/src/modules/options/optw_transport.cpp +++ b/src/modules/options/optw_transport.cpp @@ -29,5 +29,3 @@ - -#include "m_optw_transport.moc" diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp index 791048d23..9cc58f66b 100644 --- a/src/modules/options/optw_tray.cpp +++ b/src/modules/options/optw_tray.cpp @@ -88,4 +88,3 @@ void KviTrayOptionsWidget::setEnabled(bool bEnabled) } -#include "m_optw_tray.moc" diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp index 3afbbe578..64e39b4c0 100644 --- a/src/modules/options/optw_uparser.cpp +++ b/src/modules/options/optw_uparser.cpp @@ -59,4 +59,3 @@ KviUParserOptionsWidget::~KviUParserOptionsWidget() } -#include "m_optw_uparser.moc" diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp index 76060c028..dc0315605 100644 --- a/src/modules/options/optw_urlhandlers.cpp +++ b/src/modules/options/optw_urlhandlers.cpp @@ -122,6 +122,5 @@ void KviUrlHandlersOptionsWidget::commit() #endif } -#include "m_optw_urlhandlers.moc" #endif //_OPTW_URLHANDLERS_CPP_ diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp index c16dac937..42734da7c 100644 --- a/src/modules/options/optw_userlist.cpp +++ b/src/modules/options/optw_userlist.cpp @@ -242,4 +242,3 @@ KviUserListFeaturesOptionsWidget::~KviUserListFeaturesOptionsWidget() { } -#include "m_optw_userlist.moc" diff --git a/src/modules/options/pch.h b/src/modules/options/pch.h new file mode 100644 index 000000000..8c8ef6cd5 --- /dev/null +++ b/src/modules/options/pch.h @@ -0,0 +1,11 @@ +#if defined __cplusplus + #include // All moc genereated code has this include + #include + #include "kvi_settings.h" + #include "kvi_app.h" + #include "kvi_locale.h" + //#include "kvi_options.h" + #include "kvi_optionswidget.h" + #include "kvi_selectors.h" + #include "kvi_qstring.h" +#endif diff --git a/src/modules/perl/perl.pro b/src/modules/perl/perl.pro new file mode 100644 index 000000000..82674b62a --- /dev/null +++ b/src/modules/perl/perl.pro @@ -0,0 +1,5 @@ +TARGET = kviperl + +SOURCES += libkviperl.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/perlcore/perlcore.pro b/src/modules/perlcore/perlcore.pro new file mode 100644 index 000000000..7d9fc01cc --- /dev/null +++ b/src/modules/perlcore/perlcore.pro @@ -0,0 +1,11 @@ +TARGET = kviperlcore + +INCLUDEPATH += $(PERLDIR)/lib/CORE/ + +LIBS += -lperl58 + +HEADERS += perlcoreinterface.h + +SOURCES += libkviperlcore.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/popupeditor/popupeditor.pro b/src/modules/popupeditor/popupeditor.pro new file mode 100644 index 000000000..bdec0dfef --- /dev/null +++ b/src/modules/popupeditor/popupeditor.pro @@ -0,0 +1,7 @@ +TARGET = kvipopupeditor + +HEADERS += popupeditor.h + +SOURCES += libkvipopupeditor.cpp popupeditor.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/raweditor/raweditor.pro b/src/modules/raweditor/raweditor.pro new file mode 100644 index 000000000..b14df4585 --- /dev/null +++ b/src/modules/raweditor/raweditor.pro @@ -0,0 +1,7 @@ +TARGET = kviraweditor + +HEADERS += raweditor.h + +SOURCES += libkviraweditor.cpp raweditor.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/regchan/regchan.pro b/src/modules/regchan/regchan.pro new file mode 100644 index 000000000..a046a8433 --- /dev/null +++ b/src/modules/regchan/regchan.pro @@ -0,0 +1,5 @@ +TARGET = kviregchan + +SOURCES += libkviregchan.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index 7ac0c818f..74958957a 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -907,6 +907,3 @@ succesfull_import: f.close(); fillList(); } -#if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) -#include "dialog.moc" -#endif diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index 83facc92f..cf0968952 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -777,4 +777,3 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked() -#include "edituser.moc" diff --git a/src/modules/reguser/reguser.pro b/src/modules/reguser/reguser.pro new file mode 100644 index 000000000..4066c4bf4 --- /dev/null +++ b/src/modules/reguser/reguser.pro @@ -0,0 +1,7 @@ +TARGET = kvireguser + +HEADERS += edituser.h wizard.h dialog.h + +SOURCES += libkvireguser.cpp edituser.cpp wizard.cpp dialog.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index 6fefff089..0a8387698 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -459,4 +459,3 @@ void KviRegistrationWizard::notifyCheckToggled(bool) notifyNickChanged(dummy); } -#include "wizard.moc" diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index 8bd3ba5e9..ac18cb656 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -848,6 +848,3 @@ KVIRC_MODULE( rijndael_module_cleanup ) -#ifdef COMPILE_CRYPT_SUPPORT - #include "libkvirijndael.moc" -#endif diff --git a/src/modules/rijndael/rijndael.pro b/src/modules/rijndael/rijndael.pro new file mode 100644 index 000000000..5b065471a --- /dev/null +++ b/src/modules/rijndael/rijndael.pro @@ -0,0 +1,7 @@ +TARGET = kvirijndael + +HEADERS += libkvirijndael.h rijndael.h ablowfish.h + +SOURCES += libkvirijndael.cpp rijndael.cpp ablowfish.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/setup/setup.pro b/src/modules/setup/setup.pro new file mode 100644 index 000000000..4d9397502 --- /dev/null +++ b/src/modules/setup/setup.pro @@ -0,0 +1,9 @@ +TARGET = kvisetup + +HEADERS += setupwizard.h + +SOURCES += libkvisetup.cpp setupwizard.cpp + +LIBS = -lole32 -luuid + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 8201e3a55..7163c588d 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -1049,4 +1049,3 @@ void KviSetupWizard::accept() KviTalWizard::accept(); } -#include "setupwizard.moc" diff --git a/src/modules/sharedfile/sharedfile.pro b/src/modules/sharedfile/sharedfile.pro new file mode 100644 index 000000000..4fedde87e --- /dev/null +++ b/src/modules/sharedfile/sharedfile.pro @@ -0,0 +1,5 @@ +TARGET = kvisharedfile + +SOURCES += libkvisharedfile.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index c6deec20d..308846047 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -739,4 +739,3 @@ void KviSharedFilesWindow::die() //} -#include "m_sharedfileswindow.moc" diff --git a/src/modules/sharedfileswindow/sharedfileswindow.pro b/src/modules/sharedfileswindow/sharedfileswindow.pro new file mode 100644 index 000000000..be1121e46 --- /dev/null +++ b/src/modules/sharedfileswindow/sharedfileswindow.pro @@ -0,0 +1,7 @@ +TARGET = kvisharedfileswindow + +HEADERS += sharedfileswindow.h + +SOURCES += libkvisharedfileswindow.cpp sharedfileswindow.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index 9f95e442b..24c702a8f 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -741,4 +741,3 @@ KVIRC_MODULE( snd_module_cleanup ) -#include "libkvisnd.moc" diff --git a/src/modules/snd/snd.pro b/src/modules/snd/snd.pro new file mode 100644 index 000000000..8c8c53798 --- /dev/null +++ b/src/modules/snd/snd.pro @@ -0,0 +1,9 @@ +TARGET = kvisnd + +HEADERS += libkvisnd.h + +SOURCES += libkvisnd.cpp + +LIBS += -lwinmm + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/socketspy/socketspy.pro b/src/modules/socketspy/socketspy.pro new file mode 100644 index 000000000..6d09ddf7f --- /dev/null +++ b/src/modules/socketspy/socketspy.pro @@ -0,0 +1,7 @@ +TARGET = kvisocketspy + +HEADERS += socketspywindow.h + +SOURCES += libkvisocketspy.cpp socketspywindow.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp index 6456d5992..1db00e772 100644 --- a/src/modules/socketspy/socketspywindow.cpp +++ b/src/modules/socketspy/socketspywindow.cpp @@ -122,4 +122,3 @@ void KviSocketSpyWindow::applyOptions() m_pIrcView->applyOptions(); KviWindow::applyOptions(); } -#include "m_socketspywindow.moc" diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp index 4e6df0429..25935ca53 100644 --- a/src/modules/spaste/controller.cpp +++ b/src/modules/spaste/controller.cpp @@ -118,4 +118,3 @@ void SPasteController::pasteClipboard(void) } else delete this;//Clipboard finished } -#include "controller.moc" diff --git a/src/modules/spaste/spaste.pro b/src/modules/spaste/spaste.pro new file mode 100644 index 000000000..75263b386 --- /dev/null +++ b/src/modules/spaste/spaste.pro @@ -0,0 +1,7 @@ +TARGET = kvispaste + +HEADERS += controller.h libkvispaste.h + +SOURCES += libkvispaste.cpp controller.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/str/str.pro b/src/modules/str/str.pro new file mode 100644 index 000000000..b1db3541e --- /dev/null +++ b/src/modules/str/str.pro @@ -0,0 +1,8 @@ +TARGET = kvistr + +SOURCES += libkvistr.cpp + +LIBS += -leay32 \ + -lssleay32 + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/system/system.pro b/src/modules/system/system.pro new file mode 100644 index 000000000..42efa28dd --- /dev/null +++ b/src/modules/system/system.pro @@ -0,0 +1,7 @@ +TARGET = kvisystem + +HEADERS += plugin.h + +SOURCES += libkvisystem.cpp plugin.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp index 703ba01d0..281be6b6a 100644 --- a/src/modules/term/termwidget.cpp +++ b/src/modules/term/termwidget.cpp @@ -174,6 +174,5 @@ QSize KviTermWidget::sizeHint() const return QSize(wdth + 2,hght + 2); } -#include "termwidget.moc" #endif //COMPILE_KDE_SUPPORT diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp index 45fc58e3c..15d0d4dc8 100644 --- a/src/modules/term/termwindow.cpp +++ b/src/modules/term/termwindow.cpp @@ -79,6 +79,5 @@ void KviTermWindow::fillCaptionBuffers() KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().ascii()); } -#include "termwindow.moc" #endif diff --git a/src/modules/texticons/texticons.pro b/src/modules/texticons/texticons.pro new file mode 100644 index 000000000..1df63f85e --- /dev/null +++ b/src/modules/texticons/texticons.pro @@ -0,0 +1,5 @@ +TARGET = kvitexticons + +SOURCES += libkvitexticons.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/theme/theme.pro b/src/modules/theme/theme.pro new file mode 100644 index 000000000..73fe7edee --- /dev/null +++ b/src/modules/theme/theme.pro @@ -0,0 +1,14 @@ +TARGET = kvitheme + +HEADERS += managementdialog.h \ + packthemedialog.h \ + savethemedialog.h \ + themefunctions.h + +SOURCES += libkvitheme.cpp \ + managementdialog.cpp \ + packthemedialog.cpp \ + savethemedialog.cpp \ + themefunctions.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index daa16d65a..02f3314c9 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -306,4 +306,3 @@ KVIRC_MODULE( tip_module_cleanup ) -#include "libkvitip.moc" diff --git a/src/modules/tip/tip.pro b/src/modules/tip/tip.pro new file mode 100644 index 000000000..22f05b8d9 --- /dev/null +++ b/src/modules/tip/tip.pro @@ -0,0 +1,7 @@ +TARGET = kvitip + +HEADERS += libkvitip.h + +SOURCES += libkvitip.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/tmphighlight/tmphighlight.pro b/src/modules/tmphighlight/tmphighlight.pro new file mode 100644 index 000000000..dc84c1541 --- /dev/null +++ b/src/modules/tmphighlight/tmphighlight.pro @@ -0,0 +1,5 @@ +TARGET = kvitmphighlight + +SOURCES += libkvitmphighlight.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/toolbar/toolbar.pro b/src/modules/toolbar/toolbar.pro new file mode 100644 index 000000000..63ee68443 --- /dev/null +++ b/src/modules/toolbar/toolbar.pro @@ -0,0 +1,6 @@ +TARGET = kvitoolbar + + +SOURCES += libkvitoolbar.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/toolbareditor/toolbareditor.pro b/src/modules/toolbareditor/toolbareditor.pro new file mode 100644 index 000000000..d0d5861d9 --- /dev/null +++ b/src/modules/toolbareditor/toolbareditor.pro @@ -0,0 +1,7 @@ +TARGET = kvitoolbareditor + +HEADERS += toolbareditor.h + +SOURCES += libkvitoolbareditor.cpp toolbareditor.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.cpp b/src/modules/torrent/tc_ktorrentdcopinterface.cpp index fd845cb12..825736f2b 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp +++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp @@ -494,7 +494,6 @@ bool KviKTorrentDCOPInterface::setMaxDownloadSpeed(int kbytes_per_sec) } -#include "tc_ktorrentdcopinterface.moc" #endif // COMPILE_KDE_SUPPORT diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp index 5d23a299d..e939b53a4 100644 --- a/src/modules/torrent/tc_statusbarapplet.cpp +++ b/src/modules/torrent/tc_statusbarapplet.cpp @@ -65,5 +65,3 @@ void KviTorrentStatusBarApplet::update() } } -#include "tc_statusbarapplet.moc" - diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index f979da4fb..98efb2f0a 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -901,4 +901,3 @@ KVIRC_MODULE( url_module_cleanup ) -#include "libkviurl.moc" diff --git a/src/modules/url/url.pro b/src/modules/url/url.pro new file mode 100644 index 000000000..959d0fd27 --- /dev/null +++ b/src/modules/url/url.pro @@ -0,0 +1,7 @@ +TARGET = kviurl + +HEADERS += libkviurl.h icons.h + +SOURCES += libkviurl.cpp + +include(../module.pri) \ No newline at end of file diff --git a/src/modules/window/window.pro b/src/modules/window/window.pro new file mode 100644 index 000000000..7ed31401b --- /dev/null +++ b/src/modules/window/window.pro @@ -0,0 +1,7 @@ +TARGET = kviwindow + +HEADERS += userwindow.h + +SOURCES += libkviwindow.cpp userwindow.cpp + +include(../module.pri) \ No newline at end of file -- cgit v1.3.1-10-gc9f91