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

1 files changed, 15 insertions, 15 deletions

diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp
index 0101ae59d..661706bdb 100644
--- a/kicker/taskbar/taskbarcontainer.cpp
+++ b/kicker/taskbar/taskbarcontainer.cpp
@@ -63,20 +63,20 @@ TaskBarContainer::TaskBarContainer( bool enableFrame, TQWidget *parent, const ch
         margin = 0;
     }
 
-    tqlayout = new TQBoxLayout( this, TQApplication::reverseLayout() ?
+    layout = new TQBoxLayout( this, TQApplication::reverseLayout() ?
                                    TQBoxLayout::RightToLeft :
                                    TQBoxLayout::LeftToRight );
-    tqlayout->setMargin( margin );
+    layout->setMargin( margin );
 
     // scrollable taskbar
     taskBar = new TaskBar(this);
-    tqlayout->addWidget( taskBar );
+    layout->addWidget( taskBar );
 
     connect( taskBar, TQT_SIGNAL( containerCountChanged() ), TQT_SIGNAL( containerCountChanged() ) );
 
     setBackground();
 
-    // read settings and setup tqlayout
+    // read settings and setup layout
     configure();
 
     connectDCOPSignal("", "", "kdeTaskBarConfigChanged()",
@@ -110,7 +110,7 @@ void TaskBarContainer::configure()
         connect(windowListMenu, TQT_SIGNAL(aboutToHide()),
                 TQT_SLOT(windowListMenuAboutToHide()));
 
-        // tqgeometry
+        // geometry
         TQString icon;
         switch (direction)
         {
@@ -135,8 +135,8 @@ void TaskBarContainer::configure()
         windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
                                                                  KIcon::Panel,
                                                                  16));
-        windowListButton->setMinimumSize(windowListButton->tqsizeHint());
-        tqlayout->insertWidget(0, windowListButton);
+        windowListButton->setMinimumSize(windowListButton->sizeHint());
+        layout->insertWidget(0, windowListButton);
         windowListButton->show();
     }
 }
@@ -175,7 +175,7 @@ void TaskBarContainer::orientationChange(Orientation o)
             windowListButton->setFixedWidth(WINDOWLISTBUTTON_SIZE);
             windowListButton->setMaximumHeight(BUTTON_MAX_WIDTH);
         }
-        tqlayout->setDirection(TQApplication::reverseLayout() ?
+        layout->setDirection(TQApplication::reverseLayout() ?
                                 TQBoxLayout::RightToLeft :
                                 TQBoxLayout::LeftToRight);
     }
@@ -186,7 +186,7 @@ void TaskBarContainer::orientationChange(Orientation o)
             windowListButton->setMaximumWidth(BUTTON_MAX_WIDTH);
             windowListButton->setFixedHeight(WINDOWLISTBUTTON_SIZE);
         }
-        tqlayout->setDirection(TQBoxLayout::TopToBottom);
+        layout->setDirection(TQBoxLayout::TopToBottom);
     }
 
     taskBar->setOrientation(o);
@@ -194,7 +194,7 @@ void TaskBarContainer::orientationChange(Orientation o)
     {
         windowListButton->setOrientation(o);
     }
-    tqlayout->activate();
+    layout->activate();
 }
 
 void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
@@ -230,7 +230,7 @@ void TaskBarContainer::popupDirectionChange(KPanelApplet::Direction d)
         windowListButton->setPixmap(kapp->iconLoader()->loadIcon(icon,
                                                                  KIcon::Panel,
                                                                  16));
-        windowListButton->setMinimumSize(windowListButton->tqsizeHint());
+        windowListButton->setMinimumSize(windowListButton->sizeHint());
     }
 }
 
@@ -249,13 +249,13 @@ void TaskBarContainer::showWindowListMenu()
             pos.setX( pos.x() + width() );
             break;
         case KPanelApplet::Left:
-            pos.setX( pos.x() - windowListMenu->tqsizeHint().width() );
+            pos.setX( pos.x() - windowListMenu->sizeHint().width() );
             break;
         case KPanelApplet::Down:
             pos.setY( pos.y() + height() );
             break;
         case KPanelApplet::Up:
-            pos.setY( pos.y() - windowListMenu->tqsizeHint().height() );
+            pos.setY( pos.y() - windowListMenu->sizeHint().height() );
         default:
             break;
     }
@@ -277,9 +277,9 @@ void TaskBarContainer::reconnectWindowListButton()
     connect( windowListButton, TQT_SIGNAL( pressed() ), TQT_SLOT( showWindowListMenu() ) );
 }
 
-TQSize TaskBarContainer::tqsizeHint( KPanelExtension::Position p, TQSize maxSize) const
+TQSize TaskBarContainer::sizeHint( KPanelExtension::Position p, TQSize maxSize) const
 {
-    TQSize size = taskBar->tqsizeHint( p, maxSize );
+    TQSize size = taskBar->sizeHint( p, maxSize );
     if ( (p == KPanelExtension::Left || p == KPanelExtension::Right) && showWindowListButton ) {
         return TQSize( size.width(), size.height() + WINDOWLISTBUTTON_SIZE );
     }