Commit b97070a3 authored by Mehrdad Momeny's avatar Mehrdad Momeny

Fix includes

svn path=/trunk/playground/pim/blogilo/; revision=1026106
parent 21815ef8
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
along with this program; if not, see http://www.gnu.org/licenses/ along with this program; if not, see http://www.gnu.org/licenses/
*/ */
#include "addeditblog.h"
#include <kblog/gdata.h> #include <kblog/gdata.h>
#include <kblog/blogger1.h> #include <kblog/blogger1.h>
...@@ -36,9 +37,9 @@ ...@@ -36,9 +37,9 @@
#include "waitwidget.h" #include "waitwidget.h"
#include "bilboblog.h" #include "bilboblog.h"
#include "addeditblog.h"
#include "dbman.h" #include "dbman.h"
#include <QTableWidget> #include <QTableWidget>
#include <QTimer>
static const int TIMEOUT = 45000; static const int TIMEOUT = 45000;
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
class BilboBlog; class BilboBlog;
class BilboPost;
class BilboMedia; class BilboMedia;
// class KBlog::BlogMedia; // class KBlog::BlogMedia;
/** /**
......
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
*/ */
#include "bilboblog.h" #include "bilboblog.h"
#include <QApplication>
BilboBlog::BilboBlog( QObject *parent ) BilboBlog::BilboBlog( QObject *parent )
: QObject( parent ) : QObject( parent )
...@@ -31,8 +32,8 @@ BilboBlog::BilboBlog( QObject *parent ) ...@@ -31,8 +32,8 @@ BilboBlog::BilboBlog( QObject *parent )
setApi(BLOGGER1_API); setApi(BLOGGER1_API);
} }
BilboBlog::BilboBlog( const BilboBlog &blog, QObject *parent ) BilboBlog::BilboBlog( const BilboBlog &blog)
: QObject( parent ) : QObject( qApp )
{ {
mUrl = blog.url(); mUrl = blog.url();
mBlogUrl = blog.blogUrl(); mBlogUrl = blog.blogUrl();
......
...@@ -44,7 +44,7 @@ public: ...@@ -44,7 +44,7 @@ public:
}; };
explicit BilboBlog( QObject *parent = 0 ); explicit BilboBlog( QObject *parent = 0 );
explicit BilboBlog( const BilboBlog &, QObject *parent = 0); BilboBlog( const BilboBlog & );
~BilboBlog(); ~BilboBlog();
/** /**
......
...@@ -30,9 +30,11 @@ ...@@ -30,9 +30,11 @@
#include <KDE/KLocale> #include <KDE/KLocale>
#include <kdatetime.h> #include <kdatetime.h>
#include <kurl.h> #include <kurl.h>
#include <kmessagebox.h>
#include <kwallet.h> #include <kwallet.h>
#include <kio/deletejob.h> #include <kio/deletejob.h>
#include <QSqlError>
#include <QSqlQuery>
#include <QFile>
DBMan::DBMan() DBMan::DBMan()
{ {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#ifndef DBMAN_H #ifndef DBMAN_H
#define DBMAN_H #define DBMAN_H
#include <QtSql> #include <QSqlDatabase>
#include "bilbomedia.h" #include "bilbomedia.h"
#include "constants.h" #include "constants.h"
#include "category.h" #include "category.h"
......
...@@ -1872,7 +1872,7 @@ static void parseShorthandBackgroundProperty( const QVector<Value> &values, QBru ...@@ -1872,7 +1872,7 @@ static void parseShorthandBackgroundProperty( const QVector<Value> &values, QBru
QString *image, Repeat *repeat, Qt::Alignment *alignment ) QString *image, Repeat *repeat, Qt::Alignment *alignment )
{ {
*brush = QBrush(); *brush = QBrush();
*image = QString(); image->clear();
*repeat = Repeat_XY; *repeat = Repeat_XY;
*alignment = ( Qt::AlignTop | Qt::AlignLeft ); *alignment = ( Qt::AlignTop | Qt::AlignLeft );
...@@ -1882,7 +1882,7 @@ static void parseShorthandBackgroundProperty( const QVector<Value> &values, QBru ...@@ -1882,7 +1882,7 @@ static void parseShorthandBackgroundProperty( const QVector<Value> &values, QBru
*image = v.variant.toString(); *image = v.variant.toString();
continue; continue;
} else if (( v.type == Value::KnownIdentifier ) && ( v.variant.toInt() == Value_None ) ) { } else if (( v.type == Value::KnownIdentifier ) && ( v.variant.toInt() == Value_None ) ) {
*image = QString(); image->clear();
continue; continue;
} }
...@@ -2256,7 +2256,7 @@ QRect Declaration::rectValue() const ...@@ -2256,7 +2256,7 @@ QRect Declaration::rectValue() const
QStringList func = v.variant.toStringList(); QStringList func = v.variant.toStringList();
if (( func.count() != 2 ) || ( func.first().compare( QLatin1String( "rect" ) ) != 0 ) ) if (( func.count() != 2 ) || ( func.first().compare( QLatin1String( "rect" ) ) != 0 ) )
return QRect(); return QRect();
QStringList args = func[1].split( " ", QString::SkipEmptyParts ); QStringList args = func[1].split( ' ', QString::SkipEmptyParts );
if ( args.count() != 4 ) if ( args.count() != 4 )
return QRect(); return QRect();
return QRect( args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt() ); return QRect( args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt() );
......
...@@ -66,7 +66,7 @@ QString HtmlExporter::toHtml( const QTextDocument* document ) ...@@ -66,7 +66,7 @@ QString HtmlExporter::toHtml( const QTextDocument* document )
// emitBlock(doc->rootFrame()->begin().currentBlock()); // emitBlock(doc->rootFrame()->begin().currentBlock());
//sanitizeHtml(); //sanitizeHtml();
html.replace( QRegExp( "<br[\\s]*/>" ), "<br />\n" ); html.replace( QRegExp( "<br[\\s]*/>" ), "<br />\n" );
if ( html.endsWith( ">\n" ) ) { if ( html.endsWith( QLatin1String( ">\n") ) ) {
html.remove( html.length() - 1, 1 ); html.remove( html.length() - 1, 1 );
} }
return html; return html;
......
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
#include <KSelectAction> #include <KSelectAction>
#include <kimagefilepreview.h> #include <kimagefilepreview.h>
#include "uploadmediadialog.h" #include "uploadmediadialog.h"
#include <QTimer>
#define TIMEOUT 5000 #define TIMEOUT 5000
......
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
along with this program; if not, see http://www.gnu.org/licenses/ along with this program; if not, see http://www.gnu.org/licenses/
*/ */
#include "postentry.h"
#include <kdebug.h> #include <kdebug.h>
#include <klocalizedstring.h> #include <klocalizedstring.h>
#include <klineedit.h> #include <klineedit.h>
#include <KMessageBox> #include <KMessageBox>
#include "postentry.h"
#include "composer/bilboeditor.h" #include "composer/bilboeditor.h"
#include "bilbomedia.h" #include "bilbomedia.h"
#include "backend.h" #include "backend.h"
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "syncuploader.h" #include "syncuploader.h"
#include <QProgressBar> #include <QProgressBar>
#include <QLabel> #include <QLabel>
#include <QTimer>
#define MINUTE 60000 #define MINUTE 60000
......
...@@ -29,18 +29,17 @@ ...@@ -29,18 +29,17 @@
#include "bilbopost.h" #include "bilbopost.h"
class BilboEditor; class BilboEditor;
class QWidget;
class QGridLayout; class QGridLayout;
class QLabel; class QLabel;
class QHBoxLayout; class QHBoxLayout;
class KLineEdit; class KLineEdit;
class BilboMedia; class BilboMedia;
class QProgressBar; class QProgressBar;
class QTimer;
class Backend; class Backend;
/** /**
* Post Entry Widget Post Entry Widget
* contains Editor, and Title box. contains Editor, and Title box.
@author Mehrdad Momeny \<mehrdad.momeny@gmail.com\> @author Mehrdad Momeny \<mehrdad.momeny@gmail.com\>
@author Golnaz Nilieh \<g382nilieh@gmail.com\> @author Golnaz Nilieh \<g382nilieh@gmail.com\>
*/ */
......
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
along with this program; if not, see http://www.gnu.org/licenses/ along with this program; if not, see http://www.gnu.org/licenses/
*/ */
#include "toolbox.h"
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kdebug.h> #include <kdebug.h>
#include <kxmlguiwindow.h> #include <kxmlguiwindow.h>
...@@ -29,7 +31,6 @@ ...@@ -29,7 +31,6 @@
#include <kdatetime.h> #include <kdatetime.h>
#include <kurl.h> #include <kurl.h>
#include "toolbox.h"
#include "dbman.h" #include "dbman.h"
#include "entriescountdialog.h" #include "entriescountdialog.h"
#include "addeditblog.h" #include "addeditblog.h"
...@@ -43,6 +44,7 @@ ...@@ -43,6 +44,7 @@
#include <KToolInvocation> #include <KToolInvocation>
#include <settings.h> #include <settings.h>
#include <QClipboard> #include <QClipboard>
#include <QTimer>
Toolbox::Toolbox( QWidget *parent ) Toolbox::Toolbox( QWidget *parent )
: QWidget( parent ) : QWidget( parent )
...@@ -237,7 +239,7 @@ void Toolbox::slotPostRemoved( int blog_id, const BilboPost &post ) ...@@ -237,7 +239,7 @@ void Toolbox::slotPostRemoved( int blog_id, const BilboPost &post )
void Toolbox::slotError(const QString& errorMessage) void Toolbox::slotError(const QString& errorMessage)
{ {
KMessageBox::detailedError( this, i18n( "An error occurred on latest transaction" ), 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(); sender()->deleteLater();
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment