Fix includes

svn path=/trunk/playground/pim/blogilo/; revision=1026106

blogilo/src/addeditblog.cpp

@@ -22,6 +22,7 @@
     along with this program; if not, see http://www.gnu.org/licenses/
 */
 
+#include "addeditblog.h"
 
 #include <kblog/gdata.h>
 #include <kblog/blogger1.h>
@@ -36,9 +37,9 @@
 
 #include "waitwidget.h"
 #include "bilboblog.h"
-#include "addeditblog.h"
 #include "dbman.h"
 #include <QTableWidget>
+#include <QTimer>
 
 static const int TIMEOUT = 45000;
 

blogilo/src/backend.h

@@ -33,7 +33,6 @@
 
 
 class BilboBlog;
-class BilboPost;
 class BilboMedia;
 // class KBlog::BlogMedia;
 /**

blogilo/src/bilboblog.cpp

@@ -23,6 +23,7 @@
 */
 
 #include "bilboblog.h"
+#include <QApplication>
 
 BilboBlog::BilboBlog( QObject *parent )
         : QObject( parent )
@@ -31,8 +32,8 @@ BilboBlog::BilboBlog( QObject *parent )
     setApi(BLOGGER1_API);
 }
 
-BilboBlog::BilboBlog( const BilboBlog &blog, QObject *parent )
-        : QObject( parent )
+BilboBlog::BilboBlog( const BilboBlog &blog)
+        : QObject( qApp )
 {
     mUrl = blog.url();
     mBlogUrl = blog.blogUrl();

blogilo/src/bilboblog.h

@@ -44,7 +44,7 @@ public:
     };
 
     explicit BilboBlog( QObject *parent = 0 );
-    explicit BilboBlog( const BilboBlog &, QObject *parent = 0);
+    BilboBlog( const BilboBlog & );
     ~BilboBlog();
 
     /**

blogilo/src/dbman.cpp

@@ -30,9 +30,11 @@
 #include <KDE/KLocale>
 #include <kdatetime.h>
 #include <kurl.h>
-#include <kmessagebox.h>
 #include <kwallet.h>
 #include <kio/deletejob.h>
+#include <QSqlError>
+#include <QSqlQuery>
+#include <QFile>
 
 DBMan::DBMan()
 {

blogilo/src/dbman.h

@@ -24,7 +24,7 @@
 
 #ifndef DBMAN_H
 #define DBMAN_H
-#include <QtSql>
+#include <QSqlDatabase>
 #include "bilbomedia.h"
 #include "constants.h"
 #include "category.h"

blogilo/src/htmlconvertors/bilbocssparser.cpp

@@ -1872,7 +1872,7 @@ static void parseShorthandBackgroundProperty( const QVector<Value> &values, QBru
         QString *image, Repeat *repeat, Qt::Alignment *alignment )
 {
     *brush = QBrush();
-    *image = QString();
+    image->clear();
     *repeat = Repeat_XY;
     *alignment = ( Qt::AlignTop | Qt::AlignLeft );
 
@@ -1882,7 +1882,7 @@ static void parseShorthandBackgroundProperty( const QVector<Value> &values, QBru
             *image = v.variant.toString();
             continue;
         } else if (( v.type == Value::KnownIdentifier ) && ( v.variant.toInt() == Value_None ) ) {
-            *image = QString();
+            image->clear();
             continue;
         }
 
@@ -2256,7 +2256,7 @@ QRect Declaration::rectValue() const
     QStringList func = v.variant.toStringList();
     if (( func.count() != 2 ) || ( func.first().compare( QLatin1String( "rect" ) ) != 0 ) )
         return QRect();
-    QStringList args = func[1].split( " ", QString::SkipEmptyParts );
+    QStringList args = func[1].split( ' ', QString::SkipEmptyParts );
     if ( args.count() != 4 )
         return QRect();
     return QRect( args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt() );

blogilo/src/htmlconvertors/htmlexporter.cpp

@@ -66,7 +66,7 @@ QString HtmlExporter::toHtml( const QTextDocument* document )
 //  emitBlock(doc->rootFrame()->begin().currentBlock());
     //sanitizeHtml();
     html.replace( QRegExp( "<br[\\s]*/>" ), "<br />\n" );
-    if ( html.endsWith( ">\n" ) ) {
+    if ( html.endsWith( QLatin1String( ">\n") ) ) {
         html.remove( html.length() - 1, 1 );
     }
     return html;

blogilo/src/mainwindow.cpp

@@ -56,7 +56,7 @@
 #include <KSelectAction>
 #include <kimagefilepreview.h>
 #include "uploadmediadialog.h"
-
+#include <QTimer>
 
 #define TIMEOUT 5000
 

blogilo/src/postentry.cpp

@@ -22,11 +22,11 @@
     along with this program; if not, see http://www.gnu.org/licenses/
 */
 
+#include "postentry.h"
 #include <kdebug.h>
 #include <klocalizedstring.h>
 #include <klineedit.h>
 #include <KMessageBox>
-#include "postentry.h"
 #include "composer/bilboeditor.h"
 #include "bilbomedia.h"
 #include "backend.h"
@@ -39,6 +39,7 @@
 #include "syncuploader.h"
 #include <QProgressBar>
 #include <QLabel>
+#include <QTimer>
 
 #define MINUTE 60000
 

blogilo/src/postentry.h

@@ -29,18 +29,17 @@
 #include "bilbopost.h"
 
 class BilboEditor;
-class QWidget;
 class QGridLayout;
 class QLabel;
 class QHBoxLayout;
 class KLineEdit;
 class BilboMedia;
 class QProgressBar;
-class QTimer;
 class Backend;
+
 /**
- * Post Entry Widget
- * contains Editor, and Title box.
+  Post Entry Widget
+  contains Editor, and Title box.
  @author Mehrdad Momeny \<mehrdad.momeny@gmail.com\>
  @author Golnaz Nilieh \<g382nilieh@gmail.com\>
  */

blogilo/src/toolbox.cpp

@@ -22,6 +22,8 @@
     along with this program; if not, see http://www.gnu.org/licenses/
 */
 
+#include "toolbox.h"
+
 #include <kstatusbar.h>
 #include <kdebug.h>
 #include <kxmlguiwindow.h>
@@ -29,7 +31,6 @@
 #include <kdatetime.h>
 #include <kurl.h>
 
-#include "toolbox.h"
 #include "dbman.h"
 #include "entriescountdialog.h"
 #include "addeditblog.h"
@@ -43,6 +44,7 @@
 #include <KToolInvocation>
 #include <settings.h>
 #include <QClipboard>
+#include <QTimer>
 
 Toolbox::Toolbox( QWidget *parent )
         : QWidget( parent )
@@ -237,7 +239,7 @@ void Toolbox::slotPostRemoved( int blog_id, const BilboPost &post )
 void Toolbox::slotError(const QString& errorMessage)
 {
     KMessageBox::detailedError( this, i18n( "An error occurred on latest transaction" ), errorMessage );
-    statusbar->showMessage( i18n( "Failed" ), STATUSTIMEOUT );
+    statusbar->showMessage( i18nc( "Operation failed", "Failed" ), STATUSTIMEOUT );
     sender()->deleteLater();
 }