generic: adjust to Katie changes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/filelight/src/part/radialMap/map.cpp b/filelight/src/part/radialMap/map.cpp
index 9661a6d..0753bca 100644 (file)
--- a/filelight/src/part/radialMap/map.cpp
+++ b/filelight/src/part/radialMap/map.cpp
@@ -24,6 +24,7 @@
 #include <QtGui/QFont>           //ctor
 #include <QtGui/QFontMetrics>    //ctor
 #include <QtGui/QPainter>
+#include <QtGui/QPen>
 
 #include <KCursor>         //make()
 #include <KDebug>

diff --git a/gwenview/app/sidebar.cpp b/gwenview/app/sidebar.cpp
index b885db1..84767a9 100644 (file)
--- a/gwenview/app/sidebar.cpp
+++ b/gwenview/app/sidebar.cpp
@@ -25,11 +25,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <QLabel>
 #include <QPainter>
 #include <QStyle>
-#include <QtGui/qstyleoption.h>
+#include <QStyleOption>
 #include <QStylePainter>
 #include <QTabBar>
 #include <QToolButton>
 #include <QVBoxLayout>
+#include <QPen>
 
 // KDE
 #include <KDebug>

diff --git a/gwenview/lib/thumbnailview/dragpixmapgenerator.cpp b/gwenview/lib/thumbnailview/dragpixmapgenerator.cpp
index c69576b..359bb15 100644 (file)
--- a/gwenview/lib/thumbnailview/dragpixmapgenerator.cpp
+++ b/gwenview/lib/thumbnailview/dragpixmapgenerator.cpp
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA
 #include <QPainter>
 #include <QPalette>
 #include <QPixmap>
+#include <QFontMetrics>
 #include <qmath.h>
 
 namespace Gwenview

diff --git a/kcalc/kcalc_bitset.cpp b/kcalc/kcalc_bitset.cpp
index 1bb3d37..f3b292c 100644 (file)
--- a/kcalc/kcalc_bitset.cpp
+++ b/kcalc/kcalc_bitset.cpp
@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPainter>
+#include <QPen>
 
 #include "moc_kcalc_bitset.cpp"
 

diff --git a/kcron/src/crontabPrinter.cpp b/kcron/src/crontabPrinter.cpp
index e70a467..4c3ed88 100644 (file)
--- a/kcron/src/crontabPrinter.cpp
+++ b/kcron/src/crontabPrinter.cpp
@@ -14,6 +14,7 @@
 
 #include <QPainter>
 #include <QPrintDialog>
+#include <QPen>
 
 #include <kdeprintdialog.h>
 #include <klocale.h>

diff --git a/kdeplasma-addons/applets/lancelot/application/LancelotWindow.h b/kdeplasma-addons/applets/lancelot/application/LancelotWindow.h
index e31d768..5fefac5 100644 (file)
--- a/kdeplasma-addons/applets/lancelot/application/LancelotWindow.h
+++ b/kdeplasma-addons/applets/lancelot/application/LancelotWindow.h
@@ -49,7 +49,7 @@ namespace Plasma
     class LineEdit;
 }
 
-class LancelotWindow: public QGraphicsView, public Ui_LancelotWindowBase
+class LancelotWindow: public QGraphicsView, public LUi::LancelotWindowBase
 {
     Q_OBJECT
 public:

diff --git a/kdeplasma-addons/applets/lancelot/application/ui_LancelotWindowBase.h b/kdeplasma-addons/applets/lancelot/application/ui_LancelotWindowBase.h
index f828912..b85791c 100644 (file)
--- a/kdeplasma-addons/applets/lancelot/application/ui_LancelotWindowBase.h
+++ b/kdeplasma-addons/applets/lancelot/application/ui_LancelotWindowBase.h
@@ -8,19 +8,19 @@
 
 /* Includes */
 
-#include<QSize>
+#include <QSize>
 #include <lancelot/layouts/NodeLayout.h>
 #include <lancelot/layouts/CardLayout.h>
-#include<QIcon>
-#include<lancelot/widgets/Panel.h>
-#include<lancelot/widgets/ExtenderButton.h>
-#include<lancelot/widgets/TabBar.h>
-#include<QString>
-#include<lancelot/lancelot.h>
+#include <QIcon>
+#include <lancelot/widgets/Panel.h>
+#include <lancelot/widgets/ExtenderButton.h>
+#include <lancelot/widgets/TabBar.h>
+#include <QString>
+#include <lancelot/lancelot.h>
 #include <lancelot/layouts/FlipLayout.h>
-#include<lancelot/widgets/ActionListView.h>
+#include <lancelot/widgets/ActionListView.h>
 #include <lancelot/layouts/FullBorderLayout.h>
-#include<lancelot/widgets/PassagewayView.h>
+#include <lancelot/widgets/PassagewayView.h>
 
 /* Defines */
 #define SYSTEM_HEIGHT 28
@@ -29,7 +29,7 @@
 #define SECTIONS_WIDTH 128
 
 
-namespace Ui {
+namespace LUi {
 
 class LancelotWindowBase
 {