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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma
From:       Matt Williams <matt () milliams ! com>
Date:       2007-05-30 16:47:46
Message-ID: 1180543666.922733.9418.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 669864 by milliams:

EBN Krazy header fixes

 M  +2 -2      applets/cia.vc/ciavc.h  
 M  +2 -2      engines/cia.vc/ciavc.cpp  
 M  +2 -2      lib/applet.cpp  
 M  +1 -3      lib/dataenginemanager.h  
 M  +2 -1      lib/widgets/icon.cpp  
 M  +2 -1      lib/widgets/widget.cpp  
 M  +0 -1      plasma/controlbox.cpp  
 M  +1 -0      plasma/controlbox.h  
 M  +2 -2      plasma/corona.cpp  
 M  +2 -2      plasma/plasmaapp.cpp  
 M  +2 -1      plasma/rootwidget.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/cia.vc/ciavc.h #669863:669864
@@ -38,7 +38,7 @@
 #include <dataengine.h>
 
 class QTimer;
-class QDialog;
+class KDialog;
 class QCheckBox;
 
 namespace Plasma
@@ -59,11 +59,11 @@
 
     public slots:
         void configureDialog();
-        void acceptedConfigDialog();
 
     private slots:
         void sourceAdded(const QString& source);
         void sourceRemoved(const QString& source);
+        void acceptedConfigDialog();
 
     private:
         Plasma::VBoxLayout* m_layout;
--- trunk/KDE/kdebase/workspace/plasma/engines/cia.vc/ciavc.cpp #669863:669864
@@ -16,6 +16,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include "ciavc.h"
+
 #include <QDateTime>
 #include <QTimer>
 
@@ -24,8 +26,6 @@
 
 #include <syndication/item.h>
 
-#include "ciavc.h"
-
 CiaVcEngine::CiaVcEngine(QObject* parent, const QStringList& args)
     : Plasma::DataEngine(parent)
 {
--- trunk/KDE/kdebase/workspace/plasma/lib/applet.cpp #669863:669864
@@ -16,6 +16,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include "applet.h"
+
 #include <QEvent>
 #include <QList>
 #include <QSize>
@@ -26,8 +28,6 @@
 #include <KStandardDirs>
 #include <KService>
 #include <KServiceTypeTrader>
-
-#include "applet.h"
 #include "dataenginemanager.h"
 
 namespace Plasma
--- trunk/KDE/kdebase/workspace/plasma/lib/dataenginemanager.h #669863:669864
@@ -19,7 +19,7 @@
 #ifndef PLASMA_ENGINE_MANAGER_H
 #define PLASMA_ENGINE_MANAGER_H
 
-#include <QHash>
+#include <QtCore/QHash>
 #include "dataengine.h"
 
 namespace Plasma
@@ -77,8 +77,6 @@
         static QStringList knownEngines();
 
     private:
-        DataEngine::Dict m_engines;
-
         class Private;
         Private* const d;
 };
--- trunk/KDE/kdebase/workspace/plasma/lib/widgets/icon.cpp #669863:669864
@@ -16,6 +16,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include "icon.h"
+
 #include <QPainter>
 #include <QGraphicsSceneMouseEvent>
 
@@ -23,7 +25,6 @@
 #include <KDebug>
 
 #include "svg.h"
-#include "icon.h"
 
 namespace Plasma
 {
--- trunk/KDE/kdebase/workspace/plasma/lib/widgets/widget.cpp #669863:669864
@@ -18,10 +18,11 @@
  */
 
 
+#include "widget.h"
+
 #include <QtCore/QList>
 
 #include "layout.h"
-#include "widget.h"
 
 namespace Plasma
 {
--- trunk/KDE/kdebase/workspace/plasma/plasma/controlbox.cpp #669863:669864
@@ -27,7 +27,6 @@
 #include <QtGui/QVBoxLayout>
 #include <QtCore/QTimeLine>
 #include <QtCore/QTimer>
-#include <QtGui/QListView>
 #include <QtGui/QStandardItemModel>
 #include <QtCore/QStringList>
 #include <KLocale>
--- trunk/KDE/kdebase/workspace/plasma/plasma/controlbox.h #669863:669864
@@ -33,6 +33,7 @@
 
 /**
  * @short The Desktop configuration widget
+ * Just add one of these to the Corona and you've got an instant config box.
  */
 class ControlBox : public QWidget
 {
--- trunk/KDE/kdebase/workspace/plasma/plasma/corona.cpp #669863:669864
@@ -17,6 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include "corona.h"
+
 #include <QGraphicsView>
 #include <QGraphicsScene>
 #include <QVBoxLayout>
@@ -38,8 +40,6 @@
 #include "dataengine.h"
 #include "svg.h"
 #include "widgets/vboxlayout.h"
-
-#include "corona.h"
 #include "plasmaapp.h"
 
 using namespace Plasma;
--- trunk/KDE/kdebase/workspace/plasma/plasma/plasmaapp.cpp #669863:669864
@@ -21,6 +21,8 @@
 // LineGraph graph
 // plasma.connect(graph, "hardware", "cpu");
 
+#include "plasmaapp.h"
+
 #include <unistd.h>
 
 #include <QTimer>
@@ -29,8 +31,6 @@
 #include <KCrash>
 #include <KCmdLineArgs>
 #include <ksmserver_interface.h>
-
-#include "plasmaapp.h"
 #include "rootwidget.h"
 
 PlasmaApp* PlasmaApp::self()
--- trunk/KDE/kdebase/workspace/plasma/plasma/rootwidget.cpp #669863:669864
@@ -17,6 +17,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+#include "rootwidget.h"
+
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QVBoxLayout>
@@ -26,7 +28,6 @@
 #include "svg.h"
 #include "corona.h"
 #include "controlbox.h"
-#include "rootwidget.h"
 
 RootWidget::RootWidget()
     : QWidget(0, Qt::FramelessWindowHint)
[prev in list] [next in list] [prev in thread] [next in thread]