Enable automoc
authorManuel Nickschas <sputnick@quassel-irc.org>
Mon, 17 Mar 2014 22:15:57 +0000 (23:15 +0100)
committerManuel Nickschas <sputnick@quassel-irc.org>
Mon, 17 Mar 2014 22:37:01 +0000 (23:37 +0100)
Finally we can make use of this very convenient CMake feature and have
the moc stuff handled automagically. No need to list the headers anymore
for feeding them into the long-deprecated qt4_wrap_cpp macro.

Also, this should compile a bit faster and lead to slightly better optimized
code, because automoc will combine all the generated moc stuff for a target
into a single translation unit.

Note that we could get rid of various empty .cpp files (where all the code
is in the header) by just adding the header to the sources list; that way,
automoc will pick them up. There is no need to have a dummy .cpp file for
that.

13 files changed:
CMakeLists.txt
src/CMakeLists.txt
src/client/CMakeLists.txt
src/client/abstractui.cpp [deleted file]
src/client/clientcoreinfo.cpp [deleted file]
src/common/CMakeLists.txt
src/common/coreinfo.cpp [deleted file]
src/core/CMakeLists.txt
src/qtui/CMakeLists.txt
src/qtui/settingspages/previewbufferview.cpp [deleted file]
src/qtui/settingspages/settingspages.cmake
src/uisupport/CMakeLists.txt
src/uisupport/abstractnotificationbackend.cpp [deleted file]

index 6b32f2e..fcc9530 100644 (file)
@@ -37,6 +37,8 @@ set(QUASSEL_VERSION_STRING "0.11-pre")
 # Tell CMake about or own stuff
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
+set(CMAKE_AUTOMOC ON)
+
 include(CheckFunctionExists)
 include(CheckIncludeFile)
 
index bc30bbd..244d394 100644 (file)
@@ -63,10 +63,7 @@ endif(WANT_QTCLIENT)
 if(WANT_MONO)
   setup_qt_variables(Gui Network Script Sql ${CLIENT_QT_MODULES} ${CORE_QT_MODULES})
   include_directories(${QUASSEL_QT_INCLUDES})
-  if(NOT WITH_QT5)
-    qt4_wrap_cpp(MOC qtui/monoapplication.h)
-  endif(NOT WITH_QT5)
-  add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${MOC} ${COMMON_DEPS} ${CLIENT_DEPS} ${CORE_DEPS})
+  add_executable(quassel WIN32 common/main.cpp qtui/monoapplication.cpp ${COMMON_DEPS} ${CLIENT_DEPS} ${CORE_DEPS})
   add_dependencies(quassel po)
   set_target_properties(quassel PROPERTIES
                                 COMPILE_FLAGS "-DBUILD_MONO ${QUASSEL_QT_COMPILEFLAGS} ${CLIENT_COMPILE_FLAGS}"
index c7b3ee3..c149f25 100644 (file)
@@ -17,7 +17,6 @@ setup_qt_variables(Gui Network ${_modules})
 
 set(SOURCES
     abstractmessageprocessor.cpp
-    abstractui.cpp
     backlogrequester.cpp
     buffermodel.cpp
     buffersettings.cpp
@@ -28,7 +27,6 @@ set(SOURCES
     clientbacklogmanager.cpp
     clientbufferviewconfig.cpp
     clientbufferviewmanager.cpp
-    clientcoreinfo.cpp
     clientidentity.cpp
     clientignorelistmanager.cpp
     clientirclisthelper.cpp
@@ -45,51 +43,16 @@ set(SOURCES
     messagemodel.cpp
     networkmodel.cpp
     selectionmodelsynchronizer.cpp
-    treemodel.cpp)
+    treemodel.cpp
 
-set(MOC_HDRS
-    abstractmessageprocessor.h
+    # needed for automoc
     abstractui.h
-    buffermodel.h
-    bufferviewoverlay.h
-    client.h
-    clientaliasmanager.h
-    clientauthhandler.h
-    clientbacklogmanager.h
-    clientbufferviewconfig.h
-    clientbufferviewmanager.h
     clientcoreinfo.h
-    clientidentity.h
-    clientignorelistmanager.h
-    clientirclisthelper.h
-    clienttransfer.h
-    clienttransfermanager.h
-    clientuserinputhandler.h
-    coreaccountmodel.h
-    coreconnection.h
-    execwrapper.h
-    irclistmodel.h
-    messagefilter.h
-    messagemodel.h
-    networkmodel.h
-    selectionmodelsynchronizer.h
-    treemodel.h)
-
-set(HEADERS
-    backlogsettings.h
-    backlogrequester.h
-    buffersettings.h
-    clientsettings.h
-    coreaccount.h
-   )
+)
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common ${QUASSEL_QT_INCLUDES})
 
-if(NOT WITH_QT5)
-  qt4_wrap_cpp(MOC ${MOC_HDRS})
-endif(NOT WITH_QT5)
-
-add_library(mod_client STATIC ${SOURCES} ${MOC} ${HEADERS})
+add_library(mod_client STATIC ${SOURCES})
 add_dependencies(mod_client mod_common)
 
 set_target_properties(mod_client PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")
diff --git a/src/client/abstractui.cpp b/src/client/abstractui.cpp
deleted file mode 100644 (file)
index 0fc398f..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#include "abstractui.h"
-
-// this file is needed to make automoc work
diff --git a/src/client/clientcoreinfo.cpp b/src/client/clientcoreinfo.cpp
deleted file mode 100644 (file)
index ebd1e07..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#include "clientcoreinfo.h"
-
-// this file is needed to make automoc work
index 87a08d2..8690625 100644 (file)
@@ -13,7 +13,6 @@ set(SOURCES
     bufferviewmanager.cpp
     cliparser.cpp
     compressor.cpp
-    coreinfo.cpp
     ctcpevent.cpp
     event.cpp
     eventmanager.cpp
@@ -43,58 +42,14 @@ set(SOURCES
 
     protocols/datastream/datastreampeer.cpp
     protocols/legacy/legacypeer.cpp
-)
 
-set(MOC_HDRS
-    aliasmanager.h
-    authhandler.h
-    backlogmanager.h
-    basichandler.h
-    buffersyncer.h
-    bufferviewconfig.h
-    bufferviewmanager.h
-    compressor.h
+    # needed for automoc
     coreinfo.h
-    eventmanager.h
-    identity.h
-    ignorelistmanager.h
-    internalpeer.h
-    ircchannel.h
-    irclisthelper.h
-    ircuser.h
-    network.h
-    networkconfig.h
-    peer.h
-    remotepeer.h
-    settings.h
-    signalproxy.h
-    syncableobject.h
-    transfer.h
-    transfermanager.h
-
-    protocols/datastream/datastreampeer.h
-    protocols/legacy/legacypeer.h
 )
 
-set(HEADERS ${MOC_HDRS}
-    abstractcliparser.h
-    bufferinfo.h
-    cliparser.h
-    ctcpevent.h
-    event.h
-    ircevent.h
-    messageevent.h
-    networkevent.h
-    logger.h
-    message.h
-    peerfactory.h
-    protocol.h
-    types.h
-    util.h)
 
 if (HAVE_QCA2)
     set(SOURCES ${SOURCES} keyevent.cpp)
-    set(HEADERS ${HEADERS} keyevent.h)
 endif(HAVE_QCA2)
 
 if(NOT HAVE_ZLIB)
@@ -103,7 +58,6 @@ endif(NOT HAVE_ZLIB)
 
 if(APPLE)
   set(SOURCES ${SOURCES} mac_utils.cpp)
-  set(HEADERS ${HEADERS} mac_utils.h)
 endif(APPLE)
 
 if(CMAKE_HOST_WIN32)
@@ -115,13 +69,7 @@ endif(CMAKE_HOST_UNIX)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QUASSEL_QT_INCLUDES})  # for version.inc and version.gen
 
-if(NOT WITH_QT5)
-  qt4_wrap_cpp(MOC ${MOC_HDRS})
-endif(NOT WITH_QT5)
-
-set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES version.gen)
-
-add_library(mod_common STATIC ${SOURCES} ${HEADERS} ${MOC})
+add_library(mod_common STATIC ${SOURCES})
 set_target_properties(mod_common PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")
 
 if(APPLE)
diff --git a/src/common/coreinfo.cpp b/src/common/coreinfo.cpp
deleted file mode 100644 (file)
index a2d4df8..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#include "coreinfo.h"
-
-// this file is needed to make automoc work
index dfb0289..a167d8f 100644 (file)
@@ -36,68 +36,27 @@ set(SOURCES
     postgresqlstorage.cpp
     sessionthread.cpp
     sqlitestorage.cpp
-    storage.cpp)
+    storage.cpp
 
-set(MOC_HDRS
-    abstractsqlstorage.h
-    core.h
-    corealiasmanager.h
-    coreapplication.h
-    coreauthhandler.h
-    corebacklogmanager.h
-    corebasichandler.h
-    corebuffersyncer.h
-    corebufferviewconfig.h
-    corebufferviewmanager.h
-    corecoreinfo.h
+    # needed for automoc
     coreeventmanager.h
-    coreidentity.h
-    coreignorelistmanager.h
-    coreircchannel.h
-    coreirclisthelper.h
-    coreircuser.h
-    corenetwork.h
-    corenetworkconfig.h
-    coresession.h
-    coresessioneventprocessor.h
-    coretransfer.h
-    coretransfermanager.h
-    coreuserinputhandler.h
-    ctcpparser.h
-    eventstringifier.h
-    ircparser.h
-    netsplit.h
-    oidentdconfiggenerator.h
-    postgresqlstorage.h
-    sqlitestorage.h
-    storage.h
-    sessionthread.h)
-
-set(HEADERS
-    coresettings.h
-    coreusersettings.h)
+)
 
 if(HAVE_SSL)
   set(SOURCES ${SOURCES} sslserver.cpp)
-  set(MOC_HDRS ${MOC_HDRS} sslserver.h)
   include_directories(${OPENSSL_INCLUDE_DIR})
 endif(HAVE_SSL)
 
 if(HAVE_QCA2)
   set(SOURCES ${SOURCES} cipher.cpp)
-  set(HEADERS ${HEADERS} cipher.h)
   include_directories(${QCA2_INCLUDE_DIR})
 endif(HAVE_QCA2)
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common ${QUASSEL_QT_INCLUDES})
 
-if(NOT WITH_QT5)
-  qt4_wrap_cpp(MOC ${MOC_HDRS})
-endif(NOT WITH_QT5)
-
 set(CORE_RCS ${CORE_RCS} core/sql.qrc PARENT_SCOPE)
 
-add_library(mod_core STATIC ${SOURCES} ${MOC} ${HEADERS})
+add_library(mod_core STATIC ${SOURCES})
 add_dependencies(mod_core mod_common)
 set_target_properties(mod_core PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")
 
index e649d15..311931e 100644 (file)
@@ -65,60 +65,8 @@ set(SOURCES
     titlesetter.cpp
     topicwidget.cpp
     verticaldock.cpp
-    webpreviewitem.cpp)
-
-set(MOC_HDRS
-    aboutdlg.h
-    awaylogfilter.h
-    awaylogview.h
-    bufferwidget.h
-    channellistdlg.h
-    chatitem.h
-    chatlinemodel.h
-    chatmonitorfilter.h
-    chatmonitorview.h
-    chatscene.h
-    chatview.h
-    chatviewsearchbar.h
-    chatviewsearchcontroller.h
-    columnhandleitem.h
-    coreconfigwizard.h
-    coreconnectdlg.h
-    coreconnectionstatuswidget.h
-    coreinfodlg.h
-    debugbufferviewoverlay.h
-    debugconsole.h
-    debuglogwidget.h
-    debugmessagemodelfilter.h
-    inputwidget.h
-    ircconnectionwizard.h
-    legacysystemtray.h
-    mainpage.h
-    mainwin.h
-    markerlineitem.h
-    msgprocessorstatuswidget.h
-    nicklistwidget.h
-    qtui.h
-    qtuiapplication.h
-    qtuimessageprocessor.h
-    qtuistyle.h
-    receivefiledlg.h
-    settingsdlg.h
-    settingspagedlg.h
-    simplenetworkeditor.h
-    systemtray.h
-    systraynotificationbackend.h
-    taskbarnotificationbackend.h
-    titlesetter.h
-    topicwidget.h
-    verticaldock.h)
-
-set(HEADERS
-    chatline.h
-    chatlinemodelitem.h
-    chatviewsettings.h
-    qtuisettings.h
-    webpreviewitem.h)
+    webpreviewitem.cpp
+)
 
 set(FORMS
     aboutdlg.ui
@@ -147,16 +95,13 @@ set(FORMS
 
 if(HAVE_KDE)
   set(SOURCES ${SOURCES} knotificationbackend.cpp)
-  set(MOC_HDRS ${MOC_HDRS} knotificationbackend.h)
 else(HAVE_KDE)
   if(HAVE_SNORENOTIFY)
     set(SOURCES ${SOURCES} snorenotificationbackend.cpp)
-    set(MOC_HDRS ${MOC_HDRS} snorenotificationbackend.h)
     set(FORMS ${FORMS} snorentificationconfigwidget.ui)
   endif(HAVE_SNORENOTIFY)
   if(HAVE_PHONON)
     set(SOURCES ${SOURCES} phononnotificationbackend.cpp)
-    set(MOC_HDRS ${MOC_HDRS} phononnotificationbackend.h)
     set(FORMS ${FORMS} phononnotificationconfigwidget.ui)
     include_directories(${PHONON_INCLUDES})
   endif(HAVE_PHONON)
@@ -164,7 +109,6 @@ endif(HAVE_KDE)
 
 if(HAVE_DBUS)
   set(SOURCES ${SOURCES} statusnotifieritem.cpp statusnotifieritemdbus.cpp dockmanagernotificationbackend.cpp)
-  set(MOC_HDRS ${MOC_HDRS} statusnotifieritem.h statusnotifieritemdbus.h dockmanagernotificationbackend.h)
   set(FORMS ${FORMS})
   if(WITH_QT5)
     qt5_add_dbus_interface(DBUS ../../interfaces/org.kde.StatusNotifierWatcher.xml statusnotifierwatcher)
@@ -179,20 +123,17 @@ endif(HAVE_DBUS)
 
 if(HAVE_SSL)
   set(SOURCES ${SOURCES} sslinfodlg.cpp)
-  set(MOC_HDRS ${MOC_HDRS} sslinfodlg.h)
   set(FORMS ${FORMS} sslinfodlg.ui)
 endif(HAVE_SSL)
 
 if(INDICATEQT_FOUND)
   set(SOURCES ${SOURCES} indicatornotificationbackend.cpp)
-  set(MOC_HDRS ${MOC_HDRS} indicatornotificationbackend.h)
   set(FORMS ${FORMS} indicatornotificationconfigwidget.ui)
   include_directories(${INDICATEQT_INCLUDE_DIRS})
 endif(INDICATEQT_FOUND)
 
 if(HAVE_NOTIFICATION_CENTER)
   set(SOURCES ${SOURCES} osxnotificationbackend.mm)
-  set(MOC_HDRS ${MOC_HDRS} osxnotificationbackend.h)
 endif()
 
 foreach(FORM ${FORMS})
@@ -203,15 +144,11 @@ endforeach(FORM ${FORMS})
 include(settingspages/settingspages.cmake)
 foreach(SP ${SETTINGSPAGES})
   set(SPSRC ${SPSRC} settingspages/${SP}settingspage.cpp)
-  set(SPHDR ${SPHDR} settingspages/${SP}settingspage.h)
   set(SPFRM ${SPFRM} settingspages/${SP}settingspage.ui)
 endforeach(SP ${SETTINGSPAGES})
 foreach(SRC ${SP_SOURCES})
   set(SPSRC ${SPSRC} settingspages/${SRC})
 endforeach(SRC ${SP_SOURCES})
-foreach(HDR ${SP_HEADERS})
-  set(SPHDR ${SPHDR} settingspages/${HDR})
-endforeach(HDR ${SP_HEADERS})
 foreach(FRM ${SP_FORMS})
   set(SPFRM ${SPFRM} settingspages/${FRM})
 endforeach(FRM ${SP_FORMS})
@@ -227,10 +164,9 @@ include_directories(${CMAKE_SOURCE_DIR}/src/common
 if(WITH_QT5)
   qt5_wrap_ui(UI ${FORMPATH} ${SPFRM})
 else(WITH_QT5)
-  qt4_wrap_cpp(MOC ${MOC_HDRS} ${SPHDR})
   qt4_wrap_ui(UI ${FORMPATH} ${SPFRM})
 endif(WITH_QT5)
 
-add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${MOC} ${DBUS} ${UI} ${HEADERS})
+add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${DBUS} ${UI})
 add_dependencies(mod_qtui mod_common mod_client mod_uisupport)
 set_target_properties(mod_qtui PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")
diff --git a/src/qtui/settingspages/previewbufferview.cpp b/src/qtui/settingspages/previewbufferview.cpp
deleted file mode 100644 (file)
index 2db98a1..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#include "previewbufferview.h"
-
-// this file is needed to make automoc work
index 6fe4020..5b7ca52 100644 (file)
@@ -1,17 +1,50 @@
 # Putting $FOO in SETTINGSPAGES automatically includes
 # $FOOsettingspage.cpp, $FOOsettingspage.h and $FOOsettingspage.ui
 
-set(SETTINGSPAGES aliases appearance backlog bufferview chatview connection coreconnection chatmonitor coreaccount
-                  highlight identities ignorelist inputwidget itemview networks topicwidget)
+set(SETTINGSPAGES
+    aliases
+    appearance
+    backlog
+    bufferview
+    chatmonitor
+    chatview
+    connection
+    coreconnection
+    coreaccount
+    highlight
+    identities
+    ignorelist
+    inputwidget
+    itemview
+    networks
+    topicwidget
+)
 
 # Specify additional files (e.g. for subdialogs) here!
-set(SP_SOURCES aliasesmodel.cpp identityeditwidget.cpp ignorelistmodel.cpp notificationssettingspage.cpp previewbufferview.cpp)
-set(SP_HEADERS aliasesmodel.h identityeditwidget.h ignorelistmodel.h notificationssettingspage.h previewbufferview.h)
-set(SP_FORMS buffervieweditdlg.ui coreaccounteditdlg.ui createidentitydlg.ui identityeditwidget.ui ignorelisteditdlg.ui saveidentitiesdlg.ui 
-             networkadddlg.ui networkeditdlg.ui nickeditdlg.ui servereditdlg.ui)
+set(SP_SOURCES
+    aliasesmodel.cpp
+    identityeditwidget.cpp
+    ignorelistmodel.cpp
+    notificationssettingspage.cpp
+
+    # needed for automoc
+    previewbufferview.h
+)
+
+set(SP_FORMS
+    buffervieweditdlg.ui
+    coreaccounteditdlg.ui
+    createidentitydlg.ui
+    identityeditwidget.ui
+    ignorelisteditdlg.ui
+    networkadddlg.ui
+    networkeditdlg.ui
+    nickeditdlg.ui
+    saveidentitiesdlg.ui
+    servereditdlg.ui
+)
 
 if(NOT HAVE_KDE)
   set(SETTINGSPAGES ${SETTINGSPAGES} shortcuts)
   set(SP_SOURCES ${SP_SOURCES} keysequencewidget.cpp shortcutsmodel.cpp)
-  set(SP_HEADERS ${SP_HEADERS} keysequencewidget.h shortcutsmodel.h)
 endif(NOT HAVE_KDE)
index f3b7cad..1b4f176 100644 (file)
@@ -9,7 +9,6 @@ endif(WITH_QT5)
 set(SOURCES
     abstractbuffercontainer.cpp
     abstractitemview.cpp
-    abstractnotificationbackend.cpp
     action.cpp
     actioncollection.cpp
     bufferhotlistfilter.cpp
@@ -38,48 +37,13 @@ set(SOURCES
     toolbaractionprovider.cpp
     uisettings.cpp
     uistyle.cpp
-   )
 
-set(MOC_HDRS
-    abstractbuffercontainer.h
-    abstractitemview.h
+    # needed for automoc
     abstractnotificationbackend.h
-    action.h
-    actioncollection.h
-    bufferhotlistfilter.h
-    bufferview.h
-    bufferviewfilter.h
-    bufferviewoverlayfilter.h
-    clearablelineedit.h
-    clickablelabel.h
-    colorbutton.h
-    contextmenuactionprovider.h
-    flatproxymodel.h
-    fontselector.h
-    graphicalui.h
-    iconloader.h
-    multilineedit.h
-    networkmodelcontroller.h
-    nickview.h
-    nickviewfilter.h
-    resizingstackedwidget.h
-    settingspage.h
-    styledlabel.h
-    tabcompleter.h
-    toolbaractionprovider.h
-    uistyle.h
-   )
-
-set(HEADERS
-    clickable.h
-    icon.h
-    qssparser.h
-    uisettings.h
-   )
+)
 
 if(HAVE_KDE)
     set(SOURCES ${SOURCES} kcmdlinewrapper.cpp)
-    set(HEADERS ${HEADERS} kcmdlinewrapper.h)
 endif(HAVE_KDE)
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common
@@ -90,10 +54,6 @@ if(HAVE_QCA2)
   include_directories(${QCA2_INCLUDE_DIR})
 endif(HAVE_QCA2)
 
-if(NOT WITH_QT5)
-  qt4_wrap_cpp(MOC ${MOC_HDRS})
-endif(NOT WITH_QT5)
-
-add_library(mod_uisupport STATIC ${SOURCES} ${MOC} ${HEADERS})
+add_library(mod_uisupport STATIC ${SOURCES})
 add_dependencies(mod_uisupport mod_common mod_client)
 set_target_properties(mod_uisupport PROPERTIES COMPILE_FLAGS "${QUASSEL_QT_COMPILEFLAGS}")
diff --git a/src/uisupport/abstractnotificationbackend.cpp b/src/uisupport/abstractnotificationbackend.cpp
deleted file mode 100644 (file)
index 44e6c52..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
- *   devel@quassel-irc.org                                                 *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) version 3.                                           *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
- ***************************************************************************/
-
-#include "abstractnotificationbackend.h"
-
-// this file is needed to make automoc work