'[kdelibs/frameworks-kcolors] /: fix macros, cmakelists for kmessagebox[h, cpp], kcombobox[h, cpp], k'

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

List:       kde-commits
Subject:    [kdelibs/frameworks-kcolors] /: fix macros, cmakelists for kmessagebox[h, cpp], kcombobox[h, cpp], k
From:       Giorgos Tsiapaliwkas <terietor () gmail ! com>
Date:       2012-04-05 16:36:12
Message-ID: 20120405163612.4155EA60BB () git ! kde ! org
[Download RAW message or body]

Git commit 95029824028119ac0eca36bc969cbd84b1f1787e by Giorgos Tsiapaliwkas.
Committed on 05/04/2012 at 18:35.
Pushed by tsiapaliwkas into branch 'frameworks-kcolors'.

fix macros, cmakelists for kmessagebox[h,cpp], kcombobox[h,cpp], knuminput[h,cpp]

M  +0    -6    kdeui/CMakeLists.txt
M  +0    -4    kdeui/tests/CMakeLists.txt
M  +7    -0    staging/kwidgets/src/CMakeLists.txt
M  +1    -1    staging/kwidgets/src/dialogs/kmessagebox.h
M  +6    -6    staging/kwidgets/src/widgets/kcombobox.h
M  +10   -10   staging/kwidgets/src/widgets/knuminput.h
M  +4    -0    staging/kwidgets/tests/CMakeLists.txt

http://commits.kde.org/kdelibs/95029824028119ac0eca36bc969cbd84b1f1787e

diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index 7344b69..a13bf70 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -102,7 +102,6 @@ set(kdeui_LIB_SRCS
  dialogs/kedittoolbar.cpp
  dialogs/kinputdialog.cpp
  dialogs/klinkdialog.cpp
- dialogs/kmessagebox.cpp
  dialogs/kmessageboxmessagehandler.cpp
  dialogs/kaboutapplicationdialog.cpp
  dialogs/kaboutapplicationpersonmodel_p.cpp
@@ -213,7 +212,6 @@ set(kdeui_LIB_SRCS
  widgets/kcharselect.cpp
  widgets/kcharselectdata.cpp
  widgets/kcmodule.cpp
- widgets/kcombobox.cpp
  widgets/kcompletionbox.cpp
  widgets/kdatecombobox.cpp
  widgets/kdatepicker.cpp
@@ -234,7 +232,6 @@ set(kdeui_LIB_SRCS
  widgets/kmenubar.cpp
  widgets/kmessagewidget.cpp
  widgets/kmultitabbar.cpp
- widgets/knuminput.cpp
  widgets/kpixmapregionselectorwidget.cpp
  widgets/kratingpainter.cpp
  widgets/kratingwidget.cpp
@@ -478,7 +475,6 @@ install( FILES
  dialogs/kdeprintdialog.h
  dialogs/kedittoolbar.h
  dialogs/kinputdialog.h
- dialogs/kmessagebox.h
  dialogs/kmessageboxmessagehandler.h
  dialogs/knewpassworddialog.h
  dialogs/kpassworddialog.h
@@ -567,7 +563,6 @@ install( FILES
  widgets/kdatepicker.h
  widgets/kcapacitybar.h
  widgets/kcmodule.h
- widgets/kcombobox.h
  widgets/kcompletionbox.h
  widgets/kbuttongroup.h
  widgets/kcharselect.h
@@ -589,7 +584,6 @@ install( FILES
  widgets/kmenubar.h
  widgets/kmessagewidget.h
  widgets/kmultitabbar.h
- widgets/knuminput.h
  widgets/kpixmapregionselectorwidget.h
  widgets/kratingpainter.h
  widgets/kratingwidget.h
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index 158b4a9..b2ec7b3 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -38,7 +38,6 @@ KDEUI_UNIT_TESTS(
   kmainwindow_unittest
   klineedit_unittest
   ktextedit_unittest
-  kcombobox_unittest
   kreplacetest
   kshortcuttest
   kstandardactiontest
@@ -72,7 +71,6 @@ KDEUI_EXECUTABLE_TESTS(
   kbugreporttest
   kcategorizedviewtest
   kcodecactiontest
-  kcomboboxtest
   kcompletionuitest
   kdatepicktest
   kdatetabletest
@@ -89,13 +87,11 @@ KDEUI_EXECUTABLE_TESTS(
   klineedittest
   kmainwindowtest
   kmainwindowrestoretest
-  kmessageboxtest
   kmessagetest
   kmodifierkeyinfotest
   knewpassworddialogtest
   kstatusnotifieritemtest
   knotificationrestrictionstest
-  knuminputtest
   kpagedialogtest
   kpagewidgettest
   kpassivepopuptest
diff --git a/staging/kwidgets/src/CMakeLists.txt b/staging/kwidgets/src/CMakeLists.txt
index 1a9f21c..c498a28 100644
--- a/staging/kwidgets/src/CMakeLists.txt
+++ b/staging/kwidgets/src/CMakeLists.txt
@@ -3,6 +3,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}/icons
  ${CMAKE_CURRENT_SOURCE_DIR}/widgets
  ${CMAKE_CURRENT_SOURCE_DIR}/utils
+ ${CMAKE_CURRENT_SOURCE_DIR}/dialogs #kdialogqueue_p.h
  ${DBUSMENUQT_INCLUDE_DIR}
  ${kdeguiaddons_BINARY_DIR}/src
  ${kdeguiaddons_SOURCE_DIR}/src/colors # kcolorscheme
@@ -20,7 +21,10 @@ set(kwidgets_LIB_SRCS
  widgets/kseparator.cpp
  widgets/kurllabel.cpp
  widgets/kpushbutton.cpp
+ widgets/kcombobox.cpp
+ widgets/knuminput.cpp
  dialogs/kdialog.cpp
+ dialogs/kmessagebox.cpp
  icons/kicon.cpp
  icons/kiconloader.cpp
  icons/kicontheme.cpp
@@ -51,7 +55,10 @@ install( FILES
  widgets/kseparator.h
  widgets/kurllabel.h
  widgets/kpushbutton.h
+ widgets/kcombobox.h
+ widgets/knuminput.h
  dialogs/kdialog.h
+ dialogs/kmessagebox.h
  icons/kicon.h
  icons/kiconloader.h
  icons/kicontheme.h
diff --git a/staging/kwidgets/src/dialogs/kmessagebox.h b/staging/kwidgets/src/dialogs/kmessagebox.h
index 593b2e5..32b2a1e 100644
--- a/staging/kwidgets/src/dialogs/kmessagebox.h
+++ b/staging/kwidgets/src/dialogs/kmessagebox.h
@@ -59,7 +59,7 @@ class KDialog;
   *
   * @author Waldo Bastian (bastian@kde.org)
   */
-class KDEUI_EXPORT KMessageBox
+class KWIDGETS_EXPORT KMessageBox
 {
 public:
   /**
diff --git a/staging/kwidgets/src/widgets/kcombobox.h b/staging/kwidgets/src/widgets/kcombobox.h
index f0ec099..7626231 100644
--- a/staging/kwidgets/src/widgets/kcombobox.h
+++ b/staging/kwidgets/src/widgets/kcombobox.h
@@ -146,7 +146,7 @@ class KUrl;
  *
  * @author Dawit Alemayehu <adawit@kde.org>
  */
-class KDEUI_EXPORT KComboBox : public QComboBox, public KCompletionBase //krazy:exclude=qclasses
+class KWIDGETS_EXPORT KComboBox : public QComboBox, public KCompletionBase //krazy:exclude=qclasses
 {
   Q_OBJECT
   Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
@@ -183,13 +183,13 @@ public:
      * @deprecated
      */
 #ifndef KDE_NO_DEPRECATED
-    KDEUI_DEPRECATED void insertURL( const KUrl& url, int index = -1 )
+    KWIDGETS_DEPRECATED void insertURL( const KUrl& url, int index = -1 )
     { insertUrl( index < 0 ? count() : index, url ); }
-    KDEUI_DEPRECATED void insertURL( const QPixmap& pixmap, const KUrl& url, int index = -1 )
+    KWIDGETS_DEPRECATED void insertURL( const QPixmap& pixmap, const KUrl& url, int index = -1 )
     { insertUrl( index < 0 ? count() : index, QIcon(pixmap), url ); }
-    KDEUI_DEPRECATED void changeURL( const KUrl& url, int index )
+    KWIDGETS_DEPRECATED void changeURL( const KUrl& url, int index )
     { changeUrl( index, url ); }
-    KDEUI_DEPRECATED void changeURL( const QPixmap& pixmap, const KUrl& url, int index )
+    KWIDGETS_DEPRECATED void changeURL( const QPixmap& pixmap, const KUrl& url, int index )
     { changeUrl( index, QIcon(pixmap), url ); }
 #endif
 
@@ -290,7 +290,7 @@ public:
     * @deprecated use setContextMenuPolicy
     */
 #ifndef KDE_NO_DEPRECATED
-    virtual KDEUI_DEPRECATED void setContextMenuEnabled( bool showMenu );
+    virtual KWIDGETS_DEPRECATED void setContextMenuEnabled( bool showMenu );
 #endif
 
     /**
diff --git a/staging/kwidgets/src/widgets/knuminput.h b/staging/kwidgets/src/widgets/knuminput.h
index 06d1ebd..038fbd5 100644
--- a/staging/kwidgets/src/widgets/knuminput.h
+++ b/staging/kwidgets/src/widgets/knuminput.h
@@ -22,7 +22,7 @@
 #ifndef K_NUMINPUT_H
 #define K_NUMINPUT_H
 
-#include <kdeui_export.h>
+#include <kwidgets_export.h>
 
 #include <QWidget>
 #include <QSpinBox>
@@ -40,7 +40,7 @@ class KLocalizedString;
  * for a different variable type
  *
  */
-class KDEUI_EXPORT KNumInput : public QWidget
+class KWIDGETS_EXPORT KNumInput : public QWidget
 {
     Q_OBJECT
     Q_PROPERTY( QString label READ label WRITE setLabel )
@@ -59,7 +59,7 @@ public:
      * \deprecated - use the version without the below parameter instead
      */
 #ifndef KDE_NO_DEPRECATED
-    KDEUI_DEPRECATED KNumInput(QWidget *parent, KNumInput* below);
+    KWIDGETS_DEPRECATED KNumInput(QWidget *parent, KNumInput* below);
 #endif
 
     /**
@@ -169,7 +169,7 @@ private:
  * \image html kintnuminput.png "KDE Int Number Input Spinbox"
  */
 
-class KDEUI_EXPORT KIntNumInput : public KNumInput
+class KWIDGETS_EXPORT KIntNumInput : public KNumInput
 {
     Q_OBJECT
     Q_PROPERTY( int value READ value WRITE setValue NOTIFY valueChanged USER true )
@@ -221,7 +221,7 @@ public:
      * \deprecated use the version without the below parameter instead.
      */
 #ifndef KDE_NO_DEPRECATED
-    KDEUI_DEPRECATED KIntNumInput(KNumInput* below, int value, QWidget *parent, int base = 10);
+    KWIDGETS_DEPRECATED KIntNumInput(KNumInput* below, int value, QWidget *parent, int base = 10);
 #endif
 
     /**
@@ -276,7 +276,7 @@ public:
      * @deprecated Use the other setRange function and setSliderEnabled instead
      */
 #ifndef KDE_NO_DEPRECATED
-    KDEUI_DEPRECATED void setRange(int min, int max, int singleStep, bool slider);
+    KWIDGETS_DEPRECATED void setRange(int min, int max, int singleStep, bool slider);
 #endif
 
     /**
@@ -447,7 +447,7 @@ class KDoubleLine;
  * @see KIntNumInput
  */
 
-class KDEUI_EXPORT KDoubleNumInput : public KNumInput
+class KWIDGETS_EXPORT KDoubleNumInput : public KNumInput
 {
     Q_OBJECT
     Q_PROPERTY( double value READ value WRITE setValue NOTIFY valueChanged USER true )
@@ -511,7 +511,7 @@ public:
      * \deprecated use the version without below instead
      */
 #ifndef KDE_NO_DEPRECATED
-    KDEUI_DEPRECATED KDoubleNumInput(KNumInput* below,
+    KWIDGETS_DEPRECATED KDoubleNumInput(KNumInput* below,
 		    double lower, double upper, double value, QWidget *parent=0,double singleStep=0.02,
 		    int precision=2);
 #endif
@@ -592,7 +592,7 @@ public:
     void setDecimals(int decimals);
 
 #ifndef KDE_NO_DEPRECATED
-    KDEUI_DEPRECATED void setPrecision(int precision) { setDecimals(precision); }
+    KWIDGETS_DEPRECATED void setPrecision(int precision) { setDecimals(precision); }
 #endif
 
     /**
@@ -714,7 +714,7 @@ private:
  *
  * \image html kintspinbox.png "KDE Integer Input Spinboxes with hexadecimal and binary input"
  */
-class KDEUI_EXPORT KIntSpinBox : public QSpinBox
+class KWIDGETS_EXPORT KIntSpinBox : public QSpinBox
 {
     Q_OBJECT
     Q_PROPERTY( int base READ base WRITE setBase )
diff --git a/staging/kwidgets/tests/CMakeLists.txt b/staging/kwidgets/tests/CMakeLists.txt
index 61b2b11..f97baa9 100644
--- a/staging/kwidgets/tests/CMakeLists.txt
+++ b/staging/kwidgets/tests/CMakeLists.txt
@@ -29,10 +29,14 @@ KDEUI_EXECUTABLE_TESTS(
   kiconeffecttest
   kseparatortest
   kglobalsettingsclient # helper program for kglobalsettingstest
+  kcomboboxtest
+  kmessageboxtest
+  knuminputtest
 )
 
 KDEUI_UNIT_TESTS(
   kglobalsettingstest
   kdialog_unittest
   kiconloader_unittest
+  kcombobox_unittest
 )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic