++compile

svn path=/trunk/KDE/kdelibs/; revision=879801

CMakeLists.txt

@@ -29,9 +29,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_SOURCE_DIR}/kdeui/windowmanagement
                     ${CMAKE_SOURCE_DIR}/kio
                     ${CMAKE_SOURCE_DIR}/kio/kio
+                    ${CMAKE_SOURCE_DIR}/knewstuff/
                     ${CMAKE_BINARY_DIR}/solid/
                     ${CMAKE_SOURCE_DIR}/solid/
-                    ${CMAKE_SOURCE_DIR}/knewstuff/
+                    ${CMAKE_SOURCE_DIR}/threadweaver/
                     ${KDE4_INCLUDES})
 if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
     include_directories(${OPENGL_INCLUDE_DIR})

runnermanager.cpp

@@ -33,11 +33,11 @@
 #include <solid/device.h>
 #include <solid/deviceinterface.h>
 
-#include <threadweaver/debuggingaids.h.h>
-#include <threadweaver/thread.h>
-#include <threadweaver/job.h>
-#include <threadweaver/queuepolicy.h>
-#include <threadweaver/weaver.h>
+#include <Weaver/DebuggingAids.h>
+#include <Weaver/Thread.h>
+#include <Weaver/Job.h>
+#include <Weaver/QueuePolicy.h>
+#include <Weaver/ThreadWeaver.h>
 
 #include "querymatch.h"
 

service.cpp

@@ -23,7 +23,7 @@
 #include <QFile>
 #include <QTimer>
 
-#include <kdebug.h.h>
+#include <kdebug.h>
 #include <kservice.h>
 #include <kservicetypetrader.h>
 #include <ksharedconfig.h>

theme.cpp

@@ -31,8 +31,8 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
+#include <kmanagerselection.h>
 #include <kpixmapcache.h>
-#include <kselectionwatcher.h>
 #include <ksharedconfig.h>
 #include <kstandarddirs.h>
 #include <kwindowsystem.h>

tooltipcontent.cpp

@@ -19,7 +19,7 @@
 
 #include "tooltipcontent.h"
 
-#include <kiconloader>
+#include <kiconloader.h>
 
 namespace Plasma
 {

view.cpp

@@ -19,7 +19,7 @@
 
 #include "view.h"
 
-#include <kglobal>
+#include <kglobal.h>
 #include <kwindowsystem.h>
 #include <kactioncollection.h>
 

widgets/checkbox.cpp

@@ -23,7 +23,7 @@
 #include <QPainter>
 #include <QDir>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"

widgets/combobox.cpp

@@ -19,13 +19,13 @@
 
 #include "combobox.h"
 
-#include <KComboBox>
 #include <QPainter>
 #include <QApplication>
 
-#include <KMimeType>
-#include <KIconEffect>
-#include <KIconLoader>
+#include <kcombobox.h>
+#include <kmimetype.h>
+#include <kiconeffect.h>
+#include <kiconloader.h>
 
 #include "theme.h"
 #include "framesvg.h"

widgets/flashinglabel.cpp

@@ -28,7 +28,7 @@
 #include <QtGui/QPixmap>
 #include <QtGui/QColor>
 
-#include <KDebug>
+#include <kdebug.h>
 
 #include <plasma/animator.h>
 

widgets/frame.cpp

@@ -27,7 +27,7 @@
 #include <QApplication>
 
 //KDE
-#include <KMimeType>
+#include <kmimetype.h>
 
 //Plasma
 #include "plasma/theme.h"

widgets/groupbox.cpp

@@ -22,7 +22,7 @@
 #include <QGroupBox>
 #include <QPainter>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"

widgets/iconwidget.cpp

@@ -40,15 +40,15 @@
 #include "effects/blur.cpp"
 #endif
 
-#include <KGlobalSettings>
-#include <KIconEffect>
-#include <KIconLoader>
-#include <KIcon>
-#include <KUrl>
-#include <KRun>
-#include <KMimeType>
-#include <KDebug>
-#include <KColorScheme>
+#include <kglobalsettings.h>
+#include <kiconeffect.h>
+#include <kiconloader.h>
+#include <kicon.h>
+#include <kurl.h>
+#include <krun.h>
+#include <kmimetype.h>
+#include <kdebug.h>
+#include <kcolorscheme.h>
 
 #include <plasma/paintutils.h>
 #include <plasma/theme.h>

widgets/label.cpp

@@ -23,7 +23,7 @@
 #include <QPainter>
 #include <QDir>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"

widgets/lineedit.cpp

@@ -19,10 +19,10 @@
 
 #include "lineedit.h"
 
-#include <KLineEdit>
 #include <QPainter>
 
-#include <KMimeType>
+#include <klineedit.h>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"

widgets/pushbutton.cpp

@@ -25,10 +25,10 @@
 #include <QDir>
 #include <QApplication>
 
-#include <KIcon>
-#include <KIconEffect>
-#include <KMimeType>
-#include <KPushButton>
+#include <kicon.h>
+#include <kiconeffect.h>
+#include <kmimetype.h>
+#include <kpushbutton.h>
 
 #include "theme.h"
 #include "svg.h"

widgets/radiobutton.cpp

@@ -23,7 +23,7 @@
 #include <QPainter>
 #include <QDir>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"

widgets/signalplotter.cpp

@@ -32,11 +32,11 @@
 #include <QtGui/QPainterPath>
 #include <QtGui/QPolygon>
 
-#include <KDebug>
-#include <KGlobal>
-#include <KLocale>
-#include <KApplication>
-#include <KStandardDirs>
+#include <kdebug.h>
+#include <kglobal.h>
+#include <klocale.h>
+#include <kapplication.h>
+#include <kstandarddirs.h>
 
 #include <plasma/svg.h>
 

widgets/slider.cpp

@@ -23,7 +23,7 @@
 #include <QPainter>
 #include <QStyleOptionSlider>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "framesvg.h"

widgets/tabbar.cpp

@@ -28,7 +28,8 @@
 #include <QIcon>
 #include <QStyleOption>
 #include <QPainter>
-#include <KDebug>
+
+#include <kdebug.h>
 
 #include <plasma/animator.h>
 

widgets/template.cpp

@@ -22,7 +22,7 @@
 #include <<Native>>
 #include <QPainter>
 
-#include <KMimeType>
+#include <kmimetype.h>
 
 #include "theme.h"
 #include "svg.h"

widgets/textedit.cpp

@@ -19,11 +19,11 @@
 
 #include "textedit.h"
 
-#include <KTextEdit>
 #include <QPainter>
 #include <QScrollBar>
 
-#include <KMimeType>
+#include <kmimetype.h>
+#include <ktextedit.h>
 
 #include "theme.h"
 #include "svg.h"

widgets/treeview.cpp

@@ -23,7 +23,7 @@
 #include <QHeaderView>
 #include <QScrollBar>
 
-#include <KIconLoader>
+#include <kiconloader.h>
 
 #include "private/style.h"
 

widgets/webview.cpp

@@ -27,7 +27,7 @@
 #include <QtWebKit/QWebFrame>
 #include <QtWebKit/QWebPage>
 
-#include <KDE/KDebug>
+#include <kdebug.h>
 
 #include "plasma/widgets/webview.h"