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

This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.

1 files changed, 9 insertions, 9 deletions

diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp
index 2f8e73fd..8d762272 100644
--- a/libkscan/scandialog.cpp
+++ b/libkscan/scandialog.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstringlist.h>
 #include <tqstrlist.h>
 #include <tqtooltip.h>
@@ -55,7 +55,7 @@ ScanDialogFactory::ScanDialogFactory( TQObject *parent, const char *name )
     : KScanDialogFactory( parent, name )
 {
     setName( "ScanDialogFactory" );
-    KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkscan") );
+    KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkscan") );
 }
 
 KScanDialog * ScanDialogFactory::createDialog( TQWidget *parent,
@@ -113,7 +113,7 @@ void ScanDialog::createOptionsTab( void )
    TQGroupBox *gb = new TQGroupBox( 1, Qt::Horizontal, i18n("Startup Options"), page, "GB_STARTUP" );
    TQLabel *label = new TQLabel( i18n( "Note: changing these options will affect the scan plugin on next start." ),
 			       gb );
-   label->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+   label->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
 
    /* Checkbox for asking for scanner on startup */
    cb_askOnStart = new TQCheckBox( i18n( "&Ask for the scan device on plugin startup"), gb );
@@ -130,7 +130,7 @@ void ScanDialog::createOptionsTab( void )
 
    /* Read settings for startup behavior */
    KConfig *gcfg = KGlobal::config();
-   gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP));
+   gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
    bool skipDialog  = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false );
    bool onlyLocal   = gcfg->readBoolEntry( STARTUP_ONLY_LOCAL, false );
 
@@ -144,7 +144,7 @@ void ScanDialog::createOptionsTab( void )
 
    TQWidget *spaceEater = new TQWidget( page );
    Q_CHECK_PTR( spaceEater );
-   spaceEater->setSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding) );
+   spaceEater->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding) );
 
 }
 
@@ -154,7 +154,7 @@ void ScanDialog::slotNetworkToggle( bool state)
 
    kdDebug(29000) << "slotNetworkToggle: Writing state " << writestate << endl;
    KConfig *c = KGlobal::config();
-   c->setGroup(TQString::fromLatin1(GROUP_STARTUP));
+   c->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
    c->writeEntry( STARTUP_ONLY_LOCAL, writestate, true, true );
 }
 
@@ -164,7 +164,7 @@ void ScanDialog::slotAskOnStartToggle(bool state)
 
    kdDebug(29000) << "slotAskOnStartToggle: Writing state " << writestate << endl;
    KConfig *c = KGlobal::config();
-   c->setGroup(TQString::fromLatin1(GROUP_STARTUP));
+   c->setGroup(TQString::tqfromLatin1(GROUP_STARTUP));
    c->writeEntry( STARTUP_SKIP_ASK, writestate, true, true );
 }
 
@@ -314,7 +314,7 @@ bool ScanDialog::setup()
 
        kfg->setGroup( GROUP_STARTUP );
        /* Since this is a vertical splitter, only the width is important */
-       TQString key = TQString::fromLatin1( SCANDIA_SPLITTER_SIZES ).arg( r.width());
+       TQString key = TQString::tqfromLatin1( SCANDIA_SPLITTER_SIZES ).tqarg( r.width());
        kdDebug(29000) << "Read Splitter-Sizes " << key  << endl;
        splitter->setSizes( kfg->readIntListEntry( key ));
     }
@@ -336,7 +336,7 @@ void ScanDialog::slotClose()
 
 	 kfg->setGroup( GROUP_STARTUP );
 	 /* Since this is a vertical splitter, only the width is important */
-	 TQString key = TQString::fromLatin1( SCANDIA_SPLITTER_SIZES ).arg( r.width());
+	 TQString key = TQString::tqfromLatin1( SCANDIA_SPLITTER_SIZES ).tqarg( r.width());
 	 kfg->writeEntry( key, splitter->sizes(), true, true);
       }
    }