Merge remote-tracking branch 'origin/frameworks' into frameworks

CMakeLists.txt

@@ -27,6 +27,7 @@ endif(NOT Q_WS_X11)
 
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ${CMAKE_CURRENT_BINARY_DIR}
                     ${KDE4_KDECORE_INCLUDES}
                     ${KDE4_KDEUI_INCLUDES}
                     ${CMAKE_SOURCE_DIR}/experimental/libkdeclarative
@@ -325,6 +326,7 @@ install(TARGETS plasma EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_AR
 install(TARGETS plasmaqgv EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ########### install files ###############
+generate_export_header(plasma)
 
 set(plasma_LIB_INCLUDES
     abstractdialogmanager.h
@@ -349,7 +351,7 @@ set(plasma_LIB_INCLUDES
     package.h
     packagestructure.h
     plasma.h
-    plasma_export.h
+    ${CMAKE_CURRENT_BINARY_DIR}/plasma_export.h
     popupapplet.h
     querymatch.h
     remote/accessappletjob.h

abstracttoolbox.cpp

@@ -19,6 +19,8 @@
 
 #include "abstracttoolbox.h"
 
+#include <QCoreApplication>
+
 #include "containment.h"
 
 #include <kservicetypetrader.h>
@@ -78,7 +80,7 @@ KPluginInfo::List AbstractToolBox::listToolBoxInfo(const QString
 {
     KPluginInfo::List list;
 
-    if (parentApp.isEmpty() || parentApp == KGlobal::mainComponent().componentName()) {
+    if (parentApp.isEmpty() || parentApp == QCoreApplication::instance()->applicationName()) {
         list = KPluginInfo::List();
     }
 

applet.cpp

@@ -51,7 +51,7 @@
 
 #include <kaction.h>
 #include <kactioncollection.h>
-#include <kauthorized.h>
+#include <kcoreauthorized.h>
 #include <kcolorscheme.h>
 #include <kdialog.h>
 #include <kdesktopfile.h>

containment.cpp

@@ -37,7 +37,7 @@
 #include <qtemporaryfile.h>
 
 #include <kaction.h>
-#include <kauthorized.h>
+#include <kcoreauthorized.h>
 #include <kmenu.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>

coronabase.cpp

@@ -35,7 +35,6 @@
 
 #include <kaction.h>
 #include <kdebug.h>
-#include <kglobal.h>
 #include <klocalizedstring.h>
 #include <kmimetype.h>
 #include <kshortcutsdialog.h>
@@ -91,7 +90,7 @@ void CoronaBase::setDefaultContainmentPlugin(const QString &name)
 {
     // we could check if it is in:
     // Containment::listContainments().contains(name) ||
-    // Containment::listContainments(QString(), KGlobal::mainComponent().componentName()).contains(name)
+    // Containment::listContainments(QString(), QCoreApplication::instance()->applicationName()).contains(name)
     // but that seems like overkill
     d->defaultContainmentPlugin = name;
 }
@@ -454,7 +453,7 @@ CoronaBasePrivate::CoronaBasePrivate(CoronaBase *corona)
       actions(corona)
 {
     if (KGlobal::hasMainComponent()) {
-        configName = KGlobal::mainComponent().componentName() + "-appletsrc";
+        configName = QCoreApplication::instance()->applicationName() + "-appletsrc";
     } else {
         configName = "plasma-appletsrc";
     }

plasma_export.h

@@ -1,43 +0,0 @@
-/*  This file is part of the KDE project
-    Copyright 2007 Aaron Seigo <aseigo@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef PLASMA_EXPORT_H
-#define PLASMA_EXPORT_H
-
-/* needed for KDE_EXPORT and KDE_IMPORT macros */
-#include <kdemacros.h>
-
-#ifndef PLASMA_EXPORT
-# if defined(KDELIBS_STATIC_LIBS)
-   /* No export/import for static libraries */
-#  define PLASMA_EXPORT
-# elif defined(MAKE_PLASMA_LIB)
-   /* We are building this library */
-#  define PLASMA_EXPORT KDE_EXPORT
-# else
-   /* We are using this library */
-#  define PLASMA_EXPORT KDE_IMPORT
-# endif
-#endif
-
-# ifndef PLASMA_EXPORT_DEPRECATED
-#  define PLASMA_EXPORT_DEPRECATED KDE_DEPRECATED PLASMA_EXPORT
-# endif
-
-#endif

pluginloader.cpp

@@ -20,7 +20,6 @@
 #include "pluginloader.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
 #include <kservice.h>
 #include <kservicetypetrader.h>
 #include <kstandarddirs.h>
@@ -401,7 +400,7 @@ KPluginInfo::List PluginLoader::listAppletInfo(const QString &category, const QS
 {
     KPluginInfo::List list;
 
-    if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == KGlobal::mainComponent().componentName())) {
+    if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == QCoreApplication::instance()->applicationName())) {
         list = internalAppletInfo(category);
     }
 
@@ -435,7 +434,7 @@ KPluginInfo::List PluginLoader::listDataEngineInfo(const QString &parentApp)
 {
     KPluginInfo::List list;
 
-    if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == KGlobal::mainComponent().componentName())) {
+    if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == QCoreApplication::instance()->applicationName())) {
         list = internalDataEngineInfo();
     }
 
@@ -454,7 +453,7 @@ KPluginInfo::List PluginLoader::listRunnerInfo(const QString &parentApp)
 {
     KPluginInfo::List list;
 
-    if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == KGlobal::mainComponent().componentName())) {
+    if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == QCoreApplication::instance()->applicationName())) {
         list = internalRunnerInfo();
     }
 
@@ -473,7 +472,7 @@ KPluginInfo::List PluginLoader::listContainmentActionsInfo(const QString &parent
 {
     KPluginInfo::List list;
 
-    if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == KGlobal::mainComponent().componentName())) {
+    if (!d->isDefaultLoader && (parentApp.isEmpty() || parentApp == QCoreApplication::instance()->applicationName())) {
         list = internalContainmentActionsInfo();
     }
 

widgets/lineedit.h

@@ -86,7 +86,7 @@ public:
      * @deprecated use LineEdit::setPlaceholderText instead
      */
 #ifndef KDE_NO_DEPRECATED
-    void KDE_DEPRECATED setClickMessage(const QString &message);
+    void PLASMA_DEPRECATED setClickMessage(const QString &message);
 #endif
 
     /**
@@ -95,7 +95,7 @@ public:
      * @deprecated use LineEdit::placeholderText instead
      */
 #ifndef KDE_NO_DEPRECATED
-    QString KDE_DEPRECATED clickMessage() const;
+    QString PLASMA_DEPRECATED clickMessage() const;
 #endif
 
     /**