summaryrefslogtreecommitdiffstats
path: root/libkscan
diff options
context:
space:
mode:
Diffstat (limited to 'libkscan')
-rw-r--r--libkscan/devselector.cpp8
-rw-r--r--libkscan/kscandevice.cpp4
-rw-r--r--libkscan/kscanslider.cpp2
-rw-r--r--libkscan/previewer.cpp4
-rw-r--r--libkscan/scandialog.cpp16
5 files changed, 17 insertions, 17 deletions
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();
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 += "/";
diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp
index cc51e05b..61d00fbf 100644
--- a/libkscan/kscanslider.cpp
+++ b/libkscan/kscanslider.cpp
@@ -44,7 +44,7 @@ KScanSlider::KScanSlider( TQWidget *parent, const TQString& text,
if( haveStdButt )
{
- KIconLoader *loader = KGlobal::iconLoader();
+ KIconLoader *loader = TDEGlobal::iconLoader();
m_stdButt = new TQPushButton( this );
m_stdButt->setPixmap( loader->loadIcon( "undo",KIcon::Small ));
diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp
index 93538e34..b7705f82 100644
--- a/libkscan/previewer.cpp
+++ b/libkscan/previewer.cpp
@@ -125,7 +125,7 @@ Previewer::Previewer(TQWidget *parent, const char *name )
layout->addLayout( left, 2 );
/* Load autoselection values from Config file */
- KConfig *cfg = KGlobal::config();
+ KConfig *cfg = TDEGlobal::config();
cfg->setGroup( GROUP_STARTUP );
/* Units etc. TODO: get from Config */
@@ -305,7 +305,7 @@ bool Previewer::setPreviewImage( const TQImage &image )
TQString Previewer::galleryRoot()
{
- TQString dir = (KGlobal::dirs())->saveLocation( "data", "ScanImages", true );
+ TQString dir = (TDEGlobal::dirs())->saveLocation( "data", "ScanImages", true );
if( !dir.endsWith("/") )
dir += "/";
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 */
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-19 01:58:44 +0000