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

List:       kde-commits
Subject:    [kdelibs/frameworks] /: Move KMultiTabBar to KWidgetsAddons
From:       Kevin Ottens <ervin+bluesystems () kde ! org>
Date:       2013-08-19 14:08:37
Message-ID: E1VBQ8L-0006Mq-A3 () scm ! kde ! org
[Download RAW message or body]

Git commit 6a43f1d5b80ca8a9fc6e6c443c5ee238dae49b81 by Kevin Ottens.
Committed on 13/08/2013 at 13:35.
Pushed by ervin into branch 'frameworks'.

Move KMultiTabBar to KWidgetsAddons

M  +0    -2    staging/kde4attic/src/CMakeLists.txt
M  +2    -0    tier1/kwidgetsaddons/src/CMakeLists.txt
R  +0    -0    tier1/kwidgetsaddons/src/kmultitabbar.cpp [from: staging/kde=
4attic/src/kmultitabbar.cpp - 100% similarity]
R  +4    -4    tier1/kwidgetsaddons/src/kmultitabbar.h [from: staging/kde4a=
ttic/src/kmultitabbar.h - 097% similarity]
R  +0    -0    tier1/kwidgetsaddons/src/kmultitabbar_p.h [from: staging/kde=
4attic/src/kmultitabbar_p.h - 100% similarity]

http://commits.kde.org/kdelibs/6a43f1d5b80ca8a9fc6e6c443c5ee238dae49b81

diff --git a/staging/kde4attic/src/CMakeLists.txt b/staging/kde4attic/src/C=
MakeLists.txt
index eaa3432..21758e1 100644
--- a/staging/kde4attic/src/CMakeLists.txt
+++ b/staging/kde4attic/src/CMakeLists.txt
@@ -25,7 +25,6 @@ set(kde4attic_SRCS
   kdatewidget.cpp
   kgesture.cpp
   kgesturemap.cpp
-  kmultitabbar.cpp
   ktimecombobox.cpp
   ktimezonewidget.cpp
   ksslcertificatemanager.cpp
@@ -150,7 +149,6 @@ install(FILES
   kdatewidget.h
   kdeprintdialog.h
   kgesture.h
-  kmultitabbar.h
   ktimecombobox.h
   ktimezonewidget.h
   ktcpsocket.h
diff --git a/tier1/kwidgetsaddons/src/CMakeLists.txt b/tier1/kwidgetsaddons=
/src/CMakeLists.txt
index daece96..7a31a65 100644
--- a/tier1/kwidgetsaddons/src/CMakeLists.txt
+++ b/tier1/kwidgetsaddons/src/CMakeLists.txt
@@ -12,6 +12,7 @@ set(kwidgetsaddons_SRCS
   kguiitem.cpp
   kled.cpp
   kmessagebox.cpp
+  kmultitabbar.cpp
   kstandardguiitem.cpp
   kurllabel.cpp # Not good enough quality. Needs to use QUrl instead of QS=
tring and should not inherit QLabel, but hold it as a member instead.
   kcapacitybar.cpp
@@ -87,6 +88,7 @@ install(FILES
   kled.h
   kmessagebox.h
   kmessageboxdontaskagaininterface.h
+  kmultitabbar.h
   kselectaction.h
   kstandardguiitem.h
   kurllabel.h
diff --git a/staging/kde4attic/src/kmultitabbar.cpp b/tier1/kwidgetsaddons/=
src/kmultitabbar.cpp
similarity index 100%
rename from staging/kde4attic/src/kmultitabbar.cpp
rename to tier1/kwidgetsaddons/src/kmultitabbar.cpp
diff --git a/staging/kde4attic/src/kmultitabbar.h b/tier1/kwidgetsaddons/sr=
c/kmultitabbar.h
similarity index 97%
rename from staging/kde4attic/src/kmultitabbar.h
rename to tier1/kwidgetsaddons/src/kmultitabbar.h
index a5bf50b..5bc6136 100644
--- a/staging/kde4attic/src/kmultitabbar.h
+++ b/tier1/kwidgetsaddons/src/kmultitabbar.h
@@ -30,7 +30,7 @@
 #include <QtCore/QList>
 #include <QPushButton>
 =

-#include <kde4attic_export.h>
+#include <kwidgetsaddons_export.h>
 =

 class QPixmap;
 class QPainter;
@@ -54,7 +54,7 @@ class KMultiTabBarInternal;
  *
  * @author Joseph Wenninger
  */
-class KDE4ATTIC_EXPORT KMultiTabBar: public QWidget
+class KWIDGETSADDONS_EXPORT KMultiTabBar: public QWidget
 {
     Q_OBJECT
     Q_ENUMS(KMultiTabBarPosition KMultiTabBarStyle)
@@ -152,7 +152,7 @@ private:
 /**
  * Use KMultiTabBar::appendButton to append a button, which creates a KMul=
tiTabBarButton instance
  */
-class KDE4ATTIC_EXPORT KMultiTabBarButton: public QPushButton
+class KWIDGETSADDONS_EXPORT KMultiTabBarButton: public QPushButton
 {
     Q_OBJECT
 public:
@@ -189,7 +189,7 @@ private:
 /**
  * Use KMultiTabBar::appendTab to append a tab, which creates a KMultiTabB=
arTab instance
  */
-class KDE4ATTIC_EXPORT KMultiTabBarTab: public KMultiTabBarButton
+class KWIDGETSADDONS_EXPORT KMultiTabBarTab: public KMultiTabBarButton
 {
     Q_OBJECT
 public:
diff --git a/staging/kde4attic/src/kmultitabbar_p.h b/tier1/kwidgetsaddons/=
src/kmultitabbar_p.h
similarity index 100%
rename from staging/kde4attic/src/kmultitabbar_p.h
rename to tier1/kwidgetsaddons/src/kmultitabbar_p.h

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