From f12b53b8c6d6bf9c6bb0e84a4c6f941aee1a9ebd Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 29 Dec 2009 01:08:06 +0000
Subject: * KDE cron updates * KDE networking module platform string updates

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1067153 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcron/cttask.cpp | 21 ++++-----------------
 kcron/cttask.h   |  2 --
 kcron/kttask.cpp |  6 ------
 kcron/kttask.h   |  1 -
 4 files changed, 4 insertions(+), 26 deletions(-)

(limited to 'kcron')

diff --git a/kcron/cttask.cpp b/kcron/cttask.cpp
index 1b7b299..22fc77b 100644
--- a/kcron/cttask.cpp
+++ b/kcron/cttask.cpp
@@ -33,14 +33,11 @@ CTTask::CTTask(string tokStr, string _comment, bool _syscron) :
   else
     enabled = true;
 
+  //older versions had something called silence. We should still be able to not choke on what we have been 
+  //writing earlier. This has no use though.
   if (tokStr.substr(0,1) == "-")
   {
     tokStr = tokStr.substr(1,tokStr.length() - 1);
-    silent = true;
-  }
-  else
-  {
-    silent = false;
   }
   
   if (tokStr.substr(0,1) == "@")
@@ -119,7 +116,6 @@ CTTask::CTTask(string tokStr, string _comment, bool _syscron) :
   initialCommand = command;
   initialComment = comment;
   initialEnabled = enabled;
-  initialSilent = silent;
 }
 
 CTTask::CTTask(const CTTask &source) :
@@ -132,12 +128,10 @@ CTTask::CTTask(const CTTask &source) :
   command(source.command),
   comment(source.comment),
   enabled(source.enabled),
-  silent(source.silent),
   initialUser(""),
   initialCommand(""),
   initialComment(""),
-  initialEnabled(true),
-  initialSilent(false)
+  initialEnabled(true)
 {
 }
 
@@ -152,12 +146,10 @@ void CTTask::operator = (const CTTask& source)
   command        = source.command;
   comment        = source.comment;
   enabled        = source.enabled;
-  silent         = source.silent;
   initialUser    = "";
   initialCommand = "";
   initialComment = "";
   initialEnabled = true;
-  initialSilent  = false;
   return;
 }
 
@@ -169,9 +161,6 @@ ostream& operator << (ostream& outputStream, const CTTask& task)
   if (!task.enabled)
     outputStream << "#\\";
 
-  if (task.silent)
-    outputStream << "-";
-
   outputStream << task.minute << " ";
   outputStream << task.hour << " ";
   outputStream << task.dayOfMonth << " ";
@@ -197,7 +186,6 @@ void CTTask::apply()
   initialCommand = command;
   initialComment = comment;
   initialEnabled = enabled;
-  initialSilent = silent;
 }
 
 void CTTask::cancel()
@@ -211,7 +199,6 @@ void CTTask::cancel()
   command = initialCommand;
   comment = initialComment;
   enabled = initialEnabled;
-  silent = initialSilent;
 }
 
 bool CTTask::dirty() const
@@ -219,7 +206,7 @@ bool CTTask::dirty() const
   return (month.dirty() || dayOfMonth.dirty() || dayOfWeek.dirty() ||
     hour.dirty() || minute.dirty() || (user != initialUser) ||
     (command != initialCommand) || (comment != initialComment) ||
-    (enabled != initialEnabled) || (silent != initialSilent));
+    (enabled != initialEnabled) );
 }
 
 string CTTask::describe() const
diff --git a/kcron/cttask.h b/kcron/cttask.h
index 3665c61..061df57 100644
--- a/kcron/cttask.h
+++ b/kcron/cttask.h
@@ -90,7 +90,6 @@ public:
   string       command;
   string       comment;
   bool         enabled;
-  bool         silent;
 
 private:
   bool         syscron;
@@ -98,7 +97,6 @@ private:
   string       initialCommand;
   string       initialComment;
   bool         initialEnabled;
-  bool         initialSilent;
 };
 
 #endif // CTTASK_H
diff --git a/kcron/kttask.cpp b/kcron/kttask.cpp
index 8b78b49..500cab4 100644
--- a/kcron/kttask.cpp
+++ b/kcron/kttask.cpp
@@ -172,11 +172,6 @@ KTTask::KTTask(CTTask* _cttask, const QString & _caption)
   chkEnabled->setChecked(cttask->enabled);
   h3a->addWidget( chkEnabled );
 
-  // enabled
-  chkSilent = new QCheckBox(i18n("&Silent"), this, "chkSilent");
-  chkSilent->setChecked(cttask->silent);
-  h3a->addWidget( chkSilent );
-
   QHBoxLayout *h4 = new QHBoxLayout( ml, KDialogBase::spacingHint() );
 
   ml->addSpacing( 2 * KDialogBase::spacingHint() );
@@ -651,7 +646,6 @@ void KTTask::slotOK()
   cttask->comment = (const char *)leComment->text().local8Bit();
   cttask->command = (const char *)leCommand->text().local8Bit();
   cttask->enabled = chkEnabled->isChecked();
-  cttask->silent = chkSilent->isChecked();
 
   for (int mo = 1; mo <= 12; mo++)
   {
diff --git a/kcron/kttask.h b/kcron/kttask.h
index 7920593..c4d24bf 100644
--- a/kcron/kttask.h
+++ b/kcron/kttask.h
@@ -149,7 +149,6 @@ private:
   QPushButton*    pbBrowse;
 
   QCheckBox*      chkEnabled;
-  QCheckBox*      chkSilent;
 
   QButtonGroup*   bgMonth;
   QCheckBox*      cbMonth[13];
-- 
cgit v1.2.3