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

5 files changed, 28 insertions, 28 deletions

diff --git a/kicker/taskmanager/tasklmbmenu.cpp b/kicker/taskmanager/tasklmbmenu.cpp
index bf3b805ee..864d10f5d 100644
--- a/kicker/taskmanager/tasklmbmenu.cpp
+++ b/kicker/taskmanager/tasklmbmenu.cpp
@@ -75,7 +75,7 @@ void TaskMenuItem::paint(TQPainter *p, const TQColorGroup &cg,
     p->drawText(x, y, w, h, AlignAuto|AlignVCenter|DontClip|ShowPrefix, m_text);
 }
 
-TQSize TaskMenuItem::tqsizeHint()
+TQSize TaskMenuItem::sizeHint()
 {
     TQFont font = TQFont();
     if (m_isActive)
@@ -111,7 +111,7 @@ void TaskLMBMenu::fillMenu()
     {
         Task::Ptr t = (*it);
 
-        TQString text = t->visibleName().tqreplace("&", "&&");
+        TQString text = t->visibleName().replace("&", "&&");
 
         TaskMenuItem *menuItem = new TaskMenuItem(text,
                                                   t->isActive(),
diff --git a/kicker/taskmanager/tasklmbmenu.h b/kicker/taskmanager/tasklmbmenu.h
index 6f277ad0d..d11091d82 100644
--- a/kicker/taskmanager/tasklmbmenu.h
+++ b/kicker/taskmanager/tasklmbmenu.h
@@ -38,7 +38,7 @@ public:
     ~TaskMenuItem();
 
     void paint(TQPainter*, const TQColorGroup&, bool, bool, int, int, int, int);
-    TQSize tqsizeHint();
+    TQSize sizeHint();
     void setAttentionState(bool state) { m_attentionState = state; }
 
 private:
diff --git a/kicker/taskmanager/taskmanager.cpp b/kicker/taskmanager/taskmanager.cpp
index 9aeb9415b..739c626b5 100644
--- a/kicker/taskmanager/taskmanager.cpp
+++ b/kicker/taskmanager/taskmanager.cpp
@@ -247,7 +247,7 @@ Task::Ptr TaskManager::findTask(int desktop, const TQPoint& p)
             continue;
         }
 
-        if (t->tqgeometry().tqcontains(p))
+        if (t->geometry().contains(p))
         {
             int index = list.findIndex(t->window());
             if (index > currentIndex)
@@ -295,7 +295,7 @@ void TaskManager::windowAdded(WId w )
         WId transient_for = (WId) transient_for_tmp;
 
         // check if it's transient for a skiptaskbar window
-        if( _skiptaskbar_windows.tqcontains( transient_for ))
+        if( _skiptaskbar_windows.contains( transient_for ))
             return;
 
         // lets see if this is a transient for an existing task
@@ -831,7 +831,7 @@ void Task::updateDemandsAttentionState( WId w )
         NETWinInfo i( qt_xdisplay(), w, qt_xrootwin(), NET::WMState );
         if(i.state() & NET::DemandsAttention)
         {
-            if (!_transients_demanding_attention.tqcontains(w))
+            if (!_transients_demanding_attention.contains(w))
             {
                 _transients_demanding_attention.append(w);
             }
@@ -984,10 +984,10 @@ bool Task::idMatch( const TQString& id1, const TQString& id2 )
   if ( id1.isEmpty() || id2.isEmpty() )
     return false;
 
-  if ( id1.tqcontains( id2 ) > 0 )
+  if ( id1.contains( id2 ) > 0 )
     return true;
 
-  if ( id2.tqcontains( id1 ) > 0 )
+  if ( id2.contains( id1 ) > 0 )
     return true;
 
   return false;
@@ -1009,7 +1009,7 @@ void Task::move()
         KWin::deIconifyWindow(_win);
     }
 
-    TQRect geom = _info.tqgeometry();
+    TQRect geom = _info.geometry();
     TQCursor::setPos(geom.center());
 
     NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize);
@@ -1032,7 +1032,7 @@ void Task::resize()
         KWin::deIconifyWindow(_win);
     }
 
-    TQRect geom = _info.tqgeometry();
+    TQRect geom = _info.geometry();
     TQCursor::setPos(geom.bottomRight());
 
     NETRootInfo ri(qt_xdisplay(), NET::WMMoveResize);
@@ -1305,8 +1305,8 @@ void Task::updateThumbnail()
     // by the thumbnail generation. This makes things much smoother
     // on slower machines.
     //
-    TQWidget *rootWin = tqApp->desktop();
-    TQRect geom = _info.tqgeometry();
+    TQWidget *rootWin = qApp->desktop();
+    TQRect geom = _info.geometry();
     _grab = TQPixmap::grabWindow(rootWin->winId(),
                                 geom.x(), geom.y(),
                                 geom.width(), geom.height());
@@ -1329,7 +1329,7 @@ void Task::generateThumbnail()
    width = width * _thumbSize;
    height = height * _thumbSize;
 
-   img = img.smoothScale( tqRound(width), tqRound(height) );
+   img = img.smoothScale( qRound(width), qRound(height) );
    _thumb = img;
    _grab.resize( 0, 0 ); // Makes grab a null image.
 
@@ -1356,7 +1356,7 @@ TQPixmap Task::thumbnail(int maxDimension)
     Picture picture = XRenderCreatePicture(dpy, m_windowPixmap, format,
                                            CPSubwindowMode, &picAttr);
 
-    // Get tqshaped windows handled correctly.
+    // Get shaped windows handled correctly.
     XserverRegion region = XFixesCreateRegionFromWindow(dpy, m_frameId,
                                                         WindowRegionBounding);
     XFixesSetPictureClipRegion(dpy, picture, 0, 0, region);
@@ -1386,10 +1386,10 @@ TQPixmap Task::thumbnail(int maxDimension)
     XRenderComposite(dpy,
                      hasAlpha ? PictOpOver : PictOpSrc,
                      picture, // src
-                     None, // tqmask
+                     None, // mask
                      full.x11RenderHandle(), // dst
                      0, 0, // src offset
-                     0, 0, // tqmask offset
+                     0, 0, // mask offset
                      0, 0, // dst offset
                      winAttr.width, winAttr.height);
 
@@ -1411,10 +1411,10 @@ TQPixmap Task::thumbnail(int maxDimension)
     XRenderComposite(TQPaintDevice::x11AppDisplay(),
                      PictOpOver, // we're filtering, alpha values are probable
                      picture, // src
-                     None, // tqmask
+                     None, // mask
                      thumbnail.x11RenderHandle(), // dst
                      0, 0, // src offset
-                     0, 0, // tqmask offset
+                     0, 0, // mask offset
                      0, 0, // dst offset
                      thumbnailWidth, thumbnailHeight);
 #endif
@@ -1499,7 +1499,7 @@ bool TaskDrag::canDecode(const TQMimeSource* e)
 
 Task::List TaskDrag::decode( const TQMimeSource* e )
 {
-    TQByteArray data(e->tqencodedData("taskbar/task"));
+    TQByteArray data(e->encodedData("taskbar/task"));
     Task::List tasks;
 
     if (data.size())
diff --git a/kicker/taskmanager/taskmanager.h b/kicker/taskmanager/taskmanager.h
index dd730e410..8f5876360 100644
--- a/kicker/taskmanager/taskmanager.h
+++ b/kicker/taskmanager/taskmanager.h
@@ -262,12 +262,12 @@ public:
     bool showInPager() const { return _info.state() ^ NET::SkipPager; }
 
     /**
-     * Returns the tqgeometry for this window
+     * Returns the geometry for this window
      */
-    TQRect tqgeometry() const { return _info.tqgeometry(); }
+    TQRect geometry() const { return _info.geometry(); }
 
     /**
-     * Returns the tqgeometry for the from of this window
+     * Returns the geometry for the from of this window
      */
     TQRect frameGeometry() const { return _info.frameGeometry(); }
 
@@ -427,7 +427,7 @@ signals:
     /**
      * Indicates that this task has changed in some way.
      */
-    void changed(bool tqgeometryChangeOnly);
+    void changed(bool geometryChangeOnly);
 
     /**
      * Indicates that the icon for this task has changed.
@@ -529,7 +529,7 @@ public:
     /**
      * The name of the starting task (if known).
      */
-    TQString text() const { return _data.tqfindName(); }
+    TQString text() const { return _data.findName(); }
 
     /**
      * The name of the executable of the starting task.
@@ -539,7 +539,7 @@ public:
     /**
      * The name of the icon to be used for the starting task.
      */
-    TQString icon() const { return _data.tqfindIcon(); }
+    TQString icon() const { return _data.findIcon(); }
     void update( const KStartupInfoData& data );
     const KStartupInfoId& id() const { return _id; }
 
@@ -616,7 +616,7 @@ public:
     bool isOnTop(const Task*);
 
     /**
-     * Tells the task manager whether or not we care about tqgeometry
+     * Tells the task manager whether or not we care about geometry
      * updates. This generates a lot of activity so should only be used
      * when necessary.
      */
diff --git a/kicker/taskmanager/taskrmbmenu.cpp b/kicker/taskmanager/taskrmbmenu.cpp
index bb5ee6035..fb4c9ae87 100644
--- a/kicker/taskmanager/taskrmbmenu.cpp
+++ b/kicker/taskmanager/taskrmbmenu.cpp
@@ -236,7 +236,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu(Task::Ptr t)
 	m->insertSeparator();
 
 	for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
-		TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).tqreplace('&', "&&"));
+		TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
 		id = m->insertItem( name, t, TQT_SLOT( toDesktop(int) ) );
 		m->setItemParameter( id, i );
 		m->setItemChecked( id, !t->isOnAllDesktops() && t->desktop() == i );
@@ -256,7 +256,7 @@ TQPopupMenu* TaskRMBMenu::makeDesktopsMenu()
 	m->insertSeparator();
 
 	for (int i = 1; i <= TaskManager::the()->numberOfDesktops(); i++) {
-		TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).tqreplace('&', "&&"));
+		TQString name = TQString("&%1 %2").arg(i).arg(TaskManager::the()->desktopName(i).replace('&', "&&"));
 		id = m->insertItem( name, this, TQT_SLOT( slotAllToDesktop(int) ) );
 		m->setItemParameter( id, i );
 	}