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

List:       kde-commits
Subject:    KDE/kdepim
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-12-09 18:33:02
Message-ID: 20101209183302.EA549AC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204928 by tokoe:

Move CategoryEditDialog from korganizer/ to incidenceeditor-ng/


 M  +4 -0      incidenceeditor-ng/CMakeLists.txt  
 A             incidenceeditor-ng/categoryeditdialog.cpp   \
korganizer/categoryeditdialog.cpp#1204839 [License: LGPL (v2+)]  A             \
incidenceeditor-ng/categoryeditdialog.h   korganizer/categoryeditdialog.h#1204839 \
[License: LGPL (v2+)]  A             incidenceeditor-ng/categoryeditdialog_base.ui   \
korganizer/categoryeditdialog_base.ui#1204839  M  +0 -5      \
korganizer/CMakeLists.txt    D             korganizer/categoryeditdialog.cpp  
 D             korganizer/categoryeditdialog.h  
 D             korganizer/categoryeditdialog_base.ui  
 M  +2 -2      korganizer/kodialogmanager.cpp  
 M  +2 -2      korganizer/kodialogmanager.h  


--- trunk/KDE/kdepim/incidenceeditor-ng/CMakeLists.txt #1204927:1204928
@@ -58,6 +58,7 @@
   korganizereditorconfig.cpp
 
   autochecktreewidget.cpp
+  categoryeditdialog.cpp
   categoryselectdialog.cpp
   categorydialog.cpp
 )
@@ -78,7 +79,9 @@
   groupwareintegration.cpp
 )
 
+
 kde4_add_ui_files( incidenceeditors_ng_desktop_LIB_SRCS
+  categoryeditdialog_base.ui
   categoryselectdialog_base.ui
   categorydialog_base.ui
   template_management_dialog_base.ui
@@ -119,6 +122,7 @@
   )
 
   kde4_add_ui_files(incidenceeditors_ng_mobile_LIB_SRCS
+    categoryeditdialog_base.ui
     categoryselectdialog_base.ui
     categorydialog_base.ui
     editoralarms_base.ui
--- trunk/KDE/kdepim/korganizer/CMakeLists.txt #1204927:1204928
@@ -124,13 +124,8 @@
 set(korganizer_core_LIB_SRCS
     koprefs.cpp
     kocore.cpp
-    categoryeditdialog.cpp
 )
 
-kde4_add_ui_files(korganizer_core_LIB_SRCS
-  categoryeditdialog_base.ui
-)
-
 kde4_add_kcfg_files(korganizer_core_LIB_SRCS koprefs_base.kcfgc )
 
 kde4_add_library(korganizer_core ${LIBRARY_TYPE} ${korganizer_core_LIB_SRCS})
--- trunk/KDE/kdepim/korganizer/kodialogmanager.cpp #1204927:1204928
@@ -28,7 +28,6 @@
 #include <calendarsupport/archivedialog.h>
 #endif
 #include "calendarview.h"
-#include "categoryeditdialog.h"
 #include "koglobals.h"
 #include "koprefs.h"
 #include "filtereditdialog.h"
@@ -37,6 +36,7 @@
 #include <calendarsupport/utils.h>
 #include <calendarsupport/categoryconfig.h>
 
+#include <incidenceeditor-ng/categoryeditdialog.h>
 #include <incidenceeditor-ng/incidencedialog.h>
 #include <incidenceeditor-ng/incidencedialogfactory.h>
 
@@ -225,7 +225,7 @@
 
     CategoryConfig* cc = new CategoryConfig( KOPrefs::instance(), this );
     mCategoryEditDialog =
-      new CategoryEditDialog( cc, mMainView );
+      new IncidenceEditorNG::CategoryEditDialog( cc, mMainView );
     mCategoryEditDialog->setModal( true );
     mCategoryEditDialog->setHelp( "categories-view", "korganizer" );
     connect( mMainView, SIGNAL(categoriesChanged()),
--- trunk/KDE/kdepim/korganizer/kodialogmanager.h #1204927:1204928
@@ -31,7 +31,6 @@
 #include <QPointer>
 
 class CalendarView;
-class CategoryEditDialog;
 class FilterEditDialog;
 class KCMultiDialog;
 class SearchDialog;
@@ -41,6 +40,7 @@
 }
 
 namespace IncidenceEditorNG {
+  class CategoryEditDialog;
   class IncidenceDialog;
 }
 
@@ -87,7 +87,7 @@
 
     CalendarView *mMainView;
     KCMultiDialog *mOptionsDialog;
-    QPointer<CategoryEditDialog> mCategoryEditDialog;
+    QPointer<IncidenceEditorNG::CategoryEditDialog> mCategoryEditDialog;
     SearchDialog *mSearchDialog;
     CalendarSupport::ArchiveDialog *mArchiveDialog;
     FilterEditDialog *mFilterEditDialog;


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