[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kontact/src
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-11-20 20:52:10
Message-ID: 20101120205210.DE8F8AC8A0 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199144 by vkrause:

Remove the last bit of Qt3Support usage from the Kontact shell, which
happend to be dead code...


 M  +2 -4      CMakeLists.txt  
 M  +0 -19     kcmkontact.cpp  


--- trunk/KDE/kdepim/kontact/src/CMakeLists.txt #1199143:1199144
@@ -19,7 +19,7 @@
 
 kde4_add_library(kontactprivate ${LIBRARY_TYPE} ${kontactprivate_LIB_SRCS})
 
-target_link_libraries(kontactprivate  ${KDE4_KPARTS_LIBS} \
${KDEPIMLIBS_KONTACTINTERFACE_LIBS} ${QT_QTWEBKIT_LIBRARY} ${KDE4_KDEWEBKIT_LIBRARY} \
${KDE4_KCMUTILS_LIBS} ${KDEPIMLIBS_KPIMUTILS_LIBS} kdepim ${KDE4_KDE3SUPPORT_LIBRARY} \
${QT_QT3SUPPORT_LIBRARY} kdepimdbusinterfaces) +target_link_libraries(kontactprivate  \
${KDE4_KPARTS_LIBS} ${KDEPIMLIBS_KONTACTINTERFACE_LIBS} ${QT_QTWEBKIT_LIBRARY} \
${KDE4_KDEWEBKIT_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${KDEPIMLIBS_KPIMUTILS_LIBS} kdepim \
kdepimdbusinterfaces)  
 set_target_properties(kontactprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} \
SOVERSION ${GENERIC_LIB_SOVERSION} )  install(TARGETS kontactprivate \
${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) @@ -38,7 +38,6 @@
 target_link_libraries(kontact_bin
   ${QT_QTWEBKIT_LIBRARY}
   ${KDE4_KDEWEBKIT_LIBRARY}
-	${KDE4_KDE3SUPPORT_LIBS} 
 	kontactprivate 
 	kdepim 
 	kdepimdbusinterfaces 
@@ -59,8 +58,7 @@
 
 
 target_link_libraries(kcm_kontact  ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} \
                ${KDE4_KCMUTILS_LIBS} kontactprivate
-    kdepim 
-    ${QT_QT3SUPPORT_LIBRARY})
+    kdepim) 
 
 install(TARGETS kcm_kontact  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- trunk/KDE/kdepim/kontact/src/kcmkontact.cpp #1199143:1199144
@@ -32,7 +32,6 @@
 #include <KComboBox>
 #include <KServiceTypeTrader>
 
-#include <Q3ListViewItem>
 #include <QCheckBox>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
@@ -46,24 +45,6 @@
   }
 }
 
-class PluginItem : public Q3ListViewItem
-{
-  public:
-    PluginItem( Q3ListView *parent, const KService::Ptr &ptr )
-      : Q3ListViewItem( parent, ptr->name(), ptr->comment(), ptr->library() ),
-        mPtr( ptr )
-    {
-    }
-
-    KService::Ptr servicePtr() const
-    {
-      return mPtr;
-    }
-
-  private:
-    KService::Ptr mPtr;
-};
-
 KcmKontact::KcmKontact( const KComponentData &inst, QWidget *parent )
   : KPrefsModule( Prefs::self(), inst, parent )
 {


[prev in list] [next in list] [prev in thread] [next in thread]