[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkipi-plugins=5D_facebook=3A_speed_up_compilation_?=
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2011-06-22 17:33:39
Message-ID: 20110622173339.71200A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit e33f16f273dc2f41a5a7a69f4b183a3d7996f5f4 by Gilles Caulier.
Committed on 22/06/2011 at 19:32.
Pushed by cgilles into branch 'master'.

speed up compilation : no need header file if moc file exist
code clean up
CCBUGS: 252437

M  +5    -9    facebook/fbalbum.cpp     
M  +6    -4    facebook/fbalbum.h     
M  +25   -16   facebook/fbitem.h     
M  +0    -1    facebook/fbtalker.cpp     
M  +0    -1    facebook/fbwidget.cpp     
M  +0    -1    facebook/fbwindow.cpp     
M  +3    -0    facebook/mpform.cpp     
M  +2    -0    facebook/mpform.h     

http://commits.kde.org/kipi-plugins/e33f16f273dc2f41a5a7a69f4b183a3d7996f5f4

diff --git a/facebook/fbalbum.cpp b/facebook/fbalbum.cpp
index 40949ee..4e13373 100644
--- a/facebook/fbalbum.cpp
+++ b/facebook/fbalbum.cpp
@@ -20,7 +20,6 @@
  *
  * ============================================================ */
 
-#include "fbalbum.h"
 #include "fbalbum.moc"
 
 // Qt includes
@@ -43,7 +42,7 @@ namespace KIPIFacebookPlugin
 {
 
 FbNewAlbum::FbNewAlbum(QWidget* parent)
-           : KDialog(parent)
+    : KDialog(parent)
 {
     QString header(i18n("Facebook New Album"));
     setWindowTitle(header);
@@ -70,8 +69,7 @@ FbNewAlbum::FbNewAlbum(QWidget* parent)
 
     m_privacyCoB        = new KComboBox;
     m_privacyCoB->setEditable(false);
-    m_privacyCoB->setWhatsThis(
-        i18n("Privacy setting of the album that will be created (required)."));
+    m_privacyCoB->setWhatsThis(i18n("Privacy setting of the album that will be \
created (required)."));  m_privacyCoB->addItem(KIcon("user-identity"), 
                           i18n("Only Friends"), FB_FRIENDS);
     m_privacyCoB->addItem(KIcon("system-users"), 
@@ -90,8 +88,6 @@ FbNewAlbum::FbNewAlbum(QWidget* parent)
     albumBoxLayout->setSpacing(KDialog::spacingHint());
     albumBoxLayout->setMargin(KDialog::spacingHint());
     mainWidget->setLayout(albumBoxLayout);
-
-    // ------------------------------------------------------------------------
 }
 
 FbNewAlbum::~FbNewAlbum()
@@ -100,10 +96,10 @@ FbNewAlbum::~FbNewAlbum()
 
 void FbNewAlbum::getAlbumProperties(FbAlbum &album)
 {
-    album.title = m_titleEdt->text();
-    album.location = m_locEdt->text();
+    album.title       = m_titleEdt->text();
+    album.location    = m_locEdt->text();
     album.description = m_descEdt->toPlainText();
-    album.privacy = \
static_cast<KIPIFacebookPlugin::FbPrivacy>(m_privacyCoB->itemData(m_privacyCoB->currentIndex()).toInt());
 +    album.privacy     = \
static_cast<KIPIFacebookPlugin::FbPrivacy>(m_privacyCoB->itemData(m_privacyCoB->currentIndex()).toInt());
  }
 
 } // namespace KIPIFacebookPlugin
diff --git a/facebook/fbalbum.h b/facebook/fbalbum.h
index 1a2d74b..7f4fd43 100644
--- a/facebook/fbalbum.h
+++ b/facebook/fbalbum.h
@@ -41,16 +41,18 @@ class FbNewAlbum : public KDialog
     Q_OBJECT
 
 public:
+
     FbNewAlbum(QWidget* parent);
     ~FbNewAlbum();
 
     void getAlbumProperties(FbAlbum &album);
 
 private:
-    KLineEdit       *m_titleEdt;
-    KLineEdit       *m_locEdt;
-    KTextEdit       *m_descEdt;
-    KComboBox       *m_privacyCoB;
+
+    KLineEdit* m_titleEdt;
+    KLineEdit* m_locEdt;
+    KTextEdit* m_descEdt;
+    KComboBox* m_privacyCoB;
 
     friend class FbWindow;
 };
diff --git a/facebook/fbitem.h b/facebook/fbitem.h
index 0663816..80c0613 100644
--- a/facebook/fbitem.h
+++ b/facebook/fbitem.h
@@ -32,27 +32,30 @@ namespace KIPIFacebookPlugin
 class FbUser
 {
 public:
+
     FbUser()
     {
-        id = 0;
+        id         = 0;
         uploadPerm = false;
     }
 
     void clear()
     {
-        id = 0;
+        id         = 0;
         name.clear();
         profileURL.clear();
         uploadPerm = false;
     }
 
-    long long   id;
+    long long id;
 
-    QString     name;
-    QString     profileURL;
-    bool        uploadPerm;
+    QString   name;
+    QString   profileURL;
+    bool      uploadPerm;
 };
 
+// ---------------------------------------------------------------
+
 enum FbPrivacy
 {
     FB_FRIENDS = 0,
@@ -61,35 +64,41 @@ enum FbPrivacy
     FB_EVERYONE
 };
 
+// ---------------------------------------------------------------
+
 class FbAlbum
 {
 public:
+
     FbAlbum()
     {
         privacy = FB_FRIENDS;
     }
 
-    QString     id;
+    QString   id;
 
-    QString     title;
-    QString     description;
-    QString     location;
-    FbPrivacy   privacy;
-    QString     url;
+    QString   title;
+    QString   description;
+    QString   location;
+    FbPrivacy privacy;
+    QString   url;
 };
 
+// ---------------------------------------------------------------
+
 class FbPhoto
 {
 public:
+
     FbPhoto()
     {
     }
 
-    QString   id;
+    QString id;
 
-    QString     caption;
-    QString     thumbURL;
-    QString     originalURL;
+    QString caption;
+    QString thumbURL;
+    QString originalURL;
 };
 
 } // namespace KIPIFacebookPlugin
diff --git a/facebook/fbtalker.cpp b/facebook/fbtalker.cpp
index ffc1414..a4cad6f 100644
--- a/facebook/fbtalker.cpp
+++ b/facebook/fbtalker.cpp
@@ -20,7 +20,6 @@
  *
  * ============================================================ */
 
-#include "fbtalker.h"
 #include "fbtalker.moc"
 
 // C++ includes
diff --git a/facebook/fbwidget.cpp b/facebook/fbwidget.cpp
index a51131c..5849283 100644
--- a/facebook/fbwidget.cpp
+++ b/facebook/fbwidget.cpp
@@ -20,7 +20,6 @@
  *
  * ============================================================ */
 
-#include "fbwidget.h"
 #include "fbwidget.moc"
 
 // Qt includes
diff --git a/facebook/fbwindow.cpp b/facebook/fbwindow.cpp
index 02853c2..929ab30 100644
--- a/facebook/fbwindow.cpp
+++ b/facebook/fbwindow.cpp
@@ -22,7 +22,6 @@
  *
  * ============================================================ */
 
-#include "fbwindow.h"
 #include "fbwindow.moc"
 
 // Qt includes
diff --git a/facebook/mpform.cpp b/facebook/mpform.cpp
index 15d014c..affe4cc 100644
--- a/facebook/mpform.cpp
+++ b/facebook/mpform.cpp
@@ -25,13 +25,16 @@
 #include "mpform.h"
 
 // C++ includes
+
 #include <cstring>
 #include <cstdio>
 
 // Qt includes
+
 #include <QFile>
 
 // KDE includes
+
 #include <kdebug.h>
 #include <kmimetype.h>
 #include <krandom.h>
diff --git a/facebook/mpform.h b/facebook/mpform.h
index 7e84a2f..3ea01c2 100644
--- a/facebook/mpform.h
+++ b/facebook/mpform.h
@@ -26,6 +26,7 @@
 #define MPFORM_H
 
 // Qt includes
+
 #include <QByteArray>
 #include <QString>
 
@@ -51,6 +52,7 @@ public:
     QString    boundary()    const;
 
 private:
+
     QByteArray m_buffer;
     QByteArray m_boundary;
 };


[prev in list] [next in list] [prev in thread] [next in thread]