Rename a number of old tq methods that are no longer tq specific

6 files changed, 25 insertions, 25 deletions

diff --git a/certmanager/conf/appearanceconfigpage.cpp b/certmanager/conf/appearanceconfigpage.cpp
index 9e5d0f74a..02889b9e8 100644
--- a/certmanager/conf/appearanceconfigpage.cpp
+++ b/certmanager/conf/appearanceconfigpage.cpp
@@ -30,7 +30,7 @@
 */
 
 #include "appearanceconfigpage.h"
-#include <tqlayout.h>
+#include <layout.h>
 #include "appearanceconfigwidget.h"
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/certmanager/conf/appearanceconfigwidget.cpp b/certmanager/conf/appearanceconfigwidget.cpp
index 309d03be1..ad9089551 100644
--- a/certmanager/conf/appearanceconfigwidget.cpp
+++ b/certmanager/conf/appearanceconfigwidget.cpp
@@ -50,7 +50,7 @@
 #include <kcolordialog.h>
 
 #include <tqpushbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqheader.h>
 #include <tqcolor.h>
 #include <tqfont.h>
@@ -139,7 +139,7 @@ private:
     setText( 0, name );
   }
 
-  void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment );
+  void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment );
 
 private:
   TQColor mForegroundColor, mBackgroundColor;
@@ -152,7 +152,7 @@ private:
   bool mDirty;
 };
 
-void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) {
+void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) {
   TQColorGroup _cg = cg;
   TQFont font = p->font();
   if ( mHasFont )
@@ -172,7 +172,7 @@ void CategoryListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, in
   if ( mBackgroundColor.isValid() )
     _cg.setColor( TQColorGroup::Base, mBackgroundColor );
 
-  TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
+  TQListViewItem::paintCell( p, _cg, column, width, alignment );
 }
 
 ////
@@ -227,7 +227,7 @@ void AppearanceConfigWidget::slotDefaultClicked()
   if ( !item )
     return;
   item->setDefaultAppearance();
-  item->tqrepaint();
+  item->repaint();
   slotSelectionChanged( item );
   emit changed();
 }
@@ -280,7 +280,7 @@ void AppearanceConfigWidget::slotForegroundClicked() {
   int result = KColorDialog::getColor( fg );
   if ( result == KColorDialog::Accepted ) {
     item->setForegroundColor( fg );
-    item->tqrepaint();
+    item->repaint();
     emit changed();
   }
 }
@@ -294,7 +294,7 @@ void AppearanceConfigWidget::slotBackgroundClicked() {
   int result = KColorDialog::getColor( bg );
   if ( result == KColorDialog::Accepted ) {
     item->setBackgroundColor( bg );
-    item->tqrepaint();
+    item->repaint();
     emit changed();
   }
 }
@@ -308,7 +308,7 @@ void AppearanceConfigWidget::slotFontClicked() {
   int result = KFontDialog::getFont( font );
   if ( result == KFontDialog::Accepted ) {
     item->setFont( font );
-    item->tqrepaint();
+    item->repaint();
     emit changed();
   }
 }
@@ -320,7 +320,7 @@ void AppearanceConfigWidget::defaults()
   for ( ; lvit.current() ; ++lvit ) {
     CategoryListViewItem* item = static_cast<CategoryListViewItem *>( lvit.current() );
     item->setDefaultAppearance();
-    item->tqrepaint();
+    item->repaint();
   }
   emit changed();
 }
@@ -330,7 +330,7 @@ void AppearanceConfigWidget::slotItalicClicked()
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
   if ( item ) {
     item->toggleItalic();
-    item->tqrepaint();
+    item->repaint();
     emit changed();
   }
 }
@@ -340,7 +340,7 @@ void AppearanceConfigWidget::slotBoldClicked()
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
   if ( item ) {
     item->toggleBold();
-    item->tqrepaint();
+    item->repaint();
     emit changed();
   }
 }
@@ -350,7 +350,7 @@ void AppearanceConfigWidget::slotStrikeoutClicked()
   CategoryListViewItem* item = static_cast<CategoryListViewItem*>(categoriesLV->selectedItem() );
   if ( item ) {
     item->toggleStrikeout();
-    item->tqrepaint();
+    item->repaint();
     emit changed();
   }
 }
diff --git a/certmanager/conf/appearanceconfigwidgetbase.ui b/certmanager/conf/appearanceconfigwidgetbase.ui
index 0d97a877b..570292013 100644
--- a/certmanager/conf/appearanceconfigwidgetbase.ui
+++ b/certmanager/conf/appearanceconfigwidgetbase.ui
@@ -37,7 +37,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -119,7 +119,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>100</height>
diff --git a/certmanager/conf/configuredialog.cpp b/certmanager/conf/configuredialog.cpp
index 2aa622d08..db9c7739f 100644
--- a/certmanager/conf/configuredialog.cpp
+++ b/certmanager/conf/configuredialog.cpp
@@ -52,9 +52,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
   // the KCMultiDialog starts with the size of the first kcm, not
   // the largest one. This way at least after the first showing of
   // the largest kcm the size is kept.
-  const KConfigGroup tqgeometry( KGlobal::config(), "Geometry" );
-  const int width = tqgeometry.readNumEntry( "ConfigureDialogWidth" );
-  const int height = tqgeometry.readNumEntry( "ConfigureDialogHeight" );
+  const KConfigGroup geometry( KGlobal::config(), "Geometry" );
+  const int width = geometry.readNumEntry( "ConfigureDialogWidth" );
+  const int height = geometry.readNumEntry( "ConfigureDialogHeight" );
   if ( width != 0 && height != 0 ) {
      setMinimumSize( width, height );
   }
@@ -62,9 +62,9 @@ ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal
 }
 
 void ConfigureDialog::hideEvent( TQHideEvent * ) {
-  KConfigGroup tqgeometry( KGlobal::config(), "Geometry" );
-  tqgeometry.writeEntry( "ConfigureDialogWidth", width() );
-  tqgeometry.writeEntry( "ConfigureDialogHeight",height() );
+  KConfigGroup geometry( KGlobal::config(), "Geometry" );
+  geometry.writeEntry( "ConfigureDialogWidth", width() );
+  geometry.writeEntry( "ConfigureDialogHeight",height() );
 }
 
 ConfigureDialog::~ConfigureDialog() {
diff --git a/certmanager/conf/dirservconfigpage.cpp b/certmanager/conf/dirservconfigpage.cpp
index 436ef28ec..a90a6c091 100644
--- a/certmanager/conf/dirservconfigpage.cpp
+++ b/certmanager/conf/dirservconfigpage.cpp
@@ -45,7 +45,7 @@
 #include <tqlabel.h>
 #include <tqdatetimeedit.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <tdepimmacros.h>
 
@@ -283,11 +283,11 @@ Kleo::CryptoConfigEntry* DirectoryServicesConfigurationPage::configEntry( const
 {
     Kleo::CryptoConfigEntry* entry = mConfig->entry( componentName, groupName, entryName );
     if ( !entry ) {
-        KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).tqarg( componentName, groupName, entryName ) );
+        KMessageBox::error( this, i18n( "Backend error: gpgconf does not seem to know the entry for %1/%2/%3" ).arg( componentName, groupName, entryName ) );
         return 0;
     }
     if( entry->argType() != argType || entry->isList() != isList ) {
-        KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).tqarg( componentName, groupName, entryName ).tqarg( entry->argType() ).tqarg( entry->isList() ) );
+        KMessageBox::error( this, i18n( "Backend error: gpgconf has wrong type for %1/%2/%3: %4 %5" ).arg( componentName, groupName, entryName ).arg( entry->argType() ).arg( entry->isList() ) );
         return 0;
     }
     return entry;
diff --git a/certmanager/conf/dnorderconfigpage.cpp b/certmanager/conf/dnorderconfigpage.cpp
index a224b6f7a..b16c9a90b 100644
--- a/certmanager/conf/dnorderconfigpage.cpp
+++ b/certmanager/conf/dnorderconfigpage.cpp
@@ -36,7 +36,7 @@
 
 #include <tdepimmacros.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 
 DNOrderConfigPage::DNOrderConfigPage( TQWidget * parent, const char * name )
   : KCModule( parent, name )