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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim/kmail
From:       Don Sanders <don () sanders ! org>
Date:       2005-08-05 1:28:36
Message-ID: 1123205316.615811.26851.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 443140 by sanders:

Pruddy up the AS for carsten by factoring the logic to determine if
the action scheduler is enabled into
  static bool ActionScheduler::isEnabled()


 M  +14 -0     actionscheduler.cpp  
 M  +2 -0      actionscheduler.h  
 M  +2 -10     kmacctimap.cpp  
 M  +1 -9      kmfilteraction.cpp  
 M  +1 -9      kmheaders.cpp  


--- branches/KDE/3.5/kdepim/kmail/actionscheduler.cpp #443139:443140
@@ -56,6 +56,8 @@
 int ActionScheduler::refCount = 0;
 int ActionScheduler::count = 0;
 QValueList<ActionScheduler*> *ActionScheduler::schedulerList = 0;
+bool ActionScheduler::sEnabled = false;
+bool ActionScheduler::sEnabledChecked = false;
 
 ActionScheduler::ActionScheduler(KMFilterMgr::FilterSet set,
 				 QValueList<KMFilter*> filters,
@@ -759,4 +761,16 @@
     return res;
 }
 
+bool ActionScheduler::isEnabled()
+{
+    if (sEnabledChecked)
+	return sEnabled;
+
+    sEnabledChecked = true;
+    KConfig* config = KMKernel::config();
+    KConfigGroupSaver saver(config, "General");
+    sEnabled = config->readBoolEntry("action-scheduler", false);
+    return sEnabled;
+}
+
 #include "actionscheduler.moc"
--- branches/KDE/3.5/kdepim/kmail/actionscheduler.h #443139:443140
@@ -89,6 +89,7 @@
   void execFilters(KMMsgBase* msgBase);
   void execFilters(Q_UINT32 serNum);
   static QString debug();
+  static bool isEnabled();
 
 signals:
   /** Emitted when filtering is completed */
@@ -126,6 +127,7 @@
   static QValueList<ActionScheduler*> *schedulerList; // for debugging
   static KMFolderMgr *tempFolderMgr;
   static int refCount, count;
+  static bool sEnabled, sEnabledChecked;
   QValueListIterator<Q_UINT32> mMessageIt;
   QValueListIterator<KMFilter> mFilterIt;
   QValueList<Q_UINT32> mSerNums, mFetchSerNums;
--- branches/KDE/3.5/kdepim/kmail/kmacctimap.cpp #443139:443140
@@ -398,15 +398,7 @@
   QValueListIterator<Q_UINT32> filterIt = mFilterSerNums.begin();
   QValueList<Q_UINT32> inTransit;
 
-  static bool useAs = false;
-  static bool useAsChecked = false;
-  if (!useAsChecked) {
-    useAsChecked = true;
-    KConfig* config = KMKernel::config();
-    KConfigGroupSaver saver(config, "General");
-    useAs = config->readBoolEntry("action-scheduler", false);
-  }
-  if (useAs) {
+  if (ActionScheduler::isEnabled()) {
     KMFilterMgr::FilterSet set = KMFilterMgr::Inbound;
     QValueList<KMFilter*> filters = kmkernel->filterMgr()->filters();
     if (!mScheduler) {
@@ -448,7 +440,7 @@
         continue;
       }
 
-      if (useAs) {
+      if (ActionScheduler::isEnabled()) {
 	mScheduler->execFilters( msg );
       } else {
 	if (msg->transferInProgress()) {
--- branches/KDE/3.5/kdepim/kmail/kmfilteraction.cpp #443139:443140
@@ -277,15 +277,7 @@
 {
   FolderRequester *req = new FolderRequester( parent,
       kmkernel->getKMMainWidget()->folderTree() );
-  static bool useAs = false;
-  static bool useAsChecked = false;
-  if (!useAsChecked) {
-    useAsChecked = true;
-    KConfig* config = KMKernel::config();
-    KConfigGroupSaver saver(config, "General");
-    useAs = config->readBoolEntry("action-scheduler", false);
-  }
-  if (!useAs)
+  if (!ActionScheduler::isEnabled())
     req->setShowImapFolders( false );
   setParamWidgetValue( req );
   return req;
--- branches/KDE/3.5/kdepim/kmail/kmheaders.cpp #443139:443140
@@ -1314,15 +1314,7 @@
 //-----------------------------------------------------------------------------
 void KMHeaders::applyFiltersOnMsg()
 {
-  static bool useAs = false;
-  static bool useAsChecked = false;
-  if (!useAsChecked) {
-    useAsChecked = true;
-    KConfig* config = KMKernel::config();
-    KConfigGroupSaver saver(config, "General");
-    useAs = config->readBoolEntry("action-scheduler", false);
-  }
-  if (useAs) {  // uses action scheduler
+  if (ActionScheduler::isEnabled()) {  // uses action scheduler
     KMFilterMgr::FilterSet set = KMFilterMgr::Explicit;
     QValueList<KMFilter*> filters = kmkernel->filterMgr()->filters();
     ActionScheduler *scheduler = new ActionScheduler( set, filters, this );
[prev in list] [next in list] [prev in thread] [next in thread]