Rename old tq methods that no longer need a unique name

10 files changed, 59 insertions, 59 deletions

diff --git a/kitchensync/libqopensync/group.cpp b/kitchensync/libqopensync/group.cpp
index d716e1c4c..427a57c9e 100644
--- a/kitchensync/libqopensync/group.cpp
+++ b/kitchensync/libqopensync/group.cpp
@@ -146,7 +146,7 @@ TQString Group::name() const
 {
   Q_ASSERT( mGroup );
 
-  return TQString::tqfromLatin1( osync_group_get_name( mGroup ) );
+  return TQString::fromLatin1( osync_group_get_name( mGroup ) );
 }
 
 void Group::setLastSynchronization( const TQDateTime &dateTime )
diff --git a/kitchensync/libqopensync/member.cpp b/kitchensync/libqopensync/member.cpp
index fc7dfe312..a2c2268e7 100644
--- a/kitchensync/libqopensync/member.cpp
+++ b/kitchensync/libqopensync/member.cpp
@@ -55,14 +55,14 @@ TQString Member::configurationDirectory() const
 {
   Q_ASSERT( mMember );
 
-  return TQString::tqfromLatin1( osync_member_get_configdir( mMember ) );
+  return TQString::fromLatin1( osync_member_get_configdir( mMember ) );
 }
 
 TQString Member::pluginName() const
 {
   Q_ASSERT( mMember );
 
-  return TQString::tqfromLatin1( osync_member_get_pluginname( mMember ) );
+  return TQString::fromLatin1( osync_member_get_pluginname( mMember ) );
 }
 
 Plugin Member::plugin() const
diff --git a/kitchensync/libqopensync/plugin.cpp b/kitchensync/libqopensync/plugin.cpp
index fd7600499..acd54447a 100644
--- a/kitchensync/libqopensync/plugin.cpp
+++ b/kitchensync/libqopensync/plugin.cpp
@@ -43,20 +43,20 @@ TQString Plugin::name() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::tqfromLatin1( osync_plugin_get_name( mPlugin ) );
+  return TQString::fromLatin1( osync_plugin_get_name( mPlugin ) );
 }
 
 TQString Plugin::longName() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::tqfromLatin1( osync_plugin_get_longname( mPlugin ) );
+  return TQString::fromLatin1( osync_plugin_get_longname( mPlugin ) );
 }
 
 TQString Plugin::description() const
 {
   Q_ASSERT( mPlugin );
 
-  return TQString::tqfromLatin1( osync_plugin_get_description( mPlugin ) );
+  return TQString::fromLatin1( osync_plugin_get_description( mPlugin ) );
 }
 
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
index d51101aeb..041a8d1c0 100644
--- a/kitchensync/src/configguisunbird.cpp
+++ b/kitchensync/src/configguisunbird.cpp
@@ -57,14 +57,14 @@ ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *paren
 
   KPushButton *mLocalAddButton = new KPushButton( mLocalWidget );
   mLocalAddButton->setText( i18n( "Add new calendar" ) );
-  mLocalAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mLocalAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mLocalLayout->addWidget( mLocalAddButton );
   connect( mLocalAddButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( addLocalCalendar() ) );
 
   KPushButton *mWebdavAddButton = new KPushButton( mWebdavWidget );
   mWebdavAddButton->setText( i18n( "Add new calendar" ) );
-  mWebdavAddButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mWebdavAddButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   mWebdavLayout->addWidget( mWebdavAddButton );
   connect( mWebdavAddButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( addWebdavCalendar() ) );
@@ -100,7 +100,7 @@ void ConfigGuiSunbird::load( const TQString &xml )
 
       LocalCalendar *cal = new LocalCalendar( path, defaultcal, days, mLocalWidget );
       mLocalLayout->removeItem( mLocalSpacer );
-      cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+      cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
       mLocalLayout->addWidget( cal );
       mLocalLayout->addItem( mLocalSpacer );
       mLocalList.append( cal );
@@ -122,7 +122,7 @@ void ConfigGuiSunbird::load( const TQString &xml )
       WebdavCalendar *cal = new WebdavCalendar( username, password,
                                                 url, defaultcal, days, mWebdavWidget );
       mWebdavLayout->removeItem( mWebdavSpacer );
-      cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+      cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
       mWebdavLayout->addWidget( cal );
       mWebdavLayout->addItem( mWebdavSpacer );
       mWebdavList.append( cal );
@@ -175,7 +175,7 @@ void ConfigGuiSunbird::addLocalCalendar()
 {
   LocalCalendar *cal = new LocalCalendar( mLocalWidget );
   mLocalLayout->removeItem( mLocalSpacer );
-  cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+  cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
   mLocalLayout->addWidget( cal );
   mLocalLayout->addItem( mLocalSpacer );
   mLocalList.append( cal );
@@ -194,7 +194,7 @@ void ConfigGuiSunbird::addWebdavCalendar()
 {
   WebdavCalendar *cal = new WebdavCalendar( mWebdavWidget );
   mWebdavLayout->removeItem( mWebdavSpacer );
-  cal->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+  cal->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
   mWebdavLayout->addWidget( cal );
   mWebdavLayout->addItem( mWebdavSpacer );
   mWebdavList.append( cal );
@@ -239,7 +239,7 @@ void LocalCalendar::initGui()
 
   mDaysSpinBox = new TQSpinBox( this );
   mDaysSpinBox->setDisabled( true );
-  mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 
   connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
            this, TQT_SLOT( toggleDays( bool ) ) );
@@ -253,7 +253,7 @@ void LocalCalendar::initGui()
   mPathRequester = new KURLRequester( this );
 
   KPushButton *removeButton = new KPushButton( this );
-  removeButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  removeButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
   removeButton->setText( i18n( "Remove" ) );
   connect( removeButton, TQT_SIGNAL( clicked() ),
            this, TQT_SLOT( deleteWidget() ) );
@@ -308,7 +308,7 @@ void WebdavCalendar::initGui()
 
   mDaysSpinBox = new TQSpinBox( this );
   mDaysSpinBox->setDisabled( true );
-  mDaysSpinBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+  mDaysSpinBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 
   connect( mDaysCheckBox, TQT_SIGNAL( toggled( bool ) ),
            this, TQT_SLOT( toggleDays( bool ) ) );
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index 99ff35fdb..1cb95ebd2 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -50,8 +50,8 @@ GroupConfig::GroupConfig( TQWidget *parent )
   TQFrame *titleFrame = new TQFrame( this );
   topLayout->addWidget( titleFrame );
 
-  titleFrame->setPaletteForegroundColor( tqcolorGroup().light() );
-  titleFrame->setPaletteBackgroundColor( tqcolorGroup().mid() );
+  titleFrame->setPaletteForegroundColor( colorGroup().light() );
+  titleFrame->setPaletteBackgroundColor( colorGroup().mid() );
 
   TQBoxLayout *nameLayout = new TQHBoxLayout( titleFrame );
   nameLayout->setMargin( 4 );
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 3a294f5ba..acfd73e5f 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -71,27 +71,27 @@ GroupItem::GroupItem( KWidgetList *parent, SyncProcess *process )
 
   mIcon = new TQLabel( hbox );
   mIcon->setPixmap( icon );
-  mIcon->setFixedSize( mIcon->tqsizeHint() );
-  mIcon->setPaletteBackgroundColor( tqcolorGroup().mid() );
+  mIcon->setFixedSize( mIcon->sizeHint() );
+  mIcon->setPaletteBackgroundColor( colorGroup().mid() );
 
   mGroupName = new TQLabel( hbox );
-  mGroupName->tqsetAlignment( AlignLeft | AlignVCenter );
+  mGroupName->setAlignment( AlignLeft | AlignVCenter );
   mGroupName->setIndent( KDialog::spacingHint() );
   mGroupName->setFont( boldFont );
-  mGroupName->setPaletteForegroundColor( tqcolorGroup().light() );
-  mGroupName->setPaletteBackgroundColor( tqcolorGroup().mid() );
+  mGroupName->setPaletteForegroundColor( colorGroup().light() );
+  mGroupName->setPaletteBackgroundColor( colorGroup().mid() );
 
-  mtqStatus = new TQLabel( hbox );
-  mtqStatus->tqsetAlignment( TQt::AlignRight );
-  mtqStatus->tqsetAlignment( AlignRight | AlignVCenter );
-  mtqStatus->setIndent( KDialog::spacingHint() );
-  mtqStatus->setFont( boldFont );
-  mtqStatus->setPaletteForegroundColor( tqcolorGroup().light() );
-  mtqStatus->setPaletteBackgroundColor( tqcolorGroup().mid() );
-  mtqStatus->setText( i18n( "Ready" ) );
+  mStatus = new TQLabel( hbox );
+  mStatus->setAlignment( TQt::AlignRight );
+  mStatus->setAlignment( AlignRight | AlignVCenter );
+  mStatus->setIndent( KDialog::spacingHint() );
+  mStatus->setFont( boldFont );
+  mStatus->setPaletteForegroundColor( colorGroup().light() );
+  mStatus->setPaletteBackgroundColor( colorGroup().mid() );
+  mStatus->setText( i18n( "Ready" ) );
 
-  hbox->setPaletteBackgroundColor( tqcolorGroup().mid() );
-  hbox->setMaximumHeight( hbox->tqminimumSizeHint().height() );
+  hbox->setPaletteBackgroundColor( colorGroup().mid() );
+  hbox->setMaximumHeight( hbox->minimumSizeHint().height() );
 
   tqlayout->addMultiCellWidget( hbox, 0, 0, 0, 3 );
   tqlayout->addMultiCellWidget( mBox, 1, 1, 0, 3 );
@@ -189,14 +189,14 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update )
   switch ( update.type() ) {
     case QSync::SyncChangeUpdate::Received:
       mProcessedItems++;
-      mtqStatus->setText( i18n( "%1 entries read" ).tqarg( mProcessedItems ) );
+      mStatus->setText( i18n( "%1 entries read" ).tqarg( mProcessedItems ) );
       break;
     case QSync::SyncChangeUpdate::ReceivedInfo:
-      mtqStatus->setText( i18n( "Receive information" ) );
+      mStatus->setText( i18n( "Receive information" ) );
       break;
     case QSync::SyncChangeUpdate::Sent:
       mProcessedItems--;
-      mtqStatus->setText( i18n( "%1 entries written" ).tqarg( mMaxProcessedItems - mProcessedItems ) );
+      mStatus->setText( i18n( "%1 entries written" ).tqarg( mMaxProcessedItems - mProcessedItems ) );
 
       mProgressBar->show();
 
@@ -212,15 +212,15 @@ void GroupItem::change( const QSync::SyncChangeUpdate &update )
       }
       break;
     case QSync::SyncChangeUpdate::WriteError:
-      mtqStatus->setText( i18n( "Error" ) );
+      mStatus->setText( i18n( "Error" ) );
       KPassivePopup::message( update.result().message(), this );
       break;
     case QSync::SyncChangeUpdate::ReceiveError:
-      mtqStatus->setText( i18n( "Error" ) );
+      mStatus->setText( i18n( "Error" ) );
       KPassivePopup::message( update.result().message(), this );
       break;
     default:
-      mtqStatus->setText( TQString() );
+      mStatus->setText( TQString() );
       break;
   }
 }
@@ -233,24 +233,24 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update )
 {
   switch ( update.type() ) {
     case QSync::SyncEngineUpdate::EndPhaseConnected:
-      mtqStatus->setText( i18n( "Connected" ) );
+      mStatus->setText( i18n( "Connected" ) );
       mProgressBar->setProgress( 0 );
       mSynchronizing = true;
       mSyncAction->setText( "Abort Synchronization" );
       break;
     case QSync::SyncEngineUpdate::EndPhaseRead:
-      mtqStatus->setText( i18n( "Data read" ) );
+      mStatus->setText( i18n( "Data read" ) );
       break;
     case QSync::SyncEngineUpdate::EndPhaseWrite:
-      mtqStatus->setText( i18n( "Data written" ) );
+      mStatus->setText( i18n( "Data written" ) );
       mProgressBar->setProgress( 100 );
       mProcessedItems = mMaxProcessedItems = 0;
       break;
     case QSync::SyncEngineUpdate::EndPhaseDisconnected:
-      mtqStatus->setText( i18n( "Disconnected" ) );
+      mStatus->setText( i18n( "Disconnected" ) );
       break;
     case QSync::SyncEngineUpdate::Error:
-      mtqStatus->setText( i18n( "Synchronization failed" ) );
+      mStatus->setText( i18n( "Synchronization failed" ) );
       KPassivePopup::message( update.result().message(), this );
       this->update();
 
@@ -258,8 +258,8 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update )
       mSyncAction->setText( i18n( "Synchronize Now" ) );
       break;
     case QSync::SyncEngineUpdate::SyncSuccessfull:
-      mtqStatus->setText( i18n( "Successfully synchronized" ) );
-      mSyncProcess->group().setLastSynchronization( TQDateTime::tqcurrentDateTime() );
+      mStatus->setText( i18n( "Successfully synchronized" ) );
+      mSyncProcess->group().setLastSynchronization( TQDateTime::currentDateTime() );
       mSyncProcess->group().save();
       this->update();
 
@@ -267,14 +267,14 @@ void GroupItem::engine( const QSync::SyncEngineUpdate &update )
       mSyncAction->setText( i18n( "Synchronize Now" ) );
       break;
     case QSync::SyncEngineUpdate::PrevUnclean:
-      mtqStatus->setText( i18n( "Previous synchronization failed" ) );
+      mStatus->setText( i18n( "Previous synchronization failed" ) );
       break;
     case QSync::SyncEngineUpdate::EndConflicts:
-      mtqStatus->setText( i18n( "Conflicts solved" ) );
+      mStatus->setText( i18n( "Conflicts solved" ) );
       mMaxProcessedItems = mProcessedItems;
       break;
     default:
-      mtqStatus->setText( TQString() );
+      mStatus->setText( TQString() );
       break;
   }
 }
@@ -367,15 +367,15 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
 
   mIcon = new TQLabel( box );
   mIcon->setPixmap( icon );
-  mIcon->tqsetAlignment( TQt::AlignTop );
-  mIcon->setFixedWidth( mIcon->tqsizeHint().width() );
+  mIcon->setAlignment( TQt::AlignTop );
+  mIcon->setFixedWidth( mIcon->sizeHint().width() );
 
   TQVBox *nameBox = new TQVBox( box );
   mMemberName = new TQLabel( nameBox );
   mMemberName->setFont( boldFont );
   mDescription = new TQLabel( nameBox );
 
-  mtqStatus = new TQLabel( box );
+  mStatus = new TQLabel( box );
 
   mMemberName->setText( member.name() );
   mDescription->setText( plugin.longName() );
@@ -383,7 +383,7 @@ MemberItem::MemberItem( TQWidget *parent, SyncProcess *process,
 
 void MemberItem::seStatusMessage( const TQString &msg )
 {
-  mtqStatus->setText( msg );
+  mStatus->setText( msg );
 }
 
 #include "groupitem.moc"
diff --git a/kitchensync/src/groupitem.h b/kitchensync/src/groupitem.h
index 524fa0369..338c733df 100644
--- a/kitchensync/src/groupitem.h
+++ b/kitchensync/src/groupitem.h
@@ -76,7 +76,7 @@ class GroupItem : public KWidgetListItem
 
     TQLabel *mIcon;
     TQLabel *mGroupName;
-    TQLabel *mtqStatus;
+    TQLabel *mStatus;
     TQLabel *mTime;
     KURLLabel *mSyncAction;
     KURLLabel *mConfigureAction;
@@ -106,7 +106,7 @@ class MemberItem : public TQWidget
     TQLabel *mIcon;
     TQLabel *mMemberName;
     TQLabel *mDescription;
-    TQLabel *mtqStatus;
+    TQLabel *mStatus;
 };
 
 #endif
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index d8d6c46d5..64355e568 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -42,7 +42,7 @@ PluginItem::PluginItem( KWidgetList *list, const QSync::Plugin &plugin )
 
   TQLabel *icon = new TQLabel( this );
   icon->setPixmap( KGlobal::iconLoader()->loadIcon( iconName, KIcon::Desktop ) );
-  icon->setFixedSize( icon->tqsizeHint() );
+  icon->setFixedSize( icon->sizeHint() );
 
   TQLabel *name = new TQLabel( plugin.longName(), this );
   TQLabel *description = new TQLabel( plugin.description(), this );
diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp
index 672c789c3..60310b803 100644
--- a/kitchensync/src/syncprocess.cpp
+++ b/kitchensync/src/syncprocess.cpp
@@ -48,12 +48,12 @@ SyncProcess::~SyncProcess()
   mEngine = 0;
 }
 
-TQString SyncProcess::grouptqStatus() const
+TQString SyncProcess::groupStatus() const
 {
   return i18n( "Ready" );
 }
 
-TQString SyncProcess::membertqStatus( const QSync::Member& ) const
+TQString SyncProcess::memberStatus( const QSync::Member& ) const
 {
   return i18n( "Ready" );
 }
diff --git a/kitchensync/src/syncprocess.h b/kitchensync/src/syncprocess.h
index 31cbd50c7..0bf9b803e 100644
--- a/kitchensync/src/syncprocess.h
+++ b/kitchensync/src/syncprocess.h
@@ -41,8 +41,8 @@ class SyncProcess : public TQObject
     QSync::Group group() const { return mGroup; }
     QSync::Engine* engine() const { return mEngine; }
 
-    TQString grouptqStatus() const;
-    TQString membertqStatus( const QSync::Member &member ) const;
+    TQString groupStatus() const;
+    TQString memberStatus( const QSync::Member &member ) const;
 
     QSync::Result addMember( const QSync::Plugin &plugin );