[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] blogilo/src: Clean up
From: Montel Laurent <montel () kde ! org>
Date: 2013-01-31 20:35:28
Message-ID: 20130131203528.49275A60C8 () git ! kde ! org
[Download RAW message or body]
Git commit d0c301c110369d44479d4327a9fcd5bddc7a4b87 by Montel Laurent.
Committed on 31/01/2013 at 21:35.
Pushed by mlaurent into branch 'master'.
Clean up
M +11 -10 blogilo/src/backend.cpp
M +40 -42 blogilo/src/composer/dialogs/addmediadialog.cpp
M +7 -5 blogilo/src/composer/dialogs/addmediadialog.h
M +1 -1 blogilo/src/composer/htmleditor.h
M +0 -1 blogilo/src/main.cpp
M +2 -4 blogilo/src/postentry.cpp
M +8 -10 blogilo/src/sendtoblogdialog.cpp
M +2 -1 blogilo/src/titlelineedit.cpp
M +2 -2 blogilo/src/titlelineedit.h
M +0 -13 blogilo/src/toolbox.cpp
M +0 -1 blogilo/src/toolbox.h
http://commits.kde.org/kdepim/d0c301c110369d44479d4327a9fcd5bddc7a4b87
diff --git a/blogilo/src/backend.cpp b/blogilo/src/backend.cpp
index 6fe2b85..239be22 100644
--- a/blogilo/src/backend.cpp
+++ b/blogilo/src/backend.cpp
@@ -103,15 +103,16 @@ void Backend::categoriesListed( const QList< QMap < QString , \
QString > > & cate kDebug() << "Blog Id: " << d->bBlog->id();
DBMan::self()->clearCategories( d->bBlog->id() );
- for ( int i = 0; i < categories.count(); ++i ) {
+ const int categoriesCount(categories.count());
+ for ( int i = 0; i < categoriesCount; ++i ) {
const QMap<QString, QString> &category = categories.at( i );
- const QString name = category.value( "name", QString() );
- const QString description = category.value( "description", QString() );
- const QString htmlUrl = category.value( "htmlUrl", QString() );
- const QString rssUrl = category.value( "rssUrl", QString() );
- QString categoryId = category.value( "categoryId", QString() );
- const QString parentId = category.value( "parentId", QString() );
+ const QString name = category.value( QLatin1String("name"), QString() );
+ const QString description = category.value( QLatin1String("description"), \
QString() ); + const QString htmlUrl = category.value( \
QLatin1String("htmlUrl"), QString() ); + const QString rssUrl = \
category.value( QLatin1String("rssUrl"), QString() ); + QString categoryId = \
category.value( QLatin1String("categoryId"), QString() ); + const QString \
parentId = category.value( QLatin1String("parentId"), QString() );
if(categoryId.isEmpty()) {
categoryId = QString::number(i);
@@ -137,10 +138,10 @@ void Backend::entriesListed( const QList< KBlog::BlogPost > & \
posts ) // DBMan::self()->clearPosts( d->bBlog->id() );
for ( int i = 0; i < posts.count(); i++ ) {
- BilboPost tempPost( posts[i] );
+ BilboPost tempPost( posts.at(i) );
if(Settings::changeNToBreak()) {
- tempPost.setContent( tempPost.content().replace( '\n', "<br/>" ) );
- tempPost.setAdditionalContent( tempPost.additionalContent().replace( \
'\n', "<br/>" ) ); + tempPost.setContent( tempPost.content().replace( \
QLatin1Char('\n'), QLatin1String("<br/>") ) ); + \
tempPost.setAdditionalContent( tempPost.additionalContent().replace( \
QLatin1Char('\n'), QLatin1String("<br/>") ) ); }
DBMan::self()->addPost( tempPost, d->bBlog->id() );
}
diff --git a/blogilo/src/composer/dialogs/addmediadialog.cpp \
b/blogilo/src/composer/dialogs/addmediadialog.cpp index 6a93873..7a2d215 100644
--- a/blogilo/src/composer/dialogs/addmediadialog.cpp
+++ b/blogilo/src/composer/dialogs/addmediadialog.cpp
@@ -39,7 +39,8 @@
#include "bilbomedia.h"
#include "settings.h"
-AddMediaDialog::AddMediaDialog( QWidget *parent ) : KDialog( parent )
+AddMediaDialog::AddMediaDialog( QWidget *parent )
+ : KDialog( parent )
{
QWidget *dialog = new QWidget( this );
ui.setupUi( dialog );
@@ -51,6 +52,7 @@ AddMediaDialog::AddMediaDialog( QWidget *parent ) : KDialog( parent \
) connect( ui.radiobtnLocalUrl, SIGNAL(toggled(bool)),
ui.urlReqBrowse, SLOT(setEnabled(bool)) );
connect( ui.urlReqBrowse, SIGNAL(clicked(bool)), SLOT(slotSelectLocalFile()) );
+ connect( this, SIGNAL(okClicked()),SLOT(slotOkClicked()));
ui.urlReqLineEdit->setFocus();
ui.urlReqLineEdit->setToolTip( i18n( "Type media path here." ) );
ui.urlReqBrowse->setToolTip( i18n( "Browse" ) );
@@ -74,51 +76,47 @@ void AddMediaDialog::slotSelectLocalFile()
ui.urlReqLineEdit->setText(path);
}
-void AddMediaDialog::slotButtonClicked(int button)
+void AddMediaDialog::slotOkClicked()
{
- if(button == KDialog::Ok){
- KUrl mediaUrl( ui.urlReqLineEdit->text() );
- kDebug() << "parent ok";
- if ( !mediaUrl.isEmpty() ) {
- if ( mediaUrl.isValid() ) {
- media = new BilboMedia();
- QString name = mediaUrl.fileName();
-
- media->setName( name );
-
- if ( !mediaUrl.isLocalFile() ) {
- media->setRemoteUrl( mediaUrl.url() );
- media->setUploaded( true );
-
- KIO::MimetypeJob* typeJob = KIO::mimetype( mediaUrl, \
KIO::HideProgressInfo );
-
- connect( typeJob, SIGNAL(mimetype(KIO::Job*,QString)),
- this, SLOT(slotRemoteFileTypeFound(KIO::Job*,QString)) \
);
-
-// addOtherMediaAttributes();
-
- } else {
- media->setLocalUrl( mediaUrl.toLocalFile() );
- media->setRemoteUrl( mediaUrl.url() );
- media->setUploaded( false );
-
- KMimeType::Ptr typePtr;
- typePtr = KMimeType::findByUrl( mediaUrl, 0, true, false );
- name = typePtr.data()->name();
- kDebug() << name ;
- media->setMimeType( name );
-// Q_EMIT sigMediaTypeFound( media );
-
-// addOtherMediaAttributes();
- }
- _selectedMedia["url"] = media->remoteUrl().url();
- accept();
+ KUrl mediaUrl( ui.urlReqLineEdit->text() );
+ kDebug() << "parent ok";
+ if ( !mediaUrl.isEmpty() ) {
+ if ( mediaUrl.isValid() ) {
+ media = new BilboMedia();
+ QString name = mediaUrl.fileName();
+
+ media->setName( name );
+
+ if ( !mediaUrl.isLocalFile() ) {
+ media->setRemoteUrl( mediaUrl.url() );
+ media->setUploaded( true );
+
+ KIO::MimetypeJob* typeJob = KIO::mimetype( mediaUrl, \
KIO::HideProgressInfo ); +
+ connect( typeJob, SIGNAL(mimetype(KIO::Job*,QString)),
+ this, SLOT(slotRemoteFileTypeFound(KIO::Job*,QString)) );
+
+ // addOtherMediaAttributes();
+
} else {
- KMessageBox::error( this, i18n( "The selected media address is an \
invalid URL." ) ); + media->setLocalUrl( mediaUrl.toLocalFile() );
+ media->setRemoteUrl( mediaUrl.url() );
+ media->setUploaded( false );
+
+ KMimeType::Ptr typePtr;
+ typePtr = KMimeType::findByUrl( mediaUrl, 0, true, false );
+ name = typePtr.data()->name();
+ kDebug() << name ;
+ media->setMimeType( name );
+ // Q_EMIT sigMediaTypeFound( media );
+
+ // addOtherMediaAttributes();
}
+ _selectedMedia["url"] = media->remoteUrl().url();
+ accept();
+ } else {
+ KMessageBox::error( this, i18n( "The selected media address is an \
invalid URL." ) ); }
- } else {
- KDialog::slotButtonClicked(button);
}
}
QMap< QString, QString > AddMediaDialog::selectedMediaProperties() const
diff --git a/blogilo/src/composer/dialogs/addmediadialog.h \
b/blogilo/src/composer/dialogs/addmediadialog.h index 88c6202..dae0bda 100644
--- a/blogilo/src/composer/dialogs/addmediadialog.h
+++ b/blogilo/src/composer/dialogs/addmediadialog.h
@@ -57,15 +57,17 @@ public:
BilboMedia *selectedMedia() const;
QMap<QString, QString> selectedMediaProperties() const;
-protected:
+private Q_SLOTS:
+ void slotSelectLocalFile();
+ void slotRemoteFileTypeFound( KIO::Job *job, const QString &type );
+ void slotOkClicked();
+
+
+private:
QMap<QString, QString> _selectedMedia;
Ui::AddMediaDialogBase ui;
BilboMedia *media;
-protected Q_SLOTS:
- void slotButtonClicked(int button);
- void slotSelectLocalFile();
- void slotRemoteFileTypeFound( KIO::Job *job, const QString &type );
};
#endif
diff --git a/blogilo/src/composer/htmleditor.h b/blogilo/src/composer/htmleditor.h
index 914affe..3f6f962 100644
--- a/blogilo/src/composer/htmleditor.h
+++ b/blogilo/src/composer/htmleditor.h
@@ -50,7 +50,7 @@ public:
QWidget* configPage( int number, QWidget* parent);
-private slots:
+private Q_SLOTS:
void toggleWordWrap();
void toggleLineNumber();
diff --git a/blogilo/src/main.cpp b/blogilo/src/main.cpp
index 8ed5200..2cb2f1d 100644
--- a/blogilo/src/main.cpp
+++ b/blogilo/src/main.cpp
@@ -54,7 +54,6 @@ int main( int argc, char *argv[] )
global_init();
MainWindow *bilbo = new MainWindow;
-// bilbo->setAttribute(Qt::WA_DeleteOnClose, false);
bilbo->show();
int r = app.exec();
diff --git a/blogilo/src/postentry.cpp b/blogilo/src/postentry.cpp
index a457c54..6944da2 100644
--- a/blogilo/src/postentry.cpp
+++ b/blogilo/src/postentry.cpp
@@ -138,13 +138,12 @@ void PostEntry::createUi()
/// WYSIWYG Editor:
BlogiloComposerView *view = new BlogiloComposerView(this);
d->wysiwygEditor = new BlogiloComposerEditor(view,d->tabVisual);
- //d->wysiwygEditor = new TextEditor( d->tabVisual );
QVBoxLayout *vLayout = new QVBoxLayout( d->tabVisual );
vLayout->addWidget( d->wysiwygEditor );
///htmlEditor:
d->htmlEditor = HtmlEditor::self()->createView( d->tabHtml );
- QGridLayout *hLayout = new QGridLayout( d->tabHtml );
+ QGridLayout *hLayout = new QGridLayout;( d->tabHtml );
hLayout->addWidget( d->htmlEditor );
///previewer:
@@ -152,8 +151,7 @@ void PostEntry::createUi()
QGridLayout *gLayout = new QGridLayout( d->tabPreview );
gLayout->addWidget( d->previewer );
- connect( d->previewer, SIGNAL(sigSetBlogStyle()), this, SLOT(
- slotSetPostPreview() ) );
+ connect( d->previewer, SIGNAL(sigSetBlogStyle()), this, \
SLOT(slotSetPostPreview()) );
d->tabWidget->setCurrentIndex( 0 );
diff --git a/blogilo/src/sendtoblogdialog.cpp b/blogilo/src/sendtoblogdialog.cpp
index 95dc919..b41cca2 100644
--- a/blogilo/src/sendtoblogdialog.cpp
+++ b/blogilo/src/sendtoblogdialog.cpp
@@ -29,6 +29,12 @@
class SendToBlogDialog::Private
{
public:
+ Private()
+ : mIsPrivate(false),
+ mIsNew(false)
+ {
+ }
+
Ui::SendToBlogBase ui;
bool mIsPrivate;
bool mIsNew;
@@ -71,16 +77,8 @@ bool SendToBlogDialog::isNew() const
void SendToBlogDialog::accept()
{
- if(d->ui.saveDraft->isChecked()) {
- d->mIsPrivate = true;
- } else {
- d->mIsPrivate = false;
- }
- if(d->ui.pubAsModify->isChecked()) {
- d->mIsNew = false;
- } else {
- d->mIsNew = true;
- }
+ d->mIsPrivate = d->ui.saveDraft->isChecked();
+ d->mIsNew = !d->ui.pubAsModify->isChecked();
KDialog::accept();
}
diff --git a/blogilo/src/titlelineedit.cpp b/blogilo/src/titlelineedit.cpp
index 4e2cef6..806d6ba 100644
--- a/blogilo/src/titlelineedit.cpp
+++ b/blogilo/src/titlelineedit.cpp
@@ -26,7 +26,8 @@
#include <QKeyEvent>
#include <KDebug>
-TitleLineEdit::TitleLineEdit(QWidget* parent): KLineEdit(parent)
+TitleLineEdit::TitleLineEdit(QWidget* parent)
+ : KLineEdit(parent)
{
}
diff --git a/blogilo/src/titlelineedit.h b/blogilo/src/titlelineedit.h
index 8c7ee7d..eb1a284 100644
--- a/blogilo/src/titlelineedit.h
+++ b/blogilo/src/titlelineedit.h
@@ -33,9 +33,9 @@ class TitleLineEdit : public KLineEdit
Q_OBJECT
public:
explicit TitleLineEdit(QWidget* parent = 0);
- virtual ~TitleLineEdit();
+ ~TitleLineEdit();
-signals:
+Q_SIGNALS:
void downKeyPressed();
protected:
diff --git a/blogilo/src/toolbox.cpp b/blogilo/src/toolbox.cpp
index a8a57f4..a530437 100644
--- a/blogilo/src/toolbox.cpp
+++ b/blogilo/src/toolbox.cpp
@@ -64,25 +64,16 @@ Toolbox::Toolbox( QWidget *parent )
this->d->statusbar = new KStatusBar( this );
setupUi( this );
setButtonsIcon();
-// frameBlog->layout()->setAlignment( Qt::AlignTop );
frameCat->layout()->setAlignment( Qt::AlignTop );
-// reloadBlogList();
optionsDate->setDate( QDateTime::currentDateTime().date() );
optionsTime->setTime( QDateTime::currentDateTime().time() );
-// connect( btnBlogAdd, SIGNAL(clicked()), this, SLOT(slotAddBlog()) );
-// connect( btnBlogEdit, SIGNAL(clicked()), this, SLOT(slotEditBlog()) );
-// connect( btnBlogRemove, SIGNAL(clicked()), this, SLOT(slotRemoveBlog()) );
connect( btnCatReload, SIGNAL(clicked()), this, SLOT(slotReloadCategoryList()) \
);
connect( btnEntriesUpdate, SIGNAL(clicked()), this, SLOT(slotUpdateEntries()) );
connect( btnEntriesClear, SIGNAL(clicked(bool)), this, SLOT(clearEntries()) );
-// connect( this, SIGNAL(sigCurrentBlogChanged(int)), this, \
SLOT(slotCurrentBlogChanged(int)) );
-// connect( &listBlogRadioButtons, SIGNAL(buttonClicked(int)), this, \
SLOT(slotSetCurrentBlog()) );
-
connect( lstEntriesList, SIGNAL(itemDoubleClicked(QListWidgetItem*)),
this, SLOT(slotEntrySelected(QListWidgetItem*)) );
-// connect( btnEntriesCopyUrl, SIGNAL(clicked(bool)), this, \
SLOT(slotEntriesCopyUrl()) );
connect( btnEntriesRemove, SIGNAL(clicked(bool)), this, \
SLOT(slotRemoveSelectedEntryFromServer()) );
connect( btnOptionsNow, SIGNAL(clicked(bool)), this, SLOT(setDateTimeNow()) );
@@ -113,8 +104,6 @@ void Toolbox::setCurrentBlogId( int blog_id )
kDebug()<<blog_id;
if( d->mCurrentBlogId == blog_id )
return;
-// btnBlogEdit->setEnabled( true );
-// btnBlogRemove->setEnabled( true );
d->mCurrentBlogId = blog_id;
if( blog_id <= 0 )
return;
@@ -128,7 +117,6 @@ void Toolbox::setCurrentBlogId( int blog_id )
void Toolbox::slotReloadCategoryList()
{
kDebug();
-// QAbstractButton *btn = listBlogRadioButtons.checkedButton();
if ( d->mCurrentBlogId == -1 ) {
KMessageBox::sorry( this, i18n( "No blog has been selected: you have to \
select a blog from the Blogs page before asking for the list of categories." ) ); \
return; @@ -140,7 +128,6 @@ void Toolbox::slotReloadCategoryList()
emit sigBusy( true );
d->statusbar->showMessage( i18n( "Requesting list of categories..." ) );
b->getCategoryListFromServer();
-// this->setCursor( Qt::BusyCursor );
}
void Toolbox::slotUpdateEntries(int count)
diff --git a/blogilo/src/toolbox.h b/blogilo/src/toolbox.h
index d1ae9aa..4981773 100644
--- a/blogilo/src/toolbox.h
+++ b/blogilo/src/toolbox.h
@@ -71,7 +71,6 @@ public slots:
void setDateTimeNow();
signals:
-// void sigCurrentBlogChanged( int blog_id );
void sigEntrySelected( BilboPost &post, int blog_id );
void sigError( const QString& );
void sigBusy( bool isBusy );
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic