diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:45:52 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:45:52 -0600 |
| commit | 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (patch) | |
| tree | 44659d1cc0c37eb995e572bc1b979e75a74210fb /libkscan/scandialog.cpp | |
| parent | e2385b701b464dc2259fcd5f3819c98f2c8c4438 (diff) | |
| download | tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.tar.gz tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkscan/scandialog.cpp')
| -rw-r--r-- | libkscan/scandialog.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp index ae561cb9..3bc492aa 100644 --- a/libkscan/scandialog.cpp +++ b/libkscan/scandialog.cpp @@ -55,7 +55,7 @@ ScanDialogFactory::ScanDialogFactory( TQObject *parent, const char *name ) : KScanDialogFactory( parent, name ) { setName( "ScanDialogFactory" ); - KGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkscan") ); + TDEGlobal::locale()->insertCatalogue( TQString::fromLatin1("libkscan") ); } KScanDialog * ScanDialogFactory::createDialog( TQWidget *parent, @@ -129,7 +129,7 @@ void ScanDialog::createOptionsTab( void ) /* Read settings for startup behavior */ - KConfig *gcfg = KGlobal::config(); + KConfig *gcfg = TDEGlobal::config(); gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP)); bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false ); bool onlyLocal = gcfg->readBoolEntry( STARTUP_ONLY_LOCAL, false ); @@ -153,7 +153,7 @@ void ScanDialog::slotNetworkToggle( bool state) bool writestate = !state; kdDebug(29000) << "slotNetworkToggle: Writing state " << writestate << endl; - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); c->setGroup(TQString::fromLatin1(GROUP_STARTUP)); c->writeEntry( STARTUP_ONLY_LOCAL, writestate, true, true ); } @@ -163,7 +163,7 @@ void ScanDialog::slotAskOnStartToggle(bool state) bool writestate = !state; kdDebug(29000) << "slotAskOnStartToggle: Writing state " << writestate << endl; - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); c->setGroup(TQString::fromLatin1(GROUP_STARTUP)); c->writeEntry( STARTUP_SKIP_ASK, writestate, true, true ); } @@ -307,10 +307,10 @@ bool ScanDialog::setup() /* set initial sizes */ setInitialSize( configDialogSize( GROUP_STARTUP )); - KConfig *kfg = KGlobal::config(); + KConfig *kfg = TDEGlobal::config(); if( kfg ) { - TQRect r = KGlobalSettings::desktopGeometry(this); + TQRect r = TDEGlobalSettings::desktopGeometry(this); kfg->setGroup( GROUP_STARTUP ); /* Since this is a vertical splitter, only the width is important */ @@ -329,10 +329,10 @@ void ScanDialog::slotClose() if( splitter ) { - KConfig *kfg = KGlobal::config(); + KConfig *kfg = TDEGlobal::config(); if( kfg ) { - TQRect r = KGlobalSettings::desktopGeometry(this); + TQRect r = TDEGlobalSettings::desktopGeometry(this); kfg->setGroup( GROUP_STARTUP ); /* Since this is a vertical splitter, only the width is important */ |