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

List:       kde-commits
Subject:    KDE/kdepim [POSSIBLY UNSAFE]
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-03-18 11:39:07
Message-ID: 20100318113907.EB5FFAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1104728 by tokoe:

Move the DesignerField classes to korganizer/ since it
is the only user


 M  +6 -1      korganizer/CMakeLists.txt  
 A             korganizer/designerfields.cpp   libkdepim/designerfields.cpp#1104713 \
[License: LGPL (v2+)]  A             korganizer/designerfields.h   \
libkdepim/designerfields.h#1104713 [License: LGPL (v2+)]  M  +2 -0      \
korganizer/incidenceeditor/CMakeLists.txt    M  +5 -5      \
korganizer/incidenceeditor/koincidenceeditor.cpp    A             \
korganizer/kcmdesignerfields.cpp   libkdepim/kcmdesignerfields.cpp#1104713 [POSSIBLY \
UNSAFE: KRun::runCommand] [License: LGPL (v2+)]  A             \
korganizer/kcmdesignerfields.h   [License: LGPL (v2+)]  M  +4 -5      \
korganizer/koprefsdialog.h    M  +0 -3      libkdepim/CMakeLists.txt  
 D             libkdepim/designerfields.cpp  
 D             libkdepim/designerfields.h  
 D             libkdepim/kcmdesignerfields.cpp  
 D             libkdepim/kcmdesignerfields.h  


--- trunk/KDE/kdepim/korganizer/CMakeLists.txt #1104727:1104728
@@ -97,11 +97,16 @@
 
 ########### next target ###############
 
-set(kcm_korganizer_PART_SRCS koprefsdialog.cpp )
+set(kcm_korganizer_PART_SRCS
+    designerfields.cpp
+    kcmdesignerfields.cpp
+    koprefsdialog.cpp
+   )
 
 kde4_add_plugin(kcm_korganizer ${kcm_korganizer_PART_SRCS} )
 
 target_link_libraries(kcm_korganizer
+  ${QT_QTUITOOLS_LIBRARY}
   ${KDE4_KDEUI_LIBS}
   ${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_KHOLIDAYS_LIBS} ${KDEPIMLIBS_AKONADI_LIBS} \
${KDEPIMLIBS_AKONADI_KCAL_LIBS}  mailtransport korganizerprivate korganizer_core \
                kdepim )
--- trunk/KDE/kdepim/korganizer/incidenceeditor/CMakeLists.txt #1104727:1104728
@@ -30,6 +30,7 @@
     kogroupwareintegration.cpp
     freebusyurldialog.cpp
     templatemanagementdialog.cpp
+    ../designerfields.cpp
 )
 
 
@@ -45,6 +46,7 @@
    ${QT_QT3SUPPORT_LIBRARY}
    ${QT_QTCORE_LIBRARY}
    ${QT_QTGUI_LIBRARY}
+   ${QT_QTUITOOLS_LIBRARY}
    ${KDE4_KDEUI_LIBS}
    ${KDE4_KPARTS_LIBS}
    ${KDE4_KMIME_LIBRARY}
--- trunk/KDE/kdepim/korganizer/incidenceeditor/koincidenceeditor.cpp \
#1104727:1104728 @@ -25,11 +25,11 @@
 #include "koincidenceeditor.h"
 #include "koeditorconfig.h"
 #include "koeditordetails.h"
+#include "designerfields.h"
 #include "templatemanagementdialog.h"
 
 #include <akonadi/kcal/utils.h> //krazy:exclude=camelcase since kdepim/akonadi
 
-#include <libkdepim/designerfields.h>
 #include <libkdepim/embeddedurlpage.h>
 
 #include <libkdepimdbusinterfaces/urihandler.h>
@@ -393,7 +393,7 @@
 
 QWidget *KOIncidenceEditor::addDesignerTab( const QString &uifile )
 {
-  KPIM::DesignerFields *wid = new KPIM::DesignerFields( uifile, 0 );
+  DesignerFields *wid = new DesignerFields( uifile, 0 );
   mDesignerFields.append( wid );
 
   QFrame *topFrame = new QFrame();
@@ -409,7 +409,7 @@
   return topFrame;
 }
 
-class KCalStorage : public KPIM::DesignerFields::Storage
+class KCalStorage : public DesignerFields::Storage
 {
   public:
     KCalStorage( Incidence *incidence )
@@ -455,7 +455,7 @@
 void KOIncidenceEditor::readDesignerFields( const Item &i )
 {
   KCalStorage storage( Akonadi::incidence( i ).get() );
-  foreach ( KPIM::DesignerFields *fields, mDesignerFields ) {
+  foreach ( DesignerFields *fields, mDesignerFields ) {
     if ( fields ) {
       fields->load( &storage );
     }
@@ -465,7 +465,7 @@
 void KOIncidenceEditor::writeDesignerFields( Incidence *i )
 {
   KCalStorage storage( i );
-  foreach ( KPIM::DesignerFields *fields, mDesignerFields ) {
+  foreach ( DesignerFields *fields, mDesignerFields ) {
     if ( fields ) {
       fields->save( &storage );
     }
--- trunk/KDE/kdepim/korganizer/koprefsdialog.h #1104727:1104728
@@ -26,10 +26,9 @@
 #define KOPREFSDIALOG_H
 
 #include "korganizer_export.h"
+#include "kcmdesignerfields.h"
 #include "ui_accountscalendarwidget.h"
 
-
-#include <libkdepim/kcmdesignerfields.h>
 #include <libkdepim/kprefsdialog.h>
 
 #include <QHash>
@@ -50,8 +49,6 @@
 class QTreeWidget;
 class QListWidget;
 
-using namespace KPIM;
-
 namespace Ui {
   class KOGroupwarePrefsPage;
 }
@@ -60,6 +57,8 @@
   class CollectionComboBox;
 }
 
+using namespace KPIM;
+
 class KCM_KORGANIZER_EXPORT KOPrefsDialogMain : public KPrefsModule
 {
   Q_OBJECT
@@ -177,7 +176,7 @@
     QSet<QString> mDecorationsAtAgendaViewBottom;
 };
 
-class KCM_KORGANIZER_EXPORT KOPrefsDesignerFields : public KPIM::KCMDesignerFields
+class KCM_KORGANIZER_EXPORT KOPrefsDesignerFields : public KCMDesignerFields
 {
   public:
     explicit KOPrefsDesignerFields( const KComponentData &inst, QWidget *parent = 0 \
                );
--- trunk/KDE/kdepim/libkdepim/CMakeLists.txt #1104727:1104728
@@ -42,8 +42,6 @@
    kaddrbookexternal.cpp
    kwidgetlister.cpp
    recentaddresses.cpp
-   designerfields.cpp
-   kcmdesignerfields.cpp
    embeddedurlpage.cpp
    csshelper.cpp
    distributionlist.cpp 
@@ -68,7 +66,6 @@
 kde4_add_library(kdepim SHARED ${kdepim_LIB_SRCS})
 
 target_link_libraries(kdepim
-  ${QT_QTUITOOLS_LIBRARY}
   ${KDEPIMLIBS_KRESOURCES_LIBS}
   ${KDEPIMLIBS_KABC_LIBS}
   ${KDEPIMLIBS_KCAL_LIBS}


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