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

11 files changed, 33 insertions, 33 deletions

diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index 9c7d25898..f25eae002 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -82,7 +82,7 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca
     // set qwhatsthis help
     TQWhatsThis::add(this, i18n(intro_text));
     _viewer = new KHTMLPart( this, "_viewer" );
-    _viewer->widget()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
+    _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
     connect( _viewer->browserExtension(),
              TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
              this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) );
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index 4f0b14f4d..598807a2d 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -131,7 +131,7 @@ DockContainer::DockContainer(TQWidget *parent)
   , _module(0L)
 {
   _busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this);
-  _busyw->tqsetAlignment(AlignCenter);
+  _busyw->setAlignment(AlignCenter);
   _busyw->setTextFormat(RichText);
   _busyw->setGeometry(0,0, width(), height());
   addWidget( _busyw );
@@ -221,7 +221,7 @@ i18n("There are unsaved changes in the active module.\n"
 
   ProxyWidget *widget = loadModule( module );
 
-  KCGlobal::repairAccels( tqtopLevelWidget() );
+  KCGlobal::repairAccels( topLevelWidget() );
   return ( widget!=0 );
 }
 
diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index ed892ac70..0a409b7e0 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -91,12 +91,12 @@ TQString KCGlobal::baseGroup()
       if (_infocenter)
       {
         kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl;
-        _baseGroup = TQString::tqfromLatin1("Settings/Information/");
+        _baseGroup = TQString::fromLatin1("Settings/Information/");
       }
       else
       {
         kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl;
-        _baseGroup = TQString::tqfromLatin1("Settings/");
+        _baseGroup = TQString::fromLatin1("Settings/");
       }
     }
   }
diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp
index 237cbdfe9..723895de3 100644
--- a/kcontrol/kcontrol/kcrootonly.cpp
+++ b/kcontrol/kcontrol/kcrootonly.cpp
@@ -26,13 +26,13 @@
 KCRootOnly::KCRootOnly(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-   TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
+   TQVBoxLayout *layout=new TQVBoxLayout(this);
    TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>"
                                     "Click on the \"Administrator Mode\" button below."), this);
-   tqlayout->addWidget(label);
-   label->tqsetAlignment(AlignCenter);
+   layout->addWidget(label);
+   label->setAlignment(AlignCenter);
    label->setTextFormat(RichText);
-   label->setMinimumSize(label->tqsizeHint());
+   label->setMinimumSize(label->sizeHint());
 }
 
 
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 67ffdaa46..758b742fd 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -77,9 +77,9 @@ KControlApp::KControlApp()
   int fontSize = toplevel->fontInfo().pointSize();
   if (fontSize == 0)
     fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX();
-  int x = config->readNumEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk.width()), 
+  int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()), 
 			       QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) );
-  int y = config->readNumEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk.height()), 
+  int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()), 
 			       QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) );
   toplevel->resize(x,y);
 }
@@ -91,8 +91,8 @@ KControlApp::~KControlApp()
       KConfig *config = KGlobal::config();
       config->setGroup("General");
       TQWidget *desk = TQApplication::desktop();
-      config->writeEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
-      config->writeEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
+      config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
+      config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
       config->sync();
     }
   delete toplevel;
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index 6ab262508..ad60eda5a 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -68,9 +68,9 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
      connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
 
      // Item names may contain ampersands. To avoid them being converted to 
-     // accelators, tqreplace them with two ampersands.
+     // accelators, replace them with two ampersands.
      TQString name = group->caption();
-     name.tqreplace("&", "&&");
+     name.replace("&", "&&");
   
      parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
                         , name, menu);
@@ -83,9 +83,9 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
   for (module=moduleList.first(); module != 0; module=moduleList.next())
   {
      // Item names may contain ampersands. To avoid them being converted to 
-     // accelators, tqreplace them with two ampersands.
+     // accelators, replace them with two ampersands.
      TQString name = module->moduleName();
-     name.tqreplace("&", "&&");
+     name.replace("&", "&&");
 
      int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
                                      , name, id);
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 14b75c780..cc8c63af4 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -142,12 +142,12 @@ void ConfigModule::runAsRoot()
 
   // create an embed widget that will embed the
   // kcmshell running as root
-  _embedLayout = new TQVBoxLayout(_module->tqparentWidget());
-  _embedFrame = new TQVBox( _module->tqparentWidget() );
+  _embedLayout = new TQVBoxLayout(_module->parentWidget());
+  _embedFrame = new TQVBox( _module->parentWidget() );
   _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised );
   TQPalette pal( red );
   pal.setColor( TQColorGroup::Background,
-		_module->tqparentWidget()->tqcolorGroup().background() );
+		_module->parentWidget()->colorGroup().background() );
   _embedFrame->setPalette( pal );
   _embedFrame->setLineWidth( 2 );
   _embedFrame->setMidLineWidth( 2 );
@@ -158,7 +158,7 @@ void ConfigModule::runAsRoot()
   _module->hide();
   _embedFrame->show();
   TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack);
-  _busy->tqsetAlignment(AlignCenter);
+  _busy->setAlignment(AlignCenter);
   _busy->setTextFormat(RichText);
   _busy->setGeometry(0,0, _module->width(), _module->height());
   _busy->show();
@@ -338,7 +338,7 @@ TQString ConfigModuleList::findModule(ConfigModule *module)
   Menu *menu;
   for(;(menu = it.current());++it)
   {
-     if (menu->modules.tqcontainsRef(module))
+     if (menu->modules.containsRef(module))
         return it.currentKey();
   }
   return TQString::null;
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index b15f0ccd6..6f767ab20 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -133,9 +133,9 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath)
 
 
 
-TQSize ModuleTreeView::tqsizeHint() const
+TQSize ModuleTreeView::sizeHint() const
 {
-    return TQListView::tqsizeHint().boundedTo( 
+    return TQListView::sizeHint().boundedTo( 
 	TQSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) );
 }
 
@@ -166,7 +166,7 @@ void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList<TQListViewItem>
 {
   while (item)
     {
-      setOpen(item, parentList->tqcontains(item));
+      setOpen(item, parentList->contains(item));
 
           if (item->childCount() != 0)
                 expandItem(item->firstChild(), parentList);
@@ -342,8 +342,8 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu
       TQPixmap pixmap(offset, offset);
       pixmap.fill(Qt::color0);
       pixmap.setMask(pixmap.createHeuristicMask());
-      TQBitmap tqmask( pixmap.size(), true );
-      pixmap.setMask( tqmask );
+      TQBitmap mask( pixmap.size(), true );
+      pixmap.setMask( mask );
       TQListViewItem::setPixmap(0, pixmap);
     }
   }
diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h
index 448251a6f..ede3c8a52 100644
--- a/kcontrol/kcontrol/moduletreeview.h
+++ b/kcontrol/kcontrol/moduletreeview.h
@@ -74,7 +74,7 @@ public:
   void makeSelected(ConfigModule* module);
   void makeVisible(ConfigModule *module);
   void fill();
-  TQSize tqsizeHint() const;
+  TQSize sizeHint() const;
 
 signals:
   void moduleSelected(ConfigModule*);
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index e50b67fa5..b8f83c5fc 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -120,7 +120,7 @@ public:
     ~ProxyContentWidget(){}
 
     // this should be really done by qscrollview in AutoOneFit mode!
-    TQSize tqsizeHint() const { return tqminimumSizeHint(); }
+    TQSize sizeHint() const { return minimumSizeHint(); }
 };
 
 
@@ -144,7 +144,7 @@ ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool
   }
   client->reparent(contentWidget,0,TQPoint(0,0),true);
   vbox->addWidget( client );
-  vbox->activate(); // make sure we have a proper tqminimumSizeHint
+  vbox->activate(); // make sure we have a proper minimumSizeHint
   addChild(contentWidget);
 }
 
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index e4fa10d5b..aac3427ff 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -85,7 +85,7 @@ TopLevel::TopLevel(const char* name)
       connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) );
   }
 
-  // create the tqlayout box
+  // create the layout box
   _splitter = new TQSplitter( TQSplitter::Horizontal, this );
 
   TQFrame* leftFrame = new TQFrame ( _splitter );
@@ -142,7 +142,7 @@ TopLevel::TopLevel(const char* name)
   // help widget
   _help = new HelpWidget(_dock);
 
-  _stack->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+  _stack->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
 
  // Restore sizes
   config->setGroup("General");
@@ -514,7 +514,7 @@ void TopLevel::aboutModule()
 
 TQString TopLevel::handleAmpersand( TQString modulename ) const
 {
-   if( modulename.tqcontains( '&' )) // double it
+   if( modulename.contains( '&' )) // double it
    {
       for( int i = modulename.length();
            i >= 0;