summaryrefslogtreecommitdiffstats
path: root/libkscan/kscandevice.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:45:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:45:52 -0600
commit6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (patch)
tree44659d1cc0c37eb995e572bc1b979e75a74210fb /libkscan/kscandevice.cpp
parente2385b701b464dc2259fcd5f3819c98f2c8c4438 (diff)
downloadtdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.tar.gz
tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libkscan/kscandevice.cpp')
-rw-r--r--libkscan/kscandevice.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp
index ad6a9f9f..a721a094 100644
--- a/libkscan/kscandevice.cpp
+++ b/libkscan/kscandevice.cpp
@@ -187,7 +187,7 @@ KScanDevice::KScanDevice( TQObject *parent )
pixel_y = 0;
scanner_name = 0L;
- KConfig *konf = KGlobal::config ();
+ KConfig *konf = TDEGlobal::config ();
konf->setGroup( GROUP_STARTUP );
bool netaccess = konf->readBoolEntry( STARTUP_ONLY_LOCAL, false );
kdDebug(29000) << "Query for network scanners " << (netaccess ? "Not enabled" : "Enabled") << endl;
@@ -669,7 +669,7 @@ void KScanDevice::slStopScanning( void )
const TQString KScanDevice::previewFile()
{
- TQString dir = (KGlobal::dirs())->saveLocation( "data", "ScanImages", true );
+ TQString dir = (TDEGlobal::dirs())->saveLocation( "data", "ScanImages", true );
if( !dir.endsWith("/") )
dir += "/";