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

List:       kde-commits
Subject:    [kdepim] sendlateragent: use sendlater namespace
From:       Montel Laurent <montel () kde ! org>
Date:       2013-07-01 5:28:44
Message-ID: E1UtWfM-0007VA-9N () scm ! kde ! org
[Download RAW message or body]

Git commit 170e4dd798e32d3d4a69cf9912c74b025b68c3b2 by Montel Laurent.
Committed on 01/07/2013 at 05:28.
Pushed by mlaurent into branch 'master'.

use sendlater namespace

M  +4    -4    sendlateragent/sendlateragent.cpp
M  +1    -1    sendlateragent/sendlateragent.h
M  +6    -6    sendlateragent/sendlaterconfiguredialog.cpp
M  +6    -4    sendlateragent/sendlaterconfiguredialog.h
M  +7    -5    sendlateragent/sendlaterdialog.cpp
M  +6    -6    sendlateragent/sendlaterdialog.h
M  +2    -0    sendlateragent/sendlaterinfo.cpp
M  +4    -1    sendlateragent/sendlaterinfo.h
M  +1    -1    sendlateragent/sendlaterjob.cpp
M  +4    -2    sendlateragent/sendlaterjob.h
M  +4    -4    sendlateragent/sendlatermanager.cpp
M  +7    -5    sendlateragent/sendlatermanager.h
M  +1    -1    sendlateragent/sendlaterutil.cpp
M  +4    -1    sendlateragent/sendlaterutil.h
M  +1    -1    sendlateragent/tests/sendlaterinfo_gui.cpp

http://commits.kde.org/kdepim/170e4dd798e32d3d4a69cf9912c74b025b68c3b2

diff --git a/sendlateragent/sendlateragent.cpp b/sendlateragent/sendlateragent.cpp
index 22c6b6a..ad4ba4e 100644
--- a/sendlateragent/sendlateragent.cpp
+++ b/sendlateragent/sendlateragent.cpp
@@ -51,12 +51,12 @@ SendLaterAgent::~SendLaterAgent()
 {
 }
 
-SendLaterDialog::SendLaterAction SendLaterAgent::addSendLaterItem(qlonglong itemId, \
qlonglong windowId) +SendLater::SendLaterDialog::SendLaterAction \
SendLaterAgent::addSendLaterItem(qlonglong itemId, qlonglong windowId)  {
-    SendLaterInfo *info = new SendLaterInfo;
+    SendLater::SendLaterInfo *info = new SendLater::SendLaterInfo;
     info->setItemId(itemId);
-    QPointer<SendLaterDialog> dialog = new SendLaterDialog(info);
-    SendLaterDialog::SendLaterAction action = SendLaterDialog::Canceled;
+    QPointer<SendLater::SendLaterDialog> dialog = new \
SendLater::SendLaterDialog(info); +    SendLater::SendLaterDialog::SendLaterAction \
action = SendLater::SendLaterDialog::Canceled;  if (windowId) {
 #ifndef Q_WS_WIN
         KWindowSystem::setMainWindow( dialog, windowId );
diff --git a/sendlateragent/sendlateragent.h b/sendlateragent/sendlateragent.h
index 022be4f..b5819c3 100644
--- a/sendlateragent/sendlateragent.h
+++ b/sendlateragent/sendlateragent.h
@@ -31,7 +31,7 @@ public:
     ~SendLaterAgent();
 
     void showConfigureDialog(qlonglong windowId = 0);
-    SendLaterDialog::SendLaterAction addSendLaterItem(qlonglong itemId, qlonglong \
windowId = 0); +    SendLater::SendLaterDialog::SendLaterAction \
addSendLaterItem(qlonglong itemId, qlonglong windowId = 0);  
     void printDebugInfo();
 
diff --git a/sendlateragent/sendlaterconfiguredialog.cpp \
b/sendlateragent/sendlaterconfiguredialog.cpp index 2cc7422..e2a1ee5 100644
--- a/sendlateragent/sendlaterconfiguredialog.cpp
+++ b/sendlateragent/sendlaterconfiguredialog.cpp
@@ -121,12 +121,12 @@ SendLaterItem::~SendLaterItem()
     delete mInfo;
 }
 
-void SendLaterItem::setInfo(SendLaterInfo *info)
+void SendLaterItem::setInfo(SendLater::SendLaterInfo *info)
 {
     mInfo = info;
 }
 
-SendLaterInfo* SendLaterItem::info() const
+SendLater::SendLaterInfo* SendLaterItem::info() const
 {
     return mInfo;
 }
@@ -217,12 +217,12 @@ void SendLaterWidget::load()
     const int numberOfItem = filterGroups.count();
     for (int i = 0 ; i < numberOfItem; ++i) {
         KConfigGroup group = config->group(filterGroups.at(i));
-        SendLaterInfo *info = new SendLaterInfo(group);
+        SendLater::SendLaterInfo *info = new SendLater::SendLaterInfo(group);
         createOrUpdateItem(info);
     }
 }
 
-void SendLaterWidget::createOrUpdateItem(SendLaterInfo *info, SendLaterItem *item)
+void SendLaterWidget::createOrUpdateItem(SendLater::SendLaterInfo *info, \
SendLaterItem *item)  {
     if (!item) {
         item = new SendLaterItem(mWidget->treeWidget);
@@ -281,9 +281,9 @@ void SendLaterWidget::slotModifyItem()
             return;
         SendLaterItem *mailItem = static_cast<SendLaterItem *>(item);
 
-        QPointer<SendLaterDialog> dialog = new SendLaterDialog(mailItem->info(), \
this); +        QPointer<SendLater::SendLaterDialog> dialog = new \
SendLater::SendLaterDialog(mailItem->info(), this);  if (dialog->exec()) {
-            SendLaterInfo *info = dialog->info();
+            SendLater::SendLaterInfo *info = dialog->info();
             createOrUpdateItem(info, mailItem);
             mChanged = true;
         }
diff --git a/sendlateragent/sendlaterconfiguredialog.h \
b/sendlateragent/sendlaterconfiguredialog.h index 9b23f9b..b6354a8 100644
--- a/sendlateragent/sendlaterconfiguredialog.h
+++ b/sendlateragent/sendlaterconfiguredialog.h
@@ -27,7 +27,9 @@
 #include <QTreeWidgetItem>
 
 class KAboutData;
+namespace SendLater {
 class SendLaterInfo;
+}
 
 class SendLaterItem : public QTreeWidgetItem
 {
@@ -35,11 +37,11 @@ public:
     explicit SendLaterItem(QTreeWidget *parent = 0);
     ~SendLaterItem();
 
-    void setInfo(SendLaterInfo *info);
-    SendLaterInfo *info() const;
+    void setInfo(SendLater::SendLaterInfo *info);
+    SendLater::SendLaterInfo *info() const;
 
 private:
-    SendLaterInfo *mInfo;
+    SendLater::SendLaterInfo *mInfo;
 };
 
 
@@ -73,7 +75,7 @@ Q_SIGNALS:
     void sendNow(Akonadi::Item::Id);
 
 private:
-    void createOrUpdateItem(SendLaterInfo *info, SendLaterItem *item = 0);
+    void createOrUpdateItem(SendLater::SendLaterInfo *info, SendLaterItem *item = \
0);  void load();
     bool mChanged;
     Ui::SendLaterWidget *mWidget;
diff --git a/sendlateragent/sendlaterdialog.cpp b/sendlateragent/sendlaterdialog.cpp
index 1cb7e74..8081c47 100644
--- a/sendlateragent/sendlaterdialog.cpp
+++ b/sendlateragent/sendlaterdialog.cpp
@@ -30,7 +30,9 @@
 #include <QSpinBox>
 #include <QDateTimeEdit>
 
-SendLaterDialog::SendLaterDialog(SendLaterInfo *info, QWidget *parent)
+using namespace SendLater;
+
+SendLaterDialog::SendLaterDialog(SendLater::SendLaterInfo *info, QWidget *parent)
     : KDialog(parent),
       mAction(SendNow),
       mInfo(info)
@@ -157,7 +159,7 @@ void SendLaterDialog::writeConfig()
     group.writeEntry( "Size", size() );
 }
 
-void SendLaterDialog::load(SendLaterInfo *info)
+void SendLaterDialog::load(SendLater::SendLaterInfo *info)
 {
     mDateTime->setDateTime(info->dateTime());
     mRecursive->setChecked(info->isRecursive());
@@ -165,15 +167,15 @@ void SendLaterDialog::load(SendLaterInfo *info)
     mRecursiveComboBox->setCurrentIndex((int)info->recursiveUnit());
 }
 
-SendLaterInfo* SendLaterDialog::info()
+SendLater::SendLaterInfo* SendLaterDialog::info()
 {
     if (!mInfo) {
-        mInfo = new SendLaterInfo();
+        mInfo = new SendLater::SendLaterInfo();
         mInfo->setItemId(-1);
     }
     mInfo->setRecursive(mRecursive->isChecked());
     mInfo->setRecursiveEachValue(mRecursiveValue->value());
-    mInfo->setRecursiveUnit((SendLaterInfo::RecursiveUnit)mRecursiveComboBox->currentIndex());
 +    mInfo->setRecursiveUnit((SendLater::SendLaterInfo::RecursiveUnit)mRecursiveComboBox->currentIndex());
  if (mSendDateTime.isValid())
         mInfo->setDateTime(mSendDateTime);
     else
diff --git a/sendlateragent/sendlaterdialog.h b/sendlateragent/sendlaterdialog.h
index ee565e1..54ab751 100644
--- a/sendlateragent/sendlaterdialog.h
+++ b/sendlateragent/sendlaterdialog.h
@@ -26,8 +26,8 @@ class QCheckBox;
 class QSpinBox;
 class QDateTimeEdit;
 
+namespace SendLater {
 class SendLaterInfo;
-
 class SENDLATER_EXPORT SendLaterDialog : public KDialog
 {
     Q_OBJECT
@@ -39,10 +39,10 @@ public:
         SendDeliveryAtTime = 3
     };
 
-    explicit SendLaterDialog(SendLaterInfo *info, QWidget *parent = 0);
+    explicit SendLaterDialog(SendLater::SendLaterInfo *info, QWidget *parent = 0);
     ~SendLaterDialog();
 
-    SendLaterInfo *info();
+    SendLater::SendLaterInfo *info();
 
     SendLaterAction action() const;
 
@@ -57,7 +57,7 @@ private Q_SLOTS:
     void slotSendAtTime();
 
 private:
-    void load(SendLaterInfo *info);
+    void load(SendLater::SendLaterInfo *info);
     void readConfig();
     void writeConfig();
 
@@ -65,7 +65,7 @@ private:
     QDateTime mSendDateTime;
     SendLaterAction mAction;
     QDateTimeEdit *mDateTime;
-    SendLaterInfo *mInfo;
+    SendLater::SendLaterInfo *mInfo;
     KComboBox *mRecursiveComboBox;
     QCheckBox *mRecursive;
     QSpinBox *mRecursiveValue;
@@ -74,5 +74,5 @@ private:
     KPushButton *mSendIn2Hours;
     KPushButton *mSendAtTime;
 };
-
+}
 #endif // SENDLATERDIALOG_H
diff --git a/sendlateragent/sendlaterinfo.cpp b/sendlateragent/sendlaterinfo.cpp
index 2b4b4ba..db1b57e 100644
--- a/sendlateragent/sendlaterinfo.cpp
+++ b/sendlateragent/sendlaterinfo.cpp
@@ -20,6 +20,8 @@
 
 #include <KConfigGroup>
 
+using namespace SendLater;
+
 SendLaterInfo::SendLaterInfo()
     : mId(-1),
       mRecursiveEachValue(1),
diff --git a/sendlateragent/sendlaterinfo.h b/sendlateragent/sendlaterinfo.h
index 67b8ca1..c6299ab 100644
--- a/sendlateragent/sendlaterinfo.h
+++ b/sendlateragent/sendlaterinfo.h
@@ -24,12 +24,14 @@
 
 class KConfigGroup;
 
+namespace SendLater {
+
 class SENDLATER_EXPORT SendLaterInfo
 {
 public:
     explicit SendLaterInfo();
     explicit SendLaterInfo(const KConfigGroup &config);
-    SendLaterInfo(const SendLaterInfo &info);
+    SendLaterInfo(const SendLater::SendLaterInfo &info);
     ~SendLaterInfo();
 
     enum RecursiveUnit {
@@ -72,5 +74,6 @@ private:
     RecursiveUnit mRecursiveUnit;
     bool mRecursive;
 };
+}
 
 #endif // SENDLATERINFO_H
diff --git a/sendlateragent/sendlaterjob.cpp b/sendlateragent/sendlaterjob.cpp
index dd43ec6..18caab6 100644
--- a/sendlateragent/sendlaterjob.cpp
+++ b/sendlateragent/sendlaterjob.cpp
@@ -33,7 +33,7 @@
 #include <KIcon>
 #include <KIconLoader>
 
-SendLaterJob::SendLaterJob(SendLaterManager *manager, SendLaterInfo *info, QObject \
*parent) +SendLaterJob::SendLaterJob(SendLaterManager *manager, \
SendLater::SendLaterInfo *info, QObject *parent)  : QObject(parent),
       mManager(manager),
       mInfo(info)
diff --git a/sendlateragent/sendlaterjob.h b/sendlateragent/sendlaterjob.h
index f3b18a1..64c5913 100644
--- a/sendlateragent/sendlaterjob.h
+++ b/sendlateragent/sendlaterjob.h
@@ -25,13 +25,15 @@
 #include <Akonadi/ItemFetchScope>
 #include <Akonadi/Item>
 
+namespace SendLater {
 class SendLaterInfo;
+}
 class KJob;
 class SendLaterJob : public QObject
 {
     Q_OBJECT
 public:
-    explicit SendLaterJob(SendLaterManager *manager, SendLaterInfo *info, QObject \
*parent = 0); +    explicit SendLaterJob(SendLaterManager *manager, \
SendLater::SendLaterInfo *info, QObject *parent = 0);  ~SendLaterJob();
     void start();
 
@@ -48,7 +50,7 @@ Q_SIGNALS:
 private:
     Akonadi::ItemFetchScope mFetchScope;
     SendLaterManager *mManager;
-    SendLaterInfo *mInfo;
+    SendLater::SendLaterInfo *mInfo;
     Akonadi::Item mItem;
 };
 
diff --git a/sendlateragent/sendlatermanager.cpp \
b/sendlateragent/sendlatermanager.cpp index ccd2cc6..2f9f2f3 100644
--- a/sendlateragent/sendlatermanager.cpp
+++ b/sendlateragent/sendlatermanager.cpp
@@ -56,7 +56,7 @@ void SendLaterManager::load()
     const int numberOfItems = itemList.count();
     for (int i = 0 ; i < numberOfItems; ++i) {
         KConfigGroup group = mConfig->group(itemList.at(i));
-        SendLaterInfo *info = new SendLaterInfo(group);        
+        SendLater::SendLaterInfo *info = new SendLater::SendLaterInfo(group);        \
  mListSendLaterInfo.append(info);
     }
     createSendInfoList();
@@ -98,7 +98,7 @@ void SendLaterManager::removeInfo(Akonadi::Item::Id id)
     group.sync();
 }
 
-void SendLaterManager::sendError(SendLaterInfo *info, ErrorType type)
+void SendLaterManager::sendError(SendLater::SendLaterInfo *info, ErrorType type)
 {
     if (info) {
         if (type == ItemNotFound) {
@@ -122,7 +122,7 @@ void SendLaterManager::sendError(SendLaterInfo *info, ErrorType \
type)  Q_EMIT needUpdateConfigDialogBox();
 }
 
-void SendLaterManager::sendDone(SendLaterInfo *info)
+void SendLaterManager::sendDone(SendLater::SendLaterInfo *info)
 {
     if (info) {
         if (!info->isRecursive()) {
@@ -137,7 +137,7 @@ void SendLaterManager::sendDone(SendLaterInfo *info)
 
 void SendLaterManager::printDebugInfo()
 {
-    Q_FOREACH (SendLaterInfo *info, mListSendLaterInfo) {
+    Q_FOREACH (SendLater::SendLaterInfo *info, mListSendLaterInfo) {
         kDebug() <<" recusive "<<info->isRecursive() <<
                    " id :"<<info->itemId()<<
                    " date :"<<info->dateTime().toString()<<
diff --git a/sendlateragent/sendlatermanager.h b/sendlateragent/sendlatermanager.h
index 2f3e58d..bed2636 100644
--- a/sendlateragent/sendlatermanager.h
+++ b/sendlateragent/sendlatermanager.h
@@ -24,8 +24,10 @@
 
 #include <KSharedConfig>
 
-
+namespace SendLater {
 class SendLaterInfo;
+}
+
 class QTimer;
 class SendLaterJob;
 class SendLaterManager : public QObject
@@ -41,8 +43,8 @@ public:
     explicit SendLaterManager(QObject *parent);
     ~SendLaterManager();
 
-    void sendDone(SendLaterInfo *info);
-    void sendError(SendLaterInfo *info, ErrorType type);
+    void sendDone(SendLater::SendLaterInfo *info);
+    void sendError(SendLater::SendLaterInfo *info, ErrorType type);
     void printDebugInfo();
 
 Q_SIGNALS:
@@ -59,8 +61,8 @@ private:
     void stopTimer();
     void removeInfo(Akonadi::Item::Id id);
     KSharedConfig::Ptr mConfig;
-    QList<SendLaterInfo *> mListSendLaterInfo;
-    SendLaterInfo *mCurrentInfo;
+    QList<SendLater::SendLaterInfo *> mListSendLaterInfo;
+    SendLater::SendLaterInfo *mCurrentInfo;
     SendLaterJob *mCurrentJob;
     QTimer *mTimer;
 };
diff --git a/sendlateragent/sendlaterutil.cpp b/sendlateragent/sendlaterutil.cpp
index a6fec62..51e8d74 100644
--- a/sendlateragent/sendlaterutil.cpp
+++ b/sendlateragent/sendlaterutil.cpp
@@ -20,7 +20,7 @@
 #include "sendlaterinfo.h"
 
 
-bool SendLaterUtil::compareSendLaterInfo(SendLaterInfo *left, SendLaterInfo *right)
+bool SendLaterUtil::compareSendLaterInfo(SendLater::SendLaterInfo *left, \
SendLater::SendLaterInfo *right)  {
     if (left->dateTime() == right->dateTime()) {
         //Set no recursive first.
diff --git a/sendlateragent/sendlaterutil.h b/sendlateragent/sendlaterutil.h
index 704bfb4..d7938f2 100644
--- a/sendlateragent/sendlaterutil.h
+++ b/sendlateragent/sendlaterutil.h
@@ -17,10 +17,13 @@
 
 #ifndef SENDLATERUTIL_H
 #define SENDLATERUTIL_H
+
+namespace SendLater {
 class SendLaterInfo;
+}
 namespace SendLaterUtil
 {
-    bool compareSendLaterInfo(SendLaterInfo *left, SendLaterInfo *right);
+    bool compareSendLaterInfo(SendLater::SendLaterInfo *left, \
SendLater::SendLaterInfo *right);  }
 
 #endif // SENDLATERUTIL_H
diff --git a/sendlateragent/tests/sendlaterinfo_gui.cpp \
b/sendlateragent/tests/sendlaterinfo_gui.cpp index adaf927..3fcb910 100644
--- a/sendlateragent/tests/sendlaterinfo_gui.cpp
+++ b/sendlateragent/tests/sendlaterinfo_gui.cpp
@@ -27,7 +27,7 @@ int main (int argc, char **argv)
     KCmdLineArgs::init(argc, argv, "sendlaterdialog_gui", 0, \
                ki18n("SendLaterDialog_Gui"),
                        "1.0", ki18n("Test for autocreate sendlater dialog"));
     KApplication app;
-    SendLaterDialog *dialog = new SendLaterDialog(0);
+    SendLater::SendLaterDialog *dialog = new SendLater::SendLaterDialog(0);
     dialog->exec();
     delete dialog;
     return 0;


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