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

List:       kde-commits
Subject:    KDE/kdepim/incidenceeditors
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-09-09 0:41:16
Message-ID: 20100909004116.E3A9EAC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1173232 by smartins:

Make NG ready to go up to kdepim/

 M  +10 -13    CMakeLists.txt  
 M  +5 -0      incidenceeditor-ng/CMakeLists.txt  
 M  +2 -2      incidenceeditor-ng/autochecktreewidget.h  
 M  +2 -2      incidenceeditor-ng/categoryselectdialog.cpp  
 M  +3 -3      incidenceeditor-ng/categoryselectdialog.h  
 M  +2 -2      incidenceeditor-ng/templatemanagementdialog.h  


--- trunk/KDE/kdepim/incidenceeditors/CMakeLists.txt #1173231:1173232
@@ -1,17 +1,14 @@
-if (KDEPIM_MOBILE_UI)
-  remove_definitions(-DKDEPIM_MOBILE_UI)
-endif()
 #
-include_directories(
-    ${CMAKE_SOURCE_DIR}/incidenceeditors
-    ${CMAKE_BINARY_DIR}/incidenceeditors
-    ${CMAKE_SOURCE_DIR}/kdgantt1
-    ${CMAKE_SOURCE_DIR}/libkdepim
-    ${CMAKE_SOURCE_DIR}/libkdepimdbusinterfaces
-    ${CMAKE_SOURCE_DIR}/calendarsupport
-    ${CMAKE_BINARY_DIR}/calendarsupport
-    ${Boost_INCLUDE_DIR}
-)
+#include_directories(
+#    ${CMAKE_SOURCE_DIR}/incidenceeditors
+#    ${CMAKE_BINARY_DIR}/incidenceeditors
+#    ${CMAKE_SOURCE_DIR}/kdgantt1
+#    ${CMAKE_SOURCE_DIR}/libkdepim
+#    ${CMAKE_SOURCE_DIR}/libkdepimdbusinterfaces
+#    ${CMAKE_SOURCE_DIR}/calendarsupport
+#    ${CMAKE_BINARY_DIR}/calendarsupport
+#    ${Boost_INCLUDE_DIR}
+#)
 #
 #add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
 #if (QT_QT3SUPPORT_FOUND)
--- trunk/KDE/kdepim/incidenceeditors/incidenceeditor-ng/CMakeLists.txt #1173231:1173232
@@ -1,3 +1,7 @@
+if (KDEPIM_MOBILE_UI)
+  remove_definitions(-DKDEPIM_MOBILE_UI)
+endif()
+
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/calendarsupport
@@ -2,2 +6,3 @@
   ${CMAKE_BINARY_DIR}/calendarsupport
+  ${Boost_INCLUDE_DIR}
 )
--- trunk/KDE/kdepim/incidenceeditors/incidenceeditor-ng/autochecktreewidget.h #1173231:1173232
@@ -21,7 +21,7 @@
 #ifndef AUTOCHECKTREEWIDGET_H
 #define AUTOCHECKTREEWIDGET_H
 
-#include "incidenceeditors_export.h"
+#include "incidenceeditors-ng_export.h"
 
 #include <QTreeWidget>
 
@@ -37,7 +37,7 @@
 
   @author Mathias Soeken <msoeken@tzi.de>
  */
-class INCIDENCEEDITORS_EXPORT AutoCheckTreeWidget : public QTreeWidget {
+class INCIDENCEEDITORS_NG_EXPORT AutoCheckTreeWidget : public QTreeWidget {
   Q_OBJECT
 
   Q_PROPERTY( bool autoCheckChildren
--- trunk/KDE/kdepim/incidenceeditors/incidenceeditor-ng/categoryselectdialog.cpp #1173231:1173232
@@ -23,8 +23,8 @@
 #include "categoryselectdialog.h"
 #include "autochecktreewidget.h"
 
-#include "incidenceeditor-ng/categoryhierarchyreader.h"
-#include "incidenceeditor-ng/categoryconfig.h"
+#include "categoryhierarchyreader.h"
+#include "categoryconfig.h"
 
 #include "ui_categoryselectdialog_base.h"
 
--- trunk/KDE/kdepim/incidenceeditors/incidenceeditor-ng/categoryselectdialog.h #1173231:1173232
@@ -23,7 +23,7 @@
 #ifndef CATEGORYSELECTDIALOG_H
 #define CATEGORYSELECTDIALOG_H
 
-#include "incidenceeditors_export.h"
+#include "incidenceeditors-ng_export.h"
 
 #include <KDialog>
 
@@ -34,7 +34,7 @@
   class AutoCheckTreeWidget;
   class CategoryConfig;
 
-class INCIDENCEEDITORS_EXPORT CategorySelectWidget : public QWidget
+class INCIDENCEEDITORS_NG_EXPORT CategorySelectWidget : public QWidget
 {
   Q_OBJECT
   public:
@@ -67,7 +67,7 @@
     CategoryConfig *mCategoryConfig;
 };
 
-class INCIDENCEEDITORS_EXPORT CategorySelectDialog : public KDialog
+class INCIDENCEEDITORS_NG_EXPORT CategorySelectDialog : public KDialog
 {
   Q_OBJECT
   public:
--- trunk/KDE/kdepim/incidenceeditors/incidenceeditor-ng/templatemanagementdialog.h #1173231:1173232
@@ -38,7 +38,7 @@
 #ifndef TEMPLATEMANAGEMENTDIALOG_H
 #define TEMPLATEMANAGEMENTDIALOG_H
 
-#include "incidenceeditors_export.h"
+#include "incidenceeditors-ng_export.h"
 
 #include "ui_template_management_dialog_base.h"
 
@@ -51,7 +51,7 @@
 namespace IncidenceEditors
 {
 
-class INCIDENCEEDITORS_EXPORT TemplateManagementDialog: public KDialog
+class INCIDENCEEDITORS_NG_EXPORT TemplateManagementDialog: public KDialog
 {
   Q_OBJECT
   public:
[prev in list] [next in list] [prev in thread] [next in thread]