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

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.

2 files changed, 17 insertions, 17 deletions

diff --git a/libtdepim/komposer/core/pluginmanager.cpp b/libtdepim/komposer/core/pluginmanager.cpp
index 2a55d7349..dcfea6f4b 100644
--- a/libtdepim/komposer/core/pluginmanager.cpp
+++ b/libtdepim/komposer/core/pluginmanager.cpp
@@ -82,8 +82,8 @@ PluginManager::PluginManager( TQObject *parent )
                                                    this, TQT_SLOT( loadAllPlugins() ) );
 
   d->plugins = KPluginInfo::fromServices(
-    KTrader::self()->query( TQString::fromLatin1( "Komposer/Plugin" ),
-                            TQString::fromLatin1( "[X-Komposer-Version] == 1" ) ) );
+    KTrader::self()->query( TQString::tqfromLatin1( "Komposer/Plugin" ),
+                            TQString::tqfromLatin1( "[X-Komposer-Version] == 1" ) ) );
 }
 
 PluginManager::~PluginManager()
@@ -205,7 +205,7 @@ PluginManager::slotShutdownTimeout()
 
   kdWarning() << k_funcinfo << "Some plugins didn't shutdown in time!" << endl
               << "Remaining plugins: "
-              << remaining.join( TQString::fromLatin1( ", " ) ) << endl
+              << remaining.join( TQString::tqfromLatin1( ", " ) ) << endl
               << "Forcing Komposer shutdown now." << endl;
 #endif
 
@@ -229,18 +229,18 @@ PluginManager::loadAllPlugins()
     d->config = KSharedConfig::openConfig( "komposerrc" );
 
   TQMap<TQString, TQString> entries = d->config->entryMap(
-    TQString::fromLatin1( "Plugins" ) );
+    TQString::tqfromLatin1( "Plugins" ) );
 
   TQMap<TQString, TQString>::Iterator it;
   for ( it = entries.begin(); it != entries.end(); ++it )
   {
     TQString key = it.key();
-    if ( key.endsWith( TQString::fromLatin1( "Enabled" ) ) )
+    if ( key.endsWith( TQString::tqfromLatin1( "Enabled" ) ) )
     {
       key.setLength( key.length() - 7 );
       //kdDebug() << k_funcinfo << "Set " << key << " to " << it.data() << endl;
 
-      if ( it.data() == TQString::fromLatin1( "true" ) )
+      if ( it.data() == TQString::tqfromLatin1( "true" ) )
       {
         if ( !plugin( key ) )
           d->pluginsToLoad.push( key );
@@ -310,8 +310,8 @@ PluginManager::loadPluginInternal( const TQString &pluginId )
 
   int error = 0;
   Plugin *plugin = KParts::ComponentFactory::createInstanceFromQuery<Komposer::Plugin>(
-    TQString::fromLatin1( "Komposer/Plugin" ),
-    TQString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( pluginId ),
+    TQString::tqfromLatin1( "Komposer/Plugin" ),
+    TQString::tqfromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).tqarg( pluginId ),
     this, 0, TQStringList(), &error );
 
   if ( plugin ) {
@@ -424,7 +424,7 @@ PluginManager::pluginName( const Plugin *plugin ) const
       return it.key()->name();
   }
 
-  return TQString::fromLatin1( "Unknown" );
+  return TQString::tqfromLatin1( "Unknown" );
 }
 
 TQString
@@ -437,7 +437,7 @@ PluginManager::pluginId( const Plugin *plugin ) const
       return it.key()->pluginName();
   }
 
-  return TQString::fromLatin1( "unknown" );
+  return TQString::tqfromLatin1( "unknown" );
 }
 
 TQString
@@ -450,7 +450,7 @@ PluginManager::pluginIcon( const Plugin *plugin ) const
       return it.key()->icon();
   }
 
-  return TQString::fromLatin1( "Unknown" );
+  return TQString::tqfromLatin1( "Unknown" );
 }
 
 KPluginInfo*
@@ -478,7 +478,7 @@ PluginManager::setPluginEnabled( const TQString &pluginId, bool enabled /* = tru
   if ( !infoForPluginId( pluginId ) )
     return false;
 
-  d->config->writeEntry( pluginId + TQString::fromLatin1( "Enabled" ), enabled );
+  d->config->writeEntry( pluginId + TQString::tqfromLatin1( "Enabled" ), enabled );
   d->config->sync();
 
   return true;
diff --git a/libtdepim/komposer/core/prefsmodule.cpp b/libtdepim/komposer/core/prefsmodule.cpp
index 1cd97e724..77e1c264b 100644
--- a/libtdepim/komposer/core/prefsmodule.cpp
+++ b/libtdepim/komposer/core/prefsmodule.cpp
@@ -27,7 +27,7 @@
 #include <klocale.h>
 #include <ktrader.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 
@@ -75,8 +75,8 @@ EditorSelection::EditorSelection( const TQString &text, TQString &reference,
   : m_reference( reference )
 {
   m_box = new TQGroupBox( 0, TQt::Vertical, text, parent );
-  TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->layout() );
-  boxLayout->setAlignment( TQt::AlignTop );
+  TQVBoxLayout *boxLayout = new TQVBoxLayout( m_box->tqlayout() );
+  boxLayout->tqsetAlignment( TQt::AlignTop );
 
   m_editorsCombo = new KComboBox( m_box );
   boxLayout->addWidget( m_editorsCombo );
@@ -101,11 +101,11 @@ EditorSelection::readConfig()
   m_editorsCombo->clear();
 
   KTrader::OfferList editors = KTrader::self()->query(
-    TQString::fromLatin1( "Komposer/Editor" ) );
+    TQString::tqfromLatin1( "Komposer/Editor" ) );
   KTrader::OfferList::ConstIterator it;
   int i = 0;
   for ( it = editors.begin(); it != editors.end(); ++it, ++i ) {
-    if ( !(*it)->hasServiceType( TQString::fromLatin1( "Komposer/Editor" ) ) )
+    if ( !(*it)->hasServiceType( TQString::tqfromLatin1( "Komposer/Editor" ) ) )
       continue;
 
     TQString name = (*it)->property( "X-KDE-KomposerIdentifier" ).toString();