diff options
Diffstat (limited to 'libkscan/kscandevice.cpp')
| -rw-r--r-- | libkscan/kscandevice.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp index a4d46da5..e5a89c6e 100644 --- a/libkscan/kscandevice.cpp +++ b/libkscan/kscandevice.cpp @@ -35,7 +35,7 @@ #include <tdelocale.h> #include <tdeglobal.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <unistd.h> #include "kgammatable.h" @@ -46,7 +46,7 @@ #include "devselector.h" #include "imgscaninfo.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #define MIN_PREVIEW_DPI 75 #define UNDEF_SCANNERNAME I18N_NOOP( "undefined" ) @@ -135,8 +135,8 @@ KScanOption *KScanDevice::getGuiElement( const TQCString& name, TQWidget *parent w = so->createWidget( parent, desc, tooltip ); if( w ) { - connect( so, TQT_SIGNAL( optionChanged( KScanOption* ) ), - this, TQT_SLOT( slOptChanged( KScanOption* ))); + connect( so, TQ_SIGNAL( optionChanged( KScanOption* ) ), + this, TQ_SLOT( slOptChanged( KScanOption* ))); w->setEnabled( so->active() ); } else @@ -209,7 +209,7 @@ KScanDevice::KScanDevice( TQObject *parent ) } } #if 0 - connect( this, TQT_SIGNAL(sigOptionsChanged()), TQT_SLOT(slReloadAll())); + connect( this, TQ_SIGNAL(sigOptionsChanged()), TQ_SLOT(slReloadAll())); #endif gammaTables = new KScanOptSet( "GammaTables" ); } @@ -218,7 +218,7 @@ KScanDevice::KScanDevice( TQObject *parent ) kdDebug(29000) << "ERROR: sane_init failed -> SANE installed ?" << endl; } - connect( this, TQT_SIGNAL( sigScanFinished( KScanStat )), TQT_SLOT( slScanFinished( KScanStat ))); + connect( this, TQ_SIGNAL( sigScanFinished( KScanStat )), TQ_SLOT( slScanFinished( KScanStat ))); } @@ -1105,8 +1105,8 @@ KScanStat KScanDevice::acquire_data( bool isPreview ) if( sane_get_select_fd( scanner_handle, &fd ) == SANE_STATUS_GOOD ) { sn = new TQSocketNotifier( fd, TQSocketNotifier::Read, this ); - TQObject::connect( sn, TQT_SIGNAL(activated(int)), - this, TQT_SLOT( doProcessABlock() ) ); + TQObject::connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT( doProcessABlock() ) ); } } @@ -1504,7 +1504,7 @@ TQString KScanDevice::getConfig( const TQString& key, const TQString& def ) cons { TQString confFile = SCANNER_DB_FILE; - KSimpleConfig scanConfig( confFile, true ); + TDESimpleConfig scanConfig( confFile, true ); scanConfig.setGroup( shortScannerName() ); return scanConfig.readEntry( key, def ); @@ -1523,7 +1523,7 @@ void KScanDevice::slStoreConfig( const TQString& key, const TQString& val ) { kdDebug(29000) << "Storing config " << key << " in Group " << scannerName << endl; - KSimpleConfig scanConfig( confFile ); + TDESimpleConfig scanConfig( confFile ); scanConfig.setGroup( scannerName ); scanConfig.writeEntry( key, val ); scanConfig.sync(); |