diff options
| author |  Alexey Uzhva | 2007-07-05 08:49:05 +0000 |
|---|---|---|
| committer | Alexey Uzhva | 2007-07-05 08:49:05 +0000 |
| commit | aba8d2293fc3e57c8e75ed2732f8b5b715b1b134 (patch) | |
| tree | 29eabfb69aaf1f66d9ebabadc110c8a6ba3269ec | |
| parent | Added doxygen support (diff) | |
| download | KVIrc-aba8d2293fc3e57c8e75ed2732f8b5b715b1b134.tar.gz KVIrc-aba8d2293fc3e57c8e75ed2732f8b5b715b1b134.tar.bz2 KVIrc-aba8d2293fc3e57c8e75ed2732f8b5b715b1b134.zip | |
fixed font saving in qt4 kvirc
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@644 17fca916-40b9-46aa-a4ea-0a15b648b75c
246 files changed, 1648 insertions, 375 deletions
diff --git a/data/resources/auto-generated/kvilib.rc b/data/resources/auto-generated/kvilib.rc index d6a76e4a9..248c22050 100644 --- a/data/resources/auto-generated/kvilib.rc +++ b/data/resources/auto-generated/kvilib.rc @@ -1,5 +1,9 @@ // 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 new file mode 100644 index 000000000..31774c8d3 --- /dev/null +++ b/data/resources/commctrl.rc @@ -0,0 +1 @@ +1 24 "../manifests/commctrl.manifest"
\ No newline at end of file diff --git a/data/resources/kvirc.rc b/data/resources/kvirc.rc index 1db6ddcf1..86d974326 100644 --- a/data/resources/kvirc.rc +++ b/data/resources/kvirc.rc @@ -2,6 +2,11 @@ //
#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.
@@ -11,7 +16,6 @@ IDD_ICON3 ICON DISCARDABLE "kvc.ico" IDD_ICON4 ICON DISCARDABLE "kvt.ico"
IDD_ICON5 ICON DISCARDABLE "kva.ico"
-
/////////////////////////////////////////////////////////////////////////////
//
// TEXTINCLUDE
@@ -26,4 +30,37 @@ END BEGIN
"\r\n"
"\0"
-END
\ No newline at end of file +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
diff --git a/data/resources/uac.rc b/data/resources/uac.rc new file mode 100644 index 000000000..362cdbbb9 --- /dev/null +++ b/data/resources/uac.rc @@ -0,0 +1 @@ +1 24 "../manifests/damn-uac.manifest"
\ No newline at end of file diff --git a/kvirc.pro b/kvirc.pro new file mode 100644 index 000000000..a5837d0be --- /dev/null +++ b/kvirc.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs
+SUBDIRS = src
\ No newline at end of file diff --git a/src/kvilib/kvilib.pro b/src/kvilib/kvilib.pro new file mode 100644 index 000000000..b3175a861 --- /dev/null +++ b/src/kvilib/kvilib.pro @@ -0,0 +1,214 @@ +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 new file mode 100644 index 000000000..2e8472426 --- /dev/null +++ b/src/kvilib/pch.h @@ -0,0 +1,8 @@ +#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 new file mode 100644 index 000000000..7cba45caa --- /dev/null +++ b/src/kvilib/using_kvilib.pri @@ -0,0 +1,12 @@ +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 9d8675db9..b6b036004 100644 --- a/src/kvirc/build/Makefile.am +++ b/src/kvirc/build/Makefile.am @@ -20,6 +20,44 @@ 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 \ @@ -462,46 +500,6 @@ 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 2f1d9d248..fb8013437 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -2053,12 +2053,4 @@ void KviApp::timerEvent(QTimerEvent *e) kvi_time_t tNow = kvi_unixTime(); heartbeat(tNow); -} - -// 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" +}
\ No newline at end of file diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h index 09afbab0a..8c7182cf8 100644 --- a/src/kvirc/kernel/kvi_app.h +++ b/src/kvirc/kernel/kvi_app.h @@ -26,6 +26,11 @@ //============================================================================= #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" @@ -48,6 +53,10 @@ class KviIpcSentinel; #endif // !COMPILE_NO_IPC +#ifdef USING_PCH +#include <QApplication> +#endif + class KviTalPopupMenu; class QPixmap; class KviTalListBox; @@ -84,7 +93,7 @@ class KVIRC_API KviApp : public KviTalApplication Q_OBJECT public: KviApp(int &argc,char ** argv); - ~KviApp(); + virtual ~KviApp(); //mingw wants virtual destructor:/ protected: // directories diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index 18ba42df1..de7824631 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -920,5 +920,3 @@ 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 84c94c5d5..e24426176 100644 --- a/src/kvirc/kernel/kvi_ipc.cpp +++ b/src/kvirc/kernel/kvi_ipc.cpp @@ -264,6 +264,5 @@ #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 60722e875..3401a850e 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); - ~KviBasicIrcServerInfo(); + virtual ~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 c9e0a008d..c28ffc4a9 100644 --- a/src/kvirc/kernel/kvi_lagmeter.cpp +++ b/src/kvirc/kernel/kvi_lagmeter.cpp @@ -262,5 +262,3 @@ 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 5463cfc7d..dce2dabd2 100644 --- a/src/kvirc/kernel/kvi_notifylist.cpp +++ b/src/kvirc/kernel/kvi_notifylist.cpp @@ -1273,5 +1273,3 @@ 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 658e2b287..53131ffff 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 7f278d88d..107b95902 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_) +#if defined(_KVI_OPTIONS_CPP_) || defined(_WANT_OPTION_FLAGS_) || defined(CREATING_PCH) // flag definitions diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp index 7af47c51b..1022a173c 100644 --- a/src/kvirc/kernel/kvi_texticonmanager.cpp +++ b/src/kvirc/kernel/kvi_texticonmanager.cpp @@ -250,5 +250,3 @@ void KviTextIconManager::save(const QString &filename) ++it; } } - -#include "kvi_texticonmanager.moc" diff --git a/src/kvirc/kvirc.pro b/src/kvirc/kvirc.pro new file mode 100644 index 000000000..20b78674c --- /dev/null +++ b/src/kvirc/kvirc.pro @@ -0,0 +1,449 @@ +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 43dada66f..05b36d76c 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp @@ -46,11 +46,18 @@ #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 { ////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -392,8 +399,13 @@ 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 b5d53efd0..11621f593 100644 --- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp +++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp @@ -3124,6 +3124,24 @@ channel @description: Triggered when ircd sets a registered user mode. */ - EVENT("OnNickServAuth","") + 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") }; diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.h b/src/kvirc/kvs/kvi_kvs_eventtable.h index bf807bb63..05d1b0db5 100644 --- a/src/kvirc/kvs/kvi_kvs_eventtable.h +++ b/src/kvirc/kvs/kvi_kvs_eventtable.h @@ -203,7 +203,9 @@ #define KviEvent_OnNickServAuth 138 -#define KVI_KVS_NUM_APP_EVENTS 139 +#define KviEvent_OnMeAction 139 + +#define KVI_KVS_NUM_APP_EVENTS 140 // compat #define KVI_NUM_SCRIPT_EVENTS KVI_KVS_NUM_APP_EVENTS diff --git a/src/kvirc/pch.h b/src/kvirc/pch.h new file mode 100644 index 000000000..5b3def3e4 --- /dev/null +++ b/src/kvirc/pch.h @@ -0,0 +1,12 @@ +#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 272728c91..d6c42df27 100644 --- a/src/kvirc/sparser/kvi_sparser.cpp +++ b/src/kvirc/sparser/kvi_sparser.cpp @@ -143,8 +143,3 @@ 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 1149728d1..44c3684fe 100644 --- a/src/kvirc/ui/kvi_actiondrawer.cpp +++ b/src/kvirc/ui/kvi_actiondrawer.cpp @@ -22,8 +22,6 @@ // //============================================================================= -#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 a18a12e39..ea8431ffb 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -26,8 +26,6 @@ // Channel widget : abstraction of an IRC channel // -#define __KVIRC__ - #include "kvi_toolwindows_container.h" #include "kvi_styled_controls.h" #include "kvi_channel.h" @@ -1117,6 +1115,7 @@ 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 "; @@ -1622,6 +1621,4 @@ void KviChannel::unhighlight() { if(!m_pTaskBarItem)return; m_pTaskBarItem->unhighlight(); -} - -#include "kvi_channel.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h index 306f4ff39..6fef24b52 100644 --- a/src/kvirc/ui/kvi_channel.h +++ b/src/kvirc/ui/kvi_channel.h @@ -48,6 +48,7 @@ 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 18e0751bc..6c41f9c9c 100644 --- a/src/kvirc/ui/kvi_colorwin.cpp +++ b/src/kvirc/ui/kvi_colorwin.cpp @@ -22,8 +22,6 @@ // //============================================================================= -#define __KVIRC__ - #include "kvi_colorwin.h" #include "kvi_app.h" #include "kvi_options.h" @@ -117,6 +115,3 @@ 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 dadb83a1a..76be89e97 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -25,8 +25,6 @@ // FIXME: The TextEncoding should be inherited from network! -#define __KVIRC__ - #include "kvi_ircurl.h" #include "kvi_app.h" #include "kvi_console.h" @@ -1065,8 +1063,8 @@ void KviConsole::setAvatarFromOptions() void KviConsole::applyOptions() { m_pNotifyListView->applyOptions(); - m_pInput->applyOptions(); - m_pIrcView->applyOptions(); + //m_pInput->applyOptions(); will be done by KviWindow + //m_pIrcView->applyOptions(); will be done by KviWindow KviWindow::applyOptions(); @@ -1269,6 +1267,4 @@ void KviConsole::getTaskBarTipText(QString &buffer) } buffer += "</table>"; -} - -#include "kvi_console.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index 941355b69..dae1c7b46 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -384,7 +384,4 @@ 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 fde9bc149..66d6bb3d4 100644 --- a/src/kvirc/ui/kvi_ctcppagedialog.cpp +++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp @@ -142,6 +142,4 @@ void KviCtcpPageDialog::showEvent(QShowEvent *e) { QWidget::showEvent(e); center(); -} - -#include "kvi_ctcppagedialog.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_dynamictooltip.cpp b/src/kvirc/ui/kvi_dynamictooltip.cpp index 42a386a9a..7a8d3e0b8 100644 --- a/src/kvirc/ui/kvi_dynamictooltip.cpp +++ b/src/kvirc/ui/kvi_dynamictooltip.cpp @@ -56,6 +56,4 @@ void KviDynamicToolTip::maybeTip(const QPoint &pnt) void KviDynamicToolTip::tip(const QRect &rct,const QString & text) { m_pHelper->tip(rct,text); -} - -#include "kvi_dynamictooltip.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp index cf51924bc..bb1359078 100644 --- a/src/kvirc/ui/kvi_filedialog.cpp +++ b/src/kvirc/ui/kvi_filedialog.cpp @@ -224,6 +224,3 @@ 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 362e6595c..9d4ad1c77 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -1415,6 +1415,4 @@ void KviFrame::hideEvent ( QHideEvent * e) } } -} - -#include "kvi_frame.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/kvi_historywin.cpp index 59a6a5c5e..9ea16702f 100644 --- a/src/kvirc/ui/kvi_historywin.cpp +++ b/src/kvirc/ui/kvi_historywin.cpp @@ -249,6 +249,4 @@ 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 dbc843e3e..ca5e96d9c 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -2659,6 +2659,4 @@ QString KviInput::text() else szText=m_pInputEditor->text(); return szText; -} - -#include "kvi_input.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp index 951b0a3af..108a42578 100644 --- a/src/kvirc/ui/kvi_ipeditor.cpp +++ b/src/kvirc/ui/kvi_ipeditor.cpp @@ -448,6 +448,3 @@ 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 c69b323c0..6a5aab2e9 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -432,10 +432,3 @@ 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 e7a5ab702..319262c91 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -148,6 +148,7 @@ #ifdef COMPILE_USE_QT4
#include <q3mimefactory.h>
+ #include <QTimer>
#define QMimeSourceFactory Q3MimeSourceFactory
#endif
@@ -400,7 +401,11 @@ 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
{
@@ -460,6 +465,7 @@ KviIrcView::~KviIrcView() void KviIrcView::setFont(const QFont &f)
{
+ debug("setting a font");
if(m_pFm)
{
// force an update to the font variables
@@ -482,6 +488,7 @@ 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);
@@ -5287,6 +5294,4 @@ void KviIrcView::maybeTip(const QPoint &pnt) if((linkUnderMouse == m_pLastLinkUnderMouse) && linkUnderMouse)doLinkToolTip(rctLink,linkCmd,linkText);
else m_pLastLinkUnderMouse = 0; //
-}
-
-#include "kvi_ircview.moc"
+}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h index 2a3fd6bfd..560f5babc 100644 --- a/src/kvirc/ui/kvi_ircview.h +++ b/src/kvirc/ui/kvi_ircview.h @@ -152,7 +152,6 @@ private: public: void checkLogDate(); void clearUnreaded(); - void applyOptions(); void enableDnd(bool bEnable); bool haveUnreadedMessages() { return m_bHaveUnreadedMessages; }; bool haveUnreadedHighlightedMessages() { return m_bHaveUnreadedHighlightedMessages; }; @@ -201,6 +200,7 @@ 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 07dd6eec7..ce5f1d32d 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -346,5 +346,3 @@ 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 6407bcf5d..d13ec504c 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -411,5 +411,3 @@ 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 6db6eaf73..9247efcec 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -331,6 +331,4 @@ void KviModeEditor::commit() if(szModes.hasData())emit setMode(szModes.ptr()); emit done(); -} - -#include "kvi_modeeditor.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index ceffe8087..4749664c4 100755 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -170,6 +170,4 @@ void KviModeWidget::editorTextChanged( const QString & text) szText.remove(i,1); } m_pLineEdit->setText(szText); -} - -#include "kvi_modew.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index ed275ec3e..ca36935fc 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -717,6 +717,4 @@ void KviOptionsWidget::switchToAdvancedPage() // (so nobody listens to this signal....) emit wantToSwitchToAdvancedPage(this); -} - -#include "kvi_optionswidget.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index bfaf14147..7f8147089 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -650,9 +650,8 @@ 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); } -} - -#include "kvi_query.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_scriptbutton.cpp b/src/kvirc/ui/kvi_scriptbutton.cpp index e1b839119..bb4d9ba54 100644 --- a/src/kvirc/ui/kvi_scriptbutton.cpp +++ b/src/kvirc/ui/kvi_scriptbutton.cpp @@ -93,6 +93,4 @@ KviWindowScriptButton::KviWindowScriptButton(QWidget * p,KviWindow * wnd,const c KviWindowScriptButton::~KviWindowScriptButton() { -} - -#include "kvi_scriptbutton.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_scripteditor.cpp b/src/kvirc/ui/kvi_scripteditor.cpp index a873bf049..d76c686ef 100644 --- a/src/kvirc/ui/kvi_scripteditor.cpp +++ b/src/kvirc/ui/kvi_scripteditor.cpp @@ -134,6 +134,4 @@ void KviScriptEditor::destroyInstance(KviScriptEditor * e) } editorModuleDestroyScriptEditor(e); -} - -#include "kvi_scripteditor.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index 192f2dbc9..acaaddeed 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -561,6 +561,7 @@ KviFontSelector::KviFontSelector(QWidget * par,const QString & txt,QFont * pOpti setButtonFont(pOption); m_pOption = pOption; + m_tmpFont = *pOption; setEnabled(bEnabled); } @@ -575,12 +576,15 @@ void KviFontSelector::changeClicked() { bool bOk; QFont tmp = QFontDialog::getFont(&bOk,m_pButton->font()); - if(bOk)setButtonFont(&tmp); + if(bOk) { + setButtonFont(&tmp); + m_tmpFont=tmp; + } } void KviFontSelector::commit() { - *m_pOption = m_pButton->font(); + *m_pOption = m_tmpFont; } void KviFontSelector::setEnabled(bool bEnabled) @@ -834,6 +838,4 @@ void KviCahnnelListSelector::removeClicked() } lst.setAutoDelete(TRUE); lst.clear(); -} - -#include "kvi_selectors.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h index 790410e2e..4e3463566 100644 --- a/src/kvirc/ui/kvi_selectors.h +++ b/src/kvirc/ui/kvi_selectors.h @@ -251,6 +251,7 @@ 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 9a90d3632..2874fbe75 100644 --- a/src/kvirc/ui/kvi_splash.cpp +++ b/src/kvirc/ui/kvi_splash.cpp @@ -217,6 +217,3 @@ 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 e250c11c6..dc089b2a8 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -367,7 +367,4 @@ 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 3917f23b2..7778b0bb0 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(); } -inline KviTaskBarItem * KviClassicTaskBar::firstItem() +KviTaskBarItem * KviClassicTaskBar::firstItem() { return m_pButtonList->first(); } -inline KviTaskBarItem * KviClassicTaskBar::lastItem(void) +KviTaskBarItem * KviClassicTaskBar::lastItem(void) { return m_pButtonList->last(); } -inline KviTaskBarItem * KviClassicTaskBar::nextItem() +KviTaskBarItem * KviClassicTaskBar::nextItem() { return m_pButtonList->next(); } -inline KviTaskBarItem * KviClassicTaskBar::prevItem(void) +KviTaskBarItem * KviClassicTaskBar::prevItem(void) { return m_pButtonList->prev(); } -inline bool KviClassicTaskBar::setIterationPointer(KviTaskBarItem * it) +bool KviClassicTaskBar::setIterationPointer(KviTaskBarItem * it) { return (m_pButtonList->findRef((const KviTaskBarButton *)it) != -1); } @@ -1424,6 +1424,4 @@ void KviTreeTaskBar::applyOptions() } else { m_pListView->header()->show(); } -} - -#include "kvi_taskbar.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp index a5b25a1b0..1936b3faa 100644 --- a/src/kvirc/ui/kvi_texticonwin.cpp +++ b/src/kvirc/ui/kvi_texticonwin.cpp @@ -278,6 +278,3 @@ 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 3e224800e..b54172af0 100644 --- a/src/kvirc/ui/kvi_themedlabel.cpp +++ b/src/kvirc/ui/kvi_themedlabel.cpp @@ -149,6 +149,3 @@ 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 966a6bab8..c69e75df6 100644 --- a/src/kvirc/ui/kvi_toolbar.cpp +++ b/src/kvirc/ui/kvi_toolbar.cpp @@ -149,6 +149,3 @@ void KviToolBar::setSmallIcons() } - - -#include "kvi_toolbar.moc" diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index 950324019..3859a620f 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -829,6 +829,4 @@ QChar KviTopicWidget::getSubstituteChar(unsigned short control_code) return QChar(control_code); break; } -} - -#include "kvi_topicw.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index b39fc404d..8282dfbc7 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -1968,6 +1968,4 @@ void KviUserListViewArea::wheelEvent(QWheelEvent *e) #ifdef COMPILE_USE_QT4 bHere = false; #endif -} - -#include "kvi_userlistview.moc" +}
\ No newline at end of file diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index 0f4178cc1..e7ce82b47 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -1513,6 +1513,3 @@ 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 new file mode 100644 index 000000000..cf3be5658 --- /dev/null +++ b/src/kvirc/using_kvirc.pri @@ -0,0 +1,9 @@ +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 new file mode 100644 index 000000000..6d2bcbe4c --- /dev/null +++ b/src/modules/about/about.pro @@ -0,0 +1,9 @@ +TARGET = kviabout
+
+HEADERS += aboutdialog.h \
+ libkviabout.h
+
+SOURCES += aboutdialog.cpp \
+ libkviabout.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 1688e09e2..8e80ea6d0 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -161,6 +161,4 @@ void KviAboutDialog::closeEvent(QCloseEvent *e) void KviAboutDialog::closeButtonPressed() { delete this; -} - -#include "aboutdialog.moc" +}
\ No newline at end of file diff --git a/src/modules/action/action.pro b/src/modules/action/action.pro new file mode 100644 index 000000000..628337d2d --- /dev/null +++ b/src/modules/action/action.pro @@ -0,0 +1,5 @@ +TARGET = kviaction
+
+SOURCES += libkviaction.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/actioneditor/actioneditor.pro b/src/modules/actioneditor/actioneditor.pro new file mode 100644 index 000000000..ebc472477 --- /dev/null +++ b/src/modules/actioneditor/actioneditor.pro @@ -0,0 +1,7 @@ +TARGET = kviactioneditor
+
+HEADERS += actioneditor.h
+
+SOURCES += libkviactioneditor.cpp actioneditor.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/addon/addon.pro b/src/modules/addon/addon.pro new file mode 100644 index 000000000..93908063b --- /dev/null +++ b/src/modules/addon/addon.pro @@ -0,0 +1,7 @@ +TARGET = kviaddon
+
+HEADERS += managementdialog.h
+
+SOURCES += libkviaddon.cpp managementdialog.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/aliaseditor/aliaseditor.pro b/src/modules/aliaseditor/aliaseditor.pro new file mode 100644 index 000000000..d44c242f1 --- /dev/null +++ b/src/modules/aliaseditor/aliaseditor.pro @@ -0,0 +1,7 @@ +TARGET = kvialiaseditor
+
+HEADERS += aliaseditor.h
+
+SOURCES += libkvialiaseditor.cpp aliaseditor.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/avatar/avatar.pro b/src/modules/avatar/avatar.pro new file mode 100644 index 000000000..f92929cf7 --- /dev/null +++ b/src/modules/avatar/avatar.pro @@ -0,0 +1,7 @@ +TARGET = kviavatar
+
+HEADERS += libkviavatar.h
+
+SOURCES += libkviavatar.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/chan/chan.pro b/src/modules/chan/chan.pro new file mode 100644 index 000000000..16281c16e --- /dev/null +++ b/src/modules/chan/chan.pro @@ -0,0 +1,6 @@ +TARGET = kvichan
+
+
+SOURCES += libkvichan.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index 2373bf876..8796de1a0 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -25,6 +25,7 @@ #include "kvi_module.h" #include "kvi_string.h" +#include "qapplication.h" //broken mingw compiler? #include "kvi_app.h" #include "kvi_channel.h" #include "kvi_locale.h" diff --git a/src/modules/channelsjoin/channelsjoin.pro b/src/modules/channelsjoin/channelsjoin.pro new file mode 100644 index 000000000..71e87468d --- /dev/null +++ b/src/modules/channelsjoin/channelsjoin.pro @@ -0,0 +1,7 @@ +TARGET = kvichannelsjoin
+
+HEADERS += channelsjoinwindow.h
+
+SOURCES += libkvichannelsjoin.cpp channelsjoinwindow.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index 00f138597..8139399d2 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -296,6 +296,4 @@ void KviChannelsJoinWindow::closeEvent(QCloseEvent *e) { e->ignore(); delete this; -} - -#include "m_channelsjoinwindow.moc" +}
\ No newline at end of file diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h index 27bf5cddf..8719b7459 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.h +++ b/src/modules/channelsjoin/channelsjoinwindow.h @@ -25,6 +25,7 @@ #define _CHANNELSJOIN_H_ #include "kvi_window.h" #include "kvi_string.h" +#include "kvi_tal_groupbox.h" #include <qdialog.h> diff --git a/src/modules/clock/libkviclock.cpp b/src/modules/clock/libkviclock.cpp index 08e02a66d..ed5961672 100644 --- a/src/modules/clock/libkviclock.cpp +++ b/src/modules/clock/libkviclock.cpp @@ -253,5 +253,4 @@ KVIRC_MODULE( clock_module_cleanup ) #if 0 -#include "libkviclock.moc" #endif diff --git a/src/modules/codetester/codetester.pro b/src/modules/codetester/codetester.pro new file mode 100644 index 000000000..1349bee19 --- /dev/null +++ b/src/modules/codetester/codetester.pro @@ -0,0 +1,7 @@ +TARGET = kvicodetester
+
+HEADERS += codetester.h
+
+SOURCES += libkvicodetester.cpp codetester.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/config/config.pro b/src/modules/config/config.pro new file mode 100644 index 000000000..8937cf02b --- /dev/null +++ b/src/modules/config/config.pro @@ -0,0 +1,5 @@ +TARGET = kviconfig
+
+SOURCES += libkviconfig.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index 52c0abf33..edd6e6b24 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -895,4 +895,3 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename } -#include "m_broker.moc" diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index dfe39e975..43a89f381 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -296,6 +296,4 @@ void KviDccCanvas::connected() } -#include "m_canvas.moc" - #endif diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index ef5d70495..c685a7516 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1596,6 +1596,5 @@ void KviCanvasWidget::resizeEvent(QResizeEvent *) } -#include "m_canvaswidget.moc" #endif diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index a0cb686ba..a9ac8cf54 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -839,4 +839,3 @@ out_of_the_loop: return bRet; } -#include "m_chat.moc" diff --git a/src/modules/dcc/dcc.pro b/src/modules/dcc/dcc.pro new file mode 100644 index 000000000..517e1e58f --- /dev/null +++ b/src/modules/dcc/dcc.pro @@ -0,0 +1,39 @@ +TARGET = kvidcc
+
+HEADERS += adpcmcodec.h \
+ broker.h \
+ canvas.h \
+ canvaswidget.h \
+ chat.h \
+ codec.h \
+ descriptor.h \
+ dialogs.h \
+ gsmcodec.h \
+ marshal.h \
+ send.h \
+ thread.h \
+ utils.h \
+ voice.h \
+ window.h
+
+SOURCES += adpcmcodec.cpp \
+ broker.cpp \
+ canvas.cpp \
+ canvaswidget.cpp \
+ chat.cpp \
+ codec.cpp \
+ descriptor.cpp \
+ dialogs.cpp \
+ gsmcodec.cpp \
+ libkvidcc.cpp \
+ marshal.cpp \
+ requests.cpp \
+ send.cpp \
+ thread.cpp \
+ utils.cpp \
+ voice.cpp \
+ window.cpp
+
+include(../module.pri)
+
+LIBS += -lws2_32
\ No newline at end of file diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp index c999e53bb..5340e6c3c 100644 --- a/src/modules/dcc/dialogs.cpp +++ b/src/modules/dcc/dialogs.cpp @@ -203,4 +203,3 @@ void KviDccRenameBox::cancelClicked() -#include "m_dialogs.moc" diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index 2aa383434..206d946cd 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -644,4 +644,3 @@ void KviDccMarshal::connectionTimedOut() } -#include "m_marshal.moc" diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index ba4f79f49..5fae23e3c 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -1887,4 +1887,3 @@ void KviDccFileTransferBandwidthDialog::closeEvent(QCloseEvent * e) -#include "m_send.moc" diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index 787d43665..ca0d2c7a0 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -1038,4 +1038,3 @@ void KviDccVoice::focusInEvent(QFocusEvent *e) KviWindow::focusInEvent(e); } -#include "m_voice.moc" diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp index 11fe893fd..e19a87c45 100644 --- a/src/modules/dcc/window.cpp +++ b/src/modules/dcc/window.cpp @@ -50,4 +50,3 @@ const char * KviDccWindow::dccMarshalOutputContextString() return static_context; } -#include "m_window.moc" diff --git a/src/modules/dialog/dialog.pro b/src/modules/dialog/dialog.pro new file mode 100644 index 000000000..9d35186bf --- /dev/null +++ b/src/modules/dialog/dialog.pro @@ -0,0 +1,7 @@ +TARGET = kvidialog
+
+HEADERS += libkvidialog.h
+
+SOURCES += libkvidialog.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 3e4e24240..99a8367e9 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -917,4 +917,3 @@ KVIRC_MODULE( dialog_module_cleanup ) -#include "libkvidialog.moc" diff --git a/src/modules/dockwidget/dockwidget.pro b/src/modules/dockwidget/dockwidget.pro new file mode 100644 index 000000000..dfc216ef4 --- /dev/null +++ b/src/modules/dockwidget/dockwidget.pro @@ -0,0 +1,7 @@ +TARGET = kvidockwidget
+
+HEADERS += libkvidockwidget_qt4.h libkvidockwidget.h
+
+SOURCES += libkvidockwidget_qt4.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index 50e31cb04..aeeabaf57 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -853,6 +853,4 @@ KVIRC_MODULE( dockwidget_module_cleanup ) -#include "libkvidockwidget_qt3.moc" - #endif
\ No newline at end of file diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp index 26d866fba..d769889b7 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp @@ -685,6 +685,4 @@ KVIRC_MODULE( dockwidget_module_cleanup ) -#include "libkvidockwidget_qt4.moc" - #endif diff --git a/src/modules/editor/editor.pro b/src/modules/editor/editor.pro new file mode 100644 index 000000000..b45e490e8 --- /dev/null +++ b/src/modules/editor/editor.pro @@ -0,0 +1,7 @@ +TARGET = kvieditor
+
+HEADERS += scripteditor.h
+
+SOURCES += libkvieditor.cpp scripteditor.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/eventeditor/eventeditor.pro b/src/modules/eventeditor/eventeditor.pro new file mode 100644 index 000000000..90a0cff6e --- /dev/null +++ b/src/modules/eventeditor/eventeditor.pro @@ -0,0 +1,7 @@ +TARGET = kvieventeditor
+
+HEADERS += eventeditor.h
+
+SOURCES += libkvieventeditor.cpp eventeditor.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/file/file.pro b/src/modules/file/file.pro new file mode 100644 index 000000000..3c3b6d720 --- /dev/null +++ b/src/modules/file/file.pro @@ -0,0 +1,5 @@ +TARGET = kvifile
+
+SOURCES += libkvifile.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index c607efcb8..875453346 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -765,4 +765,3 @@ void KviFileTransferWindow::applyOptions() KviWindow::applyOptions(); } -#include "m_filetransferwindow.moc" diff --git a/src/modules/filetransferwindow/filetransferwindow.pro b/src/modules/filetransferwindow/filetransferwindow.pro new file mode 100644 index 000000000..89bd04104 --- /dev/null +++ b/src/modules/filetransferwindow/filetransferwindow.pro @@ -0,0 +1,7 @@ +TARGET = kvifiletransferwindow
+
+HEADERS += filetransferwindow.h
+
+SOURCES += libkvifiletransferwindow.cpp filetransferwindow.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/help/help.pro b/src/modules/help/help.pro new file mode 100644 index 000000000..0c14b7101 --- /dev/null +++ b/src/modules/help/help.pro @@ -0,0 +1,7 @@ +TARGET = kvihelp
+
+HEADERS += helpwidget.h helpwindow.h index.h
+
+SOURCES += libkvihelp.cpp helpwidget.cpp helpwindow.cpp index.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp index c416b714e..8670816ff 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -151,4 +151,3 @@ bool KviHelpWidget::eventFilter(QObject * o, QEvent *e) -#include "helpwidget.moc" diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 197e9e811..b86e21cc9 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -324,4 +324,3 @@ void KviHelpWindow::fillCaptionBuffers() } -#include "helpwindow.moc" diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index 540273d0e..8112f98cb 100755 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -961,5 +961,3 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo } - -#include "index.moc"
\ No newline at end of file diff --git a/src/modules/http/http.pro b/src/modules/http/http.pro new file mode 100644 index 000000000..31edf426e --- /dev/null +++ b/src/modules/http/http.pro @@ -0,0 +1,7 @@ +TARGET = kvihttp
+
+HEADERS += httpfiletransfer.h
+
+SOURCES += libkvihttp.cpp httpfiletransfer.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index 18ccb5b7d..45313e746 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -486,4 +486,3 @@ bool KviHttpFileTransfer::startDownload() return m_pHttpRequest->start(); } -#include "m_httpfiletransfer.moc" diff --git a/src/modules/ident/ident.pro b/src/modules/ident/ident.pro new file mode 100644 index 000000000..0ede844fd --- /dev/null +++ b/src/modules/ident/ident.pro @@ -0,0 +1,9 @@ +TARGET = kviident
+
+HEADERS += libkviident.h
+
+SOURCES += libkviident.cpp
+
+LIBS += -lws2_32
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp index 4c3690297..59e10c091 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -611,5 +611,3 @@ KVIRC_MODULE( 0, ident_module_cleanup ) - -#include "libkviident.moc" diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index 2ad73a410..dd7234db1 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -293,5 +293,4 @@ KVIRC_MODULE( ) #if 0 -#include "libkviiograph.moc" #endif diff --git a/src/modules/lag/lag.pro b/src/modules/lag/lag.pro new file mode 100644 index 000000000..e553f5d76 --- /dev/null +++ b/src/modules/lag/lag.pro @@ -0,0 +1,6 @@ +TARGET = kvilag
+
+
+SOURCES += libkvilag.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/lamerizer/lamerizer.pro b/src/modules/lamerizer/lamerizer.pro new file mode 100644 index 000000000..f70bd2d37 --- /dev/null +++ b/src/modules/lamerizer/lamerizer.pro @@ -0,0 +1,7 @@ +TARGET = kvilamerizer
+
+HEADERS += libkvilamerizer.h
+
+SOURCES += libkvilamerizer.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp index 5518bd09e..625533f38 100644 --- a/src/modules/lamerizer/libkvilamerizer.cpp +++ b/src/modules/lamerizer/libkvilamerizer.cpp @@ -274,6 +274,3 @@ KVIRC_MODULE( lamerizer_module_cleanup ) -#ifdef COMPILE_CRYPT_SUPPORT - #include "libkvilamerizer.moc" -#endif diff --git a/src/modules/links/links.pro b/src/modules/links/links.pro new file mode 100644 index 000000000..f376d40ed --- /dev/null +++ b/src/modules/links/links.pro @@ -0,0 +1,7 @@ +TARGET = kvilinks
+
+HEADERS += linkswindow.h
+
+SOURCES += libkvilinks.cpp linkswindow.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index 7986c70f2..209b16a1c 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -469,4 +469,3 @@ void KviLinksWindow::applyOptions() KviWindow::applyOptions(); } -#include "m_linkswindow.moc" diff --git a/src/modules/list/list.pro b/src/modules/list/list.pro new file mode 100644 index 000000000..e91ac1f2d --- /dev/null +++ b/src/modules/list/list.pro @@ -0,0 +1,7 @@ +TARGET = kvilist
+
+HEADERS += listwindow.h
+
+SOURCES += libkvilist.cpp listwindow.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index a4b23510c..b64818b4a 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -531,4 +531,3 @@ void KviListWindow::applyOptions() KviWindow::applyOptions(); } -#include "listwindow.moc" diff --git a/src/modules/log/log.pro b/src/modules/log/log.pro new file mode 100644 index 000000000..13c5667c1 --- /dev/null +++ b/src/modules/log/log.pro @@ -0,0 +1,5 @@ +TARGET = kvilog
+
+SOURCES += libkvilog.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/logview/logview.pro b/src/modules/logview/logview.pro new file mode 100644 index 000000000..94dfcb3b1 --- /dev/null +++ b/src/modules/logview/logview.pro @@ -0,0 +1,7 @@ +TARGET = kvilogview
+
+HEADERS += logviewwidget.h logviewmdiwindow.h
+
+SOURCES += libkvilogview.cpp logviewwidget.cpp logviewmdiwindow.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index da67b5088..c935e90fe 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -474,4 +474,3 @@ void KviLogFile::getText(QString & text,const QString& logDir){ #endif
}
-#include "logviewmdiwindow.moc"
diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp index 29398b8f1..7a0336766 100644 --- a/src/modules/logview/logviewwidget.cpp +++ b/src/modules/logview/logviewwidget.cpp @@ -73,4 +73,3 @@ QString KviLogListViewItemType::text(int col) const }; -#include "logviewwidget.moc" diff --git a/src/modules/mask/mask.pro b/src/modules/mask/mask.pro new file mode 100644 index 000000000..0c18abbf2 --- /dev/null +++ b/src/modules/mask/mask.pro @@ -0,0 +1,5 @@ +TARGET = kvimask
+
+SOURCES += libkvimask.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/math/libkvimath.cpp b/src/modules/math/libkvimath.cpp index af7152c96..192eb9418 100644 --- a/src/modules/math/libkvimath.cpp +++ b/src/modules/math/libkvimath.cpp @@ -50,7 +50,7 @@ static bool __fncname(KviKvsModuleFunctionCall * c) \ return true; \ } -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) && !defined(__GNUC__) // dobbiamo testare meglio, i risultati. static double cbrt(double x) { diff --git a/src/modules/math/math.pro b/src/modules/math/math.pro new file mode 100644 index 000000000..08d53dbdc --- /dev/null +++ b/src/modules/math/math.pro @@ -0,0 +1,5 @@ +TARGET = kvimath
+
+SOURCES += libkvimath.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/mediaplayer/mediaplayer.pro b/src/modules/mediaplayer/mediaplayer.pro new file mode 100644 index 000000000..a93e3f2e6 --- /dev/null +++ b/src/modules/mediaplayer/mediaplayer.pro @@ -0,0 +1,22 @@ +TARGET = kvimediaplayer
+
+HEADERS += mp_amarokinterface.h \
+ mp_dcopinterface.h \
+ mp_interface.h \
+ mp_jukinterface.h \
+ mp_mp3.h \
+ mp_winampinterface.h \
+ mp_xmmsinterface.h \
+ mp_amipinterface.h
+
+SOURCES += libkvimediaplayer.cpp \
+ mp_amarokinterface.cpp \
+ mp_dcopinterface.cpp \
+ mp_interface.cpp \
+ mp_jukinterface.cpp \
+ mp_mp3.cpp \
+ mp_winampinterface.cpp \
+ mp_xmmsinterface.cpp \
+ mp_amipinterface.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index 7bfa1d340..909503a10 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -380,4 +380,3 @@ KVIRC_MODULE( mircimport_module_cleanup ) -#include "libkvimircimport.moc" diff --git a/src/modules/mircimport/mircimport.pro b/src/modules/mircimport/mircimport.pro new file mode 100644 index 000000000..f5ddbcbad --- /dev/null +++ b/src/modules/mircimport/mircimport.pro @@ -0,0 +1,7 @@ +TARGET = kvimircimport
+
+HEADERS += libkvimircimport.h
+
+SOURCES += libkvimircimport.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/module.pri b/src/modules/module.pri new file mode 100644 index 000000000..0a3ef4fe7 --- /dev/null +++ b/src/modules/module.pri @@ -0,0 +1,38 @@ +CONFIG += precompile_header debug_and_release thread dll
+LANGUAGE = C++
+TEMPLATE = lib
+
+QT += core \
+ gui \
+ qt3support
+
+DEFINES -= UNICODE
+
+CONFIG(debug, debug|release) {
+ DESTDIR = ../../../bin/debug/modules/
+ LIBS += -L../../../bin/debug/
+ } else {
+ DESTDIR = ../../../bin/release/modules/
+ LIBS += -L../../../bin/release/
+ }
+
+INCLUDEPATH += ../../kvilib/tal/ \
+ ../../kvilib/config/ \
+ ../../kvilib/core/ \
+ ../../kvilib/ext/ \
+ ../../kvilib/file/ \
+ ../../kvilib/irc/ \
+ ../../kvilib/net/ \
+ ../../kvilib/system/
+
+
+INCLUDEPATH += ../../kvirc/kernel/ \
+ ../../kvirc/kvs/ \
+ ../../kvirc/module/ \
+ ../../kvirc/sparser/ \
+ ../../kvirc/ui/
+
+LIBS += -lkvilib \
+ -lkvirc
+
+RC_FILE = ../../../data/resources/commctrl.rc
\ No newline at end of file diff --git a/src/modules/modules.pro b/src/modules/modules.pro new file mode 100644 index 000000000..04ce211d3 --- /dev/null +++ b/src/modules/modules.pro @@ -0,0 +1,7 @@ +TEMPLATE = subdirs
+SUBDIRS = about action actioneditor addon aliaseditor avatar chan channelsjoin codetester config \
+ dcc dialog dockwidget editor eventeditor file filetransferwindow help http ident lag lamerizer links list log\
+ logview mask math mediaplayer mircimport my notifier objects options popupeditor raweditor \
+ regchan reguser rijndael setup sharedfile sharedfileswindow snd socketspy spaste str system \
+ texticons theme tip tmphighlight toolbar toolbareditor url window perl perlcore
+
diff --git a/src/modules/my/idle.cpp b/src/modules/my/idle.cpp index 34eef595d..351806d83 100644 --- a/src/modules/my/idle.cpp +++ b/src/modules/my/idle.cpp @@ -130,4 +130,3 @@ void Idle::doCheck() secondsIdle(secondsIdle()); } -#include "idle.moc" diff --git a/src/modules/my/my.pro b/src/modules/my/my.pro new file mode 100644 index 000000000..ba241b667 --- /dev/null +++ b/src/modules/my/my.pro @@ -0,0 +1,7 @@ +TARGET = kvimy
+
+HEADERS += idle.h
+
+SOURCES += libkvimy.cpp idle_x11.cpp idle_mac.cpp idle.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/notifier/notifier.pro b/src/modules/notifier/notifier.pro new file mode 100644 index 000000000..408a877c3 --- /dev/null +++ b/src/modules/notifier/notifier.pro @@ -0,0 +1,20 @@ +TARGET = kvinotifier
+
+HEADERS += \
+ notifiersettings.h \
+ notifierwindow.h \
+ notifiermessage.h \
+ notifierwindowtabs.h \
+ notifierwindowbody.h \
+ notifierwindowborder.h \
+ notifierwindowprogressbar.h
+
+SOURCES += libkvinotifier.cpp \
+ notifierwindow.cpp \
+ notifiermessage.cpp \
+ notifierwindowtabs.cpp \
+ notifierwindowbody.cpp \
+ notifierwindowborder.cpp \
+ notifierwindowprogressbar.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 305053cd9..14b902aaf 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -1424,5 +1424,3 @@ void KviNotifierWindow::progressUpdate() QPainter p(this); m_pProgressBar->draw(&p); } -#include "m_notifierwindow.moc" - diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp index 3b778ecc1..952840323 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -703,4 +703,3 @@ void KviNotifierWindowTabs::closeTab(KviWindow * pWnd, KviNotifierWindowTab * pT } } -#include "m_notifierwindowtabs.moc" diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index fd8a4b3b5..bbb95cdcb 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -174,5 +174,3 @@ void KviKvsObject_button::slotClicked() callFunction(this,"clickEvent",params); } - -#include "m_class_button.moc" diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 1e9260509..6545d8a1b 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -124,5 +124,3 @@ void KviKvsObject_checkbox::toggled(bool b) callFunction(this,"toggleEvent",¶ms); } - -#include "m_class_checkbox.moc" diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index f8c3d3d6b..146a92bed 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -362,5 +362,3 @@ void KviKvsObject_combobox::slotActivated(int i) callFunction(this,"activatedEvent",¶ms); } - -#include "m_class_combobox.moc" diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp index a6067a505..fc2276e91 100644 --- a/src/modules/objects/class_dockwindow.cpp +++ b/src/modules/objects/class_dockwindow.cpp @@ -227,5 +227,3 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c) else c->warning(__tr2qs("Invalid dock area specified")); return true; } - -#include "m_class_dockwindow.moc" diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp index 55bbd4f29..010a51be9 100644 --- a/src/modules/objects/class_file.cpp +++ b/src/modules/objects/class_file.cpp @@ -485,4 +485,3 @@ bool KviScriptFileObject::functionHexRead(KviCommand * c, KviParameterList * p, } */ -#include "m_class_file.moc" diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index a5e94ebc7..37144e2bf 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -457,5 +457,3 @@ void KviKvsObject_lineedit::slottextChanged(const QString &text) callFunction(this,"textChangedEvent",¶ms); } - -#include "m_class_lineedit.moc" diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp index bf7292773..8a56e2c75 100644 --- a/src/modules/objects/class_listbox.cpp +++ b/src/modules/objects/class_listbox.cpp @@ -386,5 +386,3 @@ kvs_uint_t uIndex; return true; } - -#include "m_class_listbox.moc" diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp index 4a6d03924..9f384cd5d 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -554,4 +554,3 @@ void KviKvsMdmListView::contentsDropEvent(QDropEvent *e) } } -#include "m_class_listview.moc" diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp index 7d193b98f..5136fda10 100644 --- a/src/modules/objects/class_listviewitem.cpp +++ b/src/modules/objects/class_listviewitem.cpp @@ -417,5 +417,3 @@ bool KviKvsObject_listviewitem::function_setPixmap(KviKvsObjectFunctionCall *c) m_pListViewItem->setPixmap(uCol,*pix); return true; } - -#include "m_class_listviewitem.moc" diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index 8be51a018..e3f8d0947 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -1213,5 +1213,3 @@ bool KviKvsObject_mledit::functionselectAll(KviKvsObjectFunctionCall *c) } - -#include "m_class_multilineedit.moc" diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 5c45910d2..fd2c0ab3e 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -956,20 +956,20 @@ bool KviKvsObject_painter::functionresetMatrix(KviKvsObjectFunctionCall *c) } #ifdef COMPILE_USE_QT4 -bool KviKvsObject_painter::functionsetOpacity(KviKvsObjectFunctionCall *c)
-{
- if(!m_pPainter)return true;
- kvs_real_t dOpacity;
-
- KVSO_PARAMETERS_BEGIN(c)
- KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity)
- KVSO_PARAMETERS_END(c)
- m_pPainter->setOpacity(dOpacity);
- return true;
-}
+bool KviKvsObject_painter::functionsetOpacity(KviKvsObjectFunctionCall *c) +{ + if(!m_pPainter)return true; + kvs_real_t dOpacity; + + KVSO_PARAMETERS_BEGIN(c) + KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity) + KVSO_PARAMETERS_END(c) + m_pPainter->setOpacity(dOpacity); + return true; +} bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true;
+ if(!m_pPainter)return true; bool bEnabled; KVSO_PARAMETERS_BEGIN(c) @@ -977,10 +977,10 @@ bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall KVSO_PARAMETERS_END(c) m_pPainter->setRenderHint(QPainter::TextAntialiasing,bEnabled); return true; -}
+} bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true;
+ if(!m_pPainter)return true; bool bEnabled; KVSO_PARAMETERS_BEGIN(c) @@ -988,10 +988,10 @@ bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) m_pPainter->setRenderHint(QPainter::Antialiasing,bEnabled); return true; -}
+} bool KviKvsObject_painter::functionsetSmoothPixmapTransform(KviKvsObjectFunctionCall *c) { - if(!m_pPainter)return true;
+ if(!m_pPainter)return true; bool bEnabled; KVSO_PARAMETERS_BEGIN(c) @@ -999,9 +999,7 @@ bool KviKvsObject_painter::functionsetSmoothPixmapTransform(KviKvsObjectFunction KVSO_PARAMETERS_END(c) m_pPainter->setRenderHint(QPainter::SmoothPixmapTransform,bEnabled); return true; -}
-#endif
-
-
+} +#endif + -#include "m_class_painter.moc" diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp index 89247edb9..6028642b6 100644 --- a/src/modules/objects/class_pixmap.cpp +++ b/src/modules/objects/class_pixmap.cpp @@ -313,5 +313,3 @@ QImage * KviKvsObject_pixmap::getImage() return m_pImage;
}
-
-#include "m_class_pixmap.moc"
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index c32d0f891..d47a1f7bd 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -357,5 +357,3 @@ bool KviKvsObject_popupmenu::functionactivatedEvent(KviKvsObjectFunctionCall *c) return true; } - -#include "m_class_popupmenu.moc" diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index e0951b14e..1ff1544b0 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -313,5 +313,3 @@ void KviKvsObject_process::slotReadStderr() KviKvsVariantList *params=0; callFunction(this,"readyReadStderrEvent",params); } - -#include "m_class_process.moc" diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index 402d24b50..5b2a44b3d 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -134,5 +134,3 @@ void KviKvsObject_radiobutton::toggled(bool b) callFunction(this,"toggleEvent",¶ms); } - -#include "m_class_radiobutton.moc" diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index 54673d610..02d2d5312 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -283,5 +283,3 @@ void KviKvsObject_slider::valueChanged(int value) callFunction(this,"valueChangedEvent",¶ms); } - -#include "m_class_slider.moc" diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 3819ca05b..f0d71edb6 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -1326,6 +1326,4 @@ KviQCString szData8 = szData.utf8(); -//--------------
-
-#include "m_class_socket.moc"
+//-------------
\ No newline at end of file diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index 6b0147f24..bcd6acaf9 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -261,5 +261,3 @@ void KviKvsObject_spinbox::valueChanged(int value) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value)); callFunction(this,"valueChangedEvent",¶ms); } - -#include "m_class_spinbox.moc" diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index 998bb3f44..5d6d5ebba 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -537,5 +537,3 @@ void KviKvsObject_tabwidget::slotCurrentChanged(int value) KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value)); callFunction(this,"currentChangedEvent",¶ms); } - -#include "m_class_tabwidget.moc" diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index bd46f0803..d3f2aac41 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -139,5 +139,3 @@ bool KviKvsObject_textbrowser::function_linkClickedEvent(KviKvsObjectFunctionCal emitSignal("linkClicked",c,c->params()); return true; } - -#include "m_class_tbrowser.moc" diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp index e8e3292e6..a8f1fc05b 100644 --- a/src/modules/objects/class_toolbar.cpp +++ b/src/modules/objects/class_toolbar.cpp @@ -149,5 +149,3 @@ bool KviKvsObject_toolbar::functionclear(KviKvsObjectFunctionCall *c) return true; } -#include "m_class_toolbar.moc" - diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index 3a531da30..a4c5ed7a5 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -337,5 +337,3 @@ void KviKvsObject_toolbutton::slotClicked() callFunction(this,"clickEvent",params); } -#include "m_class_toolbutton.moc" - diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 3d9cb936a..44fb2e77d 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1742,4 +1742,3 @@ bool KviKvsObject_widget::function_setAttribute(KviKvsObjectFunctionCall *c) }
#endif
-#include "m_class_widget.moc"
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp index 7bcbea852..85fb4a7c3 100644 --- a/src/modules/objects/class_window.cpp +++ b/src/modules/objects/class_window.cpp @@ -155,4 +155,3 @@ bool KviKvsObject_window::functionsetCentralWidget(KviKvsObjectFunctionCall *c) ((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KviKvsObject_widget *)ob,((KviKvsObject_widget *)ob)->widget()); return true; } -#include "m_class_window.moc" diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index 83117af97..c7d8770e8 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -387,4 +387,3 @@ void KviKvsMdmWizard::slotBackClicked() KviKvsMdmWizard::~KviKvsMdmWizard() { } -#include "m_class_wizard.moc" diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp index 464f10f85..9eb1f6a9b 100644 --- a/src/modules/objects/class_wrapper.cpp +++ b/src/modules/objects/class_wrapper.cpp @@ -265,5 +265,3 @@ QWidget *KviKvsObject_wrapper::findWidgetToWrap(const char *szClass, const char return 0; #endif } - -#include "m_class_wrapper.moc" diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp index e4ac20acf..3690c64e9 100644 --- a/src/modules/objects/class_xmlreader.cpp +++ b/src/modules/objects/class_xmlreader.cpp @@ -330,5 +330,3 @@ bool KviKvsObject_xmlreader::function_lastError(KviKvsObjectFunctionCall *c) c->returnValue()->setString(m_szLastError); return true; } - -#include "m_class_xmlreader.moc" diff --git a/src/modules/objects/objects.pro b/src/modules/objects/objects.pro new file mode 100644 index 000000000..eac04a872 --- /dev/null +++ b/src/modules/objects/objects.pro @@ -0,0 +1,101 @@ +QT += xml
+
+LIBS += -lws2_32
+
+PRECOMPILED_HEADER = pch.h
+
+precompile_header:!isEmpty(PRECOMPILED_HEADER) {
+ DEFINES += USING_PCH
+ }
+
+TARGET = kviobjects
+
+HEADERS += class_button.h \
+ class_buttongroup.h \
+ class_checkbox.h \
+ class_combobox.h \
+ class_dialog.h \
+ class_dockwindow.h \
+ class_file.h \
+ class_groupbox.h \
+ class_label.h \
+ class_layout.h \
+ class_lcd.h \
+ class_lineedit.h \
+ class_list.h \
+ class_listbox.h \
+ class_listview.h \
+ class_listviewitem.h \
+ class_mainwindow.h \
+ class_menubar.h \
+ class_multilineedit.h \
+ class_painter.h \
+ class_pixmap.h \
+ class_popupmenu.h \
+ class_process.h \
+ class_progressbar.h \
+ class_radiobutton.h \
+ class_slider.h \
+ class_socket.h \
+ class_spinbox.h \
+ class_tabwidget.h \
+ class_tbrowser.h \
+ class_toolbar.h \
+ class_toolbutton.h \
+ class_urllabel.h \
+ class_widget.h \
+ class_window.h \
+ class_wizard.h \
+ class_workspace.h \
+ class_wrapper.h \
+ class_xmlreader.h \
+ class_vbox.h \
+ class_hbox.h \
+ object_macros.h
+
+
+SOURCES += libkviobjects.cpp \
+ class_button.cpp \
+ class_buttongroup.cpp \
+ class_checkbox.cpp \
+ class_combobox.cpp \
+ class_dialog.cpp \
+ class_dockwindow.cpp \
+ class_file.cpp \
+ class_groupbox.cpp \
+ class_label.cpp \
+ class_layout.cpp \
+ class_lcd.cpp \
+ class_lineedit.cpp \
+ class_list.cpp \
+ class_listbox.cpp \
+ class_listview.cpp \
+ class_listviewitem.cpp \
+ class_mainwindow.cpp \
+ class_menubar.cpp \
+ class_multilineedit.cpp \
+ class_popupmenu.cpp \
+ class_process.cpp \
+ class_progressbar.cpp \
+ class_radiobutton.cpp \
+ class_slider.cpp \
+ class_socket.cpp \
+ class_spinbox.cpp \
+ class_tabwidget.cpp \
+ class_toolbar.cpp \
+ class_toolbutton.cpp \
+ class_painter.cpp \
+ class_pixmap.cpp \
+ class_tbrowser.cpp \
+ class_widget.cpp \
+ class_window.cpp \
+ class_wizard.cpp \
+ class_workspace.cpp \
+ class_wrapper.cpp \
+ class_urllabel.cpp \
+ class_xmlreader.cpp \
+ class_vbox.cpp \
+ class_hbox.cpp
+
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/objects/pch.h b/src/modules/objects/pch.h new file mode 100644 index 000000000..7f94318ca --- /dev/null +++ b/src/modules/objects/pch.h @@ -0,0 +1,8 @@ +#if defined __cplusplus
+ #include <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 ca1603afb..6230b0a35 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -120,4 +120,3 @@ void KviOptionsWidgetContainer::cancelClicked() deleteLater(); } -#include "m_container.moc" diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index fb133c852..6939e4a3e 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -672,4 +672,3 @@ void KviOptionsDialog::keyPressEvent( QKeyEvent * e ) e->ignore(); } -#include "m_dialog.moc" diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp index 8ee3f3dc4..6069bd7da 100644 --- a/src/modules/options/instances.cpp +++ b/src/modules/options/instances.cpp @@ -3586,5 +3586,3 @@ KviOptionsWidgetInstanceEntry * KviOptionsInstanceManager::findInstanceEntry(con } -#include "m_instances.moc" - diff --git a/src/modules/options/options.pro b/src/modules/options/options.pro new file mode 100644 index 000000000..d9439513d --- /dev/null +++ b/src/modules/options/options.pro @@ -0,0 +1,104 @@ +TARGET = kvioptions
+
+PRECOMPILED_HEADER = pch.h
+
+precompile_header:!isEmpty(PRECOMPILED_HEADER) {
+ DEFINES += USING_PCH
+ }
+
+precompile_header:isEmpty(PRECOMPILED_HEADER) {
+ DEFINES += CREATING_PCH
+ }
+
+HEADERS += container.h \
+ dialog.h \
+ instances.h \
+ optw_antispam.h \
+ optw_avatar.h \
+ optw_connection.h \
+ optw_ctcp.h \
+ optw_ctcpfloodprotection.h \
+ optw_dcc.h \
+ optw_generalopt.h \
+ optw_highlighting.h \
+ optw_ident.h \
+ optw_identity.h \
+ optw_ignore.h \
+ optw_input.h \
+ optw_interfacefeatures.h \
+ optw_interfacelookglobal.h \
+ optw_irc.h \
+ optw_ircoutput.h \
+ optw_ircview.h \
+ optw_lag.h \
+ optw_logging.h \
+ optw_mediatypes.h \
+ optw_messages.h \
+ optw_nickserv.h \
+ optw_notify.h \
+ optw_protection.h \
+ optw_proxy.h \
+ optw_query.h \
+ optw_servers.h \
+ optw_sound.h \
+ optw_ssl.h \
+ optw_taskbar.h \
+ optw_textencoding.h \
+ optw_texticons.h \
+ optw_theme.h \
+ optw_tools.h \
+ optw_transport.h \
+ optw_topiclabel.h \
+ optw_away.h \
+ optw_uparser.h \
+ optw_urlhandlers.h \
+ optw_userlist.h \
+ optw_tray.h
+
+SOURCES += libkvioptions.cpp \
+ container.cpp \
+ dialog.cpp \
+ instances.cpp \
+ optw_antispam.cpp \
+ optw_avatar.cpp \
+ optw_connection.cpp \
+ optw_ctcp.cpp \
+ optw_ctcpfloodprotection.cpp \
+ optw_dcc.cpp \
+ optw_generalopt.cpp \
+ optw_highlighting.cpp \
+ optw_ident.cpp \
+ optw_identity.cpp \
+ optw_ignore.cpp \
+ optw_input.cpp \
+ optw_interfacefeatures.cpp \
+ optw_interfacelookglobal.cpp \
+ optw_irc.cpp \
+ optw_ircoutput.cpp \
+ optw_ircview.cpp \
+ optw_lag.cpp \
+ optw_logging.cpp \
+ optw_mediatypes.cpp \
+ optw_messages.cpp \
+ optw_nickserv.cpp \
+ optw_notify.cpp \
+ optw_protection.cpp \
+ optw_proxy.cpp \
+ optw_query.cpp \
+ optw_servers.cpp \
+ optw_sound.cpp \
+ optw_ssl.cpp \
+ optw_taskbar.cpp \
+ optw_textencoding.cpp \
+ optw_texticons.cpp \
+ optw_theme.cpp \
+ optw_tools.cpp \
+ optw_transport.cpp \
+ optw_topiclabel.cpp \
+ optw_away.cpp \
+ optw_uparser.cpp \
+ optw_urlhandlers.cpp \
+ optw_userlist.cpp \
+ optw_tray.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp index 48fb565d7..a0317772d 100644 --- a/src/modules/options/optw_antispam.cpp +++ b/src/modules/options/optw_antispam.cpp @@ -61,4 +61,3 @@ void KviAntispamOptionsWidget::reenableStuff(bool) } -#include "m_optw_antispam.moc" diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp index 5e9ae129e..337bd2558 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -128,4 +128,3 @@ KviAvatarAdvancedOptionsWidget::~KviAvatarAdvancedOptionsWidget() } -#include "m_optw_avatar.moc" diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index c23f5c651..a3583416e 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -68,4 +68,3 @@ void KviAwayOptionsWidget::enableCustomAwayText(bool) } -#include "m_optw_away.moc" diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index 44da4e72c..3f04aaab7 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -318,4 +318,3 @@ KviConnectionAdvancedOptionsWidget::~KviConnectionAdvancedOptionsWidget() } -#include "m_optw_connection.moc" diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp index 59d5e7da0..f3bce9a14 100644 --- a/src/modules/options/optw_ctcp.cpp +++ b/src/modules/options/optw_ctcp.cpp @@ -87,4 +87,3 @@ KviCtcpOptionsWidget::~KviCtcpOptionsWidget() } -#include "m_optw_ctcp.moc" diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index 7e1b3a1bf..957cfc8eb 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -113,4 +113,3 @@ KviCtcpFloodProtectionOptionsWidget::~KviCtcpFloodProtectionOptionsWidget() } -#include "m_optw_ctcpfloodprotection.moc" diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index 2d3cbe16b..df2943e20 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -390,4 +390,3 @@ KviDccVoiceOptionsWidget::~KviDccVoiceOptionsWidget() { } -#include "m_optw_dcc.moc" diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp index 64b737659..2604f7b45 100644 --- a/src/modules/options/optw_generalopt.cpp +++ b/src/modules/options/optw_generalopt.cpp @@ -48,4 +48,3 @@ KviGeneralOptOptionsWidget::~KviGeneralOptOptionsWidget() } -#include "m_optw_generalopt.moc" diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index aad2cd974..fa4f4136d 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -123,6 +123,5 @@ KviAlertOptionsWidget::~KviAlertOptionsWidget() } -#include "m_optw_highlighting.moc" #endif //_OPTW_HIGHLIGHTING_CPP_ diff --git a/src/modules/options/optw_ident.cpp b/src/modules/options/optw_ident.cpp index 5a393a695..c6fdcfe18 100644 --- a/src/modules/options/optw_ident.cpp +++ b/src/modules/options/optw_ident.cpp @@ -34,4 +34,3 @@ -#include "m_optw_ident.moc" diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index 27186e455..04b759e82 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -726,4 +726,3 @@ void KviIdentityAdvancedOptionsWidget::commit() -#include "m_optw_identity.moc" diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp index e258926fd..a16ee9304 100644 --- a/src/modules/options/optw_ignore.cpp +++ b/src/modules/options/optw_ignore.cpp @@ -59,4 +59,3 @@ void KviIgnoreOptionsWidget::enableVerbose(bool) -#include "m_optw_ignore.moc" diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp index f2a23d8fc..aa03219f5 100644 --- a/src/modules/options/optw_input.cpp +++ b/src/modules/options/optw_input.cpp @@ -153,4 +153,3 @@ KviInputFeaturesOptionsWidget::~KviInputFeaturesOptionsWidget() { } -#include "m_optw_input.moc" diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp index 21db72aa2..1c40e44c4 100644 --- a/src/modules/options/optw_interfacefeatures.cpp +++ b/src/modules/options/optw_interfacefeatures.cpp @@ -85,4 +85,3 @@ void KviInterfaceFeaturesOptionsWidget::commit() } -#include "m_optw_interfacefeatures.moc" diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index f09fc7a0d..d23fed9ff 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -212,4 +212,3 @@ KviThemeToolBarAppletsOptionsWidget::~KviThemeToolBarAppletsOptionsWidget() } -#include "m_optw_interfacelookglobal.moc" diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp index 3572fe38b..3e6b4e524 100644 --- a/src/modules/options/optw_irc.cpp +++ b/src/modules/options/optw_irc.cpp @@ -217,4 +217,3 @@ void KviChannelAdvancedOptionsWidget::commit() KviOptionsWidget::commit(); } -#include "m_optw_irc.moc" diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp index a7e565f1a..2fbd1e3e7 100644 --- a/src/modules/options/optw_ircoutput.cpp +++ b/src/modules/options/optw_ircoutput.cpp @@ -91,4 +91,3 @@ void KviIrcOutputOptionsWidget::commit() KVI_OPTION_UINT(KviOption_uintOutputVerbosityLevel) = i; } -#include "m_optw_ircoutput.moc" diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp index 766a8c772..bc02491c6 100644 --- a/src/modules/options/optw_ircview.cpp +++ b/src/modules/options/optw_ircview.cpp @@ -165,4 +165,3 @@ KviIrcViewFeaturesOptionsWidget::~KviIrcViewFeaturesOptionsWidget() -#include "m_optw_ircview.moc" diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 34e3eb300..95227b173 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -82,4 +82,3 @@ KviLagOptionsWidget::~KviLagOptionsWidget() } -#include "m_optw_lag.moc" diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp index f8a197e82..b6f2cef46 100644 --- a/src/modules/options/optw_logging.cpp +++ b/src/modules/options/optw_logging.cpp @@ -61,4 +61,3 @@ KviLoggingOptionsWidget::~KviLoggingOptionsWidget() -#include "m_optw_logging.moc" diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp index 062b50309..24b69f943 100644 --- a/src/modules/options/optw_mediatypes.cpp +++ b/src/modules/options/optw_mediatypes.cpp @@ -259,4 +259,3 @@ void KviMediaTypesOptionsWidget::commit() g_pMediaManager->unlock(); } -#include "m_optw_mediatypes.moc" diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index 2742d6dd8..bcb39e934 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -690,4 +690,3 @@ void KviMessageColorsOptionsWidget::load() } } -#include "m_optw_messages.moc" diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index c6ac75df6..f3291cff8 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -365,4 +365,3 @@ void KviNickServOptionsWidget::commit() KviOptionsWidget::commit(); } -#include "m_optw_nickserv.moc" diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp index 23b4252b3..616097c27 100644 --- a/src/modules/options/optw_notify.cpp +++ b/src/modules/options/optw_notify.cpp @@ -131,4 +131,3 @@ KviNotifierOptionsWidget::~KviNotifierOptionsWidget() } -#include "m_optw_notify.moc" diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp index 137ffbb8b..e82ed5373 100644 --- a/src/modules/options/optw_protection.cpp +++ b/src/modules/options/optw_protection.cpp @@ -47,4 +47,3 @@ KviProtectionOptionsWidget::~KviProtectionOptionsWidget() { } -#include "m_optw_protection.moc" diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index 44c635205..cc1eb1dd4 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -363,5 +363,3 @@ void KviProxyOptionsWidget::removeCurrent() } } } - -#include "m_optw_proxy.moc" diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp index 19963c37f..ceb6f19a9 100644 --- a/src/modules/options/optw_query.cpp +++ b/src/modules/options/optw_query.cpp @@ -111,5 +111,3 @@ KviQueryOptionsWidget::~KviQueryOptionsWidget() { } - -#include "m_optw_query.moc" diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index ae98e14fc..69c4d73d4 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -1708,5 +1708,3 @@ void KviServerOptionsWidget::detailsClicked() m_pNetworkDetailsDialog = 0; } } - -#include "m_optw_servers.moc" diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index 69f1f4a4a..8e39d3e54 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -306,5 +306,3 @@ KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent) KviSoundsOptionsWidget::~KviSoundsOptionsWidget() { } - -#include "m_optw_sound.moc" diff --git a/src/modules/options/optw_ssl.cpp b/src/modules/options/optw_ssl.cpp index 6242c3c4b..423afc911 100644 --- a/src/modules/options/optw_ssl.cpp +++ b/src/modules/options/optw_ssl.cpp @@ -31,5 +31,3 @@ //#warning "Info tips" - -#include "m_optw_ssl.moc" diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp index 89e16c005..94ad75915 100644 --- a/src/modules/options/optw_taskbar.cpp +++ b/src/modules/options/optw_taskbar.cpp @@ -251,5 +251,3 @@ KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(QWidget * parent) KviClassicTaskBarOptionsWidget::~KviClassicTaskBarOptionsWidget() { } - -#include "m_optw_taskbar.moc" diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp index 067fe0a48..fa418a842 100644 --- a/src/modules/options/optw_textencoding.cpp +++ b/src/modules/options/optw_textencoding.cpp @@ -135,5 +135,3 @@ void KviTextEncodingOptionsWidget::commit() /* if(!KviQString::equalCI(m_pForcedLocaleCombo->text(idx),m_szLanguage)) QMessageBox::information(0,"KVIrc",__tr2qs_ctx("You need to restart KVirc to apply a language changing","options"),QMessageBox::Ok);*/ } - -#include "m_optw_textencoding.moc" diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index 09edb250e..e8b048729 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -240,5 +240,3 @@ void KviTextIconsOptionsWidget::commit() m_pTable->clearCell(i,j); } - -#include "m_optw_texticons.moc" diff --git a/src/modules/options/optw_theme.cpp b/src/modules/options/optw_theme.cpp index 9906b7ec1..861e10a3f 100644 --- a/src/modules/options/optw_theme.cpp +++ b/src/modules/options/optw_theme.cpp @@ -22,5 +22,3 @@ // //============================================================================= - -#include "m_optw_theme.moc" diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp index 1f927b2d3..ce26f7e78 100644 --- a/src/modules/options/optw_tools.cpp +++ b/src/modules/options/optw_tools.cpp @@ -46,5 +46,3 @@ KviToolsOptionsWidget::KviToolsOptionsWidget(QWidget * parent) KviToolsOptionsWidget::~KviToolsOptionsWidget() { } - -#include "m_optw_tools.moc" diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp index 67a5e635f..ebe6a0ade 100644 --- a/src/modules/options/optw_topiclabel.cpp +++ b/src/modules/options/optw_topiclabel.cpp @@ -39,5 +39,3 @@ KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOp KviTopicLabelLookOptionsWidget::~KviTopicLabelLookOptionsWidget() { } - -#include "m_optw_topiclabel.moc" diff --git a/src/modules/options/optw_transport.cpp b/src/modules/options/optw_transport.cpp index 656debbbf..54929ae78 100644 --- a/src/modules/options/optw_transport.cpp +++ b/src/modules/options/optw_transport.cpp @@ -29,5 +29,3 @@ - -#include "m_optw_transport.moc" diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp index 791048d23..9cc58f66b 100644 --- a/src/modules/options/optw_tray.cpp +++ b/src/modules/options/optw_tray.cpp @@ -88,4 +88,3 @@ void KviTrayOptionsWidget::setEnabled(bool bEnabled) } -#include "m_optw_tray.moc" diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp index 3afbbe578..64e39b4c0 100644 --- a/src/modules/options/optw_uparser.cpp +++ b/src/modules/options/optw_uparser.cpp @@ -59,4 +59,3 @@ KviUParserOptionsWidget::~KviUParserOptionsWidget() } -#include "m_optw_uparser.moc" diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp index 76060c028..dc0315605 100644 --- a/src/modules/options/optw_urlhandlers.cpp +++ b/src/modules/options/optw_urlhandlers.cpp @@ -122,6 +122,5 @@ void KviUrlHandlersOptionsWidget::commit() #endif } -#include "m_optw_urlhandlers.moc" #endif //_OPTW_URLHANDLERS_CPP_ diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp index c16dac937..42734da7c 100644 --- a/src/modules/options/optw_userlist.cpp +++ b/src/modules/options/optw_userlist.cpp @@ -242,4 +242,3 @@ KviUserListFeaturesOptionsWidget::~KviUserListFeaturesOptionsWidget() { } -#include "m_optw_userlist.moc" diff --git a/src/modules/options/pch.h b/src/modules/options/pch.h new file mode 100644 index 000000000..8c8ef6cd5 --- /dev/null +++ b/src/modules/options/pch.h @@ -0,0 +1,11 @@ +#if defined __cplusplus
+ #include <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 new file mode 100644 index 000000000..82674b62a --- /dev/null +++ b/src/modules/perl/perl.pro @@ -0,0 +1,5 @@ +TARGET = kviperl
+
+SOURCES += libkviperl.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/perlcore/perlcore.pro b/src/modules/perlcore/perlcore.pro new file mode 100644 index 000000000..7d9fc01cc --- /dev/null +++ b/src/modules/perlcore/perlcore.pro @@ -0,0 +1,11 @@ +TARGET = kviperlcore
+
+INCLUDEPATH += $(PERLDIR)/lib/CORE/
+
+LIBS += -lperl58
+
+HEADERS += perlcoreinterface.h
+
+SOURCES += libkviperlcore.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/popupeditor/popupeditor.pro b/src/modules/popupeditor/popupeditor.pro new file mode 100644 index 000000000..bdec0dfef --- /dev/null +++ b/src/modules/popupeditor/popupeditor.pro @@ -0,0 +1,7 @@ +TARGET = kvipopupeditor
+
+HEADERS += popupeditor.h
+
+SOURCES += libkvipopupeditor.cpp popupeditor.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/raweditor/raweditor.pro b/src/modules/raweditor/raweditor.pro new file mode 100644 index 000000000..b14df4585 --- /dev/null +++ b/src/modules/raweditor/raweditor.pro @@ -0,0 +1,7 @@ +TARGET = kviraweditor
+
+HEADERS += raweditor.h
+
+SOURCES += libkviraweditor.cpp raweditor.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/regchan/regchan.pro b/src/modules/regchan/regchan.pro new file mode 100644 index 000000000..a046a8433 --- /dev/null +++ b/src/modules/regchan/regchan.pro @@ -0,0 +1,5 @@ +TARGET = kviregchan
+
+SOURCES += libkviregchan.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index 7ac0c818f..74958957a 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -907,6 +907,3 @@ succesfull_import: f.close(); fillList(); } -#if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) -#include "dialog.moc" -#endif diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index 83facc92f..cf0968952 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -777,4 +777,3 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked() -#include "edituser.moc"
diff --git a/src/modules/reguser/reguser.pro b/src/modules/reguser/reguser.pro new file mode 100644 index 000000000..4066c4bf4 --- /dev/null +++ b/src/modules/reguser/reguser.pro @@ -0,0 +1,7 @@ +TARGET = kvireguser
+
+HEADERS += edituser.h wizard.h dialog.h
+
+SOURCES += libkvireguser.cpp edituser.cpp wizard.cpp dialog.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index 6fefff089..0a8387698 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -459,4 +459,3 @@ void KviRegistrationWizard::notifyCheckToggled(bool) notifyNickChanged(dummy); } -#include "wizard.moc" diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp index 8bd3ba5e9..ac18cb656 100644 --- a/src/modules/rijndael/libkvirijndael.cpp +++ b/src/modules/rijndael/libkvirijndael.cpp @@ -848,6 +848,3 @@ KVIRC_MODULE( rijndael_module_cleanup ) -#ifdef COMPILE_CRYPT_SUPPORT - #include "libkvirijndael.moc" -#endif diff --git a/src/modules/rijndael/rijndael.pro b/src/modules/rijndael/rijndael.pro new file mode 100644 index 000000000..5b065471a --- /dev/null +++ b/src/modules/rijndael/rijndael.pro @@ -0,0 +1,7 @@ +TARGET = kvirijndael
+
+HEADERS += libkvirijndael.h rijndael.h ablowfish.h
+
+SOURCES += libkvirijndael.cpp rijndael.cpp ablowfish.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/setup/setup.pro b/src/modules/setup/setup.pro new file mode 100644 index 000000000..4d9397502 --- /dev/null +++ b/src/modules/setup/setup.pro @@ -0,0 +1,9 @@ +TARGET = kvisetup
+
+HEADERS += setupwizard.h
+
+SOURCES += libkvisetup.cpp setupwizard.cpp
+
+LIBS = -lole32 -luuid
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 8201e3a55..7163c588d 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -1049,4 +1049,3 @@ void KviSetupWizard::accept() KviTalWizard::accept(); } -#include "setupwizard.moc" diff --git a/src/modules/sharedfile/sharedfile.pro b/src/modules/sharedfile/sharedfile.pro new file mode 100644 index 000000000..4fedde87e --- /dev/null +++ b/src/modules/sharedfile/sharedfile.pro @@ -0,0 +1,5 @@ +TARGET = kvisharedfile
+
+SOURCES += libkvisharedfile.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index c6deec20d..308846047 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -739,4 +739,3 @@ void KviSharedFilesWindow::die() //} -#include "m_sharedfileswindow.moc" diff --git a/src/modules/sharedfileswindow/sharedfileswindow.pro b/src/modules/sharedfileswindow/sharedfileswindow.pro new file mode 100644 index 000000000..be1121e46 --- /dev/null +++ b/src/modules/sharedfileswindow/sharedfileswindow.pro @@ -0,0 +1,7 @@ +TARGET = kvisharedfileswindow
+
+HEADERS += sharedfileswindow.h
+
+SOURCES += libkvisharedfileswindow.cpp sharedfileswindow.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp index 9f95e442b..24c702a8f 100644 --- a/src/modules/snd/libkvisnd.cpp +++ b/src/modules/snd/libkvisnd.cpp @@ -741,4 +741,3 @@ KVIRC_MODULE( snd_module_cleanup ) -#include "libkvisnd.moc" diff --git a/src/modules/snd/snd.pro b/src/modules/snd/snd.pro new file mode 100644 index 000000000..8c8c53798 --- /dev/null +++ b/src/modules/snd/snd.pro @@ -0,0 +1,9 @@ +TARGET = kvisnd
+
+HEADERS += libkvisnd.h
+
+SOURCES += libkvisnd.cpp
+
+LIBS += -lwinmm
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/socketspy/socketspy.pro b/src/modules/socketspy/socketspy.pro new file mode 100644 index 000000000..6d09ddf7f --- /dev/null +++ b/src/modules/socketspy/socketspy.pro @@ -0,0 +1,7 @@ +TARGET = kvisocketspy
+
+HEADERS += socketspywindow.h
+
+SOURCES += libkvisocketspy.cpp socketspywindow.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp index 6456d5992..1db00e772 100644 --- a/src/modules/socketspy/socketspywindow.cpp +++ b/src/modules/socketspy/socketspywindow.cpp @@ -122,4 +122,3 @@ void KviSocketSpyWindow::applyOptions() m_pIrcView->applyOptions(); KviWindow::applyOptions(); } -#include "m_socketspywindow.moc" diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp index 4e6df0429..25935ca53 100644 --- a/src/modules/spaste/controller.cpp +++ b/src/modules/spaste/controller.cpp @@ -118,4 +118,3 @@ void SPasteController::pasteClipboard(void) } else delete this;//Clipboard finished } -#include "controller.moc" diff --git a/src/modules/spaste/spaste.pro b/src/modules/spaste/spaste.pro new file mode 100644 index 000000000..75263b386 --- /dev/null +++ b/src/modules/spaste/spaste.pro @@ -0,0 +1,7 @@ +TARGET = kvispaste
+
+HEADERS += controller.h libkvispaste.h
+
+SOURCES += libkvispaste.cpp controller.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/str/str.pro b/src/modules/str/str.pro new file mode 100644 index 000000000..b1db3541e --- /dev/null +++ b/src/modules/str/str.pro @@ -0,0 +1,8 @@ +TARGET = kvistr
+
+SOURCES += libkvistr.cpp
+
+LIBS += -leay32 \
+ -lssleay32
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/system/system.pro b/src/modules/system/system.pro new file mode 100644 index 000000000..42efa28dd --- /dev/null +++ b/src/modules/system/system.pro @@ -0,0 +1,7 @@ +TARGET = kvisystem
+
+HEADERS += plugin.h
+
+SOURCES += libkvisystem.cpp plugin.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp index 703ba01d0..281be6b6a 100644 --- a/src/modules/term/termwidget.cpp +++ b/src/modules/term/termwidget.cpp @@ -174,6 +174,5 @@ QSize KviTermWidget::sizeHint() const return QSize(wdth + 2,hght + 2); } -#include "termwidget.moc" #endif //COMPILE_KDE_SUPPORT diff --git a/src/modules/term/termwindow.cpp b/src/modules/term/termwindow.cpp index 45fc58e3c..15d0d4dc8 100644 --- a/src/modules/term/termwindow.cpp +++ b/src/modules/term/termwindow.cpp @@ -79,6 +79,5 @@ void KviTermWindow::fillCaptionBuffers() KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive2).name().ascii()); } -#include "termwindow.moc" #endif diff --git a/src/modules/texticons/texticons.pro b/src/modules/texticons/texticons.pro new file mode 100644 index 000000000..1df63f85e --- /dev/null +++ b/src/modules/texticons/texticons.pro @@ -0,0 +1,5 @@ +TARGET = kvitexticons
+
+SOURCES += libkvitexticons.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/theme/theme.pro b/src/modules/theme/theme.pro new file mode 100644 index 000000000..73fe7edee --- /dev/null +++ b/src/modules/theme/theme.pro @@ -0,0 +1,14 @@ +TARGET = kvitheme
+
+HEADERS += managementdialog.h \
+ packthemedialog.h \
+ savethemedialog.h \
+ themefunctions.h
+
+SOURCES += libkvitheme.cpp \
+ managementdialog.cpp \
+ packthemedialog.cpp \
+ savethemedialog.cpp \
+ themefunctions.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index daa16d65a..02f3314c9 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -306,4 +306,3 @@ KVIRC_MODULE( tip_module_cleanup ) -#include "libkvitip.moc" diff --git a/src/modules/tip/tip.pro b/src/modules/tip/tip.pro new file mode 100644 index 000000000..22f05b8d9 --- /dev/null +++ b/src/modules/tip/tip.pro @@ -0,0 +1,7 @@ +TARGET = kvitip
+
+HEADERS += libkvitip.h
+
+SOURCES += libkvitip.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/tmphighlight/tmphighlight.pro b/src/modules/tmphighlight/tmphighlight.pro new file mode 100644 index 000000000..dc84c1541 --- /dev/null +++ b/src/modules/tmphighlight/tmphighlight.pro @@ -0,0 +1,5 @@ +TARGET = kvitmphighlight
+
+SOURCES += libkvitmphighlight.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/toolbar/toolbar.pro b/src/modules/toolbar/toolbar.pro new file mode 100644 index 000000000..63ee68443 --- /dev/null +++ b/src/modules/toolbar/toolbar.pro @@ -0,0 +1,6 @@ +TARGET = kvitoolbar
+
+
+SOURCES += libkvitoolbar.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/toolbareditor/toolbareditor.pro b/src/modules/toolbareditor/toolbareditor.pro new file mode 100644 index 000000000..d0d5861d9 --- /dev/null +++ b/src/modules/toolbareditor/toolbareditor.pro @@ -0,0 +1,7 @@ +TARGET = kvitoolbareditor
+
+HEADERS += toolbareditor.h
+
+SOURCES += libkvitoolbareditor.cpp toolbareditor.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.cpp b/src/modules/torrent/tc_ktorrentdcopinterface.cpp index fd845cb12..825736f2b 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp +++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp @@ -494,7 +494,6 @@ bool KviKTorrentDCOPInterface::setMaxDownloadSpeed(int kbytes_per_sec) } -#include "tc_ktorrentdcopinterface.moc" #endif // COMPILE_KDE_SUPPORT diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp index 5d23a299d..e939b53a4 100644 --- a/src/modules/torrent/tc_statusbarapplet.cpp +++ b/src/modules/torrent/tc_statusbarapplet.cpp @@ -65,5 +65,3 @@ void KviTorrentStatusBarApplet::update() } } -#include "tc_statusbarapplet.moc" - diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index f979da4fb..98efb2f0a 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -901,4 +901,3 @@ KVIRC_MODULE( url_module_cleanup ) -#include "libkviurl.moc" diff --git a/src/modules/url/url.pro b/src/modules/url/url.pro new file mode 100644 index 000000000..959d0fd27 --- /dev/null +++ b/src/modules/url/url.pro @@ -0,0 +1,7 @@ +TARGET = kviurl
+
+HEADERS += libkviurl.h icons.h
+
+SOURCES += libkviurl.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/modules/window/window.pro b/src/modules/window/window.pro new file mode 100644 index 000000000..7ed31401b --- /dev/null +++ b/src/modules/window/window.pro @@ -0,0 +1,7 @@ +TARGET = kviwindow
+
+HEADERS += userwindow.h
+
+SOURCES += libkviwindow.cpp userwindow.cpp
+
+include(../module.pri)
\ No newline at end of file diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 000000000..47c7948b9 --- /dev/null +++ b/src/src.pro @@ -0,0 +1,3 @@ +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 3c02ba589..bf6bb0ff6 100644 --- a/src/win32registrar/win32registrar.cpp +++ b/src/win32registrar/win32registrar.cpp @@ -2,6 +2,8 @@ #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 new file mode 100644 index 000000000..f061055fb --- /dev/null +++ b/src/win32registrar/win32registrar.pro @@ -0,0 +1,21 @@ +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 98a1f818d..7b6ec3893 100644 --- a/src/win32registrar/win32registrar.rc +++ b/src/win32registrar/win32registrar.rc @@ -2,13 +2,20 @@ //
#include "resource.h"
+#ifdef __GNUC__
+1 24 "../../data/manifests/damn-uac.manifest"
+#endif
+
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
// Generated from the TEXTINCLUDE 2 resource.
//
-#include "winres.h"
-
+#ifdef __GNUC__
+ #include "winresrc.h"
+#else
+ #include "winres.h"
+#endif
/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
|