diff options
Diffstat (limited to 'src/modules/options')
46 files changed, 115 insertions, 57 deletions
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
|