diff options
| author | Timothy Pearson <[email protected]> | 2011-12-16 09:59:00 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2011-12-16 09:59:00 -0600 |
| commit | ec1fddcd0d6663ad273af85357f04abbc5689468 (patch) | |
| tree | 6cb946ab8b4771868c6eee8d1aa5213d6ec246e2 /libkscan/devselector.cpp | |
| parent | c2637a0da6d9a1c8626ca39f8451ab3b7cda487a (diff) | |
| download | tdegraphics-ec1fddcd0d6663ad273af85357f04abbc5689468.tar.gz tdegraphics-ec1fddcd0d6663ad273af85357f04abbc5689468.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit c2637a0da6d9a1c8626ca39f8451ab3b7cda487a.
Diffstat (limited to 'libkscan/devselector.cpp')
| -rw-r--r-- | libkscan/devselector.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp index a8f067bb..97b06e54 100644 --- a/libkscan/devselector.cpp +++ b/libkscan/devselector.cpp @@ -22,7 +22,7 @@ #include <tqbuttongroup.h> #include <tqcheckbox.h> #include <tqcstring.h> -#include <layout.h> +#include <tqlayout.h> #include <tqlabel.h> #include <tqfile.h> #include <tqpushbutton.h> @@ -70,7 +70,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList, page, "CBOX_SKIP_ON_START" ); KConfig *gcfg = KGlobal::config(); - gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP)); + gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false ); cbSkipDialog->setChecked( skipDialog ); @@ -81,7 +81,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList, TQCString DeviceSelector::getDeviceFromConfig( void ) const { KConfig *gcfg = KGlobal::config(); - gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP)); + gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false ); TQCString result; @@ -126,7 +126,7 @@ TQCString DeviceSelector::getSelectedDevice( void ) const /* Store scanner selection settings */ KConfig *c = KGlobal::config(); - c->setGroup(TQString::fromLatin1(GROUP_STARTUP)); + c->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); /* Write both the scan device and the skip-start-dialog flag global. */ c->writeEntry( STARTUP_SCANDEV, dev, true, true ); c->writeEntry( STARTUP_SKIP_ASK, getShouldSkip(), true, true ); @@ -141,7 +141,7 @@ void DeviceSelector::setScanSources( const TQStrList& sources, { bool default_ok = false; KConfig *gcfg = KGlobal::config(); - gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP)); + gcfg->setGroup(TQString::tqfromLatin1(GROUP_STARTUP)); TQCString defstr = gcfg->readEntry( STARTUP_SCANDEV, "" ).local8Bit(); /* Selector-Stuff*/ @@ -152,7 +152,7 @@ void DeviceSelector::setScanSources( const TQStrList& sources, TQStringList::ConstIterator it2 = hrSources.begin(); for ( ; it.current(); ++it, ++it2 ) { - TQString text = TQString::fromLatin1("&%1. %2\n%3").arg(1+nr).arg( TQString::fromLocal8Bit(*it) ).arg( *it2 ); + TQString text = TQString::tqfromLatin1("&%1. %2\n%3").tqarg(1+nr).tqarg( TQString::fromLocal8Bit(*it) ).tqarg( *it2 ); TQRadioButton *rb = new TQRadioButton( text, selectBox ); selectBox->insert( rb ); |