[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdelibs/frameworks-kcolors] /: Move kicon, kiconloader, kicontheme, kiconengine, kiconeffect to
From: Giorgos Tsiapaliwkas <terietor () gmail ! com>
Date: 2012-03-12 11:44:22
Message-ID: 20120312114422.C82D6A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit a277b58743bd214069e68b1da48e2ef1a55d5a1d by Giorgos Tsiapaliwkas.
Committed on 12/03/2012 at 08:46.
Pushed by tsiapaliwkas into branch 'frameworks-kcolors'.
Move kicon, kiconloader, kicontheme, kiconengine, kiconeffect to
staging/kwidgets/src/icons
M +0 -9 kdeui/CMakeLists.txt
M +0 -3 kdeui/tests/CMakeLists.txt
M +10 -1 staging/kwidgets/src/CMakeLists.txt
R +0 -0 staging/kwidgets/src/icons/kicon.cpp [from: kdeui/icons/kicon.cpp - \
100% similarity] R +2 -2 staging/kwidgets/src/icons/kicon.h [from: \
kdeui/icons/kicon.h - 097% similarity] R +0 -0 \
staging/kwidgets/src/icons/kiconeffect.cpp [from: kdeui/icons/kiconeffect.cpp - 100% \
similarity] R +2 -2 staging/kwidgets/src/icons/kiconeffect.h [from: \
kdeui/icons/kiconeffect.h - 099% similarity] R +0 -0 \
staging/kwidgets/src/icons/kiconengine.cpp [from: kdeui/icons/kiconengine.cpp - 100% \
similarity] R +0 -0 staging/kwidgets/src/icons/kiconengine_p.h [from: \
kdeui/icons/kiconengine_p.h - 100% similarity] R +0 -0 \
staging/kwidgets/src/icons/kiconloader.cpp [from: kdeui/icons/kiconloader.cpp - 100% \
similarity] R +14 -14 staging/kwidgets/src/icons/kiconloader.h [from: \
kdeui/icons/kiconloader.h - 095% similarity] R +0 -0 \
staging/kwidgets/src/icons/kicontheme.cpp [from: kdeui/icons/kicontheme.cpp - 100% \
similarity] R +2 -2 staging/kwidgets/src/icons/kicontheme.h [from: \
kdeui/icons/kicontheme.h - 099% similarity] M +3 -0 \
staging/kwidgets/tests/CMakeLists.txt R +0 -0 \
staging/kwidgets/tests/kiconeffecttest.cpp [from: kdeui/tests/kiconeffecttest.cpp - \
100% similarity] R +0 -0 staging/kwidgets/tests/kiconeffecttest.h [from: \
kdeui/tests/kiconeffecttest.h - 100% similarity] R +0 -0 \
staging/kwidgets/tests/kiconloader_unittest.cpp [from: \
kdeui/tests/kiconloader_unittest.cpp - 100% similarity] R +0 -0 \
staging/kwidgets/tests/kiconloadertest.cpp [from: kdeui/tests/kiconloadertest.cpp - \
100% similarity]
http://commits.kde.org/kdelibs/a277b58743bd214069e68b1da48e2ef1a55d5a1d
diff --git a/kdeui/CMakeLists.txt b/kdeui/CMakeLists.txt
index dbac643..b3b06bc 100644
--- a/kdeui/CMakeLists.txt
+++ b/kdeui/CMakeLists.txt
@@ -133,11 +133,6 @@ set(kdeui_LIB_SRCS
fonts/kfontutils.cpp
icons/kiconbutton.cpp
icons/kicondialog.cpp
- icons/kiconeffect.cpp
- icons/kiconengine.cpp
- icons/kicon.cpp
- icons/kiconloader.cpp
- icons/kicontheme.cpp
icons/kiconcache.cpp
itemviews/klistwidget.cpp
itemviews/kconfigviewstatesaver.cpp
@@ -510,11 +505,7 @@ install( FILES
fonts/kfontutils.h
icons/kiconbutton.h
icons/kicondialog.h
- icons/kiconeffect.h
- icons/kicon.h
icons/k3icon_p.h # we install the private header as it is needed by kcm \
(tokoe)
- icons/kiconloader.h
- icons/kicontheme.h
icons/kiconcache.h
itemviews/kconfigviewstatesaver.h
itemviews/klistwidget.h
diff --git a/kdeui/tests/CMakeLists.txt b/kdeui/tests/CMakeLists.txt
index b93eff7..003675d 100644
--- a/kdeui/tests/CMakeLists.txt
+++ b/kdeui/tests/CMakeLists.txt
@@ -46,7 +46,6 @@ KDEUI_UNIT_TESTS(
kstandardshortcuttest
kuniqueapptest
kxmlgui_unittest
- kiconloader_unittest
ktabwidget_unittest
ktoolbar_unittest
krichtextedittest
@@ -84,9 +83,7 @@ KDEUI_EXECUTABLE_TESTS(
keditlistwidgettest
kfontdialogtest
kglobalsettingsclient # helper program for kglobalsettingstest
- kiconeffecttest
kicondialogtest
- kiconloadertest
kinputdialogtest
kjobtrackerstest
kledtest
diff --git a/staging/kwidgets/src/CMakeLists.txt \
b/staging/kwidgets/src/CMakeLists.txt index 4bba3e7..9a48b5b 100644
--- a/staging/kwidgets/src/CMakeLists.txt
+++ b/staging/kwidgets/src/CMakeLists.txt
@@ -10,13 +10,18 @@ set(kwidgets_LIB_SRCS
widgets/khbox.cpp
widgets/kvbox.cpp
dialogs/kdialog.cpp
+ icons/kicon.cpp
+ icons/kiconloader.cpp
+ icons/kicontheme.cpp
+ icons/kiconengine.cpp
+ icons/kiconeffect.cpp
)
add_library(kwidgets ${LIBRARY_TYPE} ${kwidgets_LIB_SRCS})
generate_export_header(kwidgets)
-target_link_libraries(kwidgets ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY} \
${KDEUI_EXTRA_LIBS}) +target_link_libraries(kwidgets ${KDE4_KDECORE_LIBS} \
${QT_QTGUI_LIBRARY} ${KDEUI_EXTRA_LIBS} kdeguiaddons)
install(TARGETS kwidgets EXPORT kdelibsLibraryTargets \
${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -25,6 +30,10 @@ install( FILES
widgets/khbox.h
widgets/kvbox.h
dialogs/kdialog.h
+ icons/kicon.h
+ icons/kiconloader.h
+ icons/kicontheme.h
+ icons/kiconeffect.h
DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
)
diff --git a/kdeui/icons/kicon.cpp b/staging/kwidgets/src/icons/kicon.cpp
similarity index 100%
rename from kdeui/icons/kicon.cpp
rename to staging/kwidgets/src/icons/kicon.cpp
diff --git a/kdeui/icons/kicon.h b/staging/kwidgets/src/icons/kicon.h
similarity index 97%
rename from kdeui/icons/kicon.h
rename to staging/kwidgets/src/icons/kicon.h
index 41a6213..c757807 100644
--- a/kdeui/icons/kicon.h
+++ b/staging/kwidgets/src/icons/kicon.h
@@ -19,7 +19,7 @@
#ifndef KICON_H
#define KICON_H
-#include <kdeui_export.h>
+#include <kwidgets_export.h>
#include <QIcon>
@@ -37,7 +37,7 @@ class QStringList;
*
* \author Hamish Rodda <rodda@kde.org>
*/
-class KDEUI_EXPORT KIcon : public QIcon
+class KWIDGETS_EXPORT KIcon : public QIcon
{
public:
/**
diff --git a/kdeui/icons/kiconeffect.cpp b/staging/kwidgets/src/icons/kiconeffect.cpp
similarity index 100%
rename from kdeui/icons/kiconeffect.cpp
rename to staging/kwidgets/src/icons/kiconeffect.cpp
diff --git a/kdeui/icons/kiconeffect.h b/staging/kwidgets/src/icons/kiconeffect.h
similarity index 99%
rename from kdeui/icons/kiconeffect.h
rename to staging/kwidgets/src/icons/kiconeffect.h
index 837b519..9292b47 100644
--- a/kdeui/icons/kiconeffect.h
+++ b/staging/kwidgets/src/icons/kiconeffect.h
@@ -24,7 +24,7 @@
#ifndef KICONEFFECT_H
#define KICONEFFECT_H
-#include <kdeui_export.h>
+#include <kwidgets_export.h>
#include <QImage>
#include <QPixmap>
@@ -44,7 +44,7 @@ class KIconEffectPrivate;
*
* @see KIcon
*/
-class KDEUI_EXPORT KIconEffect
+class KWIDGETS_EXPORT KIconEffect
{
public:
/**
diff --git a/kdeui/icons/kiconengine.cpp b/staging/kwidgets/src/icons/kiconengine.cpp
similarity index 100%
rename from kdeui/icons/kiconengine.cpp
rename to staging/kwidgets/src/icons/kiconengine.cpp
diff --git a/kdeui/icons/kiconengine_p.h b/staging/kwidgets/src/icons/kiconengine_p.h
similarity index 100%
rename from kdeui/icons/kiconengine_p.h
rename to staging/kwidgets/src/icons/kiconengine_p.h
diff --git a/kdeui/icons/kiconloader.cpp b/staging/kwidgets/src/icons/kiconloader.cpp
similarity index 100%
rename from kdeui/icons/kiconloader.cpp
rename to staging/kwidgets/src/icons/kiconloader.cpp
diff --git a/kdeui/icons/kiconloader.h b/staging/kwidgets/src/icons/kiconloader.h
similarity index 95%
rename from kdeui/icons/kiconloader.h
rename to staging/kwidgets/src/icons/kiconloader.h
index d990cd3..7e82113 100644
--- a/kdeui/icons/kiconloader.h
+++ b/staging/kwidgets/src/icons/kiconloader.h
@@ -27,7 +27,7 @@
#include <QtCore/QObject>
#include <kglobal.h>
-#include <kdeui_export.h>
+#include <kwidgets_export.h>
class QIcon;
class QMovie;
@@ -74,7 +74,7 @@ class KIconTheme;
* "User".
*
*/
-class KDEUI_EXPORT KIconLoader : public QObject
+class KWIDGETS_EXPORT KIconLoader : public QObject
{
Q_OBJECT
Q_ENUMS(Context)
@@ -292,7 +292,7 @@ public:
* @deprecated use KIcon instead, which uses the iconloader internally
*/
#ifndef KDE_NO_DEPRECATED
- KDEUI_DEPRECATED QIcon loadIconSet(const QString& name, KIconLoader::Group \
group, int size = 0, + KWIDGETS_DEPRECATED QIcon loadIconSet(const QString& name, \
KIconLoader::Group group, int size = 0, bool canReturnNull = false);
#endif
@@ -479,7 +479,7 @@ Q_SIGNALS:
* \relates KIconLoader
* Load a desktop icon.
*/
-KDEUI_EXPORT QPixmap DesktopIcon(const QString& name, int size=0,
+KWIDGETS_EXPORT QPixmap DesktopIcon(const QString& name, int size=0,
int state=KIconLoader::DefaultState, const QStringList& overlays \
= QStringList());
/**
@@ -488,14 +488,14 @@ KDEUI_EXPORT QPixmap DesktopIcon(const QString& name, int \
size=0,
* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) instead
*/
#ifndef KDE_NO_DEPRECATED
-KDEUI_DEPRECATED_EXPORT QIcon DesktopIconSet(const QString& name, int size=0);
+KWIDGETS_DEPRECATED_EXPORT QIcon DesktopIconSet(const QString& name, int size=0);
#endif
/**
* \relates KIconLoader
* Load a toolbar icon.
*/
-KDEUI_EXPORT QPixmap BarIcon(const QString& name, int size=0, int \
state=KIconLoader::DefaultState, +KWIDGETS_EXPORT QPixmap BarIcon(const QString& \
name, int size=0, int state=KIconLoader::DefaultState,
const QStringList& overlays = QStringList());
/**
@@ -504,14 +504,14 @@ KDEUI_EXPORT QPixmap BarIcon(const QString& name, int size=0, \
int state=KIconLoa
* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) instead
*/
#ifndef KDE_NO_DEPRECATED
-KDEUI_DEPRECATED_EXPORT QIcon BarIconSet(const QString& name, int size=0);
+KWIDGETS_DEPRECATED_EXPORT QIcon BarIconSet(const QString& name, int size=0);
#endif
/**
* \relates KIconLoader
* Load a small icon.
*/
-KDEUI_EXPORT QPixmap SmallIcon(const QString& name, int size=0,
+KWIDGETS_EXPORT QPixmap SmallIcon(const QString& name, int size=0,
int state=KIconLoader::DefaultState, const QStringList &overlays = \
QStringList());
/**
@@ -520,14 +520,14 @@ KDEUI_EXPORT QPixmap SmallIcon(const QString& name, int size=0,
* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) instead
*/
#ifndef KDE_NO_DEPRECATED
-KDEUI_DEPRECATED_EXPORT QIcon SmallIconSet(const QString& name, int size=0);
+KWIDGETS_DEPRECATED_EXPORT QIcon SmallIconSet(const QString& name, int size=0);
#endif
/**
* \relates KIconLoader
* Load a main toolbar icon.
*/
-KDEUI_EXPORT QPixmap MainBarIcon(const QString& name, int size=0,
+KWIDGETS_EXPORT QPixmap MainBarIcon(const QString& name, int size=0,
int state=KIconLoader::DefaultState, const QStringList &overlays \
= QStringList());
/**
@@ -536,14 +536,14 @@ KDEUI_EXPORT QPixmap MainBarIcon(const QString& name, int \
size=0,
* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) instead
*/
#ifndef KDE_NO_DEPRECATED
-KDEUI_DEPRECATED_EXPORT QIcon MainBarIconSet(const QString& name, int size=0);
+KWIDGETS_DEPRECATED_EXPORT QIcon MainBarIconSet(const QString& name, int size=0);
#endif
/**
* \relates KIconLoader
* Load a user icon. User icons are searched in $appdir/pics.
*/
-KDEUI_EXPORT QPixmap UserIcon(const QString& name, int \
state=KIconLoader::DefaultState, const QStringList &overlays = QStringList()); \
+KWIDGETS_EXPORT QPixmap UserIcon(const QString& name, int \
state=KIconLoader::DefaultState, const QStringList &overlays = QStringList());
/**
* \relates KIconLoader
@@ -551,14 +551,14 @@ KDEUI_EXPORT QPixmap UserIcon(const QString& name, int \
state=KIconLoader::Defaul
* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) instead
*/
#ifndef KDE_NO_DEPRECATED
-KDEUI_DEPRECATED_EXPORT QIcon UserIconSet(const QString& name);
+KWIDGETS_DEPRECATED_EXPORT QIcon UserIconSet(const QString& name);
#endif
/**
* \relates KIconLoader
* Returns the current icon size for a specific group.
*/
-KDEUI_EXPORT int IconSize(KIconLoader::Group group);
+KWIDGETS_EXPORT int IconSize(KIconLoader::Group group);
inline KIconLoader::Group& operator++(KIconLoader::Group& group) { group = \
static_cast<KIconLoader::Group>(group+1); return group; } inline KIconLoader::Group \
operator++(KIconLoader::Group& group,int) { KIconLoader::Group ret = group; ++group; \
return ret; }
diff --git a/kdeui/icons/kicontheme.cpp b/staging/kwidgets/src/icons/kicontheme.cpp
similarity index 100%
rename from kdeui/icons/kicontheme.cpp
rename to staging/kwidgets/src/icons/kicontheme.cpp
diff --git a/kdeui/icons/kicontheme.h b/staging/kwidgets/src/icons/kicontheme.h
similarity index 99%
rename from kdeui/icons/kicontheme.h
rename to staging/kwidgets/src/icons/kicontheme.h
index a4e6566..291b21b 100644
--- a/kdeui/icons/kicontheme.h
+++ b/staging/kwidgets/src/icons/kicontheme.h
@@ -23,7 +23,7 @@
#ifndef KICONTHEME_H
#define KICONTHEME_H
-#include <kdeui_export.h>
+#include <kwidgets_export.h>
#include <QtCore/QString>
#include <QtCore/QStringList>
@@ -43,7 +43,7 @@ class K3Icon;
* the KCM needs it.
* @see KIconLoader
*/
-class KDEUI_EXPORT KIconTheme
+class KWIDGETS_EXPORT KIconTheme
{
public:
/**
diff --git a/staging/kwidgets/tests/CMakeLists.txt \
b/staging/kwidgets/tests/CMakeLists.txt index ff2400c..3b083c8 100644
--- a/staging/kwidgets/tests/CMakeLists.txt
+++ b/staging/kwidgets/tests/CMakeLists.txt
@@ -25,8 +25,11 @@ ENDMACRO(KDEUI_EXECUTABLE_TESTS)
KDEUI_EXECUTABLE_TESTS(
khboxtest
kdialogtest
+ kiconloadertest
+ kiconeffecttest
)
KDEUI_UNIT_TESTS(
kdialog_unittest
+ kiconloader_unittest
)
diff --git a/kdeui/tests/kiconeffecttest.cpp \
b/staging/kwidgets/tests/kiconeffecttest.cpp similarity index 100%
rename from kdeui/tests/kiconeffecttest.cpp
rename to staging/kwidgets/tests/kiconeffecttest.cpp
diff --git a/kdeui/tests/kiconeffecttest.h b/staging/kwidgets/tests/kiconeffecttest.h
similarity index 100%
rename from kdeui/tests/kiconeffecttest.h
rename to staging/kwidgets/tests/kiconeffecttest.h
diff --git a/kdeui/tests/kiconloader_unittest.cpp \
b/staging/kwidgets/tests/kiconloader_unittest.cpp similarity index 100%
rename from kdeui/tests/kiconloader_unittest.cpp
rename to staging/kwidgets/tests/kiconloader_unittest.cpp
diff --git a/kdeui/tests/kiconloadertest.cpp \
b/staging/kwidgets/tests/kiconloadertest.cpp similarity index 100%
rename from kdeui/tests/kiconloadertest.cpp
rename to staging/kwidgets/tests/kiconloadertest.cpp
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic