diff options
| author |  Alexey Uzhva | 2007-07-05 09:16:45 +0000 |
|---|---|---|
| committer | Alexey Uzhva | 2007-07-05 09:16:45 +0000 |
| commit | 134c12759e236fac24c9724b6ef3aaefde6830f7 (patch) | |
| tree | f86b36fb7949816dde44e5cd8ee898d112706854 | |
| parent | fixed font saving in qt4 kvirc (diff) | |
| download | KVIrc-134c12759e236fac24c9724b6ef3aaefde6830f7.tar.gz KVIrc-134c12759e236fac24c9724b6ef3aaefde6830f7.tar.bz2 KVIrc-134c12759e236fac24c9724b6ef3aaefde6830f7.zip | |
undoing, sorry
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@646 17fca916-40b9-46aa-a4ea-0a15b648b75c
246 files changed, 375 insertions, 1648 deletions
diff --git a/data/resources/auto-generated/kvilib.rc b/data/resources/auto-generated/kvilib.rc index 248c22050..d6a76e4a9 100644 --- a/data/resources/auto-generated/kvilib.rc +++ b/data/resources/auto-generated/kvilib.rc @@ -1,9 +1,5 @@ // Microsoft Visual C++ generated resource script.
//
-#ifdef __GNUC__
-1 24 "../../manifests/commctrl.manifest"
-#endif
-
#include "kvilib-resource.h"
#define APSTUDIO_READONLY_SYMBOLS
diff --git a/data/resources/commctrl.rc b/data/resources/commctrl.rc deleted file mode 100644 index 31774c8d3..000000000 --- a/data/resources/commctrl.rc +++ /dev/null @@ -1 +0,0 @@ -1 24 "../manifests/commctrl.manifest"
\ No newline at end of file diff --git a/data/resources/kvirc.rc b/data/resources/kvirc.rc index 86d974326..1db6ddcf1 100644 --- a/data/resources/kvirc.rc +++ b/data/resources/kvirc.rc @@ -2,11 +2,6 @@ //
#include "resource.h"
-#ifdef __GNUC__
- #include "commctrl.rc"
-#endif
-
-#include "afxres.h"
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
@@ -16,6 +11,7 @@ IDD_ICON3 ICON DISCARDABLE "kvc.ico" IDD_ICON4 ICON DISCARDABLE "kvt.ico"
IDD_ICON5 ICON DISCARDABLE "kva.ico"
+
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
@@ -30,37 +26,4 @@ END BEGIN
"\r\n"
"\0"
-END
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,6,99
- PRODUCTVERSION 3,2,6,99
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "000004b0"
- BEGIN
- VALUE "CompanyName", "KVIrc Development Team"
- VALUE "FileDescription", "K Visual IRC Client Executable"
- VALUE "FileVersion", "3, 2, 6, 99"
- VALUE "InternalName", "KVIrc"
- VALUE "LegalCopyright", "Copyright (C) 2007"
- VALUE "OriginalFilename", "kvirc.exe"
- VALUE "ProductName", "K Visual IRC Client"
- VALUE "ProductVersion", "3, 2, 6, 99"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x0, 1200
- END
-END
+END
\ No newline at end of file diff --git a/data/resources/uac.rc b/data/resources/uac.rc deleted file mode 100644 index 362cdbbb9..000000000 --- a/data/resources/uac.rc +++ /dev/null @@ -1 +0,0 @@ -1 24 "../manifests/damn-uac.manifest"
\ No newline at end of file diff --git a/kvirc.pro b/kvirc.pro deleted file mode 100644 index a5837d0be..000000000 --- a/kvirc.pro +++ /dev/null @@ -1,2 +0,0 @@ -TEMPLATE = subdirs
-SUBDIRS = src
\ No newline at end of file diff --git a/src/kvilib/kvilib.pro b/src/kvilib/kvilib.pro deleted file mode 100644 index b3175a861..000000000 --- a/src/kvilib/kvilib.pro +++ /dev/null @@ -1,214 +0,0 @@ -CONFIG += precompile_header debug_and_release thread dll -LANGUAGE = C++ -TEMPLATE = lib -TARGET = kvilib -QT += core \ - gui \ - qt3support -# Use Precompiled headers (PCH) -PRECOMPILED_HEADER = pch.h - -CONFIG(debug, debug|release) { - DESTDIR = ../../bin/debug/ - } else { - DESTDIR = ../../bin/release/ - } - -HEADERS += tal/kvi_tal_application_kde.h \ - tal/kvi_tal_application_qt.h \ - tal/kvi_tal_filedialog_qt4.h \ - tal/kvi_tal_grid_qt4.h \ - tal/kvi_tal_groupbox_qt4.h \ - tal/kvi_tal_hbox_qt4.h \ - tal/kvi_tal_iconview_qt4.h \ - tal/kvi_tal_listbox_qt4.h \ - tal/kvi_tal_listview_qt4.h \ - tal/kvi_tal_mainwindow_qt4.h \ - tal/kvi_tal_menubar_qt.h \ - tal/kvi_tal_popupmenu_qt4.h \ - tal/kvi_tal_scrollview_qt4.h \ - tal/kvi_tal_tabdialog_qt4.h \ - tal/kvi_tal_textedit_qt4.h \ - tal/kvi_tal_toolbar_qt4.h \ - tal/kvi_tal_vbox_qt4.h \ - tal/kvi_tal_widgetstack_qt4.h \ - tal/kvi_tal_wizard_qt4.h \ - tal/kvi_tal_application.h \ - tal/kvi_tal_filedialog.h \ - tal/kvi_tal_grid.h \ - tal/kvi_tal_groupbox.h \ - tal/kvi_tal_hbox.h \ - tal/kvi_tal_iconview.h \ - tal/kvi_tal_listbox.h \ - tal/kvi_tal_listview.h \ - tal/kvi_tal_mainwindow.h \ - tal/kvi_tal_menubar.h \ - tal/kvi_tal_popupmenu.h \ - tal/kvi_tal_scrollview.h \ - tal/kvi_tal_tabdialog.h \ - tal/kvi_tal_textedit.h \ - tal/kvi_tal_toolbar.h \ - tal/kvi_tal_toolbardocktype.h \ - tal/kvi_tal_tooltip.h \ - tal/kvi_tal_vbox.h \ - tal/kvi_tal_widgetstack.h \ - tal/kvi_tal_windowstate.h \ - tal/kvi_tal_wizard.h \ - system/kvi_byteorder.h \ - system/kvi_env.h \ - system/kvi_library.h \ - system/kvi_locale.h \ - system/kvi_process.h \ - system/kvi_stdarg.h \ - system/kvi_thread.h \ - system/kvi_time.h \ - net/kvi_dns.h \ - net/kvi_http.h \ - net/kvi_netutils.h \ - net/kvi_socket.h \ - net/kvi_sockettype.h \ - net/kvi_ssl.h \ - net/kvi_url.h \ - irc/kvi_avatar.h \ - irc/kvi_avatarcache.h \ - irc/kvi_ircmask.h \ - irc/kvi_ircserver.h \ - irc/kvi_ircserverdb.h \ - irc/kvi_ircuserdb.h \ - irc/kvi_mirccntrl.h \ - irc/kvi_nickserv.h \ - irc/kvi_useridentity.h \ - file/kvi_file.h \ - file/kvi_fileutils.h \ - file/kvi_packagefile.h \ - ext/kvi_accel.h \ - ext/kvi_cmdformatter.h \ - ext/kvi_config.h \ - ext/kvi_crypt.h \ - ext/kvi_databuffer.h \ - ext/kvi_dcophelper.h \ - ext/kvi_doublebuffer.h \ - ext/kvi_draganddrop.h \ - ext/kvi_garbage.h \ - ext/kvi_imagelib.h \ - ext/kvi_md5.h \ - ext/kvi_mediatype.h \ - ext/kvi_miscutils.h \ - ext/kvi_msgtype.h \ - ext/kvi_osinfo.h \ - ext/kvi_parameterlist.h \ - ext/kvi_pixmap.h \ - ext/kvi_proxydb.h \ - ext/kvi_regchan.h \ - ext/kvi_regusersdb.h \ - ext/kvi_sharedfiles.h \ - ext/kvi_stringconversion.h \ - ext/kvi_xlib.h \ - core/kvi_asciidict.h \ - core/kvi_bswap.h \ - core/kvi_dict.h \ - core/kvi_error.h \ - core/kvi_heapobject.h \ - core/kvi_intdict.h \ - core/kvi_inttypes.h \ - core/kvi_list.h \ - core/kvi_malloc.h \ - core/kvi_memmove.h \ - core/kvi_ptrdict.h \ - core/kvi_qcstring.h \ - core/kvi_qstring.h \ - core/kvi_strasm.h \ - core/kvi_string.h \ - core/kvi_stringarray.h \ - core/kvi_valuelist.h \ - config/kvi_confignames.h \ - config/kvi_debug.h \ - config/kvi_defaults.h \ - config/kvi_fileextensions.h \ - config/kvi_settings.h \ - config/kvi_sourcesdate.h \ - config/kvi_version.h \ - config/kvi_wincfg.h -SOURCES += tal/kvi_tal_application.cpp \ - tal/kvi_tal_filedialog.cpp \ - tal/kvi_tal_grid.cpp \ - tal/kvi_tal_groupbox.cpp \ - tal/kvi_tal_hbox.cpp \ - tal/kvi_tal_iconview.cpp \ - tal/kvi_tal_listbox.cpp \ - tal/kvi_tal_listview.cpp \ - tal/kvi_tal_mainwindow.cpp \ - tal/kvi_tal_menubar.cpp \ - tal/kvi_tal_popupmenu.cpp \ - tal/kvi_tal_scrollview.cpp \ - tal/kvi_tal_tabdialog.cpp \ - tal/kvi_tal_textedit.cpp \ - tal/kvi_tal_toolbar.cpp \ - tal/kvi_tal_tooltip.cpp \ - tal/kvi_tal_vbox.cpp \ - tal/kvi_tal_widgetstack.cpp \ - tal/kvi_tal_wizard.cpp \ - system/kvi_env.cpp \ - system/kvi_locale.cpp \ - system/kvi_thread.cpp \ - system/kvi_time.cpp \ - net/kvi_dns.cpp \ - net/kvi_http.cpp \ - net/kvi_netutils.cpp \ - net/kvi_socket.cpp \ - net/kvi_ssl.cpp \ - net/kvi_url.cpp \ - irc/kvi_avatar.cpp \ - irc/kvi_avatarcache.cpp \ - irc/kvi_ircmask.cpp \ - irc/kvi_ircserver.cpp \ - irc/kvi_ircserverdb.cpp \ - irc/kvi_ircuserdb.cpp \ - irc/kvi_mirccntrl.cpp \ - irc/kvi_nickserv.cpp \ - irc/kvi_useridentity.cpp \ - file/kvi_file.cpp \ - file/kvi_fileutils.cpp \ - file/kvi_packagefile.cpp \ - ext/kvi_cmdformatter.cpp \ - ext/kvi_config.cpp \ - ext/kvi_crypt.cpp \ - ext/kvi_databuffer.cpp \ - ext/kvi_dcophelper.cpp \ - ext/kvi_doublebuffer.cpp \ - ext/kvi_garbage.cpp \ - ext/kvi_imagelib.cpp \ - ext/kvi_md5.cpp \ - ext/kvi_mediatype.cpp \ - ext/kvi_miscutils.cpp \ - ext/kvi_msgtype.cpp \ - ext/kvi_osinfo.cpp \ - ext/kvi_parameterlist.cpp \ - ext/kvi_pixmap.cpp \ - ext/kvi_proxydb.cpp \ - ext/kvi_regchan.cpp \ - ext/kvi_regusersdb.cpp \ - ext/kvi_sharedfiles.cpp \ - ext/kvi_stringconversion.cpp \ - core/kvi_error.cpp \ - core/kvi_heapobject.cpp \ - core/kvi_malloc.cpp \ - core/kvi_memmove.cpp \ - core/kvi_qstring.cpp \ - core/kvi_string.cpp \ - core/kvi_stringarray.cpp -FORMS += -RESOURCES += -DEFINES += __KVILIB__ \ - __QMAKE__ - - -DEFINES -= UNICODE - -LIBS += -leay32 \ - -lssleay32 \ - -lws2_32 - -RC_FILE = ../../data/resources/auto-generated/kvilib.rc - -include( using_kvilib.pri )
\ No newline at end of file diff --git a/src/kvilib/pch.h b/src/kvilib/pch.h deleted file mode 100644 index 2e8472426..000000000 --- a/src/kvilib/pch.h +++ /dev/null @@ -1,8 +0,0 @@ -#if defined __cplusplus
- #include <qglobal.h>
- #include <qvariant.h> // All moc genereated code has this include
- #include <qstring.h>
- #include <qstringlist.h>
- #include "kvi_settings.h"
-
-#endif
diff --git a/src/kvilib/using_kvilib.pri b/src/kvilib/using_kvilib.pri deleted file mode 100644 index 7cba45caa..000000000 --- a/src/kvilib/using_kvilib.pri +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDEPATH += ../kvilib/tal/ \
- ../kvilib/config/ \
- ../kvilib/core/ \
- ../kvilib/ext/ \
- ../kvilib/file/ \
- ../kvilib/irc/ \
- ../kvilib/net/ \
- ../kvilib/system/
-
-!contains( DEFINES, __KVILIB__ ) {
- LIBS += -lkvilib
- }
\ No newline at end of file diff --git a/src/kvirc/build/Makefile.am b/src/kvirc/build/Makefile.am index b6b036004..9d8675db9 100644 --- a/src/kvirc/build/Makefile.am +++ b/src/kvirc/build/Makefile.am @@ -20,44 +20,6 @@ bin_PROGRAMS = kvirc # nodist_kvirc_SOURCES = ../kernel/moc_kvi_action.cpp \ -../kernel/moc_kvi_app.cpp -../kernel/moc_kvi_iconmanager.cpp -../kernel/moc_kvi_ipc.cpp -../kernel/moc_kvi_lagmeter.cpp -../kernel/moc_kvi_notifylist.cpp -../kernel/moc_kvi_texticonmanager.cpp -../sparser/moc_kvi_sparser.cpp -../ui/moc_kvi_channel.cpp -../ui/moc_kvi_colorwin.cpp -../ui/moc_kvi_console.cpp -../ui/moc_kvi_cryptcontroller.cpp -../ui/moc_kvi_ctcppagedialog.cpp -../ui/moc_kvi_dynamictooltip.cpp -../ui/moc_kvi_filedialog.cpp -../ui/moc_kvi_frame.cpp -../ui/moc_kvi_historywin.cpp -../ui/moc_kvi_input.cpp -../ui/moc_kvi_ipeditor.cpp -../ui/moc_kvi_irctoolbar.cpp -../ui/moc_kvi_ircview.cpp -../ui/moc_kvi_maskeditor.cpp -../ui/moc_kvi_menubar.cpp -../ui/moc_kvi_modeeditor.cpp -../ui/moc_kvi_optionswidget.cpp -../ui/moc_kvi_query.cpp -../ui/moc_kvi_scriptbutton.cpp -../ui/moc_kvi_scripteditor.cpp -../ui/moc_kvi_selectors.cpp -../ui/moc_kvi_splash.cpp -../ui/moc_kvi_taskbar.cpp -../ui/moc_kvi_texticonwin.cpp -../ui/moc_kvi_themedlabel.cpp -../ui/moc_kvi_toolbar.cpp -../ui/moc_kvi_topicw.cpp -../ui/moc_kvi_modew.cpp -../ui/moc_kvi_styled_controls.cpp -../ui/moc_kvi_userlistview.cpp -../ui/moc_kvi_window.cpp ../kernel/moc_kvi_actionmanager.cpp \ ../kernel/moc_kvi_coreactions.cpp \ ../kernel/moc_kvi_filetransfer.cpp \ @@ -500,6 +462,46 @@ headers_HEADERS = ../kernel/kvi_action.h \ # DIRS="kernel sparser ui uparser" # for dire in $DIRS; do grep "\.moc" ../$dire/*.cpp | sort | sed -e 's/[[:space:]]*#include//' | sed -e s/\\\"/..\\\/$dire\\\// | sed -e 's/\"//'; done +../kernel/kvi_app.cpp: ../kernel/kvi_app.moc +../kernel/kvi_iconmanager.cpp: ../kernel/kvi_iconmanager.moc +../kernel/kvi_ipc.cpp: ../kernel/kvi_ipc.moc +../kernel/kvi_lagmeter.cpp: ../kernel/kvi_lagmeter.moc +../kernel/kvi_notifylist.cpp: ../kernel/kvi_notifylist.moc +../kernel/kvi_texticonmanager.cpp: ../kernel/kvi_texticonmanager.moc +../sparser/kvi_sparser.cpp: ../sparser/kvi_sparser.moc +../ui/kvi_channel.cpp: ../ui/kvi_channel.moc +../ui/kvi_colorwin.cpp: ../ui/kvi_colorwin.moc +../ui/kvi_console.cpp: ../ui/kvi_console.moc +../ui/kvi_cryptcontroller.cpp: ../ui/kvi_cryptcontroller.moc +../ui/kvi_ctcppagedialog.cpp: ../ui/kvi_ctcppagedialog.moc +../ui/kvi_dynamictooltip.cpp: ../ui/kvi_dynamictooltip.moc +../ui/kvi_filedialog.cpp: ../ui/kvi_filedialog.moc +../ui/kvi_frame.cpp: ../ui/kvi_frame.moc +../ui/kvi_historywin.cpp: ../ui/kvi_historywin.moc +../ui/kvi_input.cpp: ../ui/kvi_input.moc +../ui/kvi_ipeditor.cpp: ../ui/kvi_ipeditor.moc +../ui/kvi_irctoolbar.cpp: ../ui/kvi_irctoolbar.moc +../ui/kvi_ircview.cpp: ../ui/kvi_ircview.moc +../ui/kvi_maskeditor.cpp: ../ui/kvi_maskeditor.moc +../ui/kvi_menubar.cpp: ../ui/kvi_menubar.moc +../ui/kvi_modeeditor.cpp: ../ui/kvi_modeeditor.moc +../ui/kvi_optionswidget.cpp: ../ui/kvi_optionswidget.moc +../ui/kvi_query.cpp: ../ui/kvi_query.moc +../ui/kvi_scriptbutton.cpp: ../ui/kvi_scriptbutton.moc +../ui/kvi_scripteditor.cpp: ../ui/kvi_scripteditor.moc +../ui/kvi_selectors.cpp: ../ui/kvi_selectors.moc +../ui/kvi_splash.cpp: ../ui/kvi_splash.moc +../ui/kvi_taskbar.cpp: ../ui/kvi_taskbar.moc +../ui/kvi_texticonwin.cpp: ../ui/kvi_texticonwin.moc +../ui/kvi_themedlabel.cpp: ../ui/kvi_themedlabel.moc +../ui/kvi_toolbar.cpp: ../ui/kvi_toolbar.moc +../ui/kvi_topicw.cpp: ../ui/kvi_topicw.moc +../ui/kvi_modew.cpp: ../ui/kvi_modew.moc +../ui/kvi_styled_controls.cpp: ../ui/kvi_styled_controls.moc +../ui/kvi_userlistview.cpp: ../ui/kvi_userlistview.moc +../ui/kvi_window.cpp: ../ui/kvi_window.moc + + ../kvs/moc_%.cpp: ../kvs/%.h $(SS_QT_MOC) $< -o $@ diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index fb8013437..2f1d9d248 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -2053,4 +2053,12 @@ void KviApp::timerEvent(QTimerEvent *e) kvi_time_t tNow = kvi_unixTime(); heartbeat(tNow); -}
\ No newline at end of file +} + +// qvariant.h uses this , and it is included by the qt generated moc file for Qt >= 3.0.0 +#ifdef Bool + #undef Bool +#endif + + +#include "kvi_app.moc" diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index 8c7182cf8..09afbab0a 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -26,11 +26,6 @@ //============================================================================= #include "kvi_settings.h" - -#if defined(COMPILE_ON_WINDOWS) && defined(__GNUC__) - #include "qapplication.h" -#endif - #include "kvi_string.h" #include "kvi_qstring.h" #include "kvi_tal_application.h" @@ -53,10 +48,6 @@ class KviIpcSentinel; #endif // !COMPILE_NO_IPC -#ifdef USING_PCH -#include <QApplication> -#endif - class KviTalPopupMenu; class QPixmap; class KviTalListBox; @@ -93,7 +84,7 @@ class KVIRC_API KviApp : public KviTalApplication Q_OBJECT public: KviApp(int &argc,char ** argv); - virtual ~KviApp(); //mingw wants virtual destructor:/ + ~KviApp(); protected: // directories diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index de7824631..18ba42df1 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -920,3 +920,5 @@ void KviIconManager::cacheCleanup() if(m_pCachedImages->isEmpty())m_pCleanupTimer->stop(); */ } + +#include "kvi_iconmanager.moc" diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp index e24426176..84c94c5d5 100644 --- a/src/kvirc/kernel/kvi_ipc.cpp +++ b/src/kvirc/kernel/kvi_ipc.cpp @@ -264,5 +264,6 @@ #endif //!COMPILE_NO_X #endif //!COMPILE_ON_WINDOWS + #include "kvi_ipc.moc" #endif diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h index 3401a850e..60722e875 100644 --- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.h +++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.h @@ -34,7 +34,7 @@ protected: QString m_szServerVersion; public: KviBasicIrcServerInfo(const QString & version = KviQString::empty); - virtual ~KviBasicIrcServerInfo(); + ~KviBasicIrcServerInfo(); protected: virtual const QString & getCustomChannelModeDescription(QChar mode) { return KviQString::empty; }; virtual const QString & getCustomUserModeDescription(QChar mode) { return KviQString::empty; }; diff --git a/src/kvirc/kernel/kvi_lagmeter.cpp b/src/kvirc/kernel/kvi_lagmeter.cpp index c28ffc4a9..c9e0a008d 100644 --- a/src/kvirc/kernel/kvi_lagmeter.cpp +++ b/src/kvirc/kernel/kvi_lagmeter.cpp @@ -262,3 +262,5 @@ void KviLagMeter::lagCheckAbort(const char * key) if(kvi_strEqualCS(c->szKey.ptr(),key))l.append(c); for(c = l.first();c;c = l.next())m_pCheckList->removeRef(c); } + +#include "kvi_lagmeter.moc" diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp index dce2dabd2..5463cfc7d 100644 --- a/src/kvirc/kernel/kvi_notifylist.cpp +++ b/src/kvirc/kernel/kvi_notifylist.cpp @@ -1273,3 +1273,5 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg) return false; } + +#include "kvi_notifylist.moc" diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp index 53131ffff..658e2b287 100644 --- a/src/kvirc/kernel/kvi_options.cpp +++ b/src/kvirc/kernel/kvi_options.cpp @@ -47,7 +47,7 @@ //#include "kvi_textencoding.h" //xml parser -//#include <qdom.h> +#include <qdom.h> //!xml parser #include <zlib.h> diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h index 107b95902..7f278d88d 100644 --- a/src/kvirc/kernel/kvi_options.h +++ b/src/kvirc/kernel/kvi_options.h @@ -671,7 +671,7 @@ extern KVIRC_API KviStringListOption g_stringlistOptionsTable[KVI_NUM_STRINGLIST #endif -#if defined(_KVI_OPTIONS_CPP_) || defined(_WANT_OPTION_FLAGS_) || defined(CREATING_PCH) +#if defined(_KVI_OPTIONS_CPP_) || defined(_WANT_OPTION_FLAGS_) // flag definitions diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp index 1022a173c..7af47c51b 100644 --- a/src/kvirc/kernel/kvi_texticonmanager.cpp +++ b/src/kvirc/kernel/kvi_texticonmanager.cpp @@ -250,3 +250,5 @@ void KviTextIconManager::save(const QString &filename) ++it; } } + +#include "kvi_texticonmanager.moc" diff --git a/src/kvirc/kvirc.pro b/src/kvirc/kvirc.pro deleted file mode 100644 index 20b78674c..000000000 --- a/src/kvirc/kvirc.pro +++ /dev/null @@ -1,449 +0,0 @@ -DEFINES += __KVIRC__ \ - __QMAKE__ - -win32 { - DEFINES -= UNICODE -} - -CONFIG += precompile_header debug_and_release thread -LANGUAGE = C++ -TEMPLATE = app -TARGET = kvirc -QT += core \ - gui \ - qt3support - -# Use Precompiled headers (PCH) -PRECOMPILED_HEADER = pch.h - -precompile_header:!isEmpty(PRECOMPILED_HEADER) { - DEFINES += USING_PCH - } - -precompile_header:isEmpty(PRECOMPILED_HEADER) { - DEFINES += CREATING_PCH - } - -CONFIG(debug, debug|release) { - DESTDIR = ../../bin/debug/ - } else { - DESTDIR = ../../bin/release/ - } - -HEADERS += ui/kvi_actiondrawer.h \ - ui/kvi_channel.h \ - ui/kvi_colorwin.h \ - ui/kvi_console.h \ - ui/kvi_cryptcontroller.h \ - ui/kvi_ctcppagedialog.h \ - ui/kvi_customtoolbar.h \ - ui/kvi_debugwindow.h \ - ui/kvi_dynamictooltip.h \ - ui/kvi_filedialog.h \ - ui/kvi_frame.h \ - ui/kvi_historywin.h \ - ui/kvi_htmldialog.h \ - ui/kvi_imagedialog.h \ - ui/kvi_input.h \ - ui/kvi_ipeditor.h \ - ui/kvi_irctoolbar.h \ - ui/kvi_ircview.h \ - ui/kvi_ircviewprivate.h \ - ui/kvi_ircviewtools.h \ - ui/kvi_listview.h \ - ui/kvi_maskeditor.h \ - ui/kvi_mdicaption.h \ - ui/kvi_mdichild.h \ - ui/kvi_mdimanager.h \ - ui/kvi_menubar.h \ - ui/kvi_modeeditor.h \ - ui/kvi_modew.h \ - ui/kvi_msgbox.h \ - ui/kvi_optionswidget.h \ - ui/kvi_query.h \ - ui/kvi_scriptbutton.h \ - ui/kvi_scripteditor.h \ - ui/kvi_selectors.h \ - ui/kvi_splash.h \ - ui/kvi_statusbar.h \ - ui/kvi_statusbarapplet.h \ - ui/kvi_styled_controls.h \ - ui/kvi_taskbar.h \ - ui/kvi_texticonwin.h \ - ui/kvi_themedlabel.h \ - ui/kvi_toolbar.h \ - ui/kvi_toolwindows_container.h \ - ui/kvi_topicw.h \ - ui/kvi_userlistview.h \ - ui/kvi_window.h \ - sparser/kvi_antispam.h \ - sparser/kvi_ircmessage.h \ - sparser/kvi_numeric.h \ - sparser/kvi_sparser.h \ - module/kvi_mexlinkfilter.h \ - module/kvi_mexserverimport.h \ - module/kvi_mextoolbar.h \ - module/kvi_module.h \ - module/kvi_moduleextension.h \ - module/kvi_modulemanager.h \ - kvs/kvi_kvs.h \ - kvs/kvi_kvs_action.h \ - kvs/kvi_kvs_aliasmanager.h \ - kvs/kvi_kvs_array.h \ - kvs/kvi_kvs_arraycast.h \ - kvs/kvi_kvs_asyncdnsoperation.h \ - kvs/kvi_kvs_asyncoperation.h \ - kvs/kvi_kvs_callbackobject.h \ - kvs/kvi_kvs_corecallbackcommands.h \ - kvs/kvi_kvs_corefunctions.h \ - kvs/kvi_kvs_coresimplecommands.h \ - kvs/kvi_kvs_dnsmanager.h \ - kvs/kvi_kvs_event.h \ - kvs/kvi_kvs_eventhandler.h \ - kvs/kvi_kvs_eventmanager.h \ - kvs/kvi_kvs_eventtable.h \ - kvs/kvi_kvs_eventtriggers.h \ - kvs/kvi_kvs_hash.h \ - kvs/kvi_kvs_kernel.h \ - kvs/kvi_kvs_moduleinterface.h \ - kvs/kvi_kvs_object.h \ - kvs/kvi_kvs_object_class.h \ - kvs/kvi_kvs_object_controller.h \ - kvs/kvi_kvs_object_functioncall.h \ - kvs/kvi_kvs_object_functionhandler.h \ - kvs/kvi_kvs_object_functionhandlerimpl.h \ - kvs/kvi_kvs_parameterprocessor.h \ - kvs/kvi_kvs_parser.h \ - kvs/kvi_kvs_parser_macros.h \ - kvs/kvi_kvs_popupmanager.h \ - kvs/kvi_kvs_popupmenu.h \ - kvs/kvi_kvs_processmanager.h \ - kvs/kvi_kvs_report.h \ - kvs/kvi_kvs_runtimecall.h \ - kvs/kvi_kvs_runtimecontext.h \ - kvs/kvi_kvs_rwevaluationresult.h \ - kvs/kvi_kvs_script.h \ - kvs/kvi_kvs_scriptaddonmanager.h \ - kvs/kvi_kvs_switchlist.h \ - kvs/kvi_kvs_timermanager.h \ - kvs/kvi_kvs_treenode.h \ - kvs/kvi_kvs_treenode_aliasfunctioncall.h \ - kvs/kvi_kvs_treenode_aliassimplecommand.h \ - kvs/kvi_kvs_treenode_arraycount.h \ - kvs/kvi_kvs_treenode_arrayelement.h \ - kvs/kvi_kvs_treenode_arrayorhashelement.h \ - kvs/kvi_kvs_treenode_arrayreferenceassert.h \ - kvs/kvi_kvs_treenode_base.h \ - kvs/kvi_kvs_treenode_baseobjectfunctioncall.h \ - kvs/kvi_kvs_treenode_callbackcommand.h \ - kvs/kvi_kvs_treenode_command.h \ - kvs/kvi_kvs_treenode_commandevaluation.h \ - kvs/kvi_kvs_treenode_commandwithparameters.h \ - kvs/kvi_kvs_treenode_compositedata.h \ - kvs/kvi_kvs_treenode_constantdata.h \ - kvs/kvi_kvs_treenode_corecallbackcommand.h \ - kvs/kvi_kvs_treenode_corefunctioncall.h \ - kvs/kvi_kvs_treenode_coresimplecommand.h \ - kvs/kvi_kvs_treenode_data.h \ - kvs/kvi_kvs_treenode_datalist.h \ - kvs/kvi_kvs_treenode_expression.h \ - kvs/kvi_kvs_treenode_expressionreturn.h \ - kvs/kvi_kvs_treenode_extendedscopevariable.h \ - kvs/kvi_kvs_treenode_functioncall.h \ - kvs/kvi_kvs_treenode_globalvariable.h \ - kvs/kvi_kvs_treenode_hashcount.h \ - kvs/kvi_kvs_treenode_hashelement.h \ - kvs/kvi_kvs_treenode_hashreferenceassert.h \ - kvs/kvi_kvs_treenode_indirectdata.h \ - kvs/kvi_kvs_treenode_instruction.h \ - kvs/kvi_kvs_treenode_instructionblock.h \ - kvs/kvi_kvs_treenode_localvariable.h \ - kvs/kvi_kvs_treenode_modulecallbackcommand.h \ - kvs/kvi_kvs_treenode_modulefunctioncall.h \ - kvs/kvi_kvs_treenode_modulesimplecommand.h \ - kvs/kvi_kvs_treenode_multipleparameteridentifier.h \ - kvs/kvi_kvs_treenode_objectfield.h \ - kvs/kvi_kvs_treenode_objectfunctioncall.h \ - kvs/kvi_kvs_treenode_operation.h \ - kvs/kvi_kvs_treenode_parameterreturn.h \ - kvs/kvi_kvs_treenode_rebindingswitch.h \ - kvs/kvi_kvs_treenode_scopeoperator.h \ - kvs/kvi_kvs_treenode_simplecommand.h \ - kvs/kvi_kvs_treenode_singleparameteridentifier.h \ - kvs/kvi_kvs_treenode_specialcommand.h \ - kvs/kvi_kvs_treenode_specialcommandbreak.h \ - kvs/kvi_kvs_treenode_specialcommandclass.h \ - kvs/kvi_kvs_treenode_specialcommanddefpopup.h \ - kvs/kvi_kvs_treenode_specialcommanddo.h \ - kvs/kvi_kvs_treenode_specialcommandfor.h \ - kvs/kvi_kvs_treenode_specialcommandforeach.h \ - kvs/kvi_kvs_treenode_specialcommandif.h \ - kvs/kvi_kvs_treenode_specialcommandswitch.h \ - kvs/kvi_kvs_treenode_specialcommandunset.h \ - kvs/kvi_kvs_treenode_specialcommandwhile.h \ - kvs/kvi_kvs_treenode_stringcast.h \ - kvs/kvi_kvs_treenode_switchlist.h \ - kvs/kvi_kvs_treenode_thisobjectfunctioncall.h \ - kvs/kvi_kvs_treenode_variable.h \ - kvs/kvi_kvs_treenode_voidfunctioncall.h \ - kvs/kvi_kvs_types.h \ - kvs/kvi_kvs_useraction.h \ - kvs/kvi_kvs_variant.h \ - kvs/kvi_kvs_variantlist.h \ - kernel/kvi_action.h \ - kernel/kvi_actionmanager.h \ - kernel/kvi_app.h \ - kernel/kvi_asynchronousconnectiondata.h \ - kernel/kvi_coreactionnames.h \ - kernel/kvi_coreactions.h \ - kernel/kvi_customtoolbardescriptor.h \ - kernel/kvi_customtoolbarmanager.h \ - kernel/kvi_filetransfer.h \ - kernel/kvi_iconmanager.h \ - kernel/kvi_internalcmd.h \ - kernel/kvi_ipc.h \ - kernel/kvi_ircconnection.h \ - kernel/kvi_ircconnectionantictcpflooddata.h \ - kernel/kvi_ircconnectionasyncwhoisdata.h \ - kernel/kvi_ircconnectionnetsplitdetectordata.h \ - kernel/kvi_ircconnectionserverinfo.h \ - kernel/kvi_ircconnectionstatedata.h \ - kernel/kvi_ircconnectionstatistics.h \ - kernel/kvi_ircconnectiontarget.h \ - kernel/kvi_ircconnectiontargetresolver.h \ - kernel/kvi_ircconnectionuserinfo.h \ - kernel/kvi_irccontext.h \ - kernel/kvi_ircdatastreammonitor.h \ - kernel/kvi_irclink.h \ - kernel/kvi_ircsocket.h \ - kernel/kvi_ircurl.h \ - kernel/kvi_lagmeter.h \ - kernel/kvi_notifylist.h \ - kernel/kvi_options.h \ - kernel/kvi_out.h \ - kernel/kvi_sslmaster.h \ - kernel/kvi_texticonmanager.h \ - kernel/kvi_theme.h \ - kernel/kvi_useraction.h \ - kernel/kvi_userinput.h - - -SOURCES += ui/kvi_actiondrawer.cpp \ - ui/kvi_channel.cpp \ - ui/kvi_colorwin.cpp \ - ui/kvi_console.cpp \ - ui/kvi_cryptcontroller.cpp \ - ui/kvi_ctcppagedialog.cpp \ - ui/kvi_customtoolbar.cpp \ - ui/kvi_debugwindow.cpp \ - ui/kvi_dynamictooltip.cpp \ - ui/kvi_filedialog.cpp \ - ui/kvi_frame.cpp \ - ui/kvi_historywin.cpp \ - ui/kvi_htmldialog.cpp \ - ui/kvi_imagedialog.cpp \ - ui/kvi_input.cpp \ - ui/kvi_ipeditor.cpp \ - ui/kvi_irctoolbar.cpp \ - ui/kvi_ircview.cpp \ - ui/kvi_ircviewtools.cpp \ - ui/kvi_listview.cpp \ - ui/kvi_maskeditor.cpp \ - ui/kvi_mdicaption.cpp \ - ui/kvi_mdichild.cpp \ - ui/kvi_mdimanager.cpp \ - ui/kvi_menubar.cpp \ - ui/kvi_modeeditor.cpp \ - ui/kvi_modew.cpp \ - ui/kvi_msgbox.cpp \ - ui/kvi_optionswidget.cpp \ - ui/kvi_query.cpp \ - ui/kvi_scriptbutton.cpp \ - ui/kvi_scripteditor.cpp \ - ui/kvi_selectors.cpp \ - ui/kvi_splash.cpp \ - ui/kvi_statusbar.cpp \ - ui/kvi_statusbarapplet.cpp \ - ui/kvi_styled_controls.cpp \ - ui/kvi_taskbar.cpp \ - ui/kvi_texticonwin.cpp \ - ui/kvi_themedlabel.cpp \ - ui/kvi_toolbar.cpp \ - ui/kvi_toolwindows_container.cpp \ - ui/kvi_topicw.cpp \ - ui/kvi_userlistview.cpp \ - ui/kvi_window.cpp \ - sparser/kvi_antispam.cpp \ - sparser/kvi_ircmessage.cpp \ - sparser/kvi_sp_ctcp.cpp \ - sparser/kvi_sp_literal.cpp \ - sparser/kvi_sp_numeric.cpp \ - sparser/kvi_sp_tables.cpp \ - sparser/kvi_sparser.cpp \ - module/kvi_mexlinkfilter.cpp \ - module/kvi_mexserverimport.cpp \ - module/kvi_mextoolbar.cpp \ - module/kvi_module.cpp \ - module/kvi_moduleextension.cpp \ - module/kvi_modulemanager.cpp \ - kvs/kvi_kvs.cpp \ - kvs/kvi_kvs_action.cpp \ - kvs/kvi_kvs_aliasmanager.cpp \ - kvs/kvi_kvs_array.cpp \ - kvs/kvi_kvs_arraycast.cpp \ - kvs/kvi_kvs_asyncdnsoperation.cpp \ - kvs/kvi_kvs_asyncoperation.cpp \ - kvs/kvi_kvs_callbackobject.cpp \ - kvs/kvi_kvs_corecallbackcommands.cpp \ - kvs/kvi_kvs_corefunctions.cpp \ - kvs/kvi_kvs_corefunctions_af.cpp \ - kvs/kvi_kvs_corefunctions_gl.cpp \ - kvs/kvi_kvs_corefunctions_mr.cpp \ - kvs/kvi_kvs_corefunctions_sz.cpp \ - kvs/kvi_kvs_coresimplecommands.cpp \ - kvs/kvi_kvs_coresimplecommands_af.cpp \ - kvs/kvi_kvs_coresimplecommands_gl.cpp \ - kvs/kvi_kvs_coresimplecommands_mr.cpp \ - kvs/kvi_kvs_coresimplecommands_sz.cpp \ - kvs/kvi_kvs_dnsmanager.cpp \ - kvs/kvi_kvs_event.cpp \ - kvs/kvi_kvs_eventhandler.cpp \ - kvs/kvi_kvs_eventmanager.cpp \ - kvs/kvi_kvs_eventtable.cpp \ - kvs/kvi_kvs_hash.cpp \ - kvs/kvi_kvs_kernel.cpp \ - kvs/kvi_kvs_moduleinterface.cpp \ - kvs/kvi_kvs_object.cpp \ - kvs/kvi_kvs_object_class.cpp \ - kvs/kvi_kvs_object_controller.cpp \ - kvs/kvi_kvs_object_functioncall.cpp \ - kvs/kvi_kvs_object_functionhandler.cpp \ - kvs/kvi_kvs_object_functionhandlerimpl.cpp \ - kvs/kvi_kvs_parameterprocessor.cpp \ - kvs/kvi_kvs_parser.cpp \ - kvs/kvi_kvs_parser_command.cpp \ - kvs/kvi_kvs_parser_comment.cpp \ - kvs/kvi_kvs_parser_dollar.cpp \ - kvs/kvi_kvs_parser_expression.cpp \ - kvs/kvi_kvs_parser_lside.cpp \ - kvs/kvi_kvs_parser_specialcommands.cpp \ - kvs/kvi_kvs_popupmanager.cpp \ - kvs/kvi_kvs_popupmenu.cpp \ - kvs/kvi_kvs_processmanager.cpp \ - kvs/kvi_kvs_report.cpp \ - kvs/kvi_kvs_runtimecall.cpp \ - kvs/kvi_kvs_runtimecontext.cpp \ - kvs/kvi_kvs_rwevaluationresult.cpp \ - kvs/kvi_kvs_script.cpp \ - kvs/kvi_kvs_scriptaddonmanager.cpp \ - kvs/kvi_kvs_switchlist.cpp \ - kvs/kvi_kvs_timermanager.cpp \ - kvs/kvi_kvs_treenode_aliasfunctioncall.cpp \ - kvs/kvi_kvs_treenode_aliassimplecommand.cpp \ - kvs/kvi_kvs_treenode_arraycount.cpp \ - kvs/kvi_kvs_treenode_arrayelement.cpp \ - kvs/kvi_kvs_treenode_arrayorhashelement.cpp \ - kvs/kvi_kvs_treenode_arrayreferenceassert.cpp \ - kvs/kvi_kvs_treenode_base.cpp \ - kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp \ - kvs/kvi_kvs_treenode_callbackcommand.cpp \ - kvs/kvi_kvs_treenode_command.cpp \ - kvs/kvi_kvs_treenode_commandevaluation.cpp \ - kvs/kvi_kvs_treenode_commandwithparameters.cpp \ - kvs/kvi_kvs_treenode_compositedata.cpp \ - kvs/kvi_kvs_treenode_constantdata.cpp \ - kvs/kvi_kvs_treenode_corecallbackcommand.cpp \ - kvs/kvi_kvs_treenode_corefunctioncall.cpp \ - kvs/kvi_kvs_treenode_coresimplecommand.cpp \ - kvs/kvi_kvs_treenode_data.cpp \ - kvs/kvi_kvs_treenode_datalist.cpp \ - kvs/kvi_kvs_treenode_expression.cpp \ - kvs/kvi_kvs_treenode_expressionreturn.cpp \ - kvs/kvi_kvs_treenode_extendedscopevariable.cpp \ - kvs/kvi_kvs_treenode_functioncall.cpp \ - kvs/kvi_kvs_treenode_globalvariable.cpp \ - kvs/kvi_kvs_treenode_hashcount.cpp \ - kvs/kvi_kvs_treenode_hashelement.cpp \ - kvs/kvi_kvs_treenode_hashreferenceassert.cpp \ - kvs/kvi_kvs_treenode_indirectdata.cpp \ - kvs/kvi_kvs_treenode_instruction.cpp \ - kvs/kvi_kvs_treenode_instructionblock.cpp \ - kvs/kvi_kvs_treenode_localvariable.cpp \ - kvs/kvi_kvs_treenode_modulecallbackcommand.cpp \ - kvs/kvi_kvs_treenode_modulefunctioncall.cpp \ - kvs/kvi_kvs_treenode_modulesimplecommand.cpp \ - kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp \ - kvs/kvi_kvs_treenode_objectfield.cpp \ - kvs/kvi_kvs_treenode_objectfunctioncall.cpp \ - kvs/kvi_kvs_treenode_operation.cpp \ - kvs/kvi_kvs_treenode_parameterreturn.cpp \ - kvs/kvi_kvs_treenode_rebindingswitch.cpp \ - kvs/kvi_kvs_treenode_scopeoperator.cpp \ - kvs/kvi_kvs_treenode_simplecommand.cpp \ - kvs/kvi_kvs_treenode_singleparameteridentifier.cpp \ - kvs/kvi_kvs_treenode_specialcommand.cpp \ - kvs/kvi_kvs_treenode_specialcommandbreak.cpp \ - kvs/kvi_kvs_treenode_specialcommandclass.cpp \ - kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp \ - kvs/kvi_kvs_treenode_specialcommanddo.cpp \ - kvs/kvi_kvs_treenode_specialcommandfor.cpp \ - kvs/kvi_kvs_treenode_specialcommandforeach.cpp \ - kvs/kvi_kvs_treenode_specialcommandif.cpp \ - kvs/kvi_kvs_treenode_specialcommandswitch.cpp \ - kvs/kvi_kvs_treenode_specialcommandunset.cpp \ - kvs/kvi_kvs_treenode_specialcommandwhile.cpp \ - kvs/kvi_kvs_treenode_stringcast.cpp \ - kvs/kvi_kvs_treenode_switchlist.cpp \ - kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp \ - kvs/kvi_kvs_treenode_variable.cpp \ - kvs/kvi_kvs_treenode_voidfunctioncall.cpp \ - kvs/kvi_kvs_useraction.cpp \ - kvs/kvi_kvs_variant.cpp \ - kvs/kvi_kvs_variantlist.cpp \ - kernel/kvi_action.cpp \ - kernel/kvi_actionmanager.cpp \ - kernel/kvi_app.cpp \ - kernel/kvi_app_fs.cpp \ - kernel/kvi_app_setup.cpp \ - kernel/kvi_asynchronousconnectiondata.cpp \ - kernel/kvi_coreactions.cpp \ - kernel/kvi_customtoolbardescriptor.cpp \ - kernel/kvi_customtoolbarmanager.cpp \ - kernel/kvi_filetransfer.cpp \ - kernel/kvi_iconmanager.cpp \ - kernel/kvi_internalcmd.cpp \ - kernel/kvi_ipc.cpp \ - kernel/kvi_ircconnection.cpp \ - kernel/kvi_ircconnectionantictcpflooddata.cpp \ - kernel/kvi_ircconnectionasyncwhoisdata.cpp \ - kernel/kvi_ircconnectionnetsplitdetectordata.cpp \ - kernel/kvi_ircconnectionserverinfo.cpp \ - kernel/kvi_ircconnectionstatedata.cpp \ - kernel/kvi_ircconnectionstatistics.cpp \ - kernel/kvi_ircconnectiontarget.cpp \ - kernel/kvi_ircconnectiontargetresolver.cpp \ - kernel/kvi_ircconnectionuserinfo.cpp \ - kernel/kvi_irccontext.cpp \ - kernel/kvi_ircdatastreammonitor.cpp \ - kernel/kvi_irclink.cpp \ - kernel/kvi_ircsocket.cpp \ - kernel/kvi_ircurl.cpp \ - kernel/kvi_lagmeter.cpp \ - kernel/kvi_main.cpp \ - kernel/kvi_notifylist.cpp \ - kernel/kvi_options.cpp \ - kernel/kvi_sslmaster.cpp \ - kernel/kvi_texticonmanager.cpp \ - kernel/kvi_theme.cpp \ - kernel/kvi_useraction.cpp \ - kernel/kvi_userinput.cpp - -FORMS += -RESOURCES += - -LIBS += -L$$DESTDIR -lshlwapi -lws2_32 -Wl,--out-implib,$$DESTDIR/libkvirc.a - -include( ../kvilib/using_kvilib.pri ) -include( using_kvirc.pri ) - -RC_FILE = ../../data/resources/kvirc.rc
\ No newline at end of file diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp index 05b36d76c..43dada66f 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp @@ -46,18 +46,11 @@ #include "kvi_kvs_variantlist.h" #include "kvi_kvs_script.h" #include "kvi_kvs_popupmanager.h" -#include "kvi_settings.h" #include <qcursor.h> #include <qprocess.h> #include <qtimer.h> -//FIXME: should be #ifdef UNICODE here... -/*#if defined(__GNUC__) && defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) - #define _UNICODE - #include <tchar.h> -#endif -*/ namespace KviKvsCoreSimpleCommands { ////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -399,13 +392,8 @@ namespace KviKvsCoreSimpleCommands #ifdef COMPILE_ON_WINDOWS if(KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers)) { -//#if defined(__GNUC__) && defined(COMPILE_USE_QT4) //FIXME: should be #ifdef UNICODE here... -// ShellExecute(NULL, _T("open"), (const WCHAR*)(szUrl.utf16()), -// NULL, NULL, SW_SHOWNORMAL); -//#else ShellExecute(NULL, "open", szUrl.local8Bit().data(),
NULL, NULL, SW_SHOWNORMAL); -//#endif } else { #endif if(szCommand.isEmpty())szCommand = KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand); diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp index 11621f593..b5d53efd0 100644 --- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp @@ -3124,24 +3124,6 @@ channel @description: Triggered when ircd sets a registered user mode. */ - EVENT("OnNickServAuth",""), - /* - @doc: onmeaction - @type: - event - @title: - OnMeAction - @short: - User issued a CTCP ACTION - @parameters: - $0 = action message text - @window: - Channels and query windows - @description: - This event is triggered when user issues a CTCP ACTION.[br] - (The CTCP ACTION is usually triggered by the /me command).[br] - */ - - EVENT("OnMeAction","$0 = action message text") + EVENT("OnNickServAuth","") }; diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.h b/src/kvirc/kvs/kvi_kvs_eventtable.h index 05d1b0db5..bf807bb63 100644 --- a/src/kvirc/kvs/kvi_kvs_eventtable.h +++ b/src/kvirc/kvs/kvi_kvs_eventtable.h @@ -203,9 +203,7 @@ #define KviEvent_OnNickServAuth 138 -#define KviEvent_OnMeAction 139 - -#define KVI_KVS_NUM_APP_EVENTS 140 +#define KVI_KVS_NUM_APP_EVENTS 139 // compat #define KVI_NUM_SCRIPT_EVENTS KVI_KVS_NUM_APP_EVENTS diff --git a/src/kvirc/pch.h b/src/kvirc/pch.h deleted file mode 100644 index 5b3def3e4..000000000 --- a/src/kvirc/pch.h +++ /dev/null @@ -1,12 +0,0 @@ -#if defined __cplusplus
- #include <qglobal.h>
- #include <qvariant.h> // All moc genereated code has this include
- #include <qstring.h>
- #include <qstringlist.h>
- #include "kvi_settings.h"
- #include "kvi_app.h"
- #include "kvi_frame.h"
- #include "kvi_window.h"
- #include "kvi_ircview.h"
- #include "kvi_ircview.h"
-#endif
diff --git a/src/kvirc/sparser/kvi_sparser.cpp b/src/kvirc/sparser/kvi_sparser.cpp index d6c42df27..272728c91 100644 --- a/src/kvirc/sparser/kvi_sparser.cpp +++ b/src/kvirc/sparser/kvi_sparser.cpp @@ -143,3 +143,8 @@ void KviServerParser::parseMessage(const char * message,KviIrcConnection * pConn } } } + + + + +#include "kvi_sparser.moc" diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp index 44c3684fe..1149728d1 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -22,6 +22,8 @@ // //============================================================================= +#define __KVIRC__ + #include "kvi_actiondrawer.h" #include "kvi_action.h" #include "kvi_actionmanager.h" diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index ea8431ffb..a18a12e39 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -26,6 +26,8 @@ // Channel widget : abstraction of an IRC channel // +#define __KVIRC__ + #include "kvi_toolwindows_container.h" #include "kvi_styled_controls.h" #include "kvi_channel.h" @@ -1115,7 +1117,6 @@ void KviChannel::ownAction(const QString &buffer) const char * d = szData.data(); if(!d)return; if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c",szName.data(),0x01,d,0x01))return; - if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,QString(d)))return; QString szBuffer = "\r!nc\r"; szBuffer += connection()->currentNickName(); szBuffer += "\r "; @@ -1621,4 +1622,6 @@ void KviChannel::unhighlight() { if(!m_pTaskBarItem)return; m_pTaskBarItem->unhighlight(); -}
\ No newline at end of file +} + +#include "kvi_channel.moc" diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 6fef24b52..306f4ff39 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -48,7 +48,6 @@ class KviTopicWidget; class KviIrcMask; class KviThemedLabel; class KviTalHBox; -class KviModeWidget; #ifdef COMPILE_ON_WINDOWS // windows compiler wants this instead of the forward decl diff --git a/src/kvirc/ui/kvi_colorwin.cpp b/src/kvirc/ui/kvi_colorwin.cpp index 6c41f9c9c..18e0751bc 100644 --- a/src/kvirc/ui/kvi_colorwin.cpp +++ b/src/kvirc/ui/kvi_colorwin.cpp @@ -22,6 +22,8 @@ // //============================================================================= +#define __KVIRC__ + #include "kvi_colorwin.h" #include "kvi_app.h" #include "kvi_options.h" @@ -115,3 +117,6 @@ void KviColorWindow::timerEvent(QTimerEvent *) killTimer(m_iTimerId); hide(); } + + +#include "kvi_colorwin.moc" diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index 76be89e97..dadb83a1a 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -25,6 +25,8 @@ // FIXME: The TextEncoding should be inherited from network! +#define __KVIRC__ + #include "kvi_ircurl.h" #include "kvi_app.h" #include "kvi_console.h" @@ -1063,8 +1065,8 @@ void KviConsole::setAvatarFromOptions() void KviConsole::applyOptions() { m_pNotifyListView->applyOptions(); - //m_pInput->applyOptions(); will be done by KviWindow - //m_pIrcView->applyOptions(); will be done by KviWindow + m_pInput->applyOptions(); + m_pIrcView->applyOptions(); KviWindow::applyOptions(); @@ -1267,4 +1269,6 @@ void KviConsole::getTaskBarTipText(QString &buffer) } buffer += "</table>"; -}
\ No newline at end of file +} + +#include "kvi_console.moc" diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index dae1c7b46..941355b69 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -384,4 +384,7 @@ delete *inf; *inf = 0; } + + #include "kvi_cryptcontroller.moc" + #endif //COMPILE_CRYPT_SUPPORT diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp index 66d6bb3d4..fde9bc149 100644 --- a/src/kvirc/ui/kvi_ctcppagedialog.cpp +++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp @@ -142,4 +142,6 @@ void KviCtcpPageDialog::showEvent(QShowEvent *e) { QWidget::showEvent(e); center(); -}
\ No newline at end of file +} + +#include "kvi_ctcppagedialog.moc" diff --git a/src/kvirc/ui/kvi_dynamictooltip.cpp b/src/kvirc/ui/kvi_dynamictooltip.cpp index 7a8d3e0b8..42a386a9a 100644 --- a/src/kvirc/ui/kvi_dynamictooltip.cpp +++ b/src/kvirc/ui/kvi_dynamictooltip.cpp @@ -56,4 +56,6 @@ void KviDynamicToolTip::maybeTip(const QPoint &pnt) void KviDynamicToolTip::tip(const QRect &rct,const QString & text) { m_pHelper->tip(rct,text); -}
\ No newline at end of file +} + +#include "kvi_dynamictooltip.moc" diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp index bb1359078..cf51924bc 100644 --- a/src/kvirc/ui/kvi_filedialog.cpp +++ b/src/kvirc/ui/kvi_filedialog.cpp @@ -224,3 +224,6 @@ bool KviFileDialog::askForOpenFileNames(QStringList &buffer,const QString & capt delete d; return false; } + + +#include "kvi_filedialog.moc" diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index 9d4ad1c77..362e6595c 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -1415,4 +1415,6 @@ void KviFrame::hideEvent ( QHideEvent * e) } } -}
\ No newline at end of file +} + +#include "kvi_frame.moc" diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/kvi_historywin.cpp index 9ea16702f..59a6a5c5e 100644 --- a/src/kvirc/ui/kvi_historywin.cpp +++ b/src/kvirc/ui/kvi_historywin.cpp @@ -249,4 +249,6 @@ void KviHistoryWindow::hideEvent ( QHideEvent * ) m_iTimerId = -1; } } + +#include "kvi_historywin.moc" #endif //_KVI_HISTORYWIN_CPP_ diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index ca5e96d9c..dbc843e3e 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -2659,4 +2659,6 @@ QString KviInput::text() else szText=m_pInputEditor->text(); return szText; -}
\ No newline at end of file +} + +#include "kvi_input.moc" diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp index 108a42578..951b0a3af 100644 --- a/src/kvirc/ui/kvi_ipeditor.cpp +++ b/src/kvirc/ui/kvi_ipeditor.cpp @@ -448,3 +448,6 @@ QSize KviIpEditor::sizeHint() else return QSize((labHint * 7) + (ediHint * 8) + 4,hghHint + 4); } else return QFrame::sizeHint(); } + + +#include "kvi_ipeditor.moc" diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp index 6a5aab2e9..c69b323c0 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -432,3 +432,10 @@ void KviIrcContextDisplay::drawContents(QPainter * p) p->drawLine(KVI_APPLETIRCCONTEXTINDICATORWIDTH,2,KVI_APPLETIRCCONTEXTINDICATORWIDTH,height() - 2); } + + +#ifdef Bool + #undef Bool +#endif + +#include "kvi_irctoolbar.moc" diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 319262c91..e7a5ab702 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -148,7 +148,6 @@ #ifdef COMPILE_USE_QT4
#include <q3mimefactory.h>
- #include <QTimer>
#define QMimeSourceFactory Q3MimeSourceFactory
#endif
@@ -401,11 +400,7 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd) // and catch all mouse events
setMouseTracking(true);
// let's go!
-#ifdef COMPILE_USE_QT4
- QTimer::singleShot(0, this, SLOT(applyOptions()));
-#else
applyOptions();
-#endif
if(KVI_OPTION_UINT(KviOption_uintAutoFlushLogs)) //m_iFlushTimer
{
@@ -465,7 +460,6 @@ KviIrcView::~KviIrcView() void KviIrcView::setFont(const QFont &f)
{
- debug("setting a font");
if(m_pFm)
{
// force an update to the font variables
@@ -488,7 +482,6 @@ void KviIrcView::setFont(const QFont &f) void KviIrcView::applyOptions()
{
- debug("apply options");
flushLog();
setFont(KVI_OPTION_FONT(KviOption_fontIrcView));
if(m_iFlushTimer) killTimer(m_iFlushTimer);
@@ -5294,4 +5287,6 @@ void KviIrcView::maybeTip(const QPoint &pnt) if((linkUnderMouse == m_pLastLinkUnderMouse) && linkUnderMouse)doLinkToolTip(rctLink,linkCmd,linkText);
else m_pLastLinkUnderMouse = 0; //
-}
\ No newline at end of file +}
+
+#include "kvi_ircview.moc"
diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index 560f5babc..2a3fd6bfd 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -152,6 +152,7 @@ private: public: void checkLogDate(); void clearUnreaded(); + void applyOptions(); void enableDnd(bool bEnable); bool haveUnreadedMessages() { return m_bHaveUnreadedMessages; }; bool haveUnreadedHighlightedMessages() { return m_bHaveUnreadedHighlightedMessages; }; @@ -200,7 +201,6 @@ public: const QString & lastMessageText(); virtual void setFont(const QFont &f); public slots: - void applyOptions(); void flushLog(); void showToolsPopup(); void clearBuffer(); diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index ce5f1d32d..07dd6eec7 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -346,3 +346,5 @@ void KviMaskEditor::listViewDoubleClicked( KviTalListViewItem * pItem) } } } + +#include "kvi_maskeditor.moc" diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index d13ec504c..6407bcf5d 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -411,3 +411,5 @@ void KviMenuBar::addMenu(const QString &text,KviKvsPopupMenu * p,int index) connect(p,SIGNAL(destroyed()),this,SLOT(menuDestroyed())); m_pScriptItemList->append(it); } + +#include "kvi_menubar.moc" diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 9247efcec..6db6eaf73 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -331,4 +331,6 @@ void KviModeEditor::commit() if(szModes.hasData())emit setMode(szModes.ptr()); emit done(); -}
\ No newline at end of file +} + +#include "kvi_modeeditor.moc" diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index 4749664c4..ceffe8087 100755 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -170,4 +170,6 @@ void KviModeWidget::editorTextChanged( const QString & text) szText.remove(i,1); } m_pLineEdit->setText(szText); -}
\ No newline at end of file +} + +#include "kvi_modew.moc" diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index ca36935fc..ed275ec3e 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -717,4 +717,6 @@ void KviOptionsWidget::switchToAdvancedPage() // (so nobody listens to this signal....) emit wantToSwitchToAdvancedPage(this); -}
\ No newline at end of file +} + +#include "kvi_optionswidget.moc" diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index 7f8147089..bfaf14147 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -650,8 +650,9 @@ void KviQuery::ownAction(const QString &buffer) if(sz.isEmpty())return; if(!connection()->sendFmtData("PRIVMSG %s :%cACTION %s%c", sz.data(),0x01,szBuffer.data(),0x01))return; - if(KVS_TRIGGER_EVENT_1_HALTED(KviEvent_OnMeAction,this,QString(szBuffer.data())))return; output(KVI_OUT_ACTION,"\r!nc\r%Q\r %Q",&(connection()->currentNickName()),&buffer); m_pUserListView->userAction(connection()->currentNickName(),KVI_USERACTION_ACTION); } -}
\ No newline at end of file +} + +#include "kvi_query.moc" diff --git a/src/kvirc/ui/kvi_scriptbutton.cpp b/src/kvirc/ui/kvi_scriptbutton.cpp index bb4d9ba54..e1b839119 100644 --- a/src/kvirc/ui/kvi_scriptbutton.cpp +++ b/src/kvirc/ui/kvi_scriptbutton.cpp @@ -93,4 +93,6 @@ KviWindowScriptButton::KviWindowScriptButton(QWidget * p,KviWindow * wnd,const c KviWindowScriptButton::~KviWindowScriptButton() { -}
\ No newline at end of file +} + +#include "kvi_scriptbutton.moc" diff --git a/src/kvirc/ui/kvi_scripteditor.cpp b/src/kvirc/ui/kvi_scripteditor.cpp index d76c686ef..a873bf049 100644 --- a/src/kvirc/ui/kvi_scripteditor.cpp +++ b/src/kvirc/ui/kvi_scripteditor.cpp @@ -134,4 +134,6 @@ void KviScriptEditor::destroyInstance(KviScriptEditor * e) } editorModuleDestroyScriptEditor(e); -}
\ No newline at end of file +} + +#include "kvi_scripteditor.moc" diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index acaaddeed..192f2dbc9 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -561,7 +561,6 @@ KviFontSelector::KviFontSelector(QWidget * par,const QString & txt,QFont * pOpti setButtonFont(pOption); m_pOption = pOption; - m_tmpFont = *pOption; setEnabled(bEnabled); } @@ -576,15 +575,12 @@ void KviFontSelector::changeClicked() { bool bOk; QFont tmp = QFontDialog::getFont(&bOk,m_pButton->font()); - if(bOk) { - setButtonFont(&tmp); - m_tmpFont=tmp; - } + if(bOk)setButtonFont(&tmp); } void KviFontSelector::commit() { - *m_pOption = m_tmpFont; + *m_pOption = m_pButton->font(); } void KviFontSelector::setEnabled(bool bEnabled) @@ -838,4 +834,6 @@ void KviCahnnelListSelector::removeClicked() } lst.setAutoDelete(TRUE); lst.clear(); -}
\ No newline at end of file +} + +#include "kvi_selectors.moc" diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h index 4e3463566..790410e2e 100644 --- a/src/kvirc/ui/kvi_selectors.h +++ b/src/kvirc/ui/kvi_selectors.h @@ -251,7 +251,6 @@ private: QLabel * m_pLabel; QFont * m_pOption; QPushButton * m_pButton; - QFont m_tmpFont; public: virtual void commit(); virtual void setEnabled(bool bEnabled); diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp index 2874fbe75..9a90d3632 100644 --- a/src/kvirc/ui/kvi_splash.cpp +++ b/src/kvirc/ui/kvi_splash.cpp @@ -217,3 +217,6 @@ void KviSplashScreen::fadeTimerShot() } #endif } + + +#include "kvi_splash.moc" diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index dc089b2a8..e250c11c6 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -367,4 +367,7 @@ void KviStyledToolButton::resizeEvent ( QResizeEvent * e) setMinimumWidth(bShowSubmenuIndicator ? pix.width()+8+pStoredPix->width() : pix.width()); } } + +#include "kvi_styled_controls.moc" + #endif diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index 7778b0bb0..3917f23b2 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -687,27 +687,27 @@ void KviClassicTaskBar::resizeEvent(QResizeEvent *e) doLayout(); } -KviTaskBarItem * KviClassicTaskBar::firstItem() +inline KviTaskBarItem * KviClassicTaskBar::firstItem() { return m_pButtonList->first(); } -KviTaskBarItem * KviClassicTaskBar::lastItem(void) +inline KviTaskBarItem * KviClassicTaskBar::lastItem(void) { return m_pButtonList->last(); } -KviTaskBarItem * KviClassicTaskBar::nextItem() +inline KviTaskBarItem * KviClassicTaskBar::nextItem() { return m_pButtonList->next(); } -KviTaskBarItem * KviClassicTaskBar::prevItem(void) +inline KviTaskBarItem * KviClassicTaskBar::prevItem(void) { return m_pButtonList->prev(); } -bool KviClassicTaskBar::setIterationPointer(KviTaskBarItem * it) +inline bool KviClassicTaskBar::setIterationPointer(KviTaskBarItem * it) { return (m_pButtonList->findRef((const KviTaskBarButton *)it) != -1); } @@ -1424,4 +1424,6 @@ void KviTreeTaskBar::applyOptions() } else { m_pListView->header()->show(); } -}
\ No newline at end of file +} + +#include "kvi_taskbar.moc" diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp index 1936b3faa..a5b25a1b0 100644 --- a/src/kvirc/ui/kvi_texticonwin.cpp +++ b/src/kvirc/ui/kvi_texticonwin.cpp @@ -278,3 +278,6 @@ void KviTextIconWindow::mousePressEvent(QMouseEvent *e) hideme: doHide(); } + + +#include "kvi_texticonwin.moc" diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp index b54172af0..3e224800e 100644 --- a/src/kvirc/ui/kvi_themedlabel.cpp +++ b/src/kvirc/ui/kvi_themedlabel.cpp @@ -149,3 +149,6 @@ void KviThemedLabel::mouseDoubleClickEvent(QMouseEvent *) { emit doubleClicked(); } + + +#include "kvi_themedlabel.moc" diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp index c69e75df6..966a6bab8 100644 --- a/src/kvirc/ui/kvi_toolbar.cpp +++ b/src/kvirc/ui/kvi_toolbar.cpp @@ -149,3 +149,6 @@ void KviToolBar::setSmallIcons() } + + +#include "kvi_toolbar.moc" diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index 3859a620f..950324019 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -829,4 +829,6 @@ QChar KviTopicWidget::getSubstituteChar(unsigned short control_code) return QChar(control_code); break; } -}
\ No newline at end of file +} + +#include "kvi_topicw.moc" diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index 8282dfbc7..b39fc404d 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -1968,4 +1968,6 @@ void KviUserListViewArea::wheelEvent(QWheelEvent *e) #ifdef COMPILE_USE_QT4 bHere = false; #endif -}
\ No newline at end of file +} + +#include "kvi_userlistview.moc" diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index e7ce82b47..0f4178cc1 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -1513,3 +1513,6 @@ void KviWindow::preprocessMessage(QString & szMessage) } szMessage=strings.join(" "); } + + +#include "kvi_window.moc" diff --git a/src/kvirc/using_kvirc.pri b/src/kvirc/using_kvirc.pri deleted file mode 100644 index cf3be5658..000000000 --- a/src/kvirc/using_kvirc.pri +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDEPATH += kernel/ \
- kvs/ \
- module/ \
- sparser/ \
- ui/
-
-!contains( DEFINES, __KVIRC__ ) {
- LIBS += -lkvirc
- }
\ No newline at end of file diff --git a/src/modules/about/about.pro b/src/modules/about/about.pro deleted file mode 100644 index 6d2bcbe4c..000000000 --- a/src/modules/about/about.pro +++ /dev/null @@ -1,9 +0,0 @@ -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 8e80ea6d0..1688e09e2 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -161,4 +161,6 @@ void KviAboutDialog::closeEvent(QCloseEvent *e) void KviAboutDialog::closeButtonPressed() { delete this; -}
\ No newline at end of file +} + +#include "aboutdialog.moc" diff --git a/src/modules/action/action.pro b/src/modules/action/action.pro deleted file mode 100644 index 628337d2d..000000000 --- a/src/modules/action/action.pro +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index ebc472477..000000000 --- a/src/modules/actioneditor/actioneditor.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 93908063b..000000000 --- a/src/modules/addon/addon.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index d44c242f1..000000000 --- a/src/modules/aliaseditor/aliaseditor.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index f92929cf7..000000000 --- a/src/modules/avatar/avatar.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 16281c16e..000000000 --- a/src/modules/chan/chan.pro +++ /dev/null @@ -1,6 +0,0 @@ -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 8796de1a0..2373bf876 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -25,7 +25,6 @@ #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 deleted file mode 100644 index 71e87468d..000000000 --- a/src/modules/channelsjoin/channelsjoin.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 8139399d2..00f138597 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -296,4 +296,6 @@ void KviChannelsJoinWindow::closeEvent(QCloseEvent *e) { e->ignore(); delete this; -}
\ No newline at end of file +} + +#include "m_channelsjoinwindow.moc" diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h index 8719b7459..27bf5cddf 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.h +++ b/src/modules/channelsjoin/channelsjoinwindow.h @@ -25,7 +25,6 @@ #define _CHANNELSJOIN_H_ #include "kvi_window.h" #include "kvi_string.h" -#include "kvi_tal_groupbox.h" #include <qdialog.h> diff --git a/src/modules/clock/libkviclock.cpp b/src/modules/clock/libkviclock.cpp index ed5961672..08e02a66d 100644 --- a/src/modules/clock/libkviclock.cpp +++ b/src/modules/clock/libkviclock.cpp @@ -253,4 +253,5 @@ 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 deleted file mode 100644 index 1349bee19..000000000 --- a/src/modules/codetester/codetester.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 8937cf02b..000000000 --- a/src/modules/config/config.pro +++ /dev/null @@ -1,5 +0,0 @@ -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 edd6e6b24..52c0abf33 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -895,3 +895,4 @@ 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 43a89f381..dfe39e975 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -296,4 +296,6 @@ void KviDccCanvas::connected() } +#include "m_canvas.moc" + #endif diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index c685a7516..ef5d70495 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1596,5 +1596,6 @@ void KviCanvasWidget::resizeEvent(QResizeEvent *) } +#include "m_canvaswidget.moc" #endif diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index a9ac8cf54..a0cb686ba 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -839,3 +839,4 @@ out_of_the_loop: return bRet; } +#include "m_chat.moc" diff --git a/src/modules/dcc/dcc.pro b/src/modules/dcc/dcc.pro deleted file mode 100644 index 517e1e58f..000000000 --- a/src/modules/dcc/dcc.pro +++ /dev/null @@ -1,39 +0,0 @@ -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 5340e6c3c..c999e53bb 100644 --- a/src/modules/dcc/dialogs.cpp +++ b/src/modules/dcc/dialogs.cpp @@ -203,3 +203,4 @@ void KviDccRenameBox::cancelClicked() +#include "m_dialogs.moc" diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index 206d946cd..2aa383434 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -644,3 +644,4 @@ void KviDccMarshal::connectionTimedOut() } +#include "m_marshal.moc" diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index 5fae23e3c..ba4f79f49 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -1887,3 +1887,4 @@ void KviDccFileTransferBandwidthDialog::closeEvent(QCloseEvent * e) +#include "m_send.moc" diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index ca0d2c7a0..787d43665 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -1038,3 +1038,4 @@ 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 e19a87c45..11fe893fd 100644 --- a/src/modules/dcc/window.cpp +++ b/src/modules/dcc/window.cpp @@ -50,3 +50,4 @@ 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 deleted file mode 100644 index 9d35186bf..000000000 --- a/src/modules/dialog/dialog.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 99a8367e9..3e4e24240 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -917,3 +917,4 @@ KVIRC_MODULE( dialog_module_cleanup ) +#include "libkvidialog.moc" diff --git a/src/modules/dockwidget/dockwidget.pro b/src/modules/dockwidget/dockwidget.pro deleted file mode 100644 index dfc216ef4..000000000 --- a/src/modules/dockwidget/dockwidget.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 aeeabaf57..50e31cb04 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -853,4 +853,6 @@ 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 d769889b7..26d866fba 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp @@ -685,4 +685,6 @@ KVIRC_MODULE( dockwidget_module_cleanup ) +#include "libkvidockwidget_qt4.moc" + #endif diff --git a/src/modules/editor/editor.pro b/src/modules/editor/editor.pro deleted file mode 100644 index b45e490e8..000000000 --- a/src/modules/editor/editor.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 90a0cff6e..000000000 --- a/src/modules/eventeditor/eventeditor.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 3c3b6d720..000000000 --- a/src/modules/file/file.pro +++ /dev/null @@ -1,5 +0,0 @@ -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 875453346..c607efcb8 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -765,3 +765,4 @@ void KviFileTransferWindow::applyOptions() KviWindow::applyOptions(); } +#include "m_filetransferwindow.moc" diff --git a/src/modules/filetransferwindow/filetransferwindow.pro b/src/modules/filetransferwindow/filetransferwindow.pro deleted file mode 100644 index 89bd04104..000000000 --- a/src/modules/filetransferwindow/filetransferwindow.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 0c14b7101..000000000 --- a/src/modules/help/help.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 8670816ff..c416b714e 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -151,3 +151,4 @@ 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 b86e21cc9..197e9e811 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -324,3 +324,4 @@ void KviHelpWindow::fillCaptionBuffers() } +#include "helpwindow.moc" diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index 8112f98cb..540273d0e 100755 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -961,3 +961,5 @@ 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 deleted file mode 100644 index 31edf426e..000000000 --- a/src/modules/http/http.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 45313e746..18ccb5b7d 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -486,3 +486,4 @@ 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 deleted file mode 100644 index 0ede844fd..000000000 --- a/src/modules/ident/ident.pro +++ /dev/null @@ -1,9 +0,0 @@ -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 59e10c091..4c3690297 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -611,3 +611,5 @@ KVIRC_MODULE( 0, ident_module_cleanup ) + +#include "libkviident.moc" diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index dd7234db1..2ad73a410 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -293,4 +293,5 @@ KVIRC_MODULE( ) #if 0 +#include "libkviiograph.moc" #endif diff --git a/src/modules/lag/lag.pro b/src/modules/lag/lag.pro deleted file mode 100644 index e553f5d76..000000000 --- a/src/modules/lag/lag.pro +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index f70bd2d37..000000000 --- a/src/modules/lamerizer/lamerizer.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 625533f38..5518bd09e 100644 --- a/src/modules/lamerizer/libkvilamerizer.cpp +++ b/src/modules/lamerizer/libkvilamerizer.cpp @@ -274,3 +274,6 @@ 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 deleted file mode 100644 index f376d40ed..000000000 --- a/src/modules/links/links.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 209b16a1c..7986c70f2 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -469,3 +469,4 @@ void KviLinksWindow::applyOptions() KviWindow::applyOptions(); } +#include "m_linkswindow.moc" diff --git a/src/modules/list/list.pro b/src/modules/list/list.pro deleted file mode 100644 index e91ac1f2d..000000000 --- a/src/modules/list/list.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 b64818b4a..a4b23510c 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -531,3 +531,4 @@ void KviListWindow::applyOptions() KviWindow::applyOptions(); } +#include "listwindow.moc" diff --git a/src/modules/log/log.pro b/src/modules/log/log.pro deleted file mode 100644 index 13c5667c1..000000000 --- a/src/modules/log/log.pro +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 94dfcb3b1..000000000 --- a/src/modules/logview/logview.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 c935e90fe..da67b5088 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -474,3 +474,4 @@ 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 7a0336766..29398b8f1 100644 --- a/src/modules/logview/logviewwidget.cpp +++ b/src/modules/logview/logviewwidget.cpp @@ -73,3 +73,4 @@ QString KviLogListViewItemType::text(int col) const }; +#include "logviewwidget.moc" diff --git a/src/modules/mask/mask.pro b/src/modules/mask/mask.pro deleted file mode 100644 index 0c18abbf2..000000000 --- a/src/modules/mask/mask.pro +++ /dev/null @@ -1,5 +0,0 @@ -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 192eb9418..af7152c96 100644 --- a/src/modules/math/libkvimath.cpp +++ b/src/modules/math/libkvimath.cpp @@ -50,7 +50,7 @@ static bool __fncname(KviKvsModuleFunctionCall * c) \ return true; \ } -#if defined(COMPILE_ON_WINDOWS) && !defined(__GNUC__) +#ifdef COMPILE_ON_WINDOWS // dobbiamo testare meglio, i risultati. static double cbrt(double x) { diff --git a/src/modules/math/math.pro b/src/modules/math/math.pro deleted file mode 100644 index 08d53dbdc..000000000 --- a/src/modules/math/math.pro +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index a93e3f2e6..000000000 --- a/src/modules/mediaplayer/mediaplayer.pro +++ /dev/null @@ -1,22 +0,0 @@ -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 909503a10..7bfa1d340 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -380,3 +380,4 @@ KVIRC_MODULE( mircimport_module_cleanup ) +#include "libkvimircimport.moc" diff --git a/src/modules/mircimport/mircimport.pro b/src/modules/mircimport/mircimport.pro deleted file mode 100644 index f5ddbcbad..000000000 --- a/src/modules/mircimport/mircimport.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 0a3ef4fe7..000000000 --- a/src/modules/module.pri +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index 04ce211d3..000000000 --- a/src/modules/modules.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 351806d83..34eef595d 100644 --- a/src/modules/my/idle.cpp +++ b/src/modules/my/idle.cpp @@ -130,3 +130,4 @@ void Idle::doCheck() secondsIdle(secondsIdle()); } +#include "idle.moc" diff --git a/src/modules/my/my.pro b/src/modules/my/my.pro deleted file mode 100644 index ba241b667..000000000 --- a/src/modules/my/my.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 408a877c3..000000000 --- a/src/modules/notifier/notifier.pro +++ /dev/null @@ -1,20 +0,0 @@ -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 14b902aaf..305053cd9 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -1424,3 +1424,5 @@ 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 952840323..3b778ecc1 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -703,3 +703,4 @@ 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 bbb95cdcb..fd8a4b3b5 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -174,3 +174,5 @@ 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 6545d8a1b..1e9260509 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -124,3 +124,5 @@ 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 146a92bed..f8c3d3d6b 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -362,3 +362,5 @@ 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 fc2276e91..a6067a505 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -227,3 +227,5 @@ 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 010a51be9..55bbd4f29 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -485,3 +485,4 @@ 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 37144e2bf..a5e94ebc7 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -457,3 +457,5 @@ 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 8a56e2c75..bf7292773 100644 --- a/src/modules/objects/class_listbox.cpp +++ b/src/modules/objects/class_listbox.cpp @@ -386,3 +386,5 @@ 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 9f384cd5d..4a6d03924 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -554,3 +554,4 @@ 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 5136fda10..7d193b98f 100644 --- a/src/modules/objects/class_listviewitem.cpp +++ b/src/modules/objects/class_listviewitem.cpp @@ -417,3 +417,5 @@ 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 e3f8d0947..8be51a018 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -1213,3 +1213,5 @@ 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 fd2c0ab3e..5c45910d2 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,7 +999,9 @@ 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 6028642b6..89247edb9 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -313,3 +313,5 @@ 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 d47a1f7bd..c32d0f891 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -357,3 +357,5 @@ 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 1ff1544b0..e0951b14e 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -313,3 +313,5 @@ 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 5b2a44b3d..402d24b50 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -134,3 +134,5 @@ 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 02d2d5312..54673d610 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -283,3 +283,5 @@ 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 f0d71edb6..3819ca05b 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -1326,4 +1326,6 @@ KviQCString szData8 = szData.utf8(); -//-------------
\ No newline at end of file +//--------------
+
+#include "m_class_socket.moc"
diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index bcd6acaf9..6b0147f24 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -261,3 +261,5 @@ 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 5d6d5ebba..998bb3f44 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -537,3 +537,5 @@ 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 d3f2aac41..bd46f0803 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -139,3 +139,5 @@ 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 a8f1fc05b..e8e3292e6 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -149,3 +149,5 @@ 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 a4c5ed7a5..3a531da30 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -337,3 +337,5 @@ 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 44fb2e77d..3d9cb936a 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1742,3 +1742,4 @@ 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 85fb4a7c3..7bcbea852 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -155,3 +155,4 @@ 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 c7d8770e8..83117af97 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -387,3 +387,4 @@ 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 9eb1f6a9b..464f10f85 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -265,3 +265,5 @@ 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 3690c64e9..e4ac20acf 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -330,3 +330,5 @@ 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 deleted file mode 100644 index eac04a872..000000000 --- a/src/modules/objects/objects.pro +++ /dev/null @@ -1,101 +0,0 @@ -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 deleted file mode 100644 index 7f94318ca..000000000 --- a/src/modules/objects/pch.h +++ /dev/null @@ -1,8 +0,0 @@ -#if defined __cplusplus
- #include <qvariant.h> // All moc genereated code has this include
- #include <qstring.h>
- #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 6230b0a35..ca1603afb 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -120,3 +120,4 @@ void KviOptionsWidgetContainer::cancelClicked() deleteLater(); } +#include "m_container.moc" diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 6939e4a3e..fb133c852 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -672,3 +672,4 @@ 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 6069bd7da..8ee3f3dc4 100644 --- a/src/modules/options/instances.cpp +++ b/src/modules/options/instances.cpp @@ -3586,3 +3586,5 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con } +#include "m_instances.moc" + diff --git a/src/modules/options/options.pro b/src/modules/options/options.pro deleted file mode 100644 index d9439513d..000000000 --- a/src/modules/options/options.pro +++ /dev/null @@ -1,104 +0,0 @@ -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 a0317772d..48fb565d7 100644 --- a/src/modules/options/optw_antispam.cpp +++ b/src/modules/options/optw_antispam.cpp @@ -61,3 +61,4 @@ 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 337bd2558..5e9ae129e 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -128,3 +128,4 @@ KviAvatarAdvancedOptionsWidget::~KviAvatarAdvancedOptionsWidget() } +#include "m_optw_avatar.moc" diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index a3583416e..c23f5c651 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -68,3 +68,4 @@ 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 3f04aaab7..44da4e72c 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -318,3 +318,4 @@ KviConnectionAdvancedOptionsWidget::~KviConnectionAdvancedOptionsWidget() } +#include "m_optw_connection.moc" diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp index f3bce9a14..59d5e7da0 100644 --- a/src/modules/options/optw_ctcp.cpp +++ b/src/modules/options/optw_ctcp.cpp @@ -87,3 +87,4 @@ KviCtcpOptionsWidget::~KviCtcpOptionsWidget() } +#include "m_optw_ctcp.moc" diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index 957cfc8eb..7e1b3a1bf 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -113,3 +113,4 @@ KviCtcpFloodProtectionOptionsWidget::~KviCtcpFloodProtectionOptionsWidget() } +#include "m_optw_ctcpfloodprotection.moc" diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index df2943e20..2d3cbe16b 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -390,3 +390,4 @@ KviDccVoiceOptionsWidget::~KviDccVoiceOptionsWidget() { } +#include "m_optw_dcc.moc" diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp index 2604f7b45..64b737659 100644 --- a/src/modules/options/optw_generalopt.cpp +++ b/src/modules/options/optw_generalopt.cpp @@ -48,3 +48,4 @@ KviGeneralOptOptionsWidget::~KviGeneralOptOptionsWidget() } +#include "m_optw_generalopt.moc" diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index fa4f4136d..aad2cd974 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -123,5 +123,6 @@ 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 c6fdcfe18..5a393a695 100644 --- a/src/modules/options/optw_ident.cpp +++ b/src/modules/options/optw_ident.cpp @@ -34,3 +34,4 @@ +#include "m_optw_ident.moc" diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 04b759e82..27186e455 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -726,3 +726,4 @@ 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 a16ee9304..e258926fd 100644 --- a/src/modules/options/optw_ignore.cpp +++ b/src/modules/options/optw_ignore.cpp @@ -59,3 +59,4 @@ 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 aa03219f5..f2a23d8fc 100644 --- a/src/modules/options/optw_input.cpp +++ b/src/modules/options/optw_input.cpp @@ -153,3 +153,4 @@ KviInputFeaturesOptionsWidget::~KviInputFeaturesOptionsWidget() { } +#include "m_optw_input.moc" diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index 1c40e44c4..21db72aa2 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -85,3 +85,4 @@ 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 d23fed9ff..f09fc7a0d 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -212,3 +212,4 @@ KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget() } +#include "m_optw_interfacelookglobal.moc" diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index 3e6b4e524..3572fe38b 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -217,3 +217,4 @@ 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 2fbd1e3e7..a7e565f1a 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -91,3 +91,4 @@ 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 bc02491c6..766a8c772 100644 --- a/src/modules/options/optw_ircview.cpp +++ b/src/modules/options/optw_ircview.cpp @@ -165,3 +165,4 @@ KviIrcViewFeaturesOptionsWidget::~KviIrcViewFeaturesOptionsWidget() +#include "m_optw_ircview.moc" diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 95227b173..34e3eb300 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -82,3 +82,4 @@ KviLagOptionsWidget::~KviLagOptionsWidget() } +#include "m_optw_lag.moc" diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp index b6f2cef46..f8a197e82 100644 --- a/src/modules/options/optw_logging.cpp +++ b/src/modules/options/optw_logging.cpp @@ -61,3 +61,4 @@ KviLoggingOptionsWidget::~KviLoggingOptionsWidget() +#include "m_optw_logging.moc" diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp index 24b69f943..062b50309 100644 --- a/src/modules/options/optw_mediatypes.cpp +++ b/src/modules/options/optw_mediatypes.cpp @@ -259,3 +259,4 @@ 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 bcb39e934..2742d6dd8 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -690,3 +690,4 @@ 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 f3291cff8..c6ac75df6 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -365,3 +365,4 @@ 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 616097c27..23b4252b3 100644 --- a/src/modules/options/optw_notify.cpp +++ b/src/modules/options/optw_notify.cpp @@ -131,3 +131,4 @@ KviNotifierOptionsWidget::~KviNotifierOptionsWidget() } +#include "m_optw_notify.moc" diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp index e82ed5373..137ffbb8b 100644 --- a/src/modules/options/optw_protection.cpp +++ b/src/modules/options/optw_protection.cpp @@ -47,3 +47,4 @@ KviProtectionOptionsWidget::~KviProtectionOptionsWidget() { } +#include "m_optw_protection.moc" diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index cc1eb1dd4..44c635205 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -363,3 +363,5 @@ 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 ceb6f19a9..19963c37f 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -111,3 +111,5 @@ KviQueryOptionsWidget::~KviQueryOptionsWidget() { } + +#include "m_optw_query.moc" diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 69c4d73d4..ae98e14fc 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -1708,3 +1708,5 @@ 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 8e39d3e54..69f1f4a4a 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -306,3 +306,5 @@ 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 423afc911..6242c3c4b 100644 --- a/src/modules/options/optw_ssl.cpp +++ b/src/modules/options/optw_ssl.cpp @@ -31,3 +31,5 @@ //#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 94ad75915..89e16c005 100644 --- a/src/modules/options/optw_taskbar.cpp +++ b/src/modules/options/optw_taskbar.cpp @@ -251,3 +251,5 @@ 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 fa418a842..067fe0a48 100644 --- a/src/modules/options/optw_textencoding.cpp +++ b/src/modules/options/optw_textencoding.cpp @@ -135,3 +135,5 @@ 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 e8b048729..09edb250e 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -240,3 +240,5 @@ 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 861e10a3f..9906b7ec1 100644 --- a/src/modules/options/optw_theme.cpp +++ b/src/modules/options/optw_theme.cpp @@ -22,3 +22,5 @@ // //============================================================================= + +#include "m_optw_theme.moc" diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp index ce26f7e78..1f927b2d3 100644 --- a/src/modules/options/optw_tools.cpp +++ b/src/modules/options/optw_tools.cpp @@ -46,3 +46,5 @@ 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 ebe6a0ade..67a5e635f 100644 --- a/src/modules/options/optw_topiclabel.cpp +++ b/src/modules/options/optw_topiclabel.cpp @@ -39,3 +39,5 @@ 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 54929ae78..656debbbf 100644 --- a/src/modules/options/optw_transport.cpp +++ b/src/modules/options/optw_transport.cpp @@ -29,3 +29,5 @@ + +#include "m_optw_transport.moc" diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp index 9cc58f66b..791048d23 100644 --- a/src/modules/options/optw_tray.cpp +++ b/src/modules/options/optw_tray.cpp @@ -88,3 +88,4 @@ 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 64e39b4c0..3afbbe578 100644 --- a/src/modules/options/optw_uparser.cpp +++ b/src/modules/options/optw_uparser.cpp @@ -59,3 +59,4 @@ KviUParserOptionsWidget::~KviUParserOptionsWidget() } +#include "m_optw_uparser.moc" diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp index dc0315605..76060c028 100644 --- a/src/modules/options/optw_urlhandlers.cpp +++ b/src/modules/options/optw_urlhandlers.cpp @@ -122,5 +122,6 @@ 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 42734da7c..c16dac937 100644 --- a/src/modules/options/optw_userlist.cpp +++ b/src/modules/options/optw_userlist.cpp @@ -242,3 +242,4 @@ KviUserListFeaturesOptionsWidget::~KviUserListFeaturesOptionsWidget() { } +#include "m_optw_userlist.moc" diff --git a/src/modules/options/pch.h b/src/modules/options/pch.h deleted file mode 100644 index 8c8ef6cd5..000000000 --- a/src/modules/options/pch.h +++ /dev/null @@ -1,11 +0,0 @@ -#if defined __cplusplus
- #include <qvariant.h> // All moc genereated code has this include
- #include <qstring.h>
- #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 deleted file mode 100644 index 82674b62a..000000000 --- a/src/modules/perl/perl.pro +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 7d9fc01cc..000000000 --- a/src/modules/perlcore/perlcore.pro +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index bdec0dfef..000000000 --- a/src/modules/popupeditor/popupeditor.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index b14df4585..000000000 --- a/src/modules/raweditor/raweditor.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index a046a8433..000000000 --- a/src/modules/regchan/regchan.pro +++ /dev/null @@ -1,5 +0,0 @@ -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 74958957a..7ac0c818f 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -907,3 +907,6 @@ 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 cf0968952..83facc92f 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -777,3 +777,4 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked() +#include "edituser.moc"
diff --git a/src/modules/reguser/reguser.pro b/src/modules/reguser/reguser.pro deleted file mode 100644 index 4066c4bf4..000000000 --- a/src/modules/reguser/reguser.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 0a8387698..6fefff089 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -459,3 +459,4 @@ void KviRegistrationWizard::notifyCheckToggled(bool) notifyNickChanged(dummy); } +#include "wizard.moc" diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index ac18cb656..8bd3ba5e9 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -848,3 +848,6 @@ 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 deleted file mode 100644 index 5b065471a..000000000 --- a/src/modules/rijndael/rijndael.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 4d9397502..000000000 --- a/src/modules/setup/setup.pro +++ /dev/null @@ -1,9 +0,0 @@ -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 7163c588d..8201e3a55 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -1049,3 +1049,4 @@ void KviSetupWizard::accept() KviTalWizard::accept(); } +#include "setupwizard.moc" diff --git a/src/modules/sharedfile/sharedfile.pro b/src/modules/sharedfile/sharedfile.pro deleted file mode 100644 index 4fedde87e..000000000 --- a/src/modules/sharedfile/sharedfile.pro +++ /dev/null @@ -1,5 +0,0 @@ -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 308846047..c6deec20d 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -739,3 +739,4 @@ void KviSharedFilesWindow::die() //} +#include "m_sharedfileswindow.moc" diff --git a/src/modules/sharedfileswindow/sharedfileswindow.pro b/src/modules/sharedfileswindow/sharedfileswindow.pro deleted file mode 100644 index be1121e46..000000000 --- a/src/modules/sharedfileswindow/sharedfileswindow.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 24c702a8f..9f95e442b 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -741,3 +741,4 @@ KVIRC_MODULE( snd_module_cleanup ) +#include "libkvisnd.moc" diff --git a/src/modules/snd/snd.pro b/src/modules/snd/snd.pro deleted file mode 100644 index 8c8c53798..000000000 --- a/src/modules/snd/snd.pro +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 6d09ddf7f..000000000 --- a/src/modules/socketspy/socketspy.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 1db00e772..6456d5992 100644 --- a/src/modules/socketspy/socketspywindow.cpp +++ b/src/modules/socketspy/socketspywindow.cpp @@ -122,3 +122,4 @@ 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 25935ca53..4e6df0429 100644 --- a/src/modules/spaste/controller.cpp +++ b/src/modules/spaste/controller.cpp @@ -118,3 +118,4 @@ 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 deleted file mode 100644 index 75263b386..000000000 --- a/src/modules/spaste/spaste.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index b1db3541e..000000000 --- a/src/modules/str/str.pro +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 42efa28dd..000000000 --- a/src/modules/system/system.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 281be6b6a..703ba01d0 100644 --- a/src/modules/term/termwidget.cpp +++ b/src/modules/term/termwidget.cpp @@ -174,5 +174,6 @@ 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 15d0d4dc8..45fc58e3c 100644 --- a/src/modules/term/termwindow.cpp +++ b/src/modules/term/termwindow.cpp @@ -79,5 +79,6 @@ 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 deleted file mode 100644 index 1df63f85e..000000000 --- a/src/modules/texticons/texticons.pro +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 73fe7edee..000000000 --- a/src/modules/theme/theme.pro +++ /dev/null @@ -1,14 +0,0 @@ -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 02f3314c9..daa16d65a 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -306,3 +306,4 @@ KVIRC_MODULE( tip_module_cleanup ) +#include "libkvitip.moc" diff --git a/src/modules/tip/tip.pro b/src/modules/tip/tip.pro deleted file mode 100644 index 22f05b8d9..000000000 --- a/src/modules/tip/tip.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index dc84c1541..000000000 --- a/src/modules/tmphighlight/tmphighlight.pro +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index 63ee68443..000000000 --- a/src/modules/toolbar/toolbar.pro +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index d0d5861d9..000000000 --- a/src/modules/toolbareditor/toolbareditor.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 825736f2b..fd845cb12 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp +++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp @@ -494,6 +494,7 @@ 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 e939b53a4..5d23a299d 100644 --- a/src/modules/torrent/tc_statusbarapplet.cpp +++ b/src/modules/torrent/tc_statusbarapplet.cpp @@ -65,3 +65,5 @@ void KviTorrentStatusBarApplet::update() } } +#include "tc_statusbarapplet.moc" + diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index 98efb2f0a..f979da4fb 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -901,3 +901,4 @@ KVIRC_MODULE( url_module_cleanup ) +#include "libkviurl.moc" diff --git a/src/modules/url/url.pro b/src/modules/url/url.pro deleted file mode 100644 index 959d0fd27..000000000 --- a/src/modules/url/url.pro +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100644 index 7ed31401b..000000000 --- a/src/modules/window/window.pro +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = kviwindow
-
-HEADERS += userwindow.h
-
-SOURCES += libkviwindow.cpp userwindow.cpp
-
-include(../module.pri)
\ No newline at end of file diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index 47c7948b9..000000000 --- a/src/src.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs
-CONFIG += ordered
-SUBDIRS= kvilib kvirc modules win32registrar
\ No newline at end of file diff --git a/src/win32registrar/win32registrar.cpp b/src/win32registrar/win32registrar.cpp index bf6bb0ff6..3c02ba589 100644 --- a/src/win32registrar/win32registrar.cpp +++ b/src/win32registrar/win32registrar.cpp @@ -2,8 +2,6 @@ #include <tchar.h>
#include <shlwapi.h>
-#define WINVER 0x0501
-
int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance,
LPSTR lpszCmdLine,int nCmdShow)
{
diff --git a/src/win32registrar/win32registrar.pro b/src/win32registrar/win32registrar.pro deleted file mode 100644 index f061055fb..000000000 --- a/src/win32registrar/win32registrar.pro +++ /dev/null @@ -1,21 +0,0 @@ -CONFIG += precompile_header debug_and_release thread -LANGUAGE = C++ -TEMPLATE = app -TARGET = win32registrar - -DEFINES += _UNICODE - -CONFIG(debug, debug|release) { - DESTDIR = ../../bin/debug/ - } else { - DESTDIR = ../../bin/release/ - } - -HEADERS += win32registrar.h - - -SOURCES += win32registrar.cpp - -LIBS += -lshlwapi - -RC_FILE = win32registrar.rc
\ No newline at end of file diff --git a/src/win32registrar/win32registrar.rc b/src/win32registrar/win32registrar.rc index 7b6ec3893..98a1f818d 100644 --- a/src/win32registrar/win32registrar.rc +++ b/src/win32registrar/win32registrar.rc @@ -2,20 +2,13 @@ //
#include "resource.h"
-#ifdef __GNUC__
-1 24 "../../data/manifests/damn-uac.manifest"
-#endif
-
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#ifdef __GNUC__
- #include "winresrc.h"
-#else
- #include "winres.h"
-#endif
+#include "winres.h"
+
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
|