From kde-commits  Fri Jan 28 15:57:36 2011
From: Alex Fiestas <alex () eyeos ! org>
Date: Fri, 28 Jan 2011 15:57:36 +0000
To: kde-commits
Subject: =?utf-8?q?=5Bkamoso=5D_src=3A_Local=3C--=3EQt=3C--=3EKDE_include?=
Message-Id: <20110128155736.0BA46A60AE () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129623032403362

Git commit 02eceb93b8da8d2c29534dee83720ade93a4600c by Alex Fiestas.
Pushed by afiestas into branch 'master'.

Local<-->Qt<-->KDE includes

M  +29   -27   src/kamoso.cpp     

http://commits.kde.org/97ab38d2/02eceb93b8da8d2c29534dee83720ade93a4600c

diff --git a/src/kamoso.cpp b/src/kamoso.cpp
index 3684644..a67bf75 100644
--- a/src/kamoso.cpp
+++ b/src/kamoso.cpp
@@ -19,11 +19,37 @@
 
 #include "kamoso.h"
 #include "config-nepomuk.h"
+#include "thumbnailview.h"
+#include "whitewidget.h"
+#include "webcamwidget.h"
+#include "countdownwidget.h"
+#include "settings.h"
+#include "ui_generalConfig.h"
+#include "ui_pictureConfig.h"
+#include "ui_mainWidget.h"
+#include "ui_videoConfig.h"
+#include "whitewidgetmanager.h"
+#include "devicemanager.h"
+#include "kipiinterface.h"
+#include "kamosoplugin.h"
+#include "kamosojobtracker.h"
+#include "photoshootmode.h"
+#include "videoshootmode.h"
+#include "burstshootmode.h"
+#include "kipiaction.h"
+#include "webcamdialog.h"
+#include "pagewebcamconfigmanager.h"
+#if KDE_IS_VERSION(4,5,85)
+    #include "brightness_interface.h"
+#else
+    #include <solid/control/powermanager.h>
+#endif
 
 #include <QLayout>
 #include <QPushButton>
 #include <QToolButton>
 #include <QScrollBar>
+
 #include <KMenu>
 #include <KActionCollection>
 #include <KApplication>
@@ -40,11 +66,9 @@
 #include <KIO/NetAccess>
 #include <Phonon/MediaObject>
 #include <kdeversion.h>
-#if KDE_IS_VERSION(4,5,85)
-    #include "brightness_interface.h"
-#else
-    #include <solid/control/powermanager.h>
-#endif
+#include <KDirModel>
+#include <kio/copyjob.h>
+
 #ifdef HAVE_NEPOMUK
     #include <Nepomuk/ResourceManager>
     #include <Nepomuk/Resource>
@@ -53,29 +77,7 @@
 
 #include <libkipi/plugin.h>
 #include <libkipi/pluginloader.h>
-#include "thumbnailview.h"
-#include "whitewidget.h"
-#include "webcamwidget.h"
-#include "countdownwidget.h"
-#include "settings.h"
-#include "ui_generalConfig.h"
-#include "ui_pictureConfig.h"
-#include "ui_mainWidget.h"
-#include "ui_videoConfig.h"
-#include "whitewidgetmanager.h"
-#include "devicemanager.h"
-#include "kipiinterface.h"
-#include "kamosoplugin.h"
-#include "kamosojobtracker.h"
-#include "photoshootmode.h"
-#include "videoshootmode.h"
-#include "burstshootmode.h"
-#include "kipiaction.h"
 #include <KPluginInfo>
-#include "webcamdialog.h"
-#include "pagewebcamconfigmanager.h"
-#include <KDirModel>
-#include <kio/copyjob.h>
 
 const int max_exponential_value = 50;
 const int exponential_increment = 5;