Removing the old ChatWidget and related stuff from CMakeLists.txt

This marks the beginning of the new sputdev-only branch. I'll clean out
the old cruft in here, getting rid of the #ifdefs. Yay git! :)

diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 41721bd..d4a2459 100644 (file)
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -16,6 +16,8 @@ set(SOURCES
     clientsettings.cpp
     clientsyncer.cpp
     irclistmodel.cpp
+    messagefilter.cpp
+    messagemodel.cpp
     mappedselectionmodel.cpp
     networkmodel.cpp
     selectionmodelsynchronizer.cpp
@@ -30,6 +32,8 @@ set(MOC_HDRS
     clientirclisthelper.h
     clientsyncer.h
     irclistmodel.h
+    messagefilter.h
+    messagemodel.h
     networkmodel.h
     mappedselectionmodel.h
     quasselui.h
@@ -40,15 +44,9 @@ set(HEADERS
     buffersettings.h
     clientsettings.h)
 
-if(SPUTDEV)
-  set(SOURCES ${SOURCES} messagefilter.cpp messagemodel.cpp)
-  set(MOC_HDRS ${MOC_HDRS} messagefilter.h messagemodel.h)
-endif(SPUTDEV)
-
 qt4_wrap_cpp(MOC ${MOC_HDRS})
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common)
 
 add_library(mod_client STATIC ${SOURCES} ${MOC} ${HEADERS})
 add_dependencies(mod_client mod_common)
-

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index 3dbfc88..f67b91f 100644 (file)
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -9,6 +9,12 @@ set(SOURCES
     aboutdlg.cpp
     bufferwidget.cpp
     channellistdlg.cpp
+    chatitem.cpp
+    chatline.cpp
+    chatlinemodel.cpp
+    chatlinemodelitem.cpp
+    chatscene.cpp
+    chatview.cpp
     coreconfigwizard.cpp
     coreconnectdlg.cpp
     coreinfodlg.cpp
@@ -31,6 +37,9 @@ set(MOC_HDRS
     aboutdlg.h
     bufferwidget.h
     channellistdlg.h
+    chatlinemodel.h
+    chatscene.h
+    chatview.h
     coreconfigwizard.h
     coreconnectdlg.h
     coreinfodlg.h
@@ -48,19 +57,12 @@ set(MOC_HDRS
     verticaldock.h)
 
 set(HEADERS
+    chatitem.h
+    chatline.h
+    chatlinemodelitem.h
     qtuisettings.h
     qtuistyle.h)
 
-if(SPUTDEV)
-  set(SOURCES ${SOURCES} chatitem.cpp chatline.cpp chatlinemodelitem.cpp
-                         chatlinemodel.cpp chatscene.cpp chatview.cpp)
-  set(MOC_HDRS ${MOC_HDRS} chatlinemodel.h chatscene.h chatview.h)
-  set(HEADERS ${HEADERS} chatitem.h chatline.h chatlinemodelitem.h)
-else(SPUTDEV)
-  set(SOURCES ${SOURCES} chatline-old.cpp chatwidget.cpp)
-  set(MOC_HDRS ${MOC_HDRS} chatline-old.h chatwidget.h)
-endif(SPUTDEV)
-
 set(FORMS
     aboutdlg.ui
     bufferviewwidget.ui

diff --git a/src/uisupport/CMakeLists.txt b/src/uisupport/CMakeLists.txt
index a070ab2..75fa5d9 100644 (file)
--- a/src/uisupport/CMakeLists.txt
+++ b/src/uisupport/CMakeLists.txt
@@ -18,6 +18,7 @@ set(SOURCES
     settingspage.cpp
     tabcompleter.cpp
     uisettings.cpp
+    uistyle.cpp
     uistylesettings.cpp)
 
 set(MOC_HDRS
@@ -32,20 +33,13 @@ set(MOC_HDRS
     inputline.h
     nickview.h
     settingspage.h
-    tabcompleter.h)
+    tabcompleter.h
+    uistyle.h)
 
 set(HEADERS
     uisettings.h
     uistylesettings.h)
 
-if(SPUTDEV)
-  set(SOURCES ${SOURCES} uistyle.cpp)
-  set(HEADERS ${HEADERS} uistyle.h)
-else(SPUTDEV)
-  set(SOURCES ${SOURCES} old-uistyle.cpp)
-  set(HEADERS ${HEADERS} old-uistyle.h)
-endif(SPUTDEV)
-
 qt4_wrap_cpp(MOC ${MOC_HDRS})
 
 include_directories(${CMAKE_SOURCE_DIR}/src/common