- name the uninstalled headers _p.h

- correct ordering of headers in many files
- remove some unneeded headers such as iostream

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=717932

appletbrowser/appletbrowserwindow.cpp

@@ -17,7 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "appletbrowserwindow.h"
+#include "appletbrowserwindow_p.h"
+
 #include <KAction>
 #include <KStandardAction>
 
@@ -96,4 +97,5 @@ void AppletBrowserWindow::buttonAddClicked() {
 
     }
 }
-#include "appletbrowserwindow.moc"
+
+#include "appletbrowserwindow_p.moc"

appletbrowser/appletbrowserwindow_p.h

@@ -22,14 +22,14 @@
 
 #include <QtGui>
 #include <QtCore>
-#include <iostream>
+
 #include "ui_appletbrowserwindowbase.h"
 
-#include "plasmaappletitemmodel.h"
-#include "kcategorizeditemsview.h"
+#include "plasmaappletitemmodel_p.h"
+#include "kcategorizeditemsview_p.h"
 
-#include "../corona.h"
-#include "../containment.h"
+#include "plasma/corona.h"
+#include "plasma/containment.h"
 
 class AppletBrowserWindow: public QDialog, public Ui::AppletBrowserWindowBase
 {

appletbrowser/appletbrowserwindowbase.ui

@@ -56,7 +56,7 @@
   <customwidget>
    <class>KCategorizedItemsView</class>
    <extends>QWidget</extends>
-   <header>appletbrowser/kcategorizeditemsview.h</header>
+   <header>appletbrowser/kcategorizeditemsview_p.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

appletbrowser/kcategorizeditemsview.cpp

@@ -17,8 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "kcategorizeditemsview.h"
-#include "kcategorizeditemsviewdelegate.h"
+#include "kcategorizeditemsview_p.h"
+#include "kcategorizeditemsviewdelegate_p.h"
 
 #include <KIcon>
 #include <KDebug>
@@ -134,5 +134,6 @@ QList < AbstractItem * > KCategorizedItemsView::selectedItems() const {
     }
     return items;
 }
-#include "kcategorizeditemsview.moc"
+
+#include "kcategorizeditemsview_p.moc"
 

appletbrowser/kcategorizeditemsview_p.h

@@ -22,8 +22,8 @@
 
 #include <QtGui>
 #include <QtCore>
-#include <iostream>
-#include "kcategorizeditemsviewmodels.h"
+
+#include "kcategorizeditemsviewmodels_p.h"
 
 #include "ui_kcategorizeditemsviewbase.h"
 

appletbrowser/kcategorizeditemsviewdelegate.cpp

@@ -17,12 +17,16 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "kcategorizeditemsviewdelegate.h"
-#include "kcategorizeditemsview.h"
-#include <KIconLoader>
-#include <QtCore>
+#include "kcategorizeditemsviewdelegate_p.h"
+
 #include <cmath>
 
+#include <QtCore>
+
+#include <KIconLoader>
+
+#include "kcategorizeditemsview_p.h"
+
 #define FAV_ICON_SIZE 24
 #define EMBLEM_ICON_SIZE 16
 #define UNIVERSAL_PADDING 6
@@ -277,5 +281,5 @@ QSize KCategorizedItemsViewFilterDelegate::sizeHint(const QStyleOptionViewItem &
     return size;
 }
 
-#include "kcategorizeditemsviewdelegate.moc"
+#include "kcategorizeditemsviewdelegate_p.moc"
 

appletbrowser/kcategorizeditemsviewdelegate_p.h

@@ -22,8 +22,10 @@
 
 #include <QtCore>
 #include <QtGui>
+
 #include <KIcon>
-#include "kcategorizeditemsviewmodels.h"
+
+#include "kcategorizeditemsviewmodels_p.h"
 
 class KCategorizedItemsView;
 

appletbrowser/kcategorizeditemsviewmodels.cpp

@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "kcategorizeditemsviewmodels.h"
+#include "kcategorizeditemsviewmodels_p.h"
 
 namespace KCategorizedItemsViewModels {
 

appletbrowser/plasmaappletitemmodel.cpp

@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include "plasmaappletitemmodel.h"
+#include "plasmaappletitemmodel_p.h"
 
 PlasmaAppletItem::PlasmaAppletItem(QObject * parent, QString name,
         QString pluginName, QString description, QString category, QIcon icon,

appletbrowser/plasmaappletitemmodel_p.h

@@ -20,9 +20,11 @@
 #ifndef PLASMAAPPLETSMODEL_H_
 #define PLASMAAPPLETSMODEL_H_
 
-#include <plasma/applet.h>
 #include <KPluginInfo>
-#include "kcategorizeditemsview.h"
+
+#include <plasma/applet.h>
+
+#include "kcategorizeditemsview_p.h"
 
 /**
  * Implementation of the KCategorizedItemsViewModels::AbstractItem