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, 33 insertions, 33 deletions

diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index ecdcd4509..dc2431e15 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -83,7 +83,7 @@ extern "C"
 KMiniPager::KMiniPager(const TQString& configFile, Type type, int actions,
                        TQWidget *parent, const char *name)
     : KPanelApplet( configFile, type, actions, parent, name ),
-      m_tqlayout(0),
+      m_layout(0),
       m_desktopLayoutOwner( NULL ),
       m_shadowEngine(0),
       m_contextMenu(0),
@@ -363,7 +363,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
     if( y == -1 )
         y = 0;
     if( m_desktopLayoutOwner == NULL )
-    { // must own manager selection before setting global desktop tqlayout
+    { // must own manager selection before setting global desktop layout
         int screen = DefaultScreen( qt_xdisplay());
         m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
             screen, this );
@@ -397,10 +397,10 @@ void KMiniPager::resizeEvent(TQResizeEvent*)
     if(deskNum == 0 || deskNum % rowNum != 0)
         deskCols += 1;
 
-    if (m_tqlayout)
+    if (m_layout)
     {
-        delete m_tqlayout;
-        m_tqlayout = 0;
+        delete m_layout;
+        m_layout = 0;
     }
 
     int nDX, nDY;
@@ -418,7 +418,7 @@ void KMiniPager::resizeEvent(TQResizeEvent*)
     }
 
     // 1 pixel spacing.
-    m_tqlayout = new TQGridLayout(this, nDX, nDY, 0, 1);
+    m_layout = new TQGridLayout(this, nDX, nDY, 0, 1);
 
     TQValueList<KMiniPagerButton*>::Iterator it = m_desktops.begin();
     TQValueList<KMiniPagerButton*>::Iterator itEnd = m_desktops.end();
@@ -427,14 +427,14 @@ void KMiniPager::resizeEvent(TQResizeEvent*)
     while( it != itEnd ) {
         c = 0;
         while( (it != itEnd) && (c < nDY) ) {
-            m_tqlayout->addWidget( *it, r, c );
+            m_layout->addWidget( *it, r, c );
             ++it;
             ++c;
         }
         ++r;
     }
 
-    m_tqlayout->activate();
+    m_layout->activate();
     updateGeometry();
 }
 
@@ -865,7 +865,7 @@ void KMiniPager::slotDesktopNamesChanged()
     {
         TQString name = m_kwin->desktopName(i);
         (*it)->setDesktopName(name);
-        (*it)->tqrepaint();
+        (*it)->repaint();
         TQToolTip::remove((*it));
         TQToolTip::add((*it), name);
     }
diff --git a/kicker/applets/minipager/pagerapplet.h b/kicker/applets/minipager/pagerapplet.h
index 2a9f7f313..e72f44588 100644
--- a/kicker/applets/minipager/pagerapplet.h
+++ b/kicker/applets/minipager/pagerapplet.h
@@ -121,7 +121,7 @@ private:
 
     TQButtonGroup *m_group;
 
-    TQGridLayout *m_tqlayout;
+    TQGridLayout *m_layout;
     bool m_useViewports;
     int desktopLayoutOrientation;
     int desktopLayoutX;
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 3d7f06985..10a5aa8c9 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -106,7 +106,7 @@ TQRect KMiniPagerButton::mapGeometryToViewport(const KWin::WindowInfo& info) con
     if (!m_useViewports)
         return info.frameGeometry();
 
-    // ### fix vertically tqlayouted viewports
+    // ### fix vertically layouted viewports
     TQRect _r(info.frameGeometry());
     TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop()));
 
@@ -129,7 +129,7 @@ TQPoint KMiniPagerButton::mapPointToViewport(const TQPoint& _p) const
 
     TQPoint vx(m_pager->kwin()->currentViewport(m_pager->kwin()->currentDesktop()));
 
-    // ### fix vertically tqlayouted viewports
+    // ### fix vertically layouted viewports
     TQPoint p(_p);
     p.setX(p.x() + (m_desktop - vx.x()) * TQApplication::desktop()->width());
     return p;
@@ -157,8 +157,8 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const
         TQRect r = mapGeometryToViewport(*info);
 
         if (!info->hasState(NET::Sticky) &&
-            !TQApplication::desktop()->tqgeometry().tqcontains(r.topLeft()) &&
-            !TQApplication::desktop()->tqgeometry().tqcontains(r.topRight()))
+            !TQApplication::desktop()->geometry().contains(r.topLeft()) &&
+            !TQApplication::desktop()->geometry().contains(r.topRight()))
             return false;
     }
 
@@ -404,16 +404,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
             // transparent windows get an 1 pixel frame...
             if (on)
             {
-                bp->setPen(tqcolorGroup().midlight());
+                bp->setPen(colorGroup().midlight());
             }
             else if (down)
             {
-                bp->setPen(KickerLib::blendColors(tqcolorGroup().mid(),
-                                                 tqcolorGroup().midlight()));
+                bp->setPen(KickerLib::blendColors(colorGroup().mid(),
+                                                 colorGroup().midlight()));
             }
             else
             {
-                bp->setPen(tqcolorGroup().dark());
+                bp->setPen(colorGroup().dark());
             }
 
             bp->drawRect(0, 0, w, h);
@@ -424,16 +424,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
 
             if (on)
             {
-                background = tqcolorGroup().brush(TQColorGroup::Midlight);
+                background = colorGroup().brush(TQColorGroup::Midlight);
             }
             else if (down)
             {
-                background = KickerLib::blendColors(tqcolorGroup().mid(),
-                                                    tqcolorGroup().midlight());
+                background = KickerLib::blendColors(colorGroup().mid(),
+                                                    colorGroup().midlight());
             }
             else
             {
-                background = tqcolorGroup().brush(TQColorGroup::Mid);
+                background = colorGroup().brush(TQColorGroup::Mid);
             }
 
             bp->fillRect(0, 0, w, h, background);
@@ -462,12 +462,12 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
 
                 if (kwin->activeWindow() == info->win())
                 {
-                    TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight);
-                    qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush);
+                    TQBrush brush = colorGroup().brush(TQColorGroup::Highlight);
+                    qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush);
                 }
                 else
                 {
-                    TQBrush brush = tqcolorGroup().brush(TQColorGroup::Button);
+                    TQBrush brush = colorGroup().brush(TQColorGroup::Button);
 
                     if (on)
                     {
@@ -475,7 +475,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
                     }
 
                     bp->fillRect(r, brush);
-                    qDrawShadeRect(bp, r, tqcolorGroup(), true, 1, 0);
+                    qDrawShadeRect(bp, r, colorGroup(), true, 1, 0);
                 }
 
                 if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15)
@@ -498,11 +498,11 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
         // makes it look a bit more finished.
         if (on)
         {
-            bp->setPen(tqcolorGroup().midlight());
+            bp->setPen(colorGroup().midlight());
         }
         else
         {
-            bp->setPen(tqcolorGroup().mid());
+            bp->setPen(colorGroup().mid());
         }
 
         bp->drawRect(0, 0, w, h);
@@ -515,7 +515,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
         
         if (transparent || liveBkgnd)
         {
-            bp->setPen(on ? tqcolorGroup().midlight() : tqcolorGroup().buttonText());
+            bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText());
             m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size());
         }
         else
@@ -523,7 +523,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
     }
     
     if (m_inside)
-        KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), tqcolorGroup().foreground());
+        KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground());
 }
 
 void KMiniPagerButton::mousePressEvent(TQMouseEvent * e)
@@ -578,7 +578,7 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
     if (m_currentWindow && !m_pager->clickPos.isNull() &&
         (m_pager->clickPos - e->pos()).manhattanLength() > KGlobalSettings::dndEventDelay())
     {
-        TQRect r = m_currentWindow->tqgeometry();
+        TQRect r = m_currentWindow->geometry();
 
         // preview window height, window width
         int ww = r.width() * w / dw;
@@ -586,9 +586,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
         TQPixmap windowImage(ww, wh);
         TQPainter bp(&windowImage, this);
 
-        bp.setPen(tqcolorGroup().foreground());
+        bp.setPen(colorGroup().foreground());
         bp.drawRect(0, 0, ww, wh);
-        bp.fillRect(1, 1, ww - 2, wh - 2, tqcolorGroup().background());
+        bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background());
 
         Task::List tasklist;
         tasklist.append(m_currentWindow);