Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 13 insertions, 13 deletions

diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index 9033ff668..44f2229ec 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -69,8 +69,8 @@ NaughtyApplet::NaughtyApplet
   button_ = new SimpleButton(this);
   button_->setFixedSize(20, 20);
 
-  TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
-  tqlayout->addWidget(button_);
+  TQVBoxLayout * layout = new TQVBoxLayout(this);
+  layout->addWidget(button_);
 
   monitor_ = new NaughtyProcessMonitor(2, 20, this);
 
@@ -105,7 +105,7 @@ NaughtyApplet::~NaughtyApplet()
   void
 NaughtyApplet::slotWarn(ulong pid, const TQString & name)
 {
-  if (ignoreList_.tqcontains(name))
+  if (ignoreList_.contains(name))
     return;
 
   TQString s = i18n("A program called '%1' is slowing down the others "
diff --git a/kicker/applets/naughty/NaughtyApplet.h b/kicker/applets/naughty/NaughtyApplet.h
index 23bdf62c9..beb70552d 100644
--- a/kicker/applets/naughty/NaughtyApplet.h
+++ b/kicker/applets/naughty/NaughtyApplet.h
@@ -51,7 +51,7 @@ class NaughtyApplet : public KPanelApplet
 
   signals:
 
-    void tqlayoutChanged();
+    void layoutChanged();
 
   protected slots:
 
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
index 1acd64f09..6228cfba1 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
@@ -164,7 +164,7 @@ NaughtyProcessMonitor::slotTimeout()
   void
 NaughtyProcessMonitor::_process(ulong pid, uint load)
 {
-  if (!d->loadMap_.tqcontains(pid))
+  if (!d->loadMap_.contains(pid))
   {
     d->loadMap_.insert(pid, load);
     return;
@@ -172,12 +172,12 @@ NaughtyProcessMonitor::_process(ulong pid, uint load)
 
   uint oldLoad = d->loadMap_[pid];
   bool misbehaving = (load - oldLoad) > 40 * (d->interval_ / 1000);
-  bool wasMisbehaving = d->scoreMap_.tqcontains(pid);
+  bool wasMisbehaving = d->scoreMap_.contains(pid);
 
   if (misbehaving)
     if (wasMisbehaving)
     {
-      d->scoreMap_.tqreplace(pid, d->scoreMap_[pid] + 1);
+      d->scoreMap_.replace(pid, d->scoreMap_[pid] + 1);
       if (canKill(pid))
         emit(runawayProcess(pid, processName(pid)));
     }
@@ -187,7 +187,7 @@ NaughtyProcessMonitor::_process(ulong pid, uint load)
     if (wasMisbehaving)
       d->scoreMap_.remove(pid);
 
-  d->loadMap_.tqreplace(pid, load);
+  d->loadMap_.replace(pid, load);
 }
 
 // Here begins the set of system-specific methods.
@@ -221,7 +221,7 @@ NaughtyProcessMonitor::canKill(ulong pid) const
   return geteuid() == a;
 #elif defined(__OpenBSD__)
   // simply check if entry exists in the uid map and use it
-  if (!d->uidMap_.tqcontains(pid))
+  if (!d->uidMap_.contains(pid))
       return false ;
   
   return geteuid () == d->uidMap_[pid] ;
@@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
   }
 
  // Now strip 'kdeinit:' prefix.
-  TQString tqunicode(TQString::fromLocal8Bit(s));
+  TQString unicode(TQString::fromLocal8Bit(s));
 
 #elif defined(__OpenBSD__)
   int mib[4] ;
@@ -280,12 +280,12 @@ NaughtyProcessMonitor::processName(ulong pid) const
   }
   
  // Now strip 'kdeinit:' prefix.
-  TQString tqunicode(TQString::fromLocal8Bit(argv[0]));
+  TQString unicode(TQString::fromLocal8Bit(argv[0]));
 
   free (argv) ;
 #endif
 
-  TQStringList parts(TQStringList::split(' ', tqunicode));
+  TQStringList parts(TQStringList::split(' ', unicode));
 
   TQString processName = parts[0] == "kdeinit:" ? parts[1] : parts[0];
 
@@ -449,7 +449,7 @@ NaughtyProcessMonitor::getLoad(ulong pid, uint & load) const
   return true;
 #elif defined(__OpenBSD__)
   // use cache
-  if (!d->cacheLoadMap_.tqcontains(pid))
+  if (!d->cacheLoadMap_.contains(pid))
       return false ;
   
   load = d->cacheLoadMap_[pid] ;