summaryrefslogtreecommitdiffstats
path: root/libk3b/core
diff options
context:
space:
mode:
Diffstat (limited to 'libk3b/core')
-rw-r--r--libk3b/core/k3bcore.cpp14
-rw-r--r--libk3b/core/k3bcore.h8
-rw-r--r--libk3b/core/k3bexternalbinmanager.cpp4
-rw-r--r--libk3b/core/k3bexternalbinmanager.h6
-rw-r--r--libk3b/core/k3bglobals.cpp40
-rw-r--r--libk3b/core/k3bglobals.h8
-rw-r--r--libk3b/core/k3bglobalsettings.cpp4
-rw-r--r--libk3b/core/k3bglobalsettings.h6
8 files changed, 45 insertions, 45 deletions
diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp
index 20ed3c7..4af572f 100644
--- a/libk3b/core/k3bcore.cpp
+++ b/libk3b/core/k3bcore.cpp
@@ -104,7 +104,7 @@ public:
}
K3bVersion version;
- KConfig* config;
+ TDEConfig* config;
bool deleteConfig;
K3bDevice::DeviceManager* deviceManager;
K3bExternalBinManager* externalBinManager;
@@ -178,13 +178,13 @@ const K3bVersion& K3bCore::version() const
}
-KConfig* K3bCore::config() const
+TDEConfig* K3bCore::config() const
{
if( !d->config ) {
kdDebug() << "(K3bCore) opening k3b config file." << endl;
kdDebug() << "(K3bCore) while I am a " << className() << endl;
d->deleteConfig = true;
- d->config = new KConfig( "k3brc" );
+ d->config = new TDEConfig( "k3brc" );
}
return d->config;
@@ -251,9 +251,9 @@ void K3bCore::initPluginManager()
}
-void K3bCore::readSettings( KConfig* cnf )
+void K3bCore::readSettings( TDEConfig* cnf )
{
- KConfig* c = cnf;
+ TDEConfig* c = cnf;
if( !c )
c = config();
@@ -267,9 +267,9 @@ void K3bCore::readSettings( KConfig* cnf )
}
-void K3bCore::saveSettings( KConfig* cnf )
+void K3bCore::saveSettings( TDEConfig* cnf )
{
- KConfig* c = cnf;
+ TDEConfig* c = cnf;
if( !c )
c = config();
diff --git a/libk3b/core/k3bcore.h b/libk3b/core/k3bcore.h
index 9ad04aa..8e40adc 100644
--- a/libk3b/core/k3bcore.h
+++ b/libk3b/core/k3bcore.h
@@ -30,7 +30,7 @@
class K3bExternalBinManager;
class K3bVersion;
-class KConfig;
+class TDEConfig;
class TDEAboutData;
class K3bJob;
class K3bBurnJob;
@@ -81,12 +81,12 @@ class LIBK3B_EXPORT K3bCore : public TQObject
/**
* @param c if 0 K3bCore uses the K3b configuration
*/
- virtual void readSettings( KConfig* c = 0 );
+ virtual void readSettings( TDEConfig* c = 0 );
/**
* @param c if 0 K3bCore uses the K3b configuration
*/
- virtual void saveSettings( KConfig* c = 0 );
+ virtual void saveSettings( TDEConfig* c = 0 );
/**
* If this is reimplemented it is recommended to also reimplement
@@ -121,7 +121,7 @@ class LIBK3B_EXPORT K3bCore : public TQObject
* Default implementation returns the K3b configuration from k3brc.
* Normally this should not be used.
*/
- virtual KConfig* config() const;
+ virtual TDEConfig* config() const;
/**
* Used by the writing jobs to block a device.
diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp
index 7895326..83ec1b6 100644
--- a/libk3b/core/k3bexternalbinmanager.cpp
+++ b/libk3b/core/k3bexternalbinmanager.cpp
@@ -173,7 +173,7 @@ K3bExternalBinManager::~K3bExternalBinManager()
}
-bool K3bExternalBinManager::readConfig( KConfig* c )
+bool K3bExternalBinManager::readConfig( TDEConfig* c )
{
loadDefaultSearchPath();
@@ -207,7 +207,7 @@ bool K3bExternalBinManager::readConfig( KConfig* c )
return true;
}
-bool K3bExternalBinManager::saveConfig( KConfig* c )
+bool K3bExternalBinManager::saveConfig( TDEConfig* c )
{
c->setGroup( "External Programs" );
c->writePathEntry( "search path", m_searchPath );
diff --git a/libk3b/core/k3bexternalbinmanager.h b/libk3b/core/k3bexternalbinmanager.h
index 74be6b7..18b601b 100644
--- a/libk3b/core/k3bexternalbinmanager.h
+++ b/libk3b/core/k3bexternalbinmanager.h
@@ -24,7 +24,7 @@
#include "k3b_export.h"
#include "k3bversion.h"
-class KConfig;
+class TDEConfig;
class TDEProcess;
@@ -126,12 +126,12 @@ class LIBK3B_EXPORT K3bExternalBinManager : public TQObject
* read config and add changes to current map.
* Takes care of setting the config group
*/
- bool readConfig( KConfig* );
+ bool readConfig( TDEConfig* );
/**
* Takes care of setting the config group
*/
- bool saveConfig( KConfig* );
+ bool saveConfig( TDEConfig* );
bool foundBin( const TQString& name );
const TQString& binPath( const TQString& name );
diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp
index 23225b6..42ccebc 100644
--- a/libk3b/core/k3bglobals.cpp
+++ b/libk3b/core/k3bglobals.cpp
@@ -276,32 +276,32 @@ bool K3b::kbFreeOnFs( const TQString& path, unsigned long& size, unsigned long&
}
-KIO::filesize_t K3b::filesize( const KURL& url )
+TDEIO::filesize_t K3b::filesize( const KURL& url )
{
if( url.isLocalFile() ) {
k3b_struct_stat buf;
if ( !k3b_stat( TQFile::encodeName( url.path() ), &buf ) ) {
- return (KIO::filesize_t)buf.st_size;
+ return (TDEIO::filesize_t)buf.st_size;
}
}
- KIO::UDSEntry uds;
- KIO::NetAccess::stat( url, uds, 0 );
- for( KIO::UDSEntry::const_iterator it = uds.begin(); it != uds.end(); ++it ) {
- if( (*it).m_uds == KIO::UDS_SIZE ) {
+ TDEIO::UDSEntry uds;
+ TDEIO::NetAccess::stat( url, uds, 0 );
+ for( TDEIO::UDSEntry::const_iterator it = uds.begin(); it != uds.end(); ++it ) {
+ if( (*it).m_uds == TDEIO::UDS_SIZE ) {
return (*it).m_long;
}
}
- return ( KIO::filesize_t )0;
+ return ( TDEIO::filesize_t )0;
}
-KIO::filesize_t K3b::imageFilesize( const KURL& url )
+TDEIO::filesize_t K3b::imageFilesize( const KURL& url )
{
- KIO::filesize_t size = K3b::filesize( url );
+ TDEIO::filesize_t size = K3b::filesize( url );
int cnt = 0;
- while( KIO::NetAccess::exists( KURL::fromPathOrURL( url.url() + '.' + TQString::number(cnt).rightJustify( 3, '0' ) ), true ) )
+ while( TDEIO::NetAccess::exists( KURL::fromPathOrURL( url.url() + '.' + TQString::number(cnt).rightJustify( 3, '0' ) ), true ) )
size += K3b::filesize( KURL::fromPathOrURL( url.url() + '.' + TQString::number(cnt++).rightJustify( 3, '0' ) ) );
return size;
}
@@ -462,17 +462,17 @@ KURL K3b::convertToLocalUrl( const KURL& url )
{
if( !url.isLocalFile() ) {
#if KDE_IS_VERSION(3,4,91)
- return KIO::NetAccess::mostLocalURL( url, 0 );
+ return TDEIO::NetAccess::mostLocalURL( url, 0 );
#else
#ifndef UDS_LOCAL_PATH
-#define UDS_LOCAL_PATH (72 | KIO::UDS_STRING)
+#define UDS_LOCAL_PATH (72 | TDEIO::UDS_STRING)
#else
- using namespace KIO;
+ using namespace TDEIO;
#endif
- KIO::UDSEntry e;
- if( KIO::NetAccess::stat( url, e, 0 ) ) {
- const KIO::UDSEntry::ConstIterator end = e.end();
- for( KIO::UDSEntry::ConstIterator it = e.begin(); it != end; ++it ) {
+ TDEIO::UDSEntry e;
+ if( TDEIO::NetAccess::stat( url, e, 0 ) ) {
+ const TDEIO::UDSEntry::ConstIterator end = e.end();
+ for( TDEIO::UDSEntry::ConstIterator it = e.begin(); it != end; ++it ) {
if( (*it).m_uds == UDS_LOCAL_PATH && !(*it).m_str.isEmpty() )
return KURL::fromPathOrURL( (*it).m_str );
}
@@ -541,7 +541,7 @@ bool K3b::isMounted( K3bDevice::Device* dev )
if( !dev )
return false;
- return !KIO::findDeviceMountPoint( dev->blockDeviceName() ).isEmpty();
+ return !TDEIO::findDeviceMountPoint( dev->blockDeviceName() ).isEmpty();
}
@@ -554,7 +554,7 @@ bool K3b::unmount( K3bDevice::Device* dev )
#if KDE_IS_VERSION(3,4,0)
// first try to unmount it the standard way
- if( KIO::NetAccess::synchronousRun( KIO::unmount( mntDev, false ), 0 ) )
+ if( TDEIO::NetAccess::synchronousRun( TDEIO::unmount( mntDev, false ), 0 ) )
return true;
#endif
@@ -598,7 +598,7 @@ bool K3b::mount( K3bDevice::Device* dev )
#if KDE_IS_VERSION(3,4,0)
// first try to mount it the standard way
- if( KIO::NetAccess::synchronousRun( KIO::mount( true, 0, mntDev, false ), 0 ) )
+ if( TDEIO::NetAccess::synchronousRun( TDEIO::mount( true, 0, mntDev, false ), 0 ) )
return true;
#endif
diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h
index 0b58f58..0964258 100644
--- a/libk3b/core/k3bglobals.h
+++ b/libk3b/core/k3bglobals.h
@@ -28,7 +28,7 @@
#include <k3bdevicetypes.h>
#include "k3b_export.h"
-class KConfig;
+class TDEConfig;
class K3bVersion;
class K3bExternalBin;
@@ -187,7 +187,7 @@ namespace K3b
TQString systemName();
- LIBK3B_EXPORT KIO::filesize_t filesize( const KURL& );
+ LIBK3B_EXPORT TDEIO::filesize_t filesize( const KURL& );
/**
* Calculate the total size of an image file. This also includes
@@ -195,7 +195,7 @@ namespace K3b
*
* \returns the total size of the image file at url
*/
- LIBK3B_EXPORT KIO::filesize_t imageFilesize( const KURL& url );
+ LIBK3B_EXPORT TDEIO::filesize_t imageFilesize( const KURL& url );
/**
* true if the kernel supports ATAPI devices without SCSI emulation.
@@ -236,7 +236,7 @@ namespace K3b
/**
* Tries to unmount the device ignoring its actual mounting state.
- * This method uses both KIO::unmount and pumount if available.
+ * This method uses both TDEIO::unmount and pumount if available.
*/
LIBK3B_EXPORT bool unmount( K3bDevice::Device* );
diff --git a/libk3b/core/k3bglobalsettings.cpp b/libk3b/core/k3bglobalsettings.cpp
index ac6a2f0..1301b8b 100644
--- a/libk3b/core/k3bglobalsettings.cpp
+++ b/libk3b/core/k3bglobalsettings.cpp
@@ -29,7 +29,7 @@ K3bGlobalSettings::K3bGlobalSettings()
}
-void K3bGlobalSettings::readSettings( KConfig* c )
+void K3bGlobalSettings::readSettings( TDEConfig* c )
{
TQString lastG = c->group();
c->setGroup( "General Options" );
@@ -45,7 +45,7 @@ void K3bGlobalSettings::readSettings( KConfig* c )
}
-void K3bGlobalSettings::saveSettings( KConfig* c )
+void K3bGlobalSettings::saveSettings( TDEConfig* c )
{
TQString lastG = c->group();
c->setGroup( "General Options" );
diff --git a/libk3b/core/k3bglobalsettings.h b/libk3b/core/k3bglobalsettings.h
index 1194789..4765b7f 100644
--- a/libk3b/core/k3bglobalsettings.h
+++ b/libk3b/core/k3bglobalsettings.h
@@ -16,7 +16,7 @@
#ifndef _K3B_GLOBAL_SETTINGS_H_
#define _K3B_GLOBAL_SETTINGS_H_
#include "k3b_export.h"
-class KConfig;
+class TDEConfig;
/**
* Some global settings used throughout K3b.
@@ -29,12 +29,12 @@ class LIBK3B_EXPORT K3bGlobalSettings
/**
* This method takes care of settings the config group
*/
- void readSettings( KConfig* );
+ void readSettings( TDEConfig* );
/**
* This method takes care of settings the config group
*/
- void saveSettings( KConfig* );
+ void saveSettings( TDEConfig* );
bool ejectMedia() const { return m_eject; }
bool burnfree() const { return m_burnfree; }
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 00:24:55 +0000