From 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:45:52 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- libkscan/devselector.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libkscan/devselector.cpp') diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp index 00d17c06..10bf9b29 100644 --- a/libkscan/devselector.cpp +++ b/libkscan/devselector.cpp @@ -69,7 +69,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList, cbSkipDialog = new TQCheckBox( i18n("&Do not ask on startup again, always use this device"), page, "CBOX_SKIP_ON_START" ); - KConfig *gcfg = KGlobal::config(); + KConfig *gcfg = TDEGlobal::config(); gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP)); bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false ); cbSkipDialog->setChecked( skipDialog ); @@ -80,7 +80,7 @@ DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList, TQCString DeviceSelector::getDeviceFromConfig( void ) const { - KConfig *gcfg = KGlobal::config(); + KConfig *gcfg = TDEGlobal::config(); gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP)); bool skipDialog = gcfg->readBoolEntry( STARTUP_SKIP_ASK, false ); @@ -125,7 +125,7 @@ TQCString DeviceSelector::getSelectedDevice( void ) const kdDebug(29000) << "The selected device: <" << dev << ">" << endl; /* Store scanner selection settings */ - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); c->setGroup(TQString::fromLatin1(GROUP_STARTUP)); /* Write both the scan device and the skip-start-dialog flag global. */ c->writeEntry( STARTUP_SCANDEV, dev, true, true ); @@ -140,7 +140,7 @@ void DeviceSelector::setScanSources( const TQStrList& sources, const TQStringList& hrSources ) { bool default_ok = false; - KConfig *gcfg = KGlobal::config(); + KConfig *gcfg = TDEGlobal::config(); gcfg->setGroup(TQString::fromLatin1(GROUP_STARTUP)); TQCString defstr = gcfg->readEntry( STARTUP_SCANDEV, "" ).local8Bit(); -- cgit v1.2.3