diff options
Diffstat (limited to 'src/modules/options')
45 files changed, 10 insertions, 137 deletions
diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp index 9808c69a7..3e1debd49 100644 --- a/src/modules/options/OptionsDialog.cpp +++ b/src/modules/options/OptionsDialog.cpp @@ -665,7 +665,3 @@ void OptionsDialog::keyPressEvent( QKeyEvent * e ) else e->ignore(); } - -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_dialog.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsDialog.h b/src/modules/options/OptionsDialog.h index d72fc4810..d667f0fec 100644 --- a/src/modules/options/OptionsDialog.h +++ b/src/modules/options/OptionsDialog.h @@ -34,7 +34,6 @@ #include <QStringList> #include <QToolButton> #include <QPainter> -#include <QColorGroup> class QLabel; class QPushButton; diff --git a/src/modules/options/OptionsInstanceManager.cpp b/src/modules/options/OptionsInstanceManager.cpp index c3fcd24ad..c44cc28b3 100644 --- a/src/modules/options/OptionsInstanceManager.cpp +++ b/src/modules/options/OptionsInstanceManager.cpp @@ -3858,8 +3858,3 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const cha { return findInstanceEntry(pcName,m_pInstanceTree); } - -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "m_OptionsInstanceManager.moc" -#endif - diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp index 62cc3d95c..24fc7e528 100644 --- a/src/modules/options/OptionsWidgetContainer.cpp +++ b/src/modules/options/OptionsWidgetContainer.cpp @@ -164,7 +164,3 @@ void OptionsWidgetContainer::cancelClicked() { deleteLater(); } - -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidgetContainer.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp index ca3de875a..3dd3c300c 100644 --- a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp +++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp @@ -147,8 +147,5 @@ OptionsWidget_alerts::~OptionsWidget_alerts() } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_alertsAndHighlighting.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES #endif //_OPTW_HIGHLIGHTING_CPP_ diff --git a/src/modules/options/OptionsWidget_antiSpam.cpp b/src/modules/options/OptionsWidget_antiSpam.cpp index 6b7648884..1a18aafb0 100644 --- a/src/modules/options/OptionsWidget_antiSpam.cpp +++ b/src/modules/options/OptionsWidget_antiSpam.cpp @@ -61,6 +61,3 @@ void OptionsWidget_antispam::reenableStuff(bool) } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_antiSpam.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_avatar.cpp b/src/modules/options/OptionsWidget_avatar.cpp index 6f48d5f88..73b4b5faf 100644 --- a/src/modules/options/OptionsWidget_avatar.cpp +++ b/src/modules/options/OptionsWidget_avatar.cpp @@ -116,6 +116,3 @@ OptionsWidget_avatar::~OptionsWidget_avatar() } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_avatar.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_away.cpp b/src/modules/options/OptionsWidget_away.cpp index f4f2041de..85e919a81 100644 --- a/src/modules/options/OptionsWidget_away.cpp +++ b/src/modules/options/OptionsWidget_away.cpp @@ -69,6 +69,3 @@ void OptionsWidget_away::enableAwayMessage(bool) m_pAwayMessage->setEnabled(m_pEnableAwayMessage->isChecked()); } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_away.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp index b33de8197..c3bfd7b9f 100644 --- a/src/modules/options/OptionsWidget_channel.cpp +++ b/src/modules/options/OptionsWidget_channel.cpp @@ -161,6 +161,4 @@ void OptionsWidget_channelAdvanced::commit() KviOptionsWidget::commit(); } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_channel.moc" -#endif //COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/options/OptionsWidget_connection.cpp b/src/modules/options/OptionsWidget_connection.cpp index b12201f9b..c82a95bd4 100644 --- a/src/modules/options/OptionsWidget_connection.cpp +++ b/src/modules/options/OptionsWidget_connection.cpp @@ -305,6 +305,3 @@ OptionsWidget_connectionAdvanced::~OptionsWidget_connectionAdvanced() { } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_connection.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_ctcp.cpp b/src/modules/options/OptionsWidget_ctcp.cpp index d94bad8d3..c452f8f2d 100644 --- a/src/modules/options/OptionsWidget_ctcp.cpp +++ b/src/modules/options/OptionsWidget_ctcp.cpp @@ -82,6 +82,3 @@ OptionsWidget_ctcp::~OptionsWidget_ctcp() } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_ctcp.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp index 0abfd22ca..ec87dae40 100644 --- a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp +++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp @@ -113,6 +113,3 @@ OptionsWidget_ctcpFloodProtection::~OptionsWidget_ctcpFloodProtection() } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_ctcpFloodProtection.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp index 585d5b6ab..77e95e6d9 100644 --- a/src/modules/options/OptionsWidget_dcc.cpp +++ b/src/modules/options/OptionsWidget_dcc.cpp @@ -367,6 +367,3 @@ OptionsWidget_dccVoice::~OptionsWidget_dccVoice() { } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_dcc.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_general.cpp b/src/modules/options/OptionsWidget_general.cpp index b3836826a..5b9346285 100644 --- a/src/modules/options/OptionsWidget_general.cpp +++ b/src/modules/options/OptionsWidget_general.cpp @@ -46,6 +46,3 @@ OptionsWidget_general::~OptionsWidget_general() } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_general.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp index e79564221..6debb2d0d 100644 --- a/src/modules/options/OptionsWidget_identity.cpp +++ b/src/modules/options/OptionsWidget_identity.cpp @@ -1010,6 +1010,4 @@ void IdentityProfileEditor::toggleButton(const QString & szText) m_pBtnOk->setEnabled(bEnabled); } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_identity.moc" -#endif //COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/options/OptionsWidget_ignore.cpp b/src/modules/options/OptionsWidget_ignore.cpp index c8cfc6999..1381acba8 100644 --- a/src/modules/options/OptionsWidget_ignore.cpp +++ b/src/modules/options/OptionsWidget_ignore.cpp @@ -61,6 +61,3 @@ void OptionsWidget_ignore::enableVerbose(bool) -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_ignore.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp index 78bdc3cce..d8d95a99e 100644 --- a/src/modules/options/OptionsWidget_input.cpp +++ b/src/modules/options/OptionsWidget_input.cpp @@ -162,6 +162,3 @@ OptionsWidget_inputFeatures::~OptionsWidget_inputFeatures() { } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_input.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp index ef3f1c2ed..009df9005 100644 --- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp +++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp @@ -86,6 +86,3 @@ void OptionsWidget_interfaceFeatures::commit() } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_interfaceFeatures.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_irc.cpp b/src/modules/options/OptionsWidget_irc.cpp index 675eb43db..e02fe5242 100644 --- a/src/modules/options/OptionsWidget_irc.cpp +++ b/src/modules/options/OptionsWidget_irc.cpp @@ -83,6 +83,4 @@ OptionsWidget_ircAdvanced::~OptionsWidget_ircAdvanced() { } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_irc.moc" -#endif //COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp index 8bb3711ff..be69cdfb4 100644 --- a/src/modules/options/OptionsWidget_ircOutput.cpp +++ b/src/modules/options/OptionsWidget_ircOutput.cpp @@ -106,6 +106,3 @@ void OptionsWidget_ircOutput::commit() KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat) = m_pDatetimeCombo->currentIndex(); } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_ircOutput.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_ircView.cpp b/src/modules/options/OptionsWidget_ircView.cpp index ffa514817..7fb56fc48 100644 --- a/src/modules/options/OptionsWidget_ircView.cpp +++ b/src/modules/options/OptionsWidget_ircView.cpp @@ -216,6 +216,3 @@ void OptionsWidget_ircViewMarker::commit() KviOptionsWidget::commit(); } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_ircView.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_lag.cpp b/src/modules/options/OptionsWidget_lag.cpp index 0e2e763fd..79d4088c0 100644 --- a/src/modules/options/OptionsWidget_lag.cpp +++ b/src/modules/options/OptionsWidget_lag.cpp @@ -75,6 +75,3 @@ OptionsWidget_lag::~OptionsWidget_lag() } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_lag.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp index 2802e9417..97d9c9978 100644 --- a/src/modules/options/OptionsWidget_logging.cpp +++ b/src/modules/options/OptionsWidget_logging.cpp @@ -72,6 +72,3 @@ OptionsWidget_logging::~OptionsWidget_logging() -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_logging.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp index 71df63df1..7c85b21e5 100644 --- a/src/modules/options/OptionsWidget_mediaTypes.cpp +++ b/src/modules/options/OptionsWidget_mediaTypes.cpp @@ -260,6 +260,3 @@ void OptionsWidget_mediaTypes::commit() g_pMediaManager->unlock(); } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_mediaTypes.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp index 672d782c0..efb7519fc 100644 --- a/src/modules/options/OptionsWidget_message.cpp +++ b/src/modules/options/OptionsWidget_message.cpp @@ -657,6 +657,3 @@ void OptionsWidget_messageColors::load() } } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_message.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_message.h b/src/modules/options/OptionsWidget_message.h index c90ea61eb..50df67b7a 100644 --- a/src/modules/options/OptionsWidget_message.h +++ b/src/modules/options/OptionsWidget_message.h @@ -33,7 +33,6 @@ #include <QCheckBox> #include <QToolButton> #include <QPainter> -#include <QColorGroup> #include <QMenu> #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_message KviIconManager::Messages diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp index d6da68662..c88722718 100644 --- a/src/modules/options/OptionsWidget_nickserv.cpp +++ b/src/modules/options/OptionsWidget_nickserv.cpp @@ -366,6 +366,3 @@ void OptionsWidget_nickServ::commit() KviOptionsWidget::commit(); } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_nickserv.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp index d21770c65..a83eb558c 100644 --- a/src/modules/options/OptionsWidget_notifier.cpp +++ b/src/modules/options/OptionsWidget_notifier.cpp @@ -273,6 +273,3 @@ void OptionsWidget_notifier::toggleNotifierProtocol(bool) } #endif // COMPILE_KDE_SUPPORT -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_input.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp index ce8ad1338..1387514c3 100644 --- a/src/modules/options/OptionsWidget_notify.cpp +++ b/src/modules/options/OptionsWidget_notify.cpp @@ -102,6 +102,3 @@ OptionsWidget_notify::~OptionsWidget_notify() { } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_notify.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_protection.cpp b/src/modules/options/OptionsWidget_protection.cpp index a9cb10527..4ba10d389 100644 --- a/src/modules/options/OptionsWidget_protection.cpp +++ b/src/modules/options/OptionsWidget_protection.cpp @@ -42,6 +42,3 @@ OptionsWidget_protection::~OptionsWidget_protection() { } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_protection.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp index 9a399ea54..9e26501d8 100644 --- a/src/modules/options/OptionsWidget_proxy.cpp +++ b/src/modules/options/OptionsWidget_proxy.cpp @@ -360,6 +360,3 @@ void OptionsWidget_proxy::removeCurrent() } } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_proxy.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_query.cpp b/src/modules/options/OptionsWidget_query.cpp index 235b86dab..d9d113745 100644 --- a/src/modules/options/OptionsWidget_query.cpp +++ b/src/modules/options/OptionsWidget_query.cpp @@ -111,6 +111,4 @@ OptionsWidget_query::~OptionsWidget_query() } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_query.moc" -#endif //COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp index 476328171..2464dfc08 100644 --- a/src/modules/options/OptionsWidget_servers.cpp +++ b/src/modules/options/OptionsWidget_servers.cpp @@ -1728,7 +1728,7 @@ void OptionsWidget_servers::saveLastItem() { QString tmp = m_pSrvNetEdit->text(); if(tmp.isEmpty()) - tmp = QString::fromAscii("irc.unknown.net"); + tmp = QString::fromLatin1("irc.unknown.net"); m_pLastEditedItem->m_pServerData->setHostName(tmp); m_pLastEditedItem->updateVisibleStrings(); } else if(m_pLastEditedItem->m_pNetworkData) @@ -2102,6 +2102,3 @@ void OptionsWidget_servers::detailsClicked() } } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_servers.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp index ad980be4e..3b8b6d306 100644 --- a/src/modules/options/OptionsWidget_sound.cpp +++ b/src/modules/options/OptionsWidget_sound.cpp @@ -353,6 +353,3 @@ OptionsWidget_sounds::~OptionsWidget_sounds() { } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_sound.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp index f87a5ebad..eeaac0411 100644 --- a/src/modules/options/OptionsWidget_textEncoding.cpp +++ b/src/modules/options/OptionsWidget_textEncoding.cpp @@ -168,6 +168,3 @@ void OptionsWidget_textEncoding::commit() QMessageBox::information(0,"KVIrc",__tr2qs_ctx("You need to restart KVirc to apply a language changing","options"),QMessageBox::Ok);*/ } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_textEncoding.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp index c8c318bec..0c5bde729 100644 --- a/src/modules/options/OptionsWidget_textIcons.cpp +++ b/src/modules/options/OptionsWidget_textIcons.cpp @@ -80,7 +80,11 @@ OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent) m_pTable->setColumnCount(2); m_pTable->setColumnWidth(0,300); +#if (QT_VERSION >= 0x050000) + m_pTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); +#else m_pTable->horizontalHeader()->setResizeMode(QHeaderView::Stretch); +#endif m_pTable->horizontalHeader()->stretchLastSection(); m_pTable->setSelectionBehavior(QAbstractItemView::SelectRows); m_pTable->setSelectionMode(QAbstractItemView::SingleSelection); @@ -306,6 +310,3 @@ void OptionsWidget_textIcons::commit() } } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_textIcons.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_theme.cpp b/src/modules/options/OptionsWidget_theme.cpp index 96d7d6bbf..a4f8f1bf7 100644 --- a/src/modules/options/OptionsWidget_theme.cpp +++ b/src/modules/options/OptionsWidget_theme.cpp @@ -199,6 +199,3 @@ OptionsWidget_themeToolBarApplets::~OptionsWidget_themeToolBarApplets() } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_theme.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp index 2f5015fa7..6b21c57c6 100644 --- a/src/modules/options/OptionsWidget_tools.cpp +++ b/src/modules/options/OptionsWidget_tools.cpp @@ -46,6 +46,3 @@ OptionsWidget_tools::~OptionsWidget_tools() { } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_tools.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_topicLabel.cpp b/src/modules/options/OptionsWidget_topicLabel.cpp index b305771ee..bc0f4d522 100644 --- a/src/modules/options/OptionsWidget_topicLabel.cpp +++ b/src/modules/options/OptionsWidget_topicLabel.cpp @@ -45,6 +45,3 @@ OptionsWidget_topicLabel::~OptionsWidget_topicLabel() { } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_topicLabel.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp index 339df1f02..052663742 100644 --- a/src/modules/options/OptionsWidget_tray.cpp +++ b/src/modules/options/OptionsWidget_tray.cpp @@ -107,6 +107,3 @@ void OptionsWidget_tray::setEnabled(bool) } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_tray.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_uparser.cpp b/src/modules/options/OptionsWidget_uparser.cpp index d2822b02d..4a15fc9ff 100644 --- a/src/modules/options/OptionsWidget_uparser.cpp +++ b/src/modules/options/OptionsWidget_uparser.cpp @@ -68,6 +68,3 @@ OptionsWidget_uparser::~OptionsWidget_uparser() } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_uparser.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/OptionsWidget_urlHandlers.cpp b/src/modules/options/OptionsWidget_urlHandlers.cpp index 54bb2f311..9798d59a1 100644 --- a/src/modules/options/OptionsWidget_urlHandlers.cpp +++ b/src/modules/options/OptionsWidget_urlHandlers.cpp @@ -153,8 +153,5 @@ void OptionsWidget_urlHandlers::commit() #endif } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_urlHandlers.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES #endif //_OPTW_URLHANDLERS_CPP_ diff --git a/src/modules/options/OptionsWidget_userList.cpp b/src/modules/options/OptionsWidget_userList.cpp index 27a8d1344..ea8b4426a 100644 --- a/src/modules/options/OptionsWidget_userList.cpp +++ b/src/modules/options/OptionsWidget_userList.cpp @@ -245,6 +245,4 @@ OptionsWidget_userListFeatures::~OptionsWidget_userListFeatures() { } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_userList.moc" -#endif //COMPILE_USE_STANDALONE_MOC_SOURCES + diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp index 53b61c8a9..acb36b598 100644 --- a/src/modules/options/OptionsWidget_windowList.cpp +++ b/src/modules/options/OptionsWidget_windowList.cpp @@ -264,6 +264,3 @@ OptionsWidget_windowListClassic::~OptionsWidget_windowListClassic() { } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES -#include "m_OptionsWidget_windowList.moc" -#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh index 9396972bd..9a89dafc9 100755 --- a/src/modules/options/mkcreateinstanceproc.sh +++ b/src/modules/options/mkcreateinstanceproc.sh @@ -466,10 +466,6 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const cha return findInstanceEntry(pcName,m_pInstanceTree); } -#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES - #include "m_OptionsInstanceManager.moc" -#endif - EOF ################################################################################# |