summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:28 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:28 -0600
commit83b79bb29aaa412caec6abcdb42ca21d248b3b3a (patch)
treef48e8ae855d4a0be0c3ecf912a92168a829ff8c5 /src
parent2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (diff)
downloadk3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.tar.gz
k3b-83b79bb29aaa412caec6abcdb42ca21d248b3b3a.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/k3b.cpp16
-rw-r--r--src/k3b.h10
-rw-r--r--src/k3bappdevicemanager.cpp2
-rw-r--r--src/k3bappdevicemanager.h2
-rw-r--r--src/k3bapplication.cpp10
-rw-r--r--src/k3bapplication.h6
-rw-r--r--src/k3bdatamodewidget.cpp4
-rw-r--r--src/k3bdatamodewidget.h6
-rw-r--r--src/k3bdiroperator.cpp4
-rw-r--r--src/k3bdiroperator.h4
-rw-r--r--src/k3bdirview.cpp4
-rw-r--r--src/k3bdirview.h8
-rw-r--r--src/k3bdiskinfoview.cpp8
-rw-r--r--src/k3bemptydiscwaiter.cpp8
-rw-r--r--src/k3bfiletreeview.h2
-rw-r--r--src/k3bfileview.cpp4
-rw-r--r--src/k3bfileview.h6
-rw-r--r--src/k3binteractiondialog.cpp18
-rw-r--r--src/k3binteractiondialog.h6
-rw-r--r--src/k3bjobprogressdialog.cpp4
-rw-r--r--src/k3bjobprogressosd.cpp8
-rw-r--r--src/k3bjobprogressosd.h6
-rw-r--r--src/k3bmedium.cpp6
-rw-r--r--src/k3bprojectinterface.cpp2
-rw-r--r--src/k3bprojectinterface.h2
-rw-r--r--src/k3bprojectmanager.cpp12
-rw-r--r--src/k3bservicemenuinstaller.cpp12
-rw-r--r--src/k3bstatusbarmanager.cpp6
-rw-r--r--src/k3bsystemproblemdialog.cpp6
-rw-r--r--src/k3btempdirselectionwidget.cpp14
-rw-r--r--src/k3btempdirselectionwidget.h10
-rw-r--r--src/k3bthememanager.cpp8
-rw-r--r--src/k3bthememanager.h6
-rw-r--r--src/k3bwelcomewidget.cpp8
-rw-r--r--src/k3bwelcomewidget.h6
-rw-r--r--src/k3bwriterselectionwidget.cpp12
-rw-r--r--src/k3bwriterselectionwidget.h8
-rw-r--r--src/k3bwritingmodewidget.cpp4
-rw-r--r--src/k3bwritingmodewidget.h6
-rw-r--r--src/misc/k3bblankingdialog.cpp6
-rw-r--r--src/misc/k3bblankingdialog.h4
-rw-r--r--src/misc/k3bcdcopydialog.cpp8
-rw-r--r--src/misc/k3bcdcopydialog.h6
-rw-r--r--src/misc/k3bcdimagewritingdialog.cpp20
-rw-r--r--src/misc/k3bcdimagewritingdialog.h4
-rw-r--r--src/misc/k3bdvdcopydialog.cpp10
-rw-r--r--src/misc/k3bdvdcopydialog.h6
-rw-r--r--src/misc/k3bdvdformattingdialog.cpp6
-rw-r--r--src/misc/k3bdvdformattingdialog.h4
-rw-r--r--src/misc/k3bisoimagewritingdialog.cpp16
-rw-r--r--src/misc/k3bisoimagewritingdialog.h4
-rw-r--r--src/option/k3bburningoptiontab.cpp6
-rw-r--r--src/option/k3bcddboptiontab.cpp4
-rw-r--r--src/option/k3bdevicewidget.cpp2
-rw-r--r--src/option/k3bmiscoptiontab.cpp4
-rw-r--r--src/option/k3bthemeoptiontab.cpp6
-rw-r--r--src/projects/k3baudioburndialog.cpp4
-rw-r--r--src/projects/k3baudioburndialog.h4
-rw-r--r--src/projects/k3baudiotrackdialog.cpp2
-rw-r--r--src/projects/k3bbootimageview.cpp4
-rw-r--r--src/projects/k3bdataburndialog.cpp6
-rw-r--r--src/projects/k3bdataburndialog.h4
-rw-r--r--src/projects/k3bdatamultisessioncombobox.cpp4
-rw-r--r--src/projects/k3bdatamultisessioncombobox.h6
-rw-r--r--src/projects/k3bdatapropertiesdialog.cpp6
-rw-r--r--src/projects/k3bdataurladdingdialog.cpp2
-rw-r--r--src/projects/k3bdataurladdingdialog.h4
-rw-r--r--src/projects/k3bdataview.h2
-rw-r--r--src/projects/k3bdataviewitem.cpp8
-rw-r--r--src/projects/k3bdvdburndialog.cpp6
-rw-r--r--src/projects/k3bdvdburndialog.h4
-rw-r--r--src/projects/k3bfillstatusdisplay.cpp18
-rw-r--r--src/projects/k3bmixedburndialog.cpp4
-rw-r--r--src/projects/k3bmixedburndialog.h4
-rw-r--r--src/projects/k3bmovixburndialog.cpp6
-rw-r--r--src/projects/k3bmovixburndialog.h4
-rw-r--r--src/projects/k3bmovixdvdburndialog.cpp6
-rw-r--r--src/projects/k3bmovixdvdburndialog.h4
-rw-r--r--src/projects/k3bmovixlistview.cpp4
-rw-r--r--src/projects/k3bmovixoptionswidget.cpp4
-rw-r--r--src/projects/k3bmovixoptionswidget.h6
-rw-r--r--src/projects/k3bprojectburndialog.cpp4
-rw-r--r--src/projects/k3bprojectburndialog.h10
-rw-r--r--src/projects/k3bprojectplugindialog.cpp4
-rw-r--r--src/projects/k3bprojectplugindialog.h6
-rw-r--r--src/projects/k3bvcdburndialog.cpp6
-rw-r--r--src/projects/k3bvcdburndialog.h4
-rw-r--r--src/projects/k3bvcdlistviewitem.cpp2
-rw-r--r--src/projects/k3bvcdtrackdialog.cpp2
-rw-r--r--src/projects/k3bvideodvdburndialog.cpp6
-rw-r--r--src/projects/k3bvideodvdburndialog.h4
-rw-r--r--src/projects/kostore/koStore.cc12
-rw-r--r--src/projects/kostore/koZipStore.cc8
-rw-r--r--src/rip/k3baudiocdview.cpp12
-rw-r--r--src/rip/k3baudioconvertingoptionwidget.cpp12
-rw-r--r--src/rip/k3baudioconvertingoptionwidget.h8
-rw-r--r--src/rip/k3baudioprojectconvertingdialog.cpp10
-rw-r--r--src/rip/k3baudioprojectconvertingdialog.h4
-rw-r--r--src/rip/k3baudiorippingdialog.cpp10
-rw-r--r--src/rip/k3baudiorippingdialog.h4
-rw-r--r--src/rip/k3bcddbpatternwidget.cpp4
-rw-r--r--src/rip/k3bcddbpatternwidget.h6
-rw-r--r--src/rip/k3bvideocdrip.cpp2
-rw-r--r--src/rip/k3bvideocdrippingdialog.cpp10
-rw-r--r--src/rip/k3bvideocdrippingdialog.h4
-rw-r--r--src/rip/k3bvideocdview.cpp6
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.cpp12
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.h4
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingwidget.cpp6
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingwidget.h4
110 files changed, 351 insertions, 351 deletions
diff --git a/src/k3b.cpp b/src/k3b.cpp
index a2c7940..038586c 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -582,14 +582,14 @@ void K3bMainWindow::saveOptions()
d->welcomeWidget->saveConfig( config() );
- KConfigGroup grp( m_config, "General Options" );
+ TDEConfigGroup grp( m_config, "General Options" );
grp.writeEntry( "Show Document Header", actionViewDocumentHeader->isChecked() );
}
void K3bMainWindow::readOptions()
{
- KConfigGroup grp( m_config, "General Options" );
+ TDEConfigGroup grp( m_config, "General Options" );
bool bViewDocumentHeader = grp.readBoolEntry("Show Document Header", true);
actionViewDocumentHeader->setChecked(bViewDocumentHeader);
@@ -613,7 +613,7 @@ void K3bMainWindow::readOptions()
}
-void K3bMainWindow::saveProperties( KConfig* c )
+void K3bMainWindow::saveProperties( TDEConfig* c )
{
// 1. put saved projects in the config
// 2. save every modified project in "~/.trinity/share/apps/k3b/sessions/" + KApp->sessionId()
@@ -665,7 +665,7 @@ void K3bMainWindow::saveProperties( KConfig* c )
// FIXME:move this to K3bProjectManager
-void K3bMainWindow::readProperties( KConfig* c )
+void K3bMainWindow::readProperties( TDEConfig* c )
{
// FIXME: do not delete the files here. rather do it when the app is exited normally
// since that's when we can be sure we never need the session stuff again.
@@ -715,7 +715,7 @@ void K3bMainWindow::readProperties( KConfig* c )
}
// and now remove the temp dir
- KIO::del( KURL::fromPathOrURL(saveDir), false, false );
+ TDEIO::del( KURL::fromPathOrURL(saveDir), false, false );
// FIXME: for some reason the config entries are not properly stored when using the default
// KMainWindow session config. Since I was not able to find the bug I use another config object
@@ -822,7 +822,7 @@ bool K3bMainWindow::canCloseDocument( K3bDoc* doc )
if( !doc->isModified() )
return true;
- if( !KConfigGroup( config(), "General Options" ).readBoolEntry( "ask_for_saving_changes_on_exit", true ) )
+ if( !TDEConfigGroup( config(), "General Options" ).readBoolEntry( "ask_for_saving_changes_on_exit", true ) )
return true;
switch ( KMessageBox::warningYesNoCancel( this,
@@ -937,7 +937,7 @@ void K3bMainWindow::fileSaveAs( K3bDoc* doc )
if( url.isValid() ) {
KRecentDocument::add( url );
- bool exists = KIO::NetAccess::exists( url, false, 0 );
+ bool exists = TDEIO::NetAccess::exists( url, false, 0 );
if( !exists ||
( exists &&
KMessageBox::warningContinueCancel( this, i18n("Do you want to overwrite %1?").arg( url.prettyURL() ),
@@ -1215,7 +1215,7 @@ void K3bMainWindow::slotNewToolBarConfig()
bool K3bMainWindow::eject()
{
- KConfigGroup c( config(), "General Options" );
+ TDEConfigGroup c( config(), "General Options" );
return !c.readBoolEntry( "No cd eject", false );
}
diff --git a/src/k3b.h b/src/k3b.h
index 3bdc3d9..b988d9e 100644
--- a/src/k3b.h
+++ b/src/k3b.h
@@ -76,7 +76,7 @@ class K3bMainWindow : public KParts::DockMainWindow
K3bDevice::DeviceManager* deviceManager() const;
K3bExternalBinManager* externalBinManager() const;
- KConfig* config() const { return m_config; }
+ TDEConfig* config() const { return m_config; }
// return main window with browser/cd/dvd view, used for DND
K3bDirView* mainWindow() const { return m_dirView; }
/**
@@ -145,7 +145,7 @@ class K3bMainWindow : public KParts::DockMainWindow
signals:
void initializationInfo( const TQString& );
- void configChanged( KConfig* c );
+ void configChanged( TDEConfig* c );
protected:
/** queryClose is called by KTMainWindow on each closeEvent of a window. Against the
@@ -168,13 +168,13 @@ class K3bMainWindow : public KParts::DockMainWindow
* opened file by a temporary filename provided by TDEApplication.
* @see KTMainWindow#saveProperties
*/
- virtual void saveProperties(KConfig *_cfg);
+ virtual void saveProperties(TDEConfig *_cfg);
/** reads the session config file and restores the application's state including the last opened files and documents by reading the
* temporary files saved by saveProperties()
* @see KTMainWindow#readProperties
*/
- virtual void readProperties(KConfig *_cfg);
+ virtual void readProperties(TDEConfig *_cfg);
/**
* checks if doc is modified and asks the user for saving if so.
@@ -266,7 +266,7 @@ class K3bMainWindow : public KParts::DockMainWindow
bool isCdDvdImageAndIfSoOpenDialog( const KURL& url );
/** the configuration object of the application */
- KConfig *m_config;
+ TDEConfig *m_config;
/** The MDI-Interface is managed by this tabbed view */
K3bProjectTabWidget* m_documentTab;
diff --git a/src/k3bappdevicemanager.cpp b/src/k3bappdevicemanager.cpp
index 9498a71..50cde9c 100644
--- a/src/k3bappdevicemanager.cpp
+++ b/src/k3bappdevicemanager.cpp
@@ -185,7 +185,7 @@ void K3bAppDeviceManager::mountDisk()
if( !K3b::isMounted( currentDevice() ) )
K3b::mount( currentDevice() );
- emit mountFinished( KIO::findDeviceMountPoint( currentDevice()->blockDeviceName() ) );
+ emit mountFinished( TDEIO::findDeviceMountPoint( currentDevice()->blockDeviceName() ) );
}
}
diff --git a/src/k3bappdevicemanager.h b/src/k3bappdevicemanager.h
index 88d4dca..78d6f99 100644
--- a/src/k3bappdevicemanager.h
+++ b/src/k3bappdevicemanager.h
@@ -26,7 +26,7 @@ namespace K3bDevice {
class DiskInfoDetector;
}
-namespace KIO {
+namespace TDEIO {
class Job;
}
diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp
index ee1d36a..09fbb30 100644
--- a/src/k3bapplication.cpp
+++ b/src/k3bapplication.cpp
@@ -93,7 +93,7 @@ K3bApplication::~K3bApplication()
void K3bApplication::init()
{
- KConfigGroup generalOptions( config(), "General Options" );
+ TDEConfigGroup generalOptions( config(), "General Options" );
TQGuardedPtr<K3bSplash> splash;
if( !isRestored() ) {
@@ -360,7 +360,7 @@ K3bDevice::DeviceManager* K3bApplication::Core::deviceManager() const
}
-KConfig* K3bApplication::Core::config() const
+TDEConfig* K3bApplication::Core::config() const
{
return kapp->config();
}
@@ -387,11 +387,11 @@ void K3bApplication::Core::init()
}
-void K3bApplication::Core::readSettings( KConfig* cnf )
+void K3bApplication::Core::readSettings( TDEConfig* cnf )
{
K3bCore::readSettings( cnf );
- KConfig* c = cnf;
+ TDEConfig* c = cnf;
if( !c )
c = config();
@@ -399,7 +399,7 @@ void K3bApplication::Core::readSettings( KConfig* cnf )
}
-void K3bApplication::Core::saveSettings( KConfig* cnf )
+void K3bApplication::Core::saveSettings( TDEConfig* cnf )
{
if( !cnf )
cnf = config();
diff --git a/src/k3bapplication.h b/src/k3bapplication.h
index a51dbc7..e0a50e1 100644
--- a/src/k3bapplication.h
+++ b/src/k3bapplication.h
@@ -87,10 +87,10 @@ class K3bApplication::Core : public K3bCore
// make sure the libk3b uses the same configuration
// needed since the lib still depends on K3bCore::config
// the goal is to make the lib independent from the config
- KConfig* config() const;
+ TDEConfig* config() const;
- void readSettings( KConfig* c = 0 );
- void saveSettings( KConfig* c = 0 );
+ void readSettings( TDEConfig* c = 0 );
+ void saveSettings( TDEConfig* c = 0 );
/**
* \reimplemented from K3bCore. We use our own devicemanager here.
diff --git a/src/k3bdatamodewidget.cpp b/src/k3bdatamodewidget.cpp
index 7b10ff6..96065a7 100644
--- a/src/k3bdatamodewidget.cpp
+++ b/src/k3bdatamodewidget.cpp
@@ -79,7 +79,7 @@ void K3bDataModeWidget::setDataMode( int mode )
}
-void K3bDataModeWidget::saveConfig( KConfigBase* c )
+void K3bDataModeWidget::saveConfig( TDEConfigBase* c )
{
TQString datamode;
if( dataMode() == K3b::MODE1 )
@@ -92,7 +92,7 @@ void K3bDataModeWidget::saveConfig( KConfigBase* c )
}
-void K3bDataModeWidget::loadConfig( KConfigBase* c )
+void K3bDataModeWidget::loadConfig( TDEConfigBase* c )
{
TQString datamode = c->readEntry( "data_track_mode" );
if( datamode == "mode1" )
diff --git a/src/k3bdatamodewidget.h b/src/k3bdatamodewidget.h
index 5f0a27f..530379c 100644
--- a/src/k3bdatamodewidget.h
+++ b/src/k3bdatamodewidget.h
@@ -20,7 +20,7 @@
#include <tqcombobox.h>
-class KConfigBase;
+class TDEConfigBase;
class K3bDataModeWidget : public TQComboBox
@@ -37,8 +37,8 @@ class K3bDataModeWidget : public TQComboBox
*/
int dataMode() const;
- void saveConfig( KConfigBase* );
- void loadConfig( KConfigBase* );
+ void saveConfig( TDEConfigBase* );
+ void loadConfig( TDEConfigBase* );
public slots:
void setDataMode( int );
diff --git a/src/k3bdiroperator.cpp b/src/k3bdiroperator.cpp
index c498285..4504f7f 100644
--- a/src/k3bdiroperator.cpp
+++ b/src/k3bdiroperator.cpp
@@ -64,7 +64,7 @@ K3bDirOperator::~K3bDirOperator()
}
-void K3bDirOperator::readConfig( KConfig* cfg, const TQString& group )
+void K3bDirOperator::readConfig( TDEConfig* cfg, const TQString& group )
{
TQString oldGroup = cfg->group();
cfg->setGroup( group );
@@ -93,7 +93,7 @@ void K3bDirOperator::readConfig( KConfig* cfg, const TQString& group )
}
-void K3bDirOperator::writeConfig( KConfig* cfg, const TQString& group )
+void K3bDirOperator::writeConfig( TDEConfig* cfg, const TQString& group )
{
TQString oldGroup = cfg->group();
cfg->setGroup( group );
diff --git a/src/k3bdiroperator.h b/src/k3bdiroperator.h
index 452cbde..8d16e27 100644
--- a/src/k3bdiroperator.h
+++ b/src/k3bdiroperator.h
@@ -42,12 +42,12 @@ class K3bDirOperator : public KDirOperator, public KBookmarkOwner
/**
* reimplemented from KDirOperator
*/
- void readConfig( KConfig* cfg, const TQString& group );
+ void readConfig( TDEConfig* cfg, const TQString& group );
/**
* reimplemented from KDirOperator
*/
- void writeConfig( KConfig* cfg, const TQString& group );
+ void writeConfig( TDEConfig* cfg, const TQString& group );
/**
* reimplemented from KBookmarkOwner
diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp
index d4141a3..2ad6a78 100644
--- a/src/k3bdirview.cpp
+++ b/src/k3bdirview.cpp
@@ -353,13 +353,13 @@ void K3bDirView::home()
}
-void K3bDirView::saveConfig( KConfig* c )
+void K3bDirView::saveConfig( TDEConfig* c )
{
m_fileView->saveConfig(c);
}
-void K3bDirView::readConfig( KConfig* c )
+void K3bDirView::readConfig( TDEConfig* c )
{
m_fileView->readConfig(c);
}
diff --git a/src/k3bdirview.h b/src/k3bdirview.h
index c4b21e3..3c5603e 100644
--- a/src/k3bdirview.h
+++ b/src/k3bdirview.h
@@ -33,7 +33,7 @@ class TQWidgetStack;
class K3bDiskInfoView;
class TQScrollView;
class TQLabel;
-class KConfig;
+class TDEConfig;
class K3bDeviceBranch;
namespace K3bDevice {
@@ -41,7 +41,7 @@ namespace K3bDevice {
class DiskInfo;
}
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -59,8 +59,8 @@ class K3bDirView : public TQVBox
~K3bDirView();
public slots:
- void saveConfig( KConfig* c );
- void readConfig( KConfig* c );
+ void saveConfig( TDEConfig* c );
+ void readConfig( TDEConfig* c );
void showUrl( const KURL& );
void showDevice( K3bDevice::Device* );
diff --git a/src/k3bdiskinfoview.cpp b/src/k3bdiskinfoview.cpp
index df7255c..d586c39 100644
--- a/src/k3bdiskinfoview.cpp
+++ b/src/k3bdiskinfoview.cpp
@@ -356,19 +356,19 @@ void K3bDiskInfoView::createMediaInfoItems( const K3bMedium& medium )
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Capacity:"),
i18n("%1 min").arg(info.capacity().toString()),
- KIO::convertSize(info.capacity().mode1Bytes()) );
+ TDEIO::convertSize(info.capacity().mode1Bytes()) );
if( !info.empty() )
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Used Capacity:"),
i18n("%1 min").arg(info.size().toString()),
- KIO::convertSize(info.size().mode1Bytes()) );
+ TDEIO::convertSize(info.size().mode1Bytes()) );
if( info.appendable() )
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Remaining:"),
i18n("%1 min").arg( info.remainingSize().toString() ),
- KIO::convertSize(info.remainingSize().mode1Bytes()) );
+ TDEIO::convertSize(info.remainingSize().mode1Bytes()) );
atipChild = new KListViewItem( atipItem, atipChild,
i18n("Rewritable:"),
@@ -480,7 +480,7 @@ void K3bDiskInfoView::createIso9660InfoItems( const K3bIso9660SimplePrimaryDescr
// *iso.volumeSpaceSize)
// .arg(iso.logicalBlockSize)
// .arg(iso.volumeSpaceSize),
-// KIO::convertSize(iso.logicalBlockSize
+// TDEIO::convertSize(iso.logicalBlockSize
// *iso.volumeSpaceSize) );
iso9660Item->setOpen( true );
diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp
index afeadf8..7ec0286 100644
--- a/src/k3bemptydiscwaiter.cpp
+++ b/src/k3bemptydiscwaiter.cpp
@@ -256,8 +256,8 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
d->blockMediaChange = true;
- KConfig* c = k3bcore->config();
- bool formatWithoutAsking = KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "auto rewritable erasing", false );
+ TDEConfig* c = k3bcore->config();
+ bool formatWithoutAsking = TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "auto rewritable erasing", false );
K3bMedium medium = k3bappcore->mediaCache()->medium( dev );
@@ -555,8 +555,8 @@ void K3bEmptyDiscWaiter::slotMediumChanged( K3bDevice::Device* dev )
// the user may be using cdrdao for erasing as cdrecord does not work
int erasingApp = K3b::DEFAULT;
- if( KConfigGroup( c, "General Options" ).readBoolEntry( "Manual writing app selection", false ) ) {
- erasingApp = K3b::writingAppFromString( KConfigGroup( c, "CDRW Erasing" ).readEntry( "writing_app" ) );
+ if( TDEConfigGroup( c, "General Options" ).readBoolEntry( "Manual writing app selection", false ) ) {
+ erasingApp = K3b::writingAppFromString( TDEConfigGroup( c, "CDRW Erasing" ).readEntry( "writing_app" ) );
}
K3bBlankingJob job( this );
diff --git a/src/k3bfiletreeview.h b/src/k3bfiletreeview.h
index cac1633..d40ca6e 100644
--- a/src/k3bfiletreeview.h
+++ b/src/k3bfiletreeview.h
@@ -32,7 +32,7 @@ namespace K3bDevice {
class DeviceManager;
}
-namespace KIO {
+namespace TDEIO {
class Job;
}
diff --git a/src/k3bfileview.cpp b/src/k3bfileview.cpp
index 328be04..2a087e8 100644
--- a/src/k3bfileview.cpp
+++ b/src/k3bfileview.cpp
@@ -169,13 +169,13 @@ void K3bFileView::reload()
}
-void K3bFileView::saveConfig( KConfig* c )
+void K3bFileView::saveConfig( TDEConfig* c )
{
m_dirOp->writeConfig( c, "file view" );
}
-void K3bFileView::readConfig( KConfig* c )
+void K3bFileView::readConfig( TDEConfig* c )
{
m_dirOp->readConfig( c, "file view" );
}
diff --git a/src/k3bfileview.h b/src/k3bfileview.h
index 6253009..761191c 100644
--- a/src/k3bfileview.h
+++ b/src/k3bfileview.h
@@ -27,7 +27,7 @@ class KURL;
class KFileFilterCombo;
class KFileItem;
class KActionCollection;
-class KConfig;
+class TDEConfig;
class K3bToolBox;
@@ -55,8 +55,8 @@ class K3bFileView : public K3bContentsView
public slots:
void setDir( const TQString& );
- void saveConfig( KConfig* c );
- void readConfig( KConfig* c );
+ void saveConfig( TDEConfig* c );
+ void readConfig( TDEConfig* c );
void setAutoUpdate( bool );
private:
diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp
index a2bf746..9f8327c 100644
--- a/src/k3binteractiondialog.cpp
+++ b/src/k3binteractiondialog.cpp
@@ -129,7 +129,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
m_buttonSave = 0;
if( buttonMask & CANCEL_BUTTON ) {
- m_buttonCancel = new KPushButton( KConfigGroup( k3bcore->config(), "General Options" )
+ m_buttonCancel = new KPushButton( TDEConfigGroup( k3bcore->config(), "General Options" )
.readBoolEntry( "keep action dialogs open", false )
? KStdGuiItem::close()
: KStdGuiItem::cancel(),
@@ -285,27 +285,27 @@ void K3bInteractionDialog::slotLoadK3bDefaults()
void K3bInteractionDialog::slotLoadUserDefaults()
{
- KConfigGroup c( k3bcore->config(), m_configGroup );
+ TDEConfigGroup c( k3bcore->config(), m_configGroup );
loadUserDefaults( &c );
}
void K3bInteractionDialog::slotSaveUserDefaults()
{
- KConfigGroup c( k3bcore->config(), m_configGroup );
+ TDEConfigGroup c( k3bcore->config(), m_configGroup );
saveUserDefaults( &c );
}
void K3bInteractionDialog::slotLoadLastSettings()
{
- KConfigGroup c( k3bcore->config(), "last used " + m_configGroup );
+ TDEConfigGroup c( k3bcore->config(), "last used " + m_configGroup );
loadUserDefaults( &c );
}
void K3bInteractionDialog::saveLastSettings()
{
- KConfigGroup c( k3bcore->config(), "last used " + m_configGroup );
+ TDEConfigGroup c( k3bcore->config(), "last used " + m_configGroup );
saveUserDefaults( &c );
}
@@ -314,7 +314,7 @@ void K3bInteractionDialog::slotStartClickedInternal()
{
saveLastSettings();
- KConfigGroup c( k3bcore->config(), "General Options" );
+ TDEConfigGroup c( k3bcore->config(), "General Options" );
if( !c.readNumEntry( "action dialog startup settings", 0 ) ) {
// first time saving last used settings
switch( K3bMultiChoiceDialog::choose( i18n("Action Dialog Settings"),
@@ -521,12 +521,12 @@ void K3bInteractionDialog::setSaveButtonText( const TQString& text,
}
-void K3bInteractionDialog::saveUserDefaults( KConfigBase* )
+void K3bInteractionDialog::saveUserDefaults( TDEConfigBase* )
{
}
-void K3bInteractionDialog::loadUserDefaults( KConfigBase* )
+void K3bInteractionDialog::loadUserDefaults( TDEConfigBase* )
{
}
@@ -538,7 +538,7 @@ void K3bInteractionDialog::loadK3bDefaults()
void K3bInteractionDialog::loadStartupSettings()
{
- KConfigGroup c( k3bcore->config(), "General Options" );
+ TDEConfigGroup c( k3bcore->config(), "General Options" );
// earlier K3b versions loaded the saved settings
// so that is what we do as a default
diff --git a/src/k3binteractiondialog.h b/src/k3binteractiondialog.h
index 49db772..65e047f 100644
--- a/src/k3binteractiondialog.h
+++ b/src/k3binteractiondialog.h
@@ -24,7 +24,7 @@ class TQLabel;
class KPushButton;
class TQButton;
class K3bThemedHeader;
-class KConfigBase;
+class TDEConfigBase;
class KGuiItem;
@@ -207,7 +207,7 @@ class K3bInteractionDialog : public KDialog
* The save/load buttons are only activated if the config group is
* set in the constructor.
*/
- virtual void saveUserDefaults( KConfigBase* config );
+ virtual void saveUserDefaults( TDEConfigBase* config );
/**
* Reimplement this to support the save/load user default buttons.
@@ -216,7 +216,7 @@ class K3bInteractionDialog : public KDialog
* The save/load buttons are only activated if the config group is
* set in the constructor.
*/
- virtual void loadUserDefaults( KConfigBase* config );
+ virtual void loadUserDefaults( TDEConfigBase* config );
/**
* Reimplement this to support the "k3b defaults" button.
diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp
index 1542922..215bc88 100644
--- a/src/k3bjobprogressdialog.cpp
+++ b/src/k3bjobprogressdialog.cpp
@@ -263,7 +263,7 @@ void K3bJobProgressDialog::setupGUI()
void K3bJobProgressDialog::show()
{
- if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "hide main window while writing", false ) )
+ if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "hide main window while writing", false ) )
if( TQWidget* w = kapp->mainWidget() )
w->hide();
@@ -457,7 +457,7 @@ void K3bJobProgressDialog::setJob( K3bJob* job )
setCaption( m_job->jobDescription() );
- if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "Show progress OSD", true ) ) {
+ if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "Show progress OSD", true ) ) {
if( !m_osd )
m_osd = new K3bJobProgressOSD( this, "progressosd" );
}
diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp
index ab2c310..a6b95d2 100644
--- a/src/k3bjobprogressosd.cpp
+++ b/src/k3bjobprogressosd.cpp
@@ -283,18 +283,18 @@ TQPoint K3bJobProgressOSD::fixupPosition( const TQPoint& pp )
}
-void K3bJobProgressOSD::readSettings( KConfigBase* c )
+void K3bJobProgressOSD::readSettings( TDEConfigBase* c )
{
- KConfigGroup grp( c, "OSD Position" );
+ TDEConfigGroup grp( c, "OSD Position" );
setPosition( grp.readPointEntry( "Position", 0 ) );
setScreen( grp.readNumEntry( "Screen", 0 ) );
}
-void K3bJobProgressOSD::saveSettings( KConfigBase* c )
+void K3bJobProgressOSD::saveSettings( TDEConfigBase* c )
{
- KConfigGroup grp( c, "OSD Position" );
+ TDEConfigGroup grp( c, "OSD Position" );
grp.writeEntry( "Position", m_position );
grp.writeEntry( "Screen", m_screen );
diff --git a/src/k3bjobprogressosd.h b/src/k3bjobprogressosd.h
index ac89172..5159fa8 100644
--- a/src/k3bjobprogressosd.h
+++ b/src/k3bjobprogressosd.h
@@ -21,7 +21,7 @@
class TQPaintEvent;
class TQMouseEvent;
-class KConfigBase;
+class TDEConfigBase;
/**
* An OSD displaying a text and a progress bar.
@@ -40,8 +40,8 @@ class K3bJobProgressOSD : public TQWidget
int screen() const { return m_screen; }
const TQPoint& position() const { return m_position; }
- void readSettings( KConfigBase* );
- void saveSettings( KConfigBase* );
+ void readSettings( TDEConfigBase* );
+ void saveSettings( TDEConfigBase* );
public slots:
void setScreen( int );
diff --git a/src/k3bmedium.cpp b/src/k3bmedium.cpp
index e3cf946..29ba46c 100644
--- a/src/k3bmedium.cpp
+++ b/src/k3bmedium.cpp
@@ -364,7 +364,7 @@ TQString K3bMedium::longString() const
if( diskInfo().diskState() == K3bDevice::STATE_COMPLETE ||
diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE ) {
s += "<br>" + i18n("%1 in %n track", "%1 in %n tracks", toc().count() )
- .arg( KIO::convertSize(diskInfo().size().mode1Bytes() ) );
+ .arg( TDEIO::convertSize(diskInfo().size().mode1Bytes() ) );
if( diskInfo().numSessions() > 1 )
s += i18n(" and %n session", " and %n sessions", diskInfo().numSessions() );
}
@@ -372,11 +372,11 @@ TQString K3bMedium::longString() const
if( diskInfo().diskState() == K3bDevice::STATE_EMPTY ||
diskInfo().diskState() == K3bDevice::STATE_INCOMPLETE )
s += "<br>" + i18n("Free space: %1")
- .arg( KIO::convertSize( diskInfo().remainingSize().mode1Bytes() ) );
+ .arg( TDEIO::convertSize( diskInfo().remainingSize().mode1Bytes() ) );
if( !diskInfo().empty() && diskInfo().rewritable() )
s += "<br>" + i18n("Capacity: %1")
- .arg( KIO::convertSize( diskInfo().capacity().mode1Bytes() ) );
+ .arg( TDEIO::convertSize( diskInfo().capacity().mode1Bytes() ) );
return s;
}
diff --git a/src/k3bprojectinterface.cpp b/src/k3bprojectinterface.cpp
index 9eafe1e..094e386 100644
--- a/src/k3bprojectinterface.cpp
+++ b/src/k3bprojectinterface.cpp
@@ -101,7 +101,7 @@ int K3bProjectInterface::length() const
}
-KIO::filesize_t K3bProjectInterface::size() const
+TDEIO::filesize_t K3bProjectInterface::size() const
{
return m_doc->size();
}
diff --git a/src/k3bprojectinterface.h b/src/k3bprojectinterface.h
index 2a7c38a..1459fd0 100644
--- a/src/k3bprojectinterface.h
+++ b/src/k3bprojectinterface.h
@@ -65,7 +65,7 @@ class K3bProjectInterface : public DCOPObject
/**
* \return size of the project in bytes.
*/
- virtual KIO::filesize_t size() const;
+ virtual TDEIO::filesize_t size() const;
virtual const TQString& imagePath() const;
diff --git a/src/k3bprojectmanager.cpp b/src/k3bprojectmanager.cpp
index 5fb7c27..965a160 100644
--- a/src/k3bprojectmanager.cpp
+++ b/src/k3bprojectmanager.cpp
@@ -273,7 +273,7 @@ K3bDoc* K3bProjectManager::createProject( K3bDoc::DocType type )
void K3bProjectManager::loadDefaults( K3bDoc* doc )
{
- KConfig* c = kapp->config();
+ TDEConfig* c = kapp->config();
TQString oldGroup = c->group();
@@ -281,7 +281,7 @@ void K3bProjectManager::loadDefaults( K3bDoc* doc )
// earlier K3b versions loaded the saved settings
// so that is what we do as a default
- int i = KConfigGroup( c, "General Options" ).readNumEntry( "action dialog startup settings",
+ int i = TDEConfigGroup( c, "General Options" ).readNumEntry( "action dialog startup settings",
K3bInteractionDialog::LOAD_SAVED_SETTINGS );
if( i == K3bInteractionDialog::LOAD_K3B_DEFAULTS )
return; // the default k3b settings are the ones everyone starts with
@@ -473,7 +473,7 @@ K3bDoc* K3bProjectManager::openProject( const KURL& url )
TQApplication::setOverrideCursor( TQCursor(TQt::WaitCursor) );
TQString tmpfile;
- KIO::NetAccess::download( url, tmpfile, 0L );
+ TDEIO::NetAccess::download( url, tmpfile, 0L );
// ///////////////////////////////////////////////
// first check if it's a store or an old plain xml file
@@ -527,7 +527,7 @@ K3bDoc* K3bProjectManager::openProject( const KURL& url )
}
// ///////////////////////////////////////////////
- KIO::NetAccess::removeTempFile( tmpfile );
+ TDEIO::NetAccess::removeTempFile( tmpfile );
if( !success ) {
kdDebug() << "(K3bDoc) could not open file " << url.path() << endl;
@@ -594,7 +594,7 @@ K3bDoc* K3bProjectManager::openProject( const KURL& url )
bool K3bProjectManager::saveProject( K3bDoc* doc, const KURL& url )
{
TQString tmpfile;
- KIO::NetAccess::download( url, tmpfile, 0L );
+ TDEIO::NetAccess::download( url, tmpfile, 0L );
bool success = false;
@@ -639,7 +639,7 @@ bool K3bProjectManager::saveProject( K3bDoc* doc, const KURL& url )
}
}
- KIO::NetAccess::removeTempFile( tmpfile );
+ TDEIO::NetAccess::removeTempFile( tmpfile );
return success;
}
diff --git a/src/k3bservicemenuinstaller.cpp b/src/k3bservicemenuinstaller.cpp
index 497c29a..13729c7 100644
--- a/src/k3bservicemenuinstaller.cpp
+++ b/src/k3bservicemenuinstaller.cpp
@@ -67,7 +67,7 @@ bool K3bServiceInstaller::allInstalled() const
d->update();
for( unsigned int i = 0; i < d->allServiceMenuFiles.count(); ++i )
- if( !KIO::NetAccess::exists( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], true, 0 ) ) {
+ if( !TDEIO::NetAccess::exists( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], true, 0 ) ) {
kdDebug() << "(K3bServiceInstaller) service menu " << d->konqiServicemenusFolder << d->allServiceMenuFiles[i]
<< " does not exist." << endl;
return false;
@@ -85,14 +85,14 @@ bool K3bServiceInstaller::install( TQWidget* parent )
// simply link all the globally installed K3b service menus to the local konqi service menu folder
for( unsigned int i = 0; i < d->allServiceMenus.count(); ++i )
- if( !KIO::NetAccess::file_copy( KURL::fromPathOrURL( d->allServiceMenus[i] ),
+ if( !TDEIO::NetAccess::file_copy( KURL::fromPathOrURL( d->allServiceMenus[i] ),
KURL::fromPathOrURL( d->konqiServicemenusFolder + d->allServiceMenuFiles[i] ), -1,
true, false, parent ) )
success = false;
if( !success && parent )
KMessageBox::error( parent,
- KIO::NetAccess::lastErrorString(),
+ TDEIO::NetAccess::lastErrorString(),
i18n("Failed to copy service menu files") );
return success;
@@ -106,13 +106,13 @@ bool K3bServiceInstaller::remove( TQWidget* parent )
bool success = true;
for( unsigned int i = 0; i < d->allServiceMenuFiles.count(); ++i )
- if( KIO::NetAccess::exists( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], true, parent ) )
- if( !KIO::NetAccess::del( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], parent ) )
+ if( TDEIO::NetAccess::exists( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], true, parent ) )
+ if( !TDEIO::NetAccess::del( d->konqiServicemenusFolder + d->allServiceMenuFiles[i], parent ) )
success = false;
if( !success && parent )
KMessageBox::error( parent,
- KIO::NetAccess::lastErrorString(),
+ TDEIO::NetAccess::lastErrorString(),
i18n("Failed to remove service menu files") );
return success;
diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp
index 0d88798..4a4fd89 100644
--- a/src/k3bstatusbarmanager.cpp
+++ b/src/k3bstatusbarmanager.cpp
@@ -79,7 +79,7 @@ K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* parent )
m_mainWindow->statusBar()->addWidget( new TQLabel( " ", m_mainWindow->statusBar() ), 0, true );
m_mainWindow->statusBar()->addWidget( m_versionBox, 0, true );
- connect( m_mainWindow, TQT_SIGNAL(configChanged(KConfig*)), this, TQT_SLOT(update()) );
+ connect( m_mainWindow, TQT_SIGNAL(configChanged(TDEConfig*)), this, TQT_SLOT(update()) );
connect( m_mainWindow->actionCollection(), TQT_SIGNAL(actionStatusText(const TQString&)),
this, TQT_SLOT(showActionStatusText(const TQString&)) );
connect( m_mainWindow->actionCollection(), TQT_SIGNAL(clearStatusText()),
@@ -124,8 +124,8 @@ void K3bStatusBarManager::slotFreeTempSpace(const TQString&,
unsigned long,
unsigned long kbAvail)
{
- m_labelFreeTemp->setText(KIO::convertSizeFromKB(kbAvail) + "/" +
- KIO::convertSizeFromKB(kbSize) );
+ m_labelFreeTemp->setText(TDEIO::convertSizeFromKB(kbAvail) + "/" +
+ TDEIO::convertSizeFromKB(kbSize) );
// if we have less than 640 MB that is not good
if( kbAvail < 655360 )
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index 84fdb1d..de9d846 100644
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
@@ -160,7 +160,7 @@ K3bSystemProblemDialog::K3bSystemProblemDialog( const TQValueList<K3bSystemProbl
void K3bSystemProblemDialog::closeEvent( TQCloseEvent* e )
{
if( m_checkDontShowAgain->isChecked() ) {
- KConfigGroup grp( kapp->config(), "General Options" );
+ TDEConfigGroup grp( kapp->config(), "General Options" );
grp.writeEntry( "check system config", false );
}
@@ -601,7 +601,7 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
}
// remember which version of K3b checked the system the last time
- KConfigGroup cfg( k3bcore->config(), "General Options" );
+ TDEConfigGroup cfg( k3bcore->config(), "General Options" );
cfg.writeEntry( "Last system check version", k3bcore->version() );
}
@@ -678,7 +678,7 @@ TQPtrList<K3bDevice::Device> K3bSystemProblemDialog::checkForAutomounting()
bool K3bSystemProblemDialog::readCheckSystemConfig()
{
- KConfigGroup cfgGrp( k3bcore->config(), "General Options" );
+ TDEConfigGroup cfgGrp( k3bcore->config(), "General Options" );
K3bVersion configVersion( cfgGrp.readEntry( "Last system check version", "0.1" ) );
if( configVersion < k3bcore->version() )
diff --git a/src/k3btempdirselectionwidget.cpp b/src/k3btempdirselectionwidget.cpp
index fb69b34..5ba3879 100644
--- a/src/k3btempdirselectionwidget.cpp
+++ b/src/k3btempdirselectionwidget.cpp
@@ -107,7 +107,7 @@ void K3bTempDirSelectionWidget::slotUpdateFreeTempSpace()
// update the temp space
freeTempSpace();
- m_labelFreeSpace->setText( KIO::convertSizeFromKB(m_freeTempSpace) );
+ m_labelFreeSpace->setText( TDEIO::convertSizeFromKB(m_freeTempSpace) );
if( m_labelCdSize ) {
if( m_freeTempSpace < m_requestedSize/1024 )
@@ -204,34 +204,34 @@ void K3bTempDirSelectionWidget::setSelectionMode( int mode )
}
-void K3bTempDirSelectionWidget::setNeededSize( KIO::filesize_t bytes )
+void K3bTempDirSelectionWidget::setNeededSize( TDEIO::filesize_t bytes )
{
m_requestedSize = bytes;
if( !m_labelCdSize ) {
TQHBox* cdSizeBox = new TQHBox( this );
cdSizeBox->setSpacing( KDialog::spacingHint() );
(void)new TQLabel( i18n( "Size of project:" ), cdSizeBox, "TextLabel4" );
- m_labelCdSize = new TQLabel( KIO::convertSize(bytes), cdSizeBox, "m_labelCdSize" );
+ m_labelCdSize = new TQLabel( TDEIO::convertSize(bytes), cdSizeBox, "m_labelCdSize" );
m_labelCdSize->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) );
}
- m_labelCdSize->setText( KIO::convertSize(bytes) );
+ m_labelCdSize->setText( TDEIO::convertSize(bytes) );
}
void K3bTempDirSelectionWidget::saveConfig()
{
- KConfigGroup grp( k3bcore->config(), "General Options" );
+ TDEConfigGroup grp( k3bcore->config(), "General Options" );
grp.writePathEntry( "Temp Dir", tempDirectory() );
}
-void K3bTempDirSelectionWidget::readConfig( KConfigBase* c )
+void K3bTempDirSelectionWidget::readConfig( TDEConfigBase* c )
{
setTempPath( c->readPathEntry( "image path", K3b::defaultTempPath() ) );
}
-void K3bTempDirSelectionWidget::saveConfig( KConfigBase* c )
+void K3bTempDirSelectionWidget::saveConfig( TDEConfigBase* c )
{
c->writePathEntry( "image path", tempPath() );
}
diff --git a/src/k3btempdirselectionwidget.h b/src/k3btempdirselectionwidget.h
index bc0524a..639e7b6 100644
--- a/src/k3btempdirselectionwidget.h
+++ b/src/k3btempdirselectionwidget.h
@@ -23,7 +23,7 @@
class TQTimer;
class TQLabel;
class KURLRequester;
-class KConfigBase;
+class TDEConfigBase;
/**
@@ -45,7 +45,7 @@ class K3bTempDirSelectionWidget : public TQGroupBox
/**
* \return Free space in KB
- * FIXME: use KIO::filesize_t and return the number of bytes
+ * FIXME: use TDEIO::filesize_t and return the number of bytes
*/
unsigned long freeTempSpace() const;
TQString tempPath() const;
@@ -60,7 +60,7 @@ class K3bTempDirSelectionWidget : public TQGroupBox
public slots:
void setTempPath( const TQString& );
void setSelectionMode( int mode );
- void setNeededSize( KIO::filesize_t bytes );
+ void setNeededSize( TDEIO::filesize_t bytes );
/**
* In file selection mode if the user enters a directory name it will
@@ -74,8 +74,8 @@ class K3bTempDirSelectionWidget : public TQGroupBox
*/
void saveConfig();
- void readConfig( KConfigBase* );
- void saveConfig( KConfigBase* );
+ void readConfig( TDEConfigBase* );
+ void saveConfig( TDEConfigBase* );
private slots:
void slotUpdateFreeTempSpace();
diff --git a/src/k3bthememanager.cpp b/src/k3bthememanager.cpp
index a73bb2b..82e33ce 100644
--- a/src/k3bthememanager.cpp
+++ b/src/k3bthememanager.cpp
@@ -192,9 +192,9 @@ K3bTheme* K3bThemeManager::currentTheme() const
}
-void K3bThemeManager::readConfig( KConfigBase* c )
+void K3bThemeManager::readConfig( TDEConfigBase* c )
{
- KConfigGroup generalOptions( c, "General Options" );
+ TDEConfigGroup generalOptions( c, "General Options" );
// allow to override the default theme by packaging a default config file
TQString defaultTheme = generalOptions.readEntry( "default theme", "quant" );
@@ -207,10 +207,10 @@ void K3bThemeManager::readConfig( KConfigBase* c )
}
-void K3bThemeManager::saveConfig( KConfigBase* c )
+void K3bThemeManager::saveConfig( TDEConfigBase* c )
{
if( !d->currentThemeName.isEmpty() )
- KConfigGroup( c, "General Options" ).writeEntry( "current theme", d->currentThemeName );
+ TDEConfigGroup( c, "General Options" ).writeEntry( "current theme", d->currentThemeName );
}
diff --git a/src/k3bthememanager.h b/src/k3bthememanager.h
index 9124c67..89b9c9e 100644
--- a/src/k3bthememanager.h
+++ b/src/k3bthememanager.h
@@ -25,7 +25,7 @@
-class KConfigBase;
+class TDEConfigBase;
class K3bTheme
@@ -131,8 +131,8 @@ class K3bThemeManager : public TQObject
void themeChanged( K3bTheme* );
public slots:
- void readConfig( KConfigBase* );
- void saveConfig( KConfigBase* );
+ void readConfig( TDEConfigBase* );
+ void saveConfig( TDEConfigBase* );
void setCurrentTheme( const TQString& );
void setCurrentTheme( K3bTheme* );
void loadThemes();
diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp
index e0d39e0..a998687 100644
--- a/src/k3bwelcomewidget.cpp
+++ b/src/k3bwelcomewidget.cpp
@@ -362,9 +362,9 @@ K3bWelcomeWidget::~K3bWelcomeWidget()
}
-void K3bWelcomeWidget::loadConfig( KConfigBase* c )
+void K3bWelcomeWidget::loadConfig( TDEConfigBase* c )
{
- TQStringList sl = KConfigGroup( c, "Welcome Widget" ).readListEntry( "welcome_actions" );
+ TQStringList sl = TDEConfigGroup( c, "Welcome Widget" ).readListEntry( "welcome_actions" );
if( sl.isEmpty() ) {
sl.append( "file_new_audio" );
@@ -386,9 +386,9 @@ void K3bWelcomeWidget::loadConfig( KConfigBase* c )
}
-void K3bWelcomeWidget::saveConfig( KConfigBase* c )
+void K3bWelcomeWidget::saveConfig( TDEConfigBase* c )
{
- KConfigGroup grp( c, "Welcome Widget" );
+ TDEConfigGroup grp( c, "Welcome Widget" );
TQStringList sl;
for( TQPtrListIterator<KAction> it( main->m_actions ); it.current(); ++it )
diff --git a/src/k3bwelcomewidget.h b/src/k3bwelcomewidget.h
index ab6c5ad..940d951 100644
--- a/src/k3bwelcomewidget.h
+++ b/src/k3bwelcomewidget.h
@@ -32,7 +32,7 @@ class K3bFlatButton;
class TQPaintEvent;
class TQResizeEvent;
class TQSimpleRichText;
-class KConfigBase;
+class TDEConfigBase;
class TQMouseEvent;
class TQShowEvent;
@@ -46,8 +46,8 @@ class K3bWelcomeWidget : public TQScrollView
K3bWelcomeWidget( K3bMainWindow*, TQWidget* parent = 0, const char* name = 0 );
~K3bWelcomeWidget();
- void loadConfig( KConfigBase* c );
- void saveConfig( KConfigBase* c );
+ void loadConfig( TDEConfigBase* c );
+ void saveConfig( TDEConfigBase* c );
class Display;
diff --git a/src/k3bwriterselectionwidget.cpp b/src/k3bwriterselectionwidget.cpp
index df4f756..4c85c5a 100644
--- a/src/k3bwriterselectionwidget.cpp
+++ b/src/k3bwriterselectionwidget.cpp
@@ -234,9 +234,9 @@ int K3bWriterSelectionWidget::wantedMediumState() const
}
-void K3bWriterSelectionWidget::slotConfigChanged( KConfigBase* c )
+void K3bWriterSelectionWidget::slotConfigChanged( TDEConfigBase* c )
{
- KConfigGroup g( c, "General Options" );
+ TDEConfigGroup g( c, "General Options" );
if( g.readBoolEntry( "Manual writing app selection", false ) ) {
m_comboWritingApp->show();
m_writingAppLabel->show();
@@ -414,7 +414,7 @@ int K3bWriterSelectionWidget::writerSpeed() const
int K3bWriterSelectionWidget::writingApp() const
{
- KConfigGroup g( k3bcore->config(), "General Options" );
+ TDEConfigGroup g( k3bcore->config(), "General Options" );
if( g.readBoolEntry( "Manual writing app selection", false ) ) {
return selectedWritingApp();
}
@@ -451,7 +451,7 @@ void K3bWriterSelectionWidget::slotWriterChanged()
// save last selected writer
if( K3bDevice::Device* dev = writerDevice() ) {
- KConfigGroup g( k3bcore->config(), "General Options" );
+ TDEConfigGroup g( k3bcore->config(), "General Options" );
g.writeEntry( "current_writer", dev->devicename() );
}
}
@@ -500,7 +500,7 @@ void K3bWriterSelectionWidget::slotRefreshWritingApps()
}
-void K3bWriterSelectionWidget::loadConfig( KConfigBase* c )
+void K3bWriterSelectionWidget::loadConfig( TDEConfigBase* c )
{
setWriterDevice( k3bcore->deviceManager()->findDevice( c->readEntry( "writer_device" ) ) );
setSpeed( c->readNumEntry( "writing_speed", 0 ) );
@@ -508,7 +508,7 @@ void K3bWriterSelectionWidget::loadConfig( KConfigBase* c )
}
-void K3bWriterSelectionWidget::saveConfig( KConfigBase* c )
+void K3bWriterSelectionWidget::saveConfig( TDEConfigBase* c )
{
c->writeEntry( "writing_speed", writerSpeed() );
c->writeEntry( "writer_device", writerDevice() ? writerDevice()->devicename() : TQString() );
diff --git a/src/k3bwriterselectionwidget.h b/src/k3bwriterselectionwidget.h
index 920f78a..c4cb386 100644
--- a/src/k3bwriterselectionwidget.h
+++ b/src/k3bwriterselectionwidget.h
@@ -20,7 +20,7 @@
#include <tqwidget.h>
class KComboBox;
-class KConfigBase;
+class TDEConfigBase;
class TQLabel;
class K3bMediaSelectionComboBox;
namespace K3bDevice {
@@ -58,8 +58,8 @@ class K3bWriterSelectionWidget : public TQWidget
int wantedMediumState() const;
void loadDefaults();
- void loadConfig( KConfigBase* );
- void saveConfig( KConfigBase* );
+ void loadConfig( TDEConfigBase* );
+ void saveConfig( TDEConfigBase* );
public slots:
void setWriterDevice( K3bDevice::Device* );
@@ -122,7 +122,7 @@ class K3bWriterSelectionWidget : public TQWidget
void slotRefreshWriterSpeeds();
void slotRefreshWritingApps();
void slotWritingAppSelected( int id );
- void slotConfigChanged( KConfigBase* c );
+ void slotConfigChanged( TDEConfigBase* c );
void slotSpeedChanged( int index );
void slotWriterChanged();
void slotNewBurnMedium( K3bDevice::Device* dev );
diff --git a/src/k3bwritingmodewidget.cpp b/src/k3bwritingmodewidget.cpp
index 1d329ce..077c2e8 100644
--- a/src/k3bwritingmodewidget.cpp
+++ b/src/k3bwritingmodewidget.cpp
@@ -166,7 +166,7 @@ void K3bWritingModeWidget::updateModes()
}
-void K3bWritingModeWidget::saveConfig( KConfigBase* c )
+void K3bWritingModeWidget::saveConfig( TDEConfigBase* c )
{
switch( writingMode() ) {
case K3b::DAO:
@@ -190,7 +190,7 @@ void K3bWritingModeWidget::saveConfig( KConfigBase* c )
}
}
-void K3bWritingModeWidget::loadConfig( KConfigBase* c )
+void K3bWritingModeWidget::loadConfig( TDEConfigBase* c )
{
TQString mode = c->readEntry( "writing_mode" );
if ( mode == "dao" )
diff --git a/src/k3bwritingmodewidget.h b/src/k3bwritingmodewidget.h
index 869f492..eb49f49 100644
--- a/src/k3bwritingmodewidget.h
+++ b/src/k3bwritingmodewidget.h
@@ -21,7 +21,7 @@
#include <k3bmedium.h>
-class KConfigBase;
+class TDEConfigBase;
/**
@@ -39,11 +39,11 @@ class K3bWritingModeWidget : public K3bIntMapComboBox
int writingMode() const;
- void saveConfig( KConfigBase* );
+ void saveConfig( TDEConfigBase* );
/**
* This will not emit the writingModeChanged signal
*/
- void loadConfig( KConfigBase* );
+ void loadConfig( TDEConfigBase* );
public slots:
/**
diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp
index 904683b..b9dc2a9 100644
--- a/src/misc/k3bblankingdialog.cpp
+++ b/src/misc/k3bblankingdialog.cpp
@@ -160,7 +160,7 @@ void K3bBlankingDialog::slotStartClicked()
if( d->jobRunning ) // in case the job already finished in the start slot
d->erasingDlg->exec(false);
- if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+ if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
!exitLoopOnHide() )
show();
else
@@ -265,7 +265,7 @@ void K3bBlankingDialog::loadK3bDefaults()
m_comboEraseMode->setCurrentItem( d->typeComboMap[K3bBlankingJob::Fast] );
}
-void K3bBlankingDialog::loadUserDefaults( KConfigBase* c )
+void K3bBlankingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_writerSelectionWidget->loadConfig( c );
slotWritingAppChanged( m_writerSelectionWidget->writingApp() );
@@ -285,7 +285,7 @@ void K3bBlankingDialog::loadUserDefaults( KConfigBase* c )
}
}
-void K3bBlankingDialog::saveUserDefaults( KConfigBase* c )
+void K3bBlankingDialog::saveUserDefaults( TDEConfigBase* c )
{
TQString mode;
switch( d->comboTypeMap[m_comboEraseMode->currentItem()] ) {
diff --git a/src/misc/k3bblankingdialog.h b/src/misc/k3bblankingdialog.h
index 0a5d643..0816c1d 100644
--- a/src/misc/k3bblankingdialog.h
+++ b/src/misc/k3bblankingdialog.h
@@ -73,8 +73,8 @@ Q_OBJECT
private:
void setupGui();
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
K3bWriterSelectionWidget* m_writerSelectionWidget;
diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp
index b5e6d71..3245906 100644
--- a/src/misc/k3bcdcopydialog.cpp
+++ b/src/misc/k3bcdcopydialog.cpp
@@ -357,7 +357,7 @@ void K3bCdCopyDialog::slotStartClicked()
delete dlg;
delete burnJob;
- if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+ if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
!exitLoopOnHide() )
show();
else
@@ -456,7 +456,7 @@ void K3bCdCopyDialog::updateOverrideDevice()
}
-void K3bCdCopyDialog::loadUserDefaults( KConfigBase* c )
+void K3bCdCopyDialog::loadUserDefaults( TDEConfigBase* c )
{
m_writerSelectionWidget->loadConfig( c );
m_comboSourceDevice->setSelectedDevice( k3bcore->deviceManager()->findDevice( c->readEntry( "source_device" ) ) );
@@ -489,7 +489,7 @@ void K3bCdCopyDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bCdCopyDialog::saveUserDefaults( KConfigBase* c )
+void K3bCdCopyDialog::saveUserDefaults( TDEConfigBase* c )
{
m_writingModeWidget->saveConfig( c );
c->writeEntry( "simulate", m_checkSimulate->isChecked() );
@@ -545,7 +545,7 @@ void K3bCdCopyDialog::loadK3bDefaults()
}
-KIO::filesize_t K3bCdCopyDialog::neededSize() const
+TDEIO::filesize_t K3bCdCopyDialog::neededSize() const
{
if( m_comboCopyMode->currentItem() == 0 )
return k3bappcore->mediaCache()->medium( m_comboSourceDevice->selectedDevice() ).diskInfo().size().mode1Bytes();
diff --git a/src/misc/k3bcdcopydialog.h b/src/misc/k3bcdcopydialog.h
index d1421dd..4b17fa8 100644
--- a/src/misc/k3bcdcopydialog.h
+++ b/src/misc/k3bcdcopydialog.h
@@ -65,11 +65,11 @@ class K3bCdCopyDialog : public K3bInteractionDialog
void toggleAll();
private:
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void loadK3bDefaults();
- KIO::filesize_t neededSize() const;
+ TDEIO::filesize_t neededSize() const;
K3bWriterSelectionWidget* m_writerSelectionWidget;
K3bTempDirSelectionWidget* m_tempDirSelectionWidget;
diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp
index 57b313b..5c73381 100644
--- a/src/misc/k3bcdimagewritingdialog.cpp
+++ b/src/misc/k3bcdimagewritingdialog.cpp
@@ -163,7 +163,7 @@ void K3bCdImageWritingDialog::init()
if( !d->imageForced ) {
// when opening the dialog first the default settings are loaded and afterwards we set the
// last written image because that's what most users want
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup( configGroup() );
TQString image = c->readPathEntry( "last written image" );
if( TQFile::exists( image ) )
@@ -337,7 +337,7 @@ void K3bCdImageWritingDialog::slotStartClicked()
d->md5Job->cancel();
// save the path
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup( configGroup() );
c->writePathEntry( "last written image", imagePath() );
@@ -404,7 +404,7 @@ void K3bCdImageWritingDialog::slotStartClicked()
{
K3bIso9660 isoFs( d->imageFile );
if( isoFs.open() ) {
- if( K3b::filesize( KURL::fromPathOrURL(d->imageFile) ) < (KIO::filesize_t)(isoFs.primaryDescriptor().volumeSpaceSize*2048) ) {
+ if( K3b::filesize( KURL::fromPathOrURL(d->imageFile) ) < (TDEIO::filesize_t)(isoFs.primaryDescriptor().volumeSpaceSize*2048) ) {
if( KMessageBox::questionYesNo( this,
i18n("<p>This image has an invalid file size."
"If it has been downloaded make sure the download is complete."
@@ -447,7 +447,7 @@ void K3bCdImageWritingDialog::slotStartClicked()
delete job;
- if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+ if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
!exitLoopOnHide() )
show();
else
@@ -591,10 +591,10 @@ void K3bCdImageWritingDialog::createIso9660InfoItems( K3bIso9660* isoF )
isoRootItem->setForegroundColor( 0, palette().disabled().foreground() );
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
- KIO::filesize_t size = K3b::filesize( KURL::fromPathOrURL(isoF->fileName()) );
+ TDEIO::filesize_t size = K3b::filesize( KURL::fromPathOrURL(isoF->fileName()) );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
i18n("Filesize:"),
- KIO::convertSize( size ) );
+ TDEIO::convertSize( size ) );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
@@ -657,7 +657,7 @@ void K3bCdImageWritingDialog::createCdrecordCloneItems( const TQString& tocFile,
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
- i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
+ i18n("Filesize:"), TDEIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
@@ -685,7 +685,7 @@ void K3bCdImageWritingDialog::createCueBinItems( const TQString& cueFile, const
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
- i18n("Filesize:"), KIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
+ i18n("Filesize:"), TDEIO::convertSize( K3b::filesize(KURL::fromPathOrURL(imageFile)) ) );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
@@ -912,7 +912,7 @@ void K3bCdImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, cons
}
-void K3bCdImageWritingDialog::loadUserDefaults( KConfigBase* c )
+void K3bCdImageWritingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_writingModeWidget->loadConfig( c );
m_checkDummy->setChecked( c->readBoolEntry("simulate", false ) );
@@ -954,7 +954,7 @@ void K3bCdImageWritingDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bCdImageWritingDialog::saveUserDefaults( KConfigBase* c )
+void K3bCdImageWritingDialog::saveUserDefaults( TDEConfigBase* c )
{
m_writingModeWidget->saveConfig( c ),
c->writeEntry( "simulate", m_checkDummy->isChecked() );
diff --git a/src/misc/k3bcdimagewritingdialog.h b/src/misc/k3bcdimagewritingdialog.h
index 0941a13..85dbc05 100644
--- a/src/misc/k3bcdimagewritingdialog.h
+++ b/src/misc/k3bcdimagewritingdialog.h
@@ -66,8 +66,8 @@ class K3bCdImageWritingDialog : public K3bInteractionDialog
void slotUpdateImage( const TQString& );
protected:
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void loadK3bDefaults();
void calculateMd5Sum( const TQString& );
diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp
index 24aeace..729c4c7 100644
--- a/src/misc/k3bdvdcopydialog.cpp
+++ b/src/misc/k3bdvdcopydialog.cpp
@@ -277,7 +277,7 @@ void K3bDvdCopyDialog::slotStartClicked()
delete dlg;
delete job;
- if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+ if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
!exitLoopOnHide() )
show();
else
@@ -285,7 +285,7 @@ void K3bDvdCopyDialog::slotStartClicked()
}
-void K3bDvdCopyDialog::loadUserDefaults( KConfigBase* c )
+void K3bDvdCopyDialog::loadUserDefaults( TDEConfigBase* c )
{
m_comboSourceDevice->setSelectedDevice( k3bcore->deviceManager()->findDevice( c->readEntry( "source_device" ) ) );
@@ -308,7 +308,7 @@ void K3bDvdCopyDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bDvdCopyDialog::saveUserDefaults( KConfigBase* c )
+void K3bDvdCopyDialog::saveUserDefaults( TDEConfigBase* c )
{
m_tempDirSelectionWidget->saveConfig();
@@ -440,14 +440,14 @@ void K3bDvdCopyDialog::updateOverrideDevice()
}
-KIO::filesize_t K3bDvdCopyDialog::neededSize() const
+TDEIO::filesize_t K3bDvdCopyDialog::neededSize() const
{
K3bMedium medium = k3bappcore->mediaCache()->medium( m_comboSourceDevice->selectedDevice() );
if( medium.diskInfo().diskState() == K3bDevice::STATE_NO_MEDIA )
return 0;
else if( medium.diskInfo().mediaType() & (K3bDevice::MEDIA_DVD_RW_OVWR|K3bDevice::MEDIA_DVD_PLUS_RW) )
- return (KIO::filesize_t)medium.iso9660Descriptor().volumeSpaceSize * (KIO::filesize_t)2048;
+ return (TDEIO::filesize_t)medium.iso9660Descriptor().volumeSpaceSize * (TDEIO::filesize_t)2048;
else
return medium.diskInfo().size().mode1Bytes();
}
diff --git a/src/misc/k3bdvdcopydialog.h b/src/misc/k3bdvdcopydialog.h
index 13561c9..390ee2e 100644
--- a/src/misc/k3bdvdcopydialog.h
+++ b/src/misc/k3bdvdcopydialog.h
@@ -57,11 +57,11 @@ class K3bDvdCopyDialog : public K3bInteractionDialog
void toggleAll();
private:
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void loadK3bDefaults();
- KIO::filesize_t neededSize() const;
+ TDEIO::filesize_t neededSize() const;
K3bWriterSelectionWidget* m_writerSelectionWidget;
K3bTempDirSelectionWidget* m_tempDirSelectionWidget;
diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp
index 309f48c..6524d05 100644
--- a/src/misc/k3bdvdformattingdialog.cpp
+++ b/src/misc/k3bdvdformattingdialog.cpp
@@ -141,7 +141,7 @@ void K3bDvdFormattingDialog::slotStartClicked()
delete job;
- if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+ if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
!exitLoopOnHide() )
show();
else
@@ -155,7 +155,7 @@ void K3bDvdFormattingDialog::slotWriterChanged()
}
-void K3bDvdFormattingDialog::loadUserDefaults( KConfigBase* c )
+void K3bDvdFormattingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_checkForce->setChecked( c->readBoolEntry( "force", false ) );
m_checkQuickFormat->setChecked( c->readBoolEntry( "quick format", true ) );
@@ -164,7 +164,7 @@ void K3bDvdFormattingDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bDvdFormattingDialog::saveUserDefaults( KConfigBase* c )
+void K3bDvdFormattingDialog::saveUserDefaults( TDEConfigBase* c )
{
c->writeEntry( "force", m_checkForce->isChecked() );
c->writeEntry( "quick format", m_checkQuickFormat->isChecked() );
diff --git a/src/misc/k3bdvdformattingdialog.h b/src/misc/k3bdvdformattingdialog.h
index 3f8db52..a30c97a 100644
--- a/src/misc/k3bdvdformattingdialog.h
+++ b/src/misc/k3bdvdformattingdialog.h
@@ -43,8 +43,8 @@ class K3bDvdFormattingDialog : public K3bInteractionDialog
void slotWriterChanged();
private:
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void loadK3bDefaults();
K3bWriterSelectionWidget* m_writerSelectionWidget;
diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp
index 3d23020..32461df 100644
--- a/src/misc/k3bisoimagewritingdialog.cpp
+++ b/src/misc/k3bisoimagewritingdialog.cpp
@@ -134,7 +134,7 @@ void K3bIsoImageWritingDialog::init()
if( !d->imageForced ) {
// when opening the dialog first the default settings are loaded and afterwards we set the
// last written image because that's what most users want
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup( configGroup() );
TQString image = c->readPathEntry( "last written image" );
if( TQFile::exists( image ) )
@@ -244,7 +244,7 @@ void K3bIsoImageWritingDialog::slotStartClicked()
K3bIso9660 isoFs( imagePath() );
if( isoFs.open() ) {
- if( K3b::imageFilesize( KURL::fromPathOrURL( imagePath() ) ) < (KIO::filesize_t)(isoFs.primaryDescriptor().volumeSpaceSize*2048) ) {
+ if( K3b::imageFilesize( KURL::fromPathOrURL( imagePath() ) ) < (TDEIO::filesize_t)(isoFs.primaryDescriptor().volumeSpaceSize*2048) ) {
if( KMessageBox::questionYesNo( this,
i18n("<p>This image has an invalid file size."
"If it has been downloaded make sure the download is complete."
@@ -259,7 +259,7 @@ void K3bIsoImageWritingDialog::slotStartClicked()
m_md5Job->cancel();
// save the path
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup( configGroup() );
if( c->readPathEntry( "last written image" ).isEmpty() )
c->writePathEntry( "last written image", imagePath() );
@@ -288,7 +288,7 @@ void K3bIsoImageWritingDialog::slotStartClicked()
delete job;
- if( KConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
+ if( TDEConfigGroup( k3bcore->config(), "General Options" ).readBoolEntry( "keep action dialogs open", false ) &&
!exitLoopOnHide() )
show();
else
@@ -307,7 +307,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
TQFileInfo info( path );
if( info.isFile() ) {
- KIO::filesize_t imageSize = K3b::filesize( KURL::fromPathOrURL(path) );
+ TDEIO::filesize_t imageSize = K3b::filesize( KURL::fromPathOrURL(path) );
// ------------------------------------------------
// Test for iso9660 image
@@ -323,7 +323,7 @@ void K3bIsoImageWritingDialog::updateImageSize( const TQString& path )
isoRootItem->setPixmap( 0, SmallIcon( "cdimage") );
K3bListViewItem* item = new K3bListViewItem( isoRootItem, m_infoView->lastItem(),
- i18n("Filesize:"), KIO::convertSize( imageSize ) );
+ i18n("Filesize:"), TDEIO::convertSize( imageSize ) );
item->setForegroundColor( 0, palette().disabled().foreground() );
item = new K3bListViewItem( isoRootItem,
@@ -514,7 +514,7 @@ void K3bIsoImageWritingDialog::slotContextMenu( KListView*, TQListViewItem*, con
}
-void K3bIsoImageWritingDialog::loadUserDefaults( KConfigBase* c )
+void K3bIsoImageWritingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_writingModeWidget->loadConfig( c );
m_checkDummy->setChecked( c->readBoolEntry("simulate", false ) );
@@ -531,7 +531,7 @@ void K3bIsoImageWritingDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bIsoImageWritingDialog::saveUserDefaults( KConfigBase* c )
+void K3bIsoImageWritingDialog::saveUserDefaults( TDEConfigBase* c )
{
m_writingModeWidget->saveConfig( c ),
c->writeEntry( "simulate", m_checkDummy->isChecked() );
diff --git a/src/misc/k3bisoimagewritingdialog.h b/src/misc/k3bisoimagewritingdialog.h
index a357ddb..68b277b 100644
--- a/src/misc/k3bisoimagewritingdialog.h
+++ b/src/misc/k3bisoimagewritingdialog.h
@@ -59,8 +59,8 @@ class K3bIsoImageWritingDialog : public K3bInteractionDialog
void slotContextMenu( KListView*, TQListViewItem*, const TQPoint& pos );
protected:
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void loadK3bDefaults();
void calculateMd5Sum( const TQString& );
diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp
index 55a65ee..97a5aaf 100644
--- a/src/option/k3bburningoptiontab.cpp
+++ b/src/option/k3bburningoptiontab.cpp
@@ -151,7 +151,7 @@ void K3bBurningOptionTab::setupGui()
void K3bBurningOptionTab::readSettings()
{
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup( "General Options" );
m_checkAutoErasingRewritable->setChecked( c->readBoolEntry( "auto rewritable erasing", false ) );
@@ -169,7 +169,7 @@ void K3bBurningOptionTab::readSettings()
void K3bBurningOptionTab::saveSettings()
{
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup( "General Options" );
c->writeEntry( "auto rewritable erasing", m_checkAutoErasingRewritable->isChecked() );
@@ -182,7 +182,7 @@ void K3bBurningOptionTab::saveSettings()
k3bcore->globalSettings()->setBufferSize( m_editWritingBufferSize->value() );
k3bcore->globalSettings()->setForce( m_checkForceUnsafeOperations->isChecked() );
- // FIXME: remove this once libk3b does not use KConfig anymore for these values
+ // FIXME: remove this once libk3b does not use TDEConfig anymore for these values
k3bcore->globalSettings()->saveSettings( c );
}
diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp
index 9252b90..1db1ba2 100644
--- a/src/option/k3bcddboptiontab.cpp
+++ b/src/option/k3bcddboptiontab.cpp
@@ -130,7 +130,7 @@ K3bCddbOptionTab::~K3bCddbOptionTab()
void K3bCddbOptionTab::readSettings()
{
- KConfig* c = kapp->config();
+ TDEConfig* c = kapp->config();
c->setGroup( "Cddb" );
@@ -188,7 +188,7 @@ void K3bCddbOptionTab::readSettings()
void K3bCddbOptionTab::apply()
{
- KConfig* c = kapp->config();
+ TDEConfig* c = kapp->config();
c->setGroup( "Cddb" );
diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp
index c592956..bcc890d 100644
--- a/src/option/k3bdevicewidget.cpp
+++ b/src/option/k3bdevicewidget.cpp
@@ -319,7 +319,7 @@ void K3bDeviceWidget::updateDeviceListViews()
if( dev->device->bufferSize() > 0 ) {
typeItem = new K3bListViewItem( devRoot, typeItem,
i18n("Buffer Size:"),
- KIO::convertSizeFromKB(dev->device->bufferSize()) );
+ TDEIO::convertSizeFromKB(dev->device->bufferSize()) );
typeItem->setForegroundColor( 1, palette().disabled().foreground() );
}
diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp
index 19d3b28..884291f 100644
--- a/src/option/k3bmiscoptiontab.cpp
+++ b/src/option/k3bmiscoptiontab.cpp
@@ -69,7 +69,7 @@ K3bMiscOptionTab::~K3bMiscOptionTab()
void K3bMiscOptionTab::readSettings()
{
- KConfig* c = kapp->config();
+ TDEConfig* c = kapp->config();
c->setGroup( "General Options" );
m_checkSaveOnExit->setChecked( c->readBoolEntry( "ask_for_saving_changes_on_exit", true ) );
m_checkShowSplash->setChecked( c->readBoolEntry("Show splash", true) );
@@ -106,7 +106,7 @@ void K3bMiscOptionTab::readSettings()
bool K3bMiscOptionTab::saveSettings()
{
- KConfig* c = kapp->config();
+ TDEConfig* c = kapp->config();
c->setGroup( "General Options" );
c->writeEntry( "ask_for_saving_changes_on_exit", m_checkSaveOnExit->isChecked() );
c->writeEntry( "Show splash", m_checkShowSplash->isChecked() );
diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp
index ec4ca6c..ebb92be 100644
--- a/src/option/k3bthemeoptiontab.cpp
+++ b/src/option/k3bthemeoptiontab.cpp
@@ -140,7 +140,7 @@ void K3bThemeOptionTab::slotInstallTheme()
TQString themeTmpFile;
// themeTmpFile contains the name of the downloaded file
- if( !KIO::NetAccess::download( themeURL, themeTmpFile, this ) ) {
+ if( !TDEIO::NetAccess::download( themeURL, themeTmpFile, this ) ) {
TQString sorryText;
if (themeURL.isLocalFile())
sorryText = i18n("Unable to find the icon theme archive %1.");
@@ -196,7 +196,7 @@ void K3bThemeOptionTab::slotInstallTheme()
}
archive.close();
- KIO::NetAccess::removeTempFile(themeTmpFile);
+ TDEIO::NetAccess::removeTempFile(themeTmpFile);
readSettings();
}
@@ -227,7 +227,7 @@ void K3bThemeOptionTab::slotRemoveTheme()
readSettings();
// delete the theme data itself
- KIO::del( path, false, false );
+ TDEIO::del( path, false, false );
}
}
diff --git a/src/projects/k3baudioburndialog.cpp b/src/projects/k3baudioburndialog.cpp
index 4f1a40b..5c5634a 100644
--- a/src/projects/k3baudioburndialog.cpp
+++ b/src/projects/k3baudioburndialog.cpp
@@ -194,7 +194,7 @@ void K3bAudioBurnDialog::loadK3bDefaults()
}
-void K3bAudioBurnDialog::loadUserDefaults( KConfigBase* c )
+void K3bAudioBurnDialog::loadUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::loadUserDefaults( c );
@@ -210,7 +210,7 @@ void K3bAudioBurnDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bAudioBurnDialog::saveUserDefaults( KConfigBase* c )
+void K3bAudioBurnDialog::saveUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::saveUserDefaults( c );
diff --git a/src/projects/k3baudioburndialog.h b/src/projects/k3baudioburndialog.h
index df59be5..c564efe 100644
--- a/src/projects/k3baudioburndialog.h
+++ b/src/projects/k3baudioburndialog.h
@@ -52,8 +52,8 @@ class K3bAudioBurnDialog : public K3bProjectBurnDialog
void saveSettings();
void readSettings();
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void showEvent( TQShowEvent* );
void toggleAll();
diff --git a/src/projects/k3baudiotrackdialog.cpp b/src/projects/k3baudiotrackdialog.cpp
index bdfb9f0..14f3726 100644
--- a/src/projects/k3baudiotrackdialog.cpp
+++ b/src/projects/k3baudiotrackdialog.cpp
@@ -105,7 +105,7 @@ void K3bAudioTrackDialog::updateTrackLengthDisplay()
{
// K3b::Msf len = m_editTrackEnd->msfValue() - m_editTrackStart->msfValue();
// m_displayLength->setText( len.toString() );
-// m_displaySize->setText( KIO::convertSize(len.audioBytes()) );
+// m_displaySize->setText( TDEIO::convertSize(len.audioBytes()) );
}
diff --git a/src/projects/k3bbootimageview.cpp b/src/projects/k3bbootimageview.cpp
index cf2f086..52c32e2 100644
--- a/src/projects/k3bbootimageview.cpp
+++ b/src/projects/k3bbootimageview.cpp
@@ -128,7 +128,7 @@ void K3bBootImageView::slotNewBootImage()
{
TQString file = KFileDialog::getOpenFileName( TQString(), TQString(), this, i18n("Please Choose Boot Image") );
if( !file.isEmpty() ) {
- KIO::filesize_t fsize = K3b::filesize( file );
+ TDEIO::filesize_t fsize = K3b::filesize( file );
int boottype = K3bBootItem::FLOPPY;
if( fsize != 1200*1024 &&
fsize != 1440*1024 &&
@@ -218,7 +218,7 @@ void K3bBootImageView::loadBootItemSettings( K3bBootItem* item )
m_radioNoEmulation->setChecked(true);
// force floppy size
- KIO::filesize_t fsize = K3b::filesize( item->localPath() );
+ TDEIO::filesize_t fsize = K3b::filesize( item->localPath() );
m_radioFloppy->setDisabled( fsize != 1200*1024 &&
fsize != 1440*1024 &&
fsize != 2880*1024 );
diff --git a/src/projects/k3bdataburndialog.cpp b/src/projects/k3bdataburndialog.cpp
index 38260e3..eee70f0 100644
--- a/src/projects/k3bdataburndialog.cpp
+++ b/src/projects/k3bdataburndialog.cpp
@@ -69,7 +69,7 @@ K3bDataBurnDialog::K3bDataBurnDialog(K3bDataDoc* _doc, TQWidget *parent, const c
{
prepareGui();
- setTitle( i18n("Data Project"), i18n("Size: %1").arg( KIO::convertSize(_doc->size()) ) );
+ setTitle( i18n("Data Project"), i18n("Size: %1").arg( TDEIO::convertSize(_doc->size()) ) );
// for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@@ -220,7 +220,7 @@ void K3bDataBurnDialog::loadK3bDefaults()
}
-void K3bDataBurnDialog::loadUserDefaults( KConfigBase* c )
+void K3bDataBurnDialog::loadUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::loadUserDefaults(c);
@@ -236,7 +236,7 @@ void K3bDataBurnDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bDataBurnDialog::saveUserDefaults( KConfigBase* c )
+void K3bDataBurnDialog::saveUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::saveUserDefaults(c);
diff --git a/src/projects/k3bdataburndialog.h b/src/projects/k3bdataburndialog.h
index de73862..749b783 100644
--- a/src/projects/k3bdataburndialog.h
+++ b/src/projects/k3bdataburndialog.h
@@ -51,8 +51,8 @@ class K3bDataBurnDialog : public K3bProjectBurnDialog
protected:
void setupSettingsTab();
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void toggleAll();
// --- settings tab ---------------------------
diff --git a/src/projects/k3bdatamultisessioncombobox.cpp b/src/projects/k3bdatamultisessioncombobox.cpp
index 98736b1..5566ead 100644
--- a/src/projects/k3bdatamultisessioncombobox.cpp
+++ b/src/projects/k3bdatamultisessioncombobox.cpp
@@ -99,7 +99,7 @@ K3bDataDoc::MultiSessionMode K3bDataMultiSessionCombobox::multiSessionMode() con
}
-void K3bDataMultiSessionCombobox::saveConfig( KConfigBase* c )
+void K3bDataMultiSessionCombobox::saveConfig( TDEConfigBase* c )
{
TQString s;
switch( currentItem() ) {
@@ -124,7 +124,7 @@ void K3bDataMultiSessionCombobox::saveConfig( KConfigBase* c )
}
-void K3bDataMultiSessionCombobox::loadConfig( KConfigBase* c )
+void K3bDataMultiSessionCombobox::loadConfig( TDEConfigBase* c )
{
TQString s = c->readEntry( "multisession mode" );
if( s == "none" )
diff --git a/src/projects/k3bdatamultisessioncombobox.h b/src/projects/k3bdatamultisessioncombobox.h
index 64465e3..704f61c 100644
--- a/src/projects/k3bdatamultisessioncombobox.h
+++ b/src/projects/k3bdatamultisessioncombobox.h
@@ -19,7 +19,7 @@
#include <tqcombobox.h>
#include <k3bdatadoc.h>
-class KConfigBase;
+class TDEConfigBase;
class K3bDataMultiSessionCombobox : public TQComboBox
@@ -38,8 +38,8 @@ class K3bDataMultiSessionCombobox : public TQComboBox
void setForceNoMultisession( bool );
- void saveConfig( KConfigBase* );
- void loadConfig( KConfigBase* );
+ void saveConfig( TDEConfigBase* );
+ void loadConfig( TDEConfigBase* );
public slots:
void setMultiSessionMode( K3bDataDoc::MultiSessionMode );
diff --git a/src/projects/k3bdatapropertiesdialog.cpp b/src/projects/k3bdatapropertiesdialog.cpp
index 67c6602..d6d5075 100644
--- a/src/projects/k3bdatapropertiesdialog.cpp
+++ b/src/projects/k3bdatapropertiesdialog.cpp
@@ -101,7 +101,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
TQString localLocation = kFileItem.url().path(-1);
localLocation.truncate( localLocation.findRev('/') );
m_labelLocalLocation->setText( localLocation );
- m_labelSize->setText( KIO::convertSize(dataItem->size()) );
+ m_labelSize->setText( TDEIO::convertSize(dataItem->size()) );
}
else if( K3bDirItem* dirItem = dynamic_cast<K3bDirItem*>(dataItem) ) {
labelMimeType->setPixmap( KMimeType::pixmapForURL( KURL( "/" )) );
@@ -111,7 +111,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
m_labelLocalName->hide();
m_labelLocalLocation->hide();
line->hide();
- m_labelSize->setText( KIO::convertSize(dataItem->size()) + "\n(" +
+ m_labelSize->setText( TDEIO::convertSize(dataItem->size()) + "\n(" +
i18n("in 1 file", "in %n files", dirItem->numFiles()) + " " +
i18n("and 1 directory", "and %n directories", dirItem->numDirs()) + ")" );
}
@@ -123,7 +123,7 @@ K3bDataPropertiesDialog::K3bDataPropertiesDialog( K3bDataItem* dataItem, TQWidge
label1->hide();
label2->hide();
line->hide();
- m_labelSize->setText( KIO::convertSize(dataItem->size()) );
+ m_labelSize->setText( TDEIO::convertSize(dataItem->size()) );
}
m_editName->setText( dataItem->k3bName() );
diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp
index a471308..842520e 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -181,7 +181,7 @@ TQString K3bDataUrlAddingDialog::resultMessage() const
.arg( m_unreadableFiles.join( "<br>" ) );
if( !m_tooBigFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
- .arg( i18n("It is not possible to add files bigger than %1").arg(KIO::convertSize(0xFFFFFFFF)) )
+ .arg( i18n("It is not possible to add files bigger than %1").arg(TDEIO::convertSize(0xFFFFFFFF)) )
.arg( m_tooBigFiles.join( "<br>" ) );
if( !m_mkisofsLimitationRenamedFiles.isEmpty() )
message += TQString("<p><b>%1:</b><br>%2")
diff --git a/src/projects/k3bdataurladdingdialog.h b/src/projects/k3bdataurladdingdialog.h
index a5207c7..4a6b081 100644
--- a/src/projects/k3bdataurladdingdialog.h
+++ b/src/projects/k3bdataurladdingdialog.h
@@ -101,8 +101,8 @@ class K3bDataUrlAddingDialog : public KDialogBase
bool m_copyItems;
- KIO::filesize_t m_totalFiles;
- KIO::filesize_t m_filesHandled;
+ TDEIO::filesize_t m_totalFiles;
+ TDEIO::filesize_t m_filesHandled;
K3bDirSizeJob* m_dirSizeJob;
unsigned int m_lastProgress;
diff --git a/src/projects/k3bdataview.h b/src/projects/k3bdataview.h
index bf09b1f..1291643 100644
--- a/src/projects/k3bdataview.h
+++ b/src/projects/k3bdataview.h
@@ -28,7 +28,7 @@ class K3bDataFileView;
class TQLineEdit;
-namespace KIO {
+namespace TDEIO {
class Job;
}
namespace K3bDevice {
diff --git a/src/projects/k3bdataviewitem.cpp b/src/projects/k3bdataviewitem.cpp
index 414fe6d..7cfe576 100644
--- a/src/projects/k3bdataviewitem.cpp
+++ b/src/projects/k3bdataviewitem.cpp
@@ -169,7 +169,7 @@ TQString K3bDataDirViewItem::text( int index ) const
case 1:
return i18n("Directory");
case 2:
- return KIO::convertSize( m_dirItem->size() );
+ return TDEIO::convertSize( m_dirItem->size() );
default:
return "";
}
@@ -233,7 +233,7 @@ TQString K3bDataFileViewItem::text( int index ) const
return comment;
}
case 2:
- return KIO::convertSize( m_fileItem->size() );
+ return TDEIO::convertSize( m_fileItem->size() );
case 3:
return m_fileItem->localPath();
case 4: {
@@ -311,7 +311,7 @@ TQString K3bSpecialDataViewItem::text( int col ) const
case 1:
return ((K3bSpecialDataItem*)dataItem())->mimeType();
case 2:
- return KIO::convertSize( dataItem()->size() );
+ return TDEIO::convertSize( dataItem()->size() );
default:
return "";
}
@@ -333,7 +333,7 @@ TQString K3bSessionImportViewItem::text( int col ) const
case 1:
return i18n("From previous session");
case 2:
- return KIO::convertSize( dataItem()->size() );
+ return TDEIO::convertSize( dataItem()->size() );
default:
return "";
}
diff --git a/src/projects/k3bdvdburndialog.cpp b/src/projects/k3bdvdburndialog.cpp
index 7f04ed4..a393360 100644
--- a/src/projects/k3bdvdburndialog.cpp
+++ b/src/projects/k3bdvdburndialog.cpp
@@ -50,7 +50,7 @@ K3bDvdBurnDialog::K3bDvdBurnDialog( K3bDvdDoc* doc, TQWidget *parent, const char
{
prepareGui();
- setTitle( i18n("DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) );
+ setTitle( i18n("DVD Project"), i18n("Size: %1").arg( TDEIO::convertSize(doc->size()) ) );
// for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@@ -244,7 +244,7 @@ void K3bDvdBurnDialog::loadK3bDefaults()
}
-void K3bDvdBurnDialog::loadUserDefaults( KConfigBase* c )
+void K3bDvdBurnDialog::loadUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::loadUserDefaults(c);
@@ -259,7 +259,7 @@ void K3bDvdBurnDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bDvdBurnDialog::saveUserDefaults( KConfigBase* c )
+void K3bDvdBurnDialog::saveUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::saveUserDefaults(c);
diff --git a/src/projects/k3bdvdburndialog.h b/src/projects/k3bdvdburndialog.h
index b49fef8..69387b3 100644
--- a/src/projects/k3bdvdburndialog.h
+++ b/src/projects/k3bdvdburndialog.h
@@ -47,8 +47,8 @@ class K3bDvdBurnDialog : public K3bProjectBurnDialog
protected:
void slotStartClicked();
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void toggleAll();
private:
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index 15534b5..555348b 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -194,22 +194,22 @@ void K3bFillStatusDisplayWidget::paintEvent( TQPaintEvent* )
if( d->showTime )
docSizeText = d->doc->length().toString(false) + " " + i18n("min");
else
- docSizeText = KIO::convertSize( d->doc->size() );
+ docSizeText = TDEIO::convertSize( d->doc->size() );
TQString overSizeText;
if( d->cdSize.mode1Bytes() >= d->doc->size() )
overSizeText = i18n("Available: %1 of %2")
.arg( d->showTime
? i18n("%1 min").arg((K3b::Msf( cdSize*60*75 ) - d->doc->length()).toString(false))
- : KIO::convertSize( TQMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) )
+ : TDEIO::convertSize( TQMAX( (cdSize * 1024LL * 1024LL) - (long long)d->doc->size(), 0LL ) ) )
.arg( d->showTime
? i18n("%1 min").arg(K3b::Msf( cdSize*60*75 ).toString(false))
- : KIO::convertSizeFromKB( cdSize * 1024 ) );
+ : TDEIO::convertSizeFromKB( cdSize * 1024 ) );
else
overSizeText = i18n("Capacity exceeded by %1")
.arg( d->showTime
? i18n("%1 min").arg( (d->doc->length() - K3b::Msf( cdSize*60*75 ) ).toString(false))
- : KIO::convertSize( (long long)d->doc->size() - (cdSize * 1024LL * 1024LL) ) );
+ : TDEIO::convertSize( (long long)d->doc->size() - (cdSize * 1024LL * 1024LL) ) );
// ====================================================================================
// draw the medium size marker
@@ -286,7 +286,7 @@ public:
void maybeTip( const TQPoint& ) {
tip( parentWidget()->rect(),
- KIO::convertSize( m_doc->size() ) +
+ TDEIO::convertSize( m_doc->size() ) +
" (" + TDEGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " +
m_doc->length().toString(false) + " " + i18n("min") +
" (" + i18n("Right click for media sizes") + ")");
@@ -394,9 +394,9 @@ void K3bFillStatusDisplay::setupPopupMenu()
d->actionCollection, "fillstatus_80minutes" );
d->action100Min = new KRadioAction( i18n("%1 MB").arg(880), 0, TQT_TQOBJECT(this), TQT_SLOT(slot100Minutes()),
d->actionCollection, "fillstatus_100minutes" );
- d->actionDvd4_7GB = new KRadioAction( KIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()),
+ d->actionDvd4_7GB = new KRadioAction( TDEIO::convertSizeFromKB((int)(4.4*1024.0*1024.0)), 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvd4_7GB()),
d->actionCollection, "fillstatus_dvd_4_7gb" );
- d->actionDvdDoubleLayer = new KRadioAction( KIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)),
+ d->actionDvdDoubleLayer = new KRadioAction( TDEIO::convertSizeFromKB((int)(8.0*1024.0*1024.0)),
0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdDoubleLayer()),
d->actionCollection, "fillstatus_dvd_double_layer" );
d->actionCustomSize = new K3bRadioAction( i18n("Custom..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCustomSize()),
@@ -618,7 +618,7 @@ void K3bFillStatusDisplay::slotDetermineSize()
void K3bFillStatusDisplay::slotLoadUserDefaults()
{
// load project specific values
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup( "default " + d->doc->typeString() + " settings" );
// defaults to megabytes
@@ -725,7 +725,7 @@ void K3bFillStatusDisplay::slotMediumChanged( K3bDevice::Device* )
void K3bFillStatusDisplay::slotSaveUserDefaults()
{
// save project specific values
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup( "default " + d->doc->typeString() + " settings" );
c->writeEntry( "show minutes", d->showTime );
diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp
index 1446f1f..7d74a2f 100644
--- a/src/projects/k3bmixedburndialog.cpp
+++ b/src/projects/k3bmixedburndialog.cpp
@@ -214,7 +214,7 @@ void K3bMixedBurnDialog::loadK3bDefaults()
}
-void K3bMixedBurnDialog::loadUserDefaults( KConfigBase* c )
+void K3bMixedBurnDialog::loadUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::loadUserDefaults( c );
@@ -238,7 +238,7 @@ void K3bMixedBurnDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bMixedBurnDialog::saveUserDefaults( KConfigBase* c )
+void K3bMixedBurnDialog::saveUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::saveUserDefaults(c);
diff --git a/src/projects/k3bmixedburndialog.h b/src/projects/k3bmixedburndialog.h
index 0d1a132..fc9a229 100644
--- a/src/projects/k3bmixedburndialog.h
+++ b/src/projects/k3bmixedburndialog.h
@@ -44,8 +44,8 @@ class K3bMixedBurnDialog : public K3bProjectBurnDialog
protected:
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void toggleAll();
K3bDataImageSettingsWidget* m_imageSettingsWidget;
diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp
index 1864745..c09f930 100644
--- a/src/projects/k3bmovixburndialog.cpp
+++ b/src/projects/k3bmovixburndialog.cpp
@@ -52,7 +52,7 @@ K3bMovixBurnDialog::K3bMovixBurnDialog( K3bMovixDoc* doc, TQWidget* parent, cons
m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE );
setTitle( i18n("eMovix CD Project"),
- i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) );
+ i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(TDEIO::convertSize(m_doc->size())) );
m_movixOptionsWidget = new K3bMovixOptionsWidget( this );
addPage( m_movixOptionsWidget, i18n("eMovix") );
@@ -127,7 +127,7 @@ void K3bMovixBurnDialog::loadK3bDefaults()
}
-void K3bMovixBurnDialog::loadUserDefaults( KConfigBase* c )
+void K3bMovixBurnDialog::loadUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::loadUserDefaults(c);
@@ -146,7 +146,7 @@ void K3bMovixBurnDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bMovixBurnDialog::saveUserDefaults( KConfigBase* c )
+void K3bMovixBurnDialog::saveUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::saveUserDefaults(c);
diff --git a/src/projects/k3bmovixburndialog.h b/src/projects/k3bmovixburndialog.h
index 9462603..1be5d69 100644
--- a/src/projects/k3bmovixburndialog.h
+++ b/src/projects/k3bmovixburndialog.h
@@ -43,8 +43,8 @@ class K3bMovixBurnDialog : public K3bProjectBurnDialog
void saveSettings();
void readSettings();
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void toggleAll();
private:
diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp
index 24e3904..83d560b 100644
--- a/src/projects/k3bmovixdvdburndialog.cpp
+++ b/src/projects/k3bmovixdvdburndialog.cpp
@@ -54,7 +54,7 @@ K3bMovixDvdBurnDialog::K3bMovixDvdBurnDialog( K3bMovixDvdDoc* doc, TQWidget* par
m_tempDirSelectionWidget->setSelectionMode( K3bTempDirSelectionWidget::FILE );
setTitle( i18n("eMovix DVD Project"),
- i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(KIO::convertSize(m_doc->size())) );
+ i18n("1 file (%1)", "%n files (%1)", m_doc->movixFileItems().count()).arg(TDEIO::convertSize(m_doc->size())) );
m_movixOptionsWidget = new K3bMovixOptionsWidget( this );
addPage( m_movixOptionsWidget, i18n("eMovix") );
@@ -103,7 +103,7 @@ void K3bMovixDvdBurnDialog::loadK3bDefaults()
}
-void K3bMovixDvdBurnDialog::loadUserDefaults( KConfigBase* c )
+void K3bMovixDvdBurnDialog::loadUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::loadUserDefaults(c);
@@ -118,7 +118,7 @@ void K3bMovixDvdBurnDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bMovixDvdBurnDialog::saveUserDefaults( KConfigBase* c )
+void K3bMovixDvdBurnDialog::saveUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::saveUserDefaults(c);
diff --git a/src/projects/k3bmovixdvdburndialog.h b/src/projects/k3bmovixdvdburndialog.h
index 2acf389..7210389 100644
--- a/src/projects/k3bmovixdvdburndialog.h
+++ b/src/projects/k3bmovixdvdburndialog.h
@@ -42,8 +42,8 @@ class K3bMovixDvdBurnDialog : public K3bProjectBurnDialog
void saveSettings();
void readSettings();
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void toggleAll();
private:
diff --git a/src/projects/k3bmovixlistview.cpp b/src/projects/k3bmovixlistview.cpp
index 44136b5..b3b7fb2 100644
--- a/src/projects/k3bmovixlistview.cpp
+++ b/src/projects/k3bmovixlistview.cpp
@@ -89,7 +89,7 @@ TQString K3bMovixFileViewItem::text( int col ) const
return const_cast<K3bMovixFileViewItem*>(this)->mimeComment() + " ";
}
case 3:
- return KIO::convertSize( fileItem()->size() ) + " ";
+ return TDEIO::convertSize( fileItem()->size() ) + " ";
case 4:
return fileItem()->localPath() + " ";
case 5:
@@ -144,7 +144,7 @@ TQString K3bMovixSubTitleViewItem::text( int c ) const
return const_cast<K3bMovixSubTitleViewItem*>(this)->mimeComment();
}
case 3:
- return KIO::convertSize( fileItem()->subTitleItem()->size() );
+ return TDEIO::convertSize( fileItem()->subTitleItem()->size() );
case 4:
return fileItem()->subTitleItem()->localPath();
case 5:
diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp
index 094de6e..0a2432d 100644
--- a/src/projects/k3bmovixoptionswidget.cpp
+++ b/src/projects/k3bmovixoptionswidget.cpp
@@ -163,7 +163,7 @@ void K3bMovixOptionsWidget::loadDefaults()
}
-void K3bMovixOptionsWidget::loadConfig( KConfigBase* c )
+void K3bMovixOptionsWidget::loadConfig( TDEConfigBase* c )
{
TQString s = c->readEntry("subtitle_fontset");
if( !s.isEmpty() && s != "none" && m_comboSubtitleFontset->contains(s) )
@@ -201,7 +201,7 @@ void K3bMovixOptionsWidget::loadConfig( KConfigBase* c )
}
-void K3bMovixOptionsWidget::saveConfig( KConfigBase* c )
+void K3bMovixOptionsWidget::saveConfig( TDEConfigBase* c )
{
if( m_comboSubtitleFontset->currentItem() == 0 )
c->writeEntry( "subtitle_fontset", "none" );
diff --git a/src/projects/k3bmovixoptionswidget.h b/src/projects/k3bmovixoptionswidget.h
index c646996..d589622 100644
--- a/src/projects/k3bmovixoptionswidget.h
+++ b/src/projects/k3bmovixoptionswidget.h
@@ -21,7 +21,7 @@
class K3bMovixDoc;
class K3bMovixBin;
-class KConfigBase;
+class TDEConfigBase;
class K3bMovixOptionsWidget : public base_K3bMovixOptionsWidget
@@ -37,8 +37,8 @@ class K3bMovixOptionsWidget : public base_K3bMovixOptionsWidget
void init( const K3bMovixBin* );
void readSettings( K3bMovixDoc* );
void saveSettings( K3bMovixDoc* );
- void loadConfig( KConfigBase* c );
- void saveConfig( KConfigBase* c );
+ void loadConfig( TDEConfigBase* c );
+ void saveConfig( TDEConfigBase* c );
void loadDefaults();
private:
diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp
index d486f23..04e829b 100644
--- a/src/projects/k3bprojectburndialog.cpp
+++ b/src/projects/k3bprojectburndialog.cpp
@@ -366,7 +366,7 @@ void K3bProjectBurnDialog::readSettings()
}
-void K3bProjectBurnDialog::saveUserDefaults( KConfigBase* c )
+void K3bProjectBurnDialog::saveUserDefaults( TDEConfigBase* c )
{
m_writingModeWidget->saveConfig( c );
c->writeEntry( "simulate", m_checkSimulate->isChecked() );
@@ -380,7 +380,7 @@ void K3bProjectBurnDialog::saveUserDefaults( KConfigBase* c )
}
-void K3bProjectBurnDialog::loadUserDefaults( KConfigBase* c )
+void K3bProjectBurnDialog::loadUserDefaults( TDEConfigBase* c )
{
m_writingModeWidget->loadConfig( c );
m_checkSimulate->setChecked( c->readBoolEntry( "simulate", false ) );
diff --git a/src/projects/k3bprojectburndialog.h b/src/projects/k3bprojectburndialog.h
index 086e16c..1dcaca3 100644
--- a/src/projects/k3bprojectburndialog.h
+++ b/src/projects/k3bprojectburndialog.h
@@ -30,7 +30,7 @@ class TQTabWidget;
class TQSpinBox;
class TQVBoxLayout;
class K3bWritingModeWidget;
-class KConfigBase;
+class TDEConfigBase;
/**
@@ -95,7 +95,7 @@ class K3bProjectBurnDialog : public K3bInteractionDialog
virtual void loadK3bDefaults();
/**
- * The default implementation loads the following settings from the KConfig.
+ * The default implementation loads the following settings from the TDEConfig.
* May be used in subclasses.
* <ul>
* <li>Writing mode</li>
@@ -107,10 +107,10 @@ class K3bProjectBurnDialog : public K3bInteractionDialog
* <li>writing speed</li>
* </ul>
*/
- virtual void loadUserDefaults( KConfigBase* );
+ virtual void loadUserDefaults( TDEConfigBase* );
/**
- * The default implementation saves the following settings to the KConfig.
+ * The default implementation saves the following settings to the TDEConfig.
* May be used in subclasses.
* <ul>
* <li>Writing mode</li>
@@ -122,7 +122,7 @@ class K3bProjectBurnDialog : public K3bInteractionDialog
* <li>writing speed</li>
* </ul>
*/
- virtual void saveUserDefaults( KConfigBase* );
+ virtual void saveUserDefaults( TDEConfigBase* );
/**
* The default implementation saves the following settings to the doc and may be called
diff --git a/src/projects/k3bprojectplugindialog.cpp b/src/projects/k3bprojectplugindialog.cpp
index 6b59c68..de15960 100644
--- a/src/projects/k3bprojectplugindialog.cpp
+++ b/src/projects/k3bprojectplugindialog.cpp
@@ -48,13 +48,13 @@ void K3bProjectPluginDialog::slotStartClicked()
}
-void K3bProjectPluginDialog::saveUserDefaults( KConfigBase* config )
+void K3bProjectPluginDialog::saveUserDefaults( TDEConfigBase* config )
{
m_pluginGui->saveSettings( config );
}
-void K3bProjectPluginDialog::loadUserDefaults( KConfigBase* config )
+void K3bProjectPluginDialog::loadUserDefaults( TDEConfigBase* config )
{
m_pluginGui->readSettings( config );
}
diff --git a/src/projects/k3bprojectplugindialog.h b/src/projects/k3bprojectplugindialog.h
index af698d0..cd87e10 100644
--- a/src/projects/k3bprojectplugindialog.h
+++ b/src/projects/k3bprojectplugindialog.h
@@ -21,7 +21,7 @@
class K3bProjectPlugin;
class K3bProjectPluginGUIBase;
class K3bDoc;
-class KConfigBase;
+class TDEConfigBase;
class K3bProjectPluginDialog : public K3bInteractionDialog
@@ -35,8 +35,8 @@ class K3bProjectPluginDialog : public K3bInteractionDialog
protected slots:
void slotStartClicked();
- void saveUserDefaults( KConfigBase* config );
- void loadUserDefaults( KConfigBase* config );
+ void saveUserDefaults( TDEConfigBase* config );
+ void loadUserDefaults( TDEConfigBase* config );
void loadK3bDefaults();
private:
diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp
index 1d6d8a9..0a36668 100644
--- a/src/projects/k3bvcdburndialog.cpp
+++ b/src/projects/k3bvcdburndialog.cpp
@@ -69,7 +69,7 @@ K3bVcdBurnDialog::K3bVcdBurnDialog( K3bVcdDoc* _doc, TQWidget *parent, const cha
}
setTitle( vcdType, i18n( "1 MPEG (%1)", "%n MPEGs (%1)",
- m_vcdDoc->tracks() ->count() ).arg( KIO::convertSize( m_vcdDoc->size() ) ) );
+ m_vcdDoc->tracks() ->count() ).arg( TDEIO::convertSize( m_vcdDoc->size() ) ) );
const K3bExternalBin* cdrecordBin = k3bcore->externalBinManager() ->binObject( "cdrecord" );
if ( cdrecordBin && cdrecordBin->hasFeature( "cuefile" ) )
@@ -793,7 +793,7 @@ void K3bVcdBurnDialog::readSettings()
loadCdiConfig();
}
-void K3bVcdBurnDialog::loadUserDefaults( KConfigBase* c )
+void K3bVcdBurnDialog::loadUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::loadUserDefaults( c );
@@ -845,7 +845,7 @@ void K3bVcdBurnDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bVcdBurnDialog::saveUserDefaults( KConfigBase* c )
+void K3bVcdBurnDialog::saveUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::saveUserDefaults( c );
diff --git a/src/projects/k3bvcdburndialog.h b/src/projects/k3bvcdburndialog.h
index cbba2ec..c43ac19 100644
--- a/src/projects/k3bvcdburndialog.h
+++ b/src/projects/k3bvcdburndialog.h
@@ -55,8 +55,8 @@ class K3bVcdBurnDialog : public K3bProjectBurnDialog
void readSettings();
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
// -----------------------------------------------------------
// the video-cd-tab
diff --git a/src/projects/k3bvcdlistviewitem.cpp b/src/projects/k3bvcdlistviewitem.cpp
index 9ad778f..b18ec30 100644
--- a/src/projects/k3bvcdlistviewitem.cpp
+++ b/src/projects/k3bvcdlistviewitem.cpp
@@ -72,7 +72,7 @@ TQString K3bVcdListViewItem::text( int i ) const
return m_track->duration() + " ";
case 8:
// track size
- return KIO::convertSize( m_track->size() ) + " ";
+ return TDEIO::convertSize( m_track->size() ) + " ";
case 9:
// filename
return m_track->fileName();
diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp
index ff25b55..99eeb6c 100644
--- a/src/projects/k3bvcdtrackdialog.cpp
+++ b/src/projects/k3bvcdtrackdialog.cpp
@@ -69,7 +69,7 @@ K3bVcdTrackDialog::K3bVcdTrackDialog( K3bVcdDoc* _doc, TQPtrList<K3bVcdTrack>& t
m_displayFileName->setText( selectedTrack->fileName() );
m_displayLength->setText( selectedTrack->duration() );
- m_displaySize->setText( KIO::convertSize( selectedTrack->size() ) );
+ m_displaySize->setText( TDEIO::convertSize( selectedTrack->size() ) );
m_muxrate->setText( i18n( "%1 bit/s" ).arg( selectedTrack->muxrate() ) );
if ( selectedTrack->isSegment() )
diff --git a/src/projects/k3bvideodvdburndialog.cpp b/src/projects/k3bvideodvdburndialog.cpp
index 32bdefa..8a02e2b 100644
--- a/src/projects/k3bvideodvdburndialog.cpp
+++ b/src/projects/k3bvideodvdburndialog.cpp
@@ -46,7 +46,7 @@ K3bVideoDvdBurnDialog::K3bVideoDvdBurnDialog( K3bVideoDvdDoc* doc, TQWidget *par
{
prepareGui();
- setTitle( i18n("Video DVD Project"), i18n("Size: %1").arg( KIO::convertSize(doc->size()) ) );
+ setTitle( i18n("Video DVD Project"), i18n("Size: %1").arg( TDEIO::convertSize(doc->size()) ) );
// for now we just put the verify checkbox on the main page...
m_checkVerify = K3bStdGuiItems::verifyCheckBox( m_optionGroup );
@@ -146,7 +146,7 @@ void K3bVideoDvdBurnDialog::loadK3bDefaults()
}
-void K3bVideoDvdBurnDialog::loadUserDefaults( KConfigBase* c )
+void K3bVideoDvdBurnDialog::loadUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::loadUserDefaults( c );
@@ -159,7 +159,7 @@ void K3bVideoDvdBurnDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bVideoDvdBurnDialog::saveUserDefaults( KConfigBase* c )
+void K3bVideoDvdBurnDialog::saveUserDefaults( TDEConfigBase* c )
{
K3bProjectBurnDialog::saveUserDefaults(c);
diff --git a/src/projects/k3bvideodvdburndialog.h b/src/projects/k3bvideodvdburndialog.h
index af2d33c..185c84b 100644
--- a/src/projects/k3bvideodvdburndialog.h
+++ b/src/projects/k3bvideodvdburndialog.h
@@ -41,8 +41,8 @@ class K3bVideoDvdBurnDialog : public K3bProjectBurnDialog
protected:
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
void toggleAll();
private:
diff --git a/src/projects/kostore/koStore.cc b/src/projects/kostore/koStore.cc
index 08268dc..4f645e0 100644
--- a/src/projects/kostore/koStore.cc
+++ b/src/projects/kostore/koStore.cc
@@ -132,7 +132,7 @@ KoStore* KoStore::createStore( TQWidget* window, const KURL& url, Mode mode, con
else
{
const bool downloaded =
- KIO::NetAccess::download( url, tmpFile, window );
+ TDEIO::NetAccess::download( url, tmpFile, window );
if (!downloaded)
{
@@ -194,14 +194,14 @@ bool KoStore::open( const TQString & _name )
if ( m_bIsOpen )
{
kdWarning(s_area) << "KoStore: File is already opened" << endl;
- //return KIO::ERR_INTERNAL;
+ //return TDEIO::ERR_INTERNAL;
return false;
}
if ( m_sName.length() > 512 )
{
kdError(s_area) << "KoStore: Filename " << m_sName << " is too long" << endl;
- //return KIO::ERR_MALFORMED_URL;
+ //return TDEIO::ERR_MALFORMED_URL;
return false;
}
@@ -211,7 +211,7 @@ bool KoStore::open( const TQString & _name )
if ( m_strFiles.findIndex( m_sName ) != -1 ) // just check if it's there
{
kdWarning(s_area) << "KoStore: Duplicate filename " << m_sName << endl;
- //return KIO::ERR_FILE_ALREADY_EXIST;
+ //return TDEIO::ERR_FILE_ALREADY_EXIST;
return false;
}
@@ -228,7 +228,7 @@ bool KoStore::open( const TQString & _name )
return false;
}
else
- //return KIO::ERR_UNSUPPORTED_ACTION;
+ //return TDEIO::ERR_UNSUPPORTED_ACTION;
return false;
m_bIsOpen = true;
@@ -247,7 +247,7 @@ bool KoStore::close()
if ( !m_bIsOpen )
{
kdWarning(s_area) << "KoStore: You must open before closing" << endl;
- //return KIO::ERR_INTERNAL;
+ //return TDEIO::ERR_INTERNAL;
return false;
}
diff --git a/src/projects/kostore/koZipStore.cc b/src/projects/kostore/koZipStore.cc
index 1f1a526..cd393eb 100644
--- a/src/projects/kostore/koZipStore.cc
+++ b/src/projects/kostore/koZipStore.cc
@@ -98,11 +98,11 @@ KoZipStore::~KoZipStore()
// Now we have still some job to do for remote files.
if ( m_fileMode == KoStoreBase::RemoteRead )
{
- KIO::NetAccess::removeTempFile( m_localFileName );
+ TDEIO::NetAccess::removeTempFile( m_localFileName );
}
else if ( m_fileMode == KoStoreBase::RemoteWrite )
{
- KIO::NetAccess::upload( m_localFileName, m_url, m_window );
+ TDEIO::NetAccess::upload( m_localFileName, m_url, m_window );
// ### FIXME: delete temp file
}
}
@@ -148,13 +148,13 @@ bool KoZipStore::openRead( const TQString& name )
if ( entry == 0L )
{
//kdWarning(s_area) << "Unknown filename " << name << endl;
- //return KIO::ERR_DOES_NOT_EXIST;
+ //return TDEIO::ERR_DOES_NOT_EXIST;
return false;
}
if ( entry->isDirectory() )
{
kdWarning(s_area) << name << " is a directory !" << endl;
- //return KIO::ERR_IS_DIRECTORY;
+ //return TDEIO::ERR_IS_DIRECTORY;
return false;
}
// Must cast to KZipFileEntry, not only KArchiveFile, because device() isn't virtual!
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp
index 8fa47c2..66b4820 100644
--- a/src/rip/k3baudiocdview.cpp
+++ b/src/rip/k3baudiocdview.cpp
@@ -69,7 +69,7 @@ public:
setText( 1, TQString::number(_trackNumber).rightJustify( 2, ' ' ) );
setText( 3, i18n("Track %1").arg(_trackNumber) );
setText( 4, " " + length.toString() + " " );
- setText( 5, " " + KIO::convertSize( length.audioBytes() ) + " " );
+ setText( 5, " " + TDEIO::convertSize( length.audioBytes() ) + " " );
trackNumber = _trackNumber;
@@ -203,7 +203,7 @@ void K3bAudioCdView::reloadMedium()
updateDisplay();
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup("Cddb");
bool useCddb = ( c->readBoolEntry( "use local cddb query", true ) ||
c->readBoolEntry( "use remote cddb", false ) );
@@ -432,7 +432,7 @@ void K3bAudioCdView::slotEditAlbumCddb()
void K3bAudioCdView::queryCddb()
{
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup("Cddb");
m_cddb->readConfig( c );
@@ -453,7 +453,7 @@ void K3bAudioCdView::slotCddbQueryFinished( int error )
m_cddbInfo = m_cddb->result();
// save the entry locally
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup( "Cddb" );
if( c->readBoolEntry( "save cddb entries locally", true ) )
m_cddb->saveEntry( m_cddbInfo );
@@ -461,7 +461,7 @@ void K3bAudioCdView::slotCddbQueryFinished( int error )
updateDisplay();
}
else if( error == K3bCddbQuery::NO_ENTRY_FOUND ) {
- if( !KConfigGroup( k3bcore->config(), "Cddb" ).readBoolEntry( "use remote cddb", false ) )
+ if( !TDEConfigGroup( k3bcore->config(), "Cddb" ).readBoolEntry( "use remote cddb", false ) )
K3bPassivePopup::showPopup( i18n("<p>No CDDB entry found. Enable remote CDDB queries in the K3b settings to get access "
"to more entries through the internet."), i18n("CDDB") );
else
@@ -509,7 +509,7 @@ void K3bAudioCdView::slotSaveCddbLocally()
// make sure the data gets updated (bad design like a lot in the cddb stuff! :(
m_cddbInfo.rawData.truncate(0);
- KConfig* c = k3bcore->config();
+ TDEConfig* c = k3bcore->config();
c->setGroup("Cddb");
m_cddb->readConfig( c );
diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp
index f777ef7..15fa9fd 100644
--- a/src/rip/k3baudioconvertingoptionwidget.cpp
+++ b/src/rip/k3baudioconvertingoptionwidget.cpp
@@ -44,7 +44,7 @@ public:
TQTimer freeSpaceUpdateTimer;
- KIO::filesize_t neededSize;
+ TDEIO::filesize_t neededSize;
int getDefaultFormat() {
// we prefere formats in this order:
@@ -145,11 +145,11 @@ void K3bAudioConvertingOptionWidget::setBaseDir( const TQString& path )
}
-void K3bAudioConvertingOptionWidget::setNeededSize( KIO::filesize_t size )
+void K3bAudioConvertingOptionWidget::setNeededSize( TDEIO::filesize_t size )
{
d->neededSize = size;
if( size > 0 )
- m_labelNeededSpace->setText( KIO::convertSize( size ) );
+ m_labelNeededSpace->setText( TDEIO::convertSize( size ) );
else
m_labelNeededSpace->setText( i18n("unknown") );
@@ -175,7 +175,7 @@ void K3bAudioConvertingOptionWidget::slotUpdateFreeTempSpace()
unsigned long size, avail;
if( K3b::kbFreeOnFs( path, size, avail ) ) {
- m_labelFreeSpace->setText( KIO::convertSizeFromKB(avail) );
+ m_labelFreeSpace->setText( TDEIO::convertSizeFromKB(avail) );
if( avail < d->neededSize/1024 )
m_labelNeededSpace->setPaletteForegroundColor( TQt::red );
else
@@ -220,7 +220,7 @@ void K3bAudioConvertingOptionWidget::loadDefaults()
}
-void K3bAudioConvertingOptionWidget::loadConfig( KConfigBase* c )
+void K3bAudioConvertingOptionWidget::loadConfig( TDEConfigBase* c )
{
m_editBaseDir->setURL( c->readPathEntry( "last ripping directory", TQDir::homeDirPath() ) );
@@ -247,7 +247,7 @@ void K3bAudioConvertingOptionWidget::loadConfig( KConfigBase* c )
}
-void K3bAudioConvertingOptionWidget::saveConfig( KConfigBase* c )
+void K3bAudioConvertingOptionWidget::saveConfig( TDEConfigBase* c )
{
c->writePathEntry( "last ripping directory", m_editBaseDir->url() );
diff --git a/src/rip/k3baudioconvertingoptionwidget.h b/src/rip/k3baudioconvertingoptionwidget.h
index a9bbefa..9352e3f 100644
--- a/src/rip/k3baudioconvertingoptionwidget.h
+++ b/src/rip/k3baudioconvertingoptionwidget.h
@@ -22,7 +22,7 @@
#include <kio/global.h>
class K3bAudioEncoder;
-class KConfigBase;
+class TDEConfigBase;
/**
@@ -39,7 +39,7 @@ class K3bAudioConvertingOptionWidget : public base_K3bAudioRippingOptionWidget
void setBaseDir( const TQString& path );
- void setNeededSize( KIO::filesize_t );
+ void setNeededSize( TDEIO::filesize_t );
/**
* @returns 0 if wave is selected
@@ -56,8 +56,8 @@ class K3bAudioConvertingOptionWidget : public base_K3bAudioRippingOptionWidget
public slots:
void loadDefaults();
- void loadConfig( KConfigBase* );
- void saveConfig( KConfigBase* );
+ void loadConfig( TDEConfigBase* );
+ void saveConfig( TDEConfigBase* );
signals:
void changed();
diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp
index fbb0800..03c7db3 100644
--- a/src/rip/k3baudioprojectconvertingdialog.cpp
+++ b/src/rip/k3baudioprojectconvertingdialog.cpp
@@ -220,7 +220,7 @@ void K3bAudioProjectConvertingDialog::refresh()
TQString extension = m_optionWidget->extension();
- KIO::filesize_t overallSize = 0;
+ TDEIO::filesize_t overallSize = 0;
if( m_optionWidget->createSingleFile() ) {
TQString filename;
@@ -245,7 +245,7 @@ void K3bAudioProjectConvertingDialog::refresh()
m_viewTracks->lastItem(),
filename + "." + extension,
m_doc->length().toString(),
- filesize < 0 ? i18n("unknown") : KIO::convertSize( filesize ) );
+ filesize < 0 ? i18n("unknown") : TDEIO::convertSize( filesize ) );
d->filenames.append( K3b::fixupPath( baseDir + "/" + filename + "." + extension ) );
@@ -283,7 +283,7 @@ void K3bAudioProjectConvertingDialog::refresh()
m_viewTracks->lastItem(),
filename,
track->length().toString(),
- filesize < 0 ? i18n("unknown") : KIO::convertSize( filesize ) );
+ filesize < 0 ? i18n("unknown") : TDEIO::convertSize( filesize ) );
d->filenames.append( K3b::fixupPath( baseDir + "/" + filename ) );
@@ -330,7 +330,7 @@ void K3bAudioProjectConvertingDialog::loadK3bDefaults()
refresh();
}
-void K3bAudioProjectConvertingDialog::loadUserDefaults( KConfigBase* c )
+void K3bAudioProjectConvertingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_optionWidget->loadConfig( c );
m_patternWidget->loadConfig( c );
@@ -339,7 +339,7 @@ void K3bAudioProjectConvertingDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bAudioProjectConvertingDialog::saveUserDefaults( KConfigBase* c )
+void K3bAudioProjectConvertingDialog::saveUserDefaults( TDEConfigBase* c )
{
m_optionWidget->saveConfig( c );
m_patternWidget->saveConfig( c );
diff --git a/src/rip/k3baudioprojectconvertingdialog.h b/src/rip/k3baudioprojectconvertingdialog.h
index e443aeb..e04e5ca 100644
--- a/src/rip/k3baudioprojectconvertingdialog.h
+++ b/src/rip/k3baudioprojectconvertingdialog.h
@@ -55,8 +55,8 @@ class K3bAudioProjectConvertingDialog : public K3bInteractionDialog
protected:
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
private:
K3bCddbPatternWidget* m_patternWidget;
diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp
index 4e681b2..4298532 100644
--- a/src/rip/k3baudiorippingdialog.cpp
+++ b/src/rip/k3baudiorippingdialog.cpp
@@ -292,7 +292,7 @@ void K3bAudioRippingDialog::refresh()
TQString baseDir = K3b::prepareDir( m_optionWidget->baseDir() );
d->fsInfo.setPath( baseDir );
- KIO::filesize_t overallSize = 0;
+ TDEIO::filesize_t overallSize = 0;
if( m_optionWidget->createSingleFile() ) {
long length = 0;
@@ -334,7 +334,7 @@ void K3bAudioRippingDialog::refresh()
m_viewTracks->lastItem(),
filename + "." + extension,
K3b::Msf(length).toString(),
- fileSize < 0 ? i18n("unknown") : KIO::convertSize( fileSize ),
+ fileSize < 0 ? i18n("unknown") : TDEIO::convertSize( fileSize ),
i18n("Audio") );
d->filenames.append( baseDir + "/" + filename + "." + extension );
@@ -392,7 +392,7 @@ void K3bAudioRippingDialog::refresh()
m_viewTracks->lastItem(),
filename,
trackLength.toString(),
- fileSize < 0 ? i18n("unknown") : KIO::convertSize( fileSize ),
+ fileSize < 0 ? i18n("unknown") : TDEIO::convertSize( fileSize ),
(m_toc[index].type() == K3bTrack::AUDIO ? i18n("Audio") : i18n("Data") ) );
d->filenames.append( baseDir + "/" + filename );
@@ -442,7 +442,7 @@ void K3bAudioRippingDialog::loadK3bDefaults()
refresh();
}
-void K3bAudioRippingDialog::loadUserDefaults( KConfigBase* c )
+void K3bAudioRippingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_comboParanoiaMode->setCurrentItem( c->readNumEntry( "paranoia_mode", 0 ) );
m_spinRetries->setValue( c->readNumEntry( "read_retries", 5 ) );
@@ -455,7 +455,7 @@ void K3bAudioRippingDialog::loadUserDefaults( KConfigBase* c )
refresh();
}
-void K3bAudioRippingDialog::saveUserDefaults( KConfigBase* c )
+void K3bAudioRippingDialog::saveUserDefaults( TDEConfigBase* c )
{
c->writeEntry( "paranoia_mode", m_comboParanoiaMode->currentText().toInt() );
c->writeEntry( "read_retries", m_spinRetries->value() );
diff --git a/src/rip/k3baudiorippingdialog.h b/src/rip/k3baudiorippingdialog.h
index 2cb58ed..f660efe 100644
--- a/src/rip/k3baudiorippingdialog.h
+++ b/src/rip/k3baudiorippingdialog.h
@@ -80,8 +80,8 @@ class K3bAudioRippingDialog : public K3bInteractionDialog
void setupContextHelp();
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
class Private;
Private* d;
diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp
index cd0c3f1..ae1191f 100644
--- a/src/rip/k3bcddbpatternwidget.cpp
+++ b/src/rip/k3bcddbpatternwidget.cpp
@@ -100,7 +100,7 @@ bool K3bCddbPatternWidget::replaceBlanks() const
}
-void K3bCddbPatternWidget::loadConfig( KConfigBase* c )
+void K3bCddbPatternWidget::loadConfig( TDEConfigBase* c )
{
m_comboPlaylistPattern->setEditText( c->readEntry( "playlist pattern", m_comboPlaylistPattern->text(0) ) );
m_comboFilenamePattern->setEditText( c->readEntry( "filename pattern", m_comboFilenamePattern->text(0) ) );
@@ -109,7 +109,7 @@ void K3bCddbPatternWidget::loadConfig( KConfigBase* c )
}
-void K3bCddbPatternWidget::saveConfig( KConfigBase* c )
+void K3bCddbPatternWidget::saveConfig( TDEConfigBase* c )
{
c->writeEntry( "playlist pattern", m_comboPlaylistPattern->currentText() );
c->writeEntry( "filename pattern", m_comboFilenamePattern->currentText() );
diff --git a/src/rip/k3bcddbpatternwidget.h b/src/rip/k3bcddbpatternwidget.h
index 77e8f26..5c8dca5 100644
--- a/src/rip/k3bcddbpatternwidget.h
+++ b/src/rip/k3bcddbpatternwidget.h
@@ -19,7 +19,7 @@
#include "base_k3bcddbpatternwidget.h"
-class KConfigBase;
+class TDEConfigBase;
class K3bCddbPatternWidget : public base_K3bCddbPatternWidget
@@ -40,8 +40,8 @@ class K3bCddbPatternWidget : public base_K3bCddbPatternWidget
void changed();
public slots:
- void loadConfig( KConfigBase* );
- void saveConfig( KConfigBase* );
+ void loadConfig( TDEConfigBase* );
+ void saveConfig( TDEConfigBase* );
void loadDefaults();
private slots:
diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp
index 7df8305..b987e96 100644
--- a/src/rip/k3bvideocdrip.cpp
+++ b/src/rip/k3bvideocdrip.cpp
@@ -349,7 +349,7 @@ TQString K3bVideoCdRip::jobDescription() const
TQString K3bVideoCdRip::jobDetails() const
{
- return TQString( "(%1)" ).arg ( KIO::convertSize( m_videooptions ->getVideoCdSize() ) );
+ return TQString( "(%1)" ).arg ( TDEIO::convertSize( m_videooptions ->getVideoCdSize() ) );
}
#include "k3bvideocdrip.moc"
diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp
index 855de41..eeec3d5 100644
--- a/src/rip/k3bvideocdrippingdialog.cpp
+++ b/src/rip/k3bvideocdrippingdialog.cpp
@@ -126,7 +126,7 @@ void K3bVideoCdRippingDialog::setupGui()
connect( m_editDirectory, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotUpdateFreeSpace()) );
- m_labelNecessarySize ->setText( KIO::convertSize( m_videooptions ->getVideoCdSize() ) );
+ m_labelNecessarySize ->setText( TDEIO::convertSize( m_videooptions ->getVideoCdSize() ) );
}
@@ -170,7 +170,7 @@ void K3bVideoCdRippingDialog::slotStartClicked()
TQFileInfo* fi;
while ( ( fi = it.current() ) != 0 ) {
if ( fi ->fileName() != "." && fi ->fileName() != ".." )
- filesExists.append( TQString( "%1 (%2)" ).arg( TQFile::encodeName( fi ->fileName() ).data() ).arg( KIO::convertSize( fi ->size() ) ) );
+ filesExists.append( TQString( "%1 (%2)" ).arg( TQFile::encodeName( fi ->fileName() ).data() ).arg( TDEIO::convertSize( fi ->size() ) ) );
++it;
}
@@ -202,7 +202,7 @@ void K3bVideoCdRippingDialog::slotFreeSpace(const TQString&,
unsigned long,
unsigned long kbAvail)
{
- m_labelFreeSpace->setText( KIO::convertSizeFromKB(kbAvail) );
+ m_labelFreeSpace->setText( TDEIO::convertSizeFromKB(kbAvail) );
m_freeSpace = kbAvail;
@@ -239,7 +239,7 @@ void K3bVideoCdRippingDialog::loadK3bDefaults()
slotUpdateFreeSpace();
}
-void K3bVideoCdRippingDialog::loadUserDefaults( KConfigBase* c )
+void K3bVideoCdRippingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_editDirectory ->setURL( c->readPathEntry( "last ripping directory", TQDir::homeDirPath() ) );
m_ignoreExt ->setChecked( c->readBoolEntry( "ignore ext", false ) );
@@ -249,7 +249,7 @@ void K3bVideoCdRippingDialog::loadUserDefaults( KConfigBase* c )
slotUpdateFreeSpace();
}
-void K3bVideoCdRippingDialog::saveUserDefaults( KConfigBase* c )
+void K3bVideoCdRippingDialog::saveUserDefaults( TDEConfigBase* c )
{
c->writePathEntry( "last ripping directory", m_editDirectory->url() );
c->writeEntry( "ignore ext", m_ignoreExt ->isChecked( ) );
diff --git a/src/rip/k3bvideocdrippingdialog.h b/src/rip/k3bvideocdrippingdialog.h
index 11240f9..1d2aafd 100644
--- a/src/rip/k3bvideocdrippingdialog.h
+++ b/src/rip/k3bvideocdrippingdialog.h
@@ -46,8 +46,8 @@ class K3bVideoCdRippingDialog : public K3bInteractionDialog
void setupContextHelp();
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
K3bTempDirSelectionWidget* m_tempDirSelectionWidget;
diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp
index 62fc364..1924d23 100644
--- a/src/rip/k3bvideocdview.cpp
+++ b/src/rip/k3bvideocdview.cpp
@@ -72,7 +72,7 @@ class K3bVideoCdView::VideoTrackViewItem : public TQListViewItem
setText( 1, name );
if ( length > 0 ) {
setText( 2, length.toString() );
- setText( 3, KIO::convertSize( length.mode2Form2Bytes() ) );
+ setText( 3, TDEIO::convertSize( length.mode2Form2Bytes() ) );
}
trackNumber = _trackNumber;
@@ -129,9 +129,9 @@ class K3bVideoCdView::VideoTrackViewCheckItem : public TQCheckListItem
{
setText( 2, length.toString() );
if ( form2 )
- setText( 3, KIO::convertSize( length.mode2Form2Bytes() ) );
+ setText( 3, TDEIO::convertSize( length.mode2Form2Bytes() ) );
else
- setText( 3, KIO::convertSize( length.mode2Form1Bytes() ) );
+ setText( 3, TDEIO::convertSize( length.mode2Form1Bytes() ) );
}
};
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index 3ba01b4..4aa571e 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -272,7 +272,7 @@ void K3bVideoDVDRippingDialog::slotUpdateFilenames()
void K3bVideoDVDRippingDialog::slotUpdateFilesizes()
{
double bitrate = (double)m_w->m_spinVideoBitrate->value();
- KIO::filesize_t overallSize = 0ULL;
+ TDEIO::filesize_t overallSize = 0ULL;
// update file sizes
for( TQMap<TQCheckListItem*, K3bVideoDVDRippingJob::TitleRipInfo>::iterator it = m_titleRipInfos.begin();
@@ -281,13 +281,13 @@ void K3bVideoDVDRippingDialog::slotUpdateFilesizes()
double sec = m_dvd[it.data().title-1].playbackTime().totalSeconds();
// estimate the filesize
- KIO::filesize_t size = (KIO::filesize_t)( sec * bitrate * 1000.0 / 8.0 );
+ TDEIO::filesize_t size = (TDEIO::filesize_t)( sec * bitrate * 1000.0 / 8.0 );
// add audio stream size
// FIXME: consider AC3 passthrough
- size += (KIO::filesize_t)( sec * m_w->selectedAudioBitrate() / 8.0 * 1024.0 );
+ size += (TDEIO::filesize_t)( sec * m_w->selectedAudioBitrate() / 8.0 * 1024.0 );
- it.key()->setText( 2, KIO::convertSize( size ) );
+ it.key()->setText( 2, TDEIO::convertSize( size ) );
overallSize += size;
}
@@ -514,7 +514,7 @@ void K3bVideoDVDRippingDialog::loadK3bDefaults()
}
-void K3bVideoDVDRippingDialog::loadUserDefaults( KConfigBase* c )
+void K3bVideoDVDRippingDialog::loadUserDefaults( TDEConfigBase* c )
{
m_w->m_spinVideoBitrate->setValue( c->readNumEntry( "video bitrate", 1200 ) );
m_w->m_checkTwoPassEncoding->setChecked( c->readBoolEntry( "two pass encoding", true ) );
@@ -532,7 +532,7 @@ void K3bVideoDVDRippingDialog::loadUserDefaults( KConfigBase* c )
}
-void K3bVideoDVDRippingDialog::saveUserDefaults( KConfigBase* c )
+void K3bVideoDVDRippingDialog::saveUserDefaults( TDEConfigBase* c )
{
c->writeEntry( "video bitrate", m_w->m_spinVideoBitrate->value() );
c->writeEntry( "two pass encoding", m_w->m_checkTwoPassEncoding->isChecked() );
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.h b/src/rip/videodvd/k3bvideodvdrippingdialog.h
index 7f5408a..7180a2b 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.h
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.h
@@ -66,8 +66,8 @@ class K3bVideoDVDRippingDialog : public K3bInteractionDialog
TQString createFilename( const K3bVideoDVDRippingJob::TitleRipInfo& info, const TQString& pattern ) const;
void loadK3bDefaults();
- void loadUserDefaults( KConfigBase* );
- void saveUserDefaults( KConfigBase* );
+ void loadUserDefaults( TDEConfigBase* );
+ void saveUserDefaults( TDEConfigBase* );
K3bVideoDVDRippingWidget* m_w;
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
index 41489f7..51b74a2 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp
@@ -253,7 +253,7 @@ void K3bVideoDVDRippingWidget::slotUpdateFreeTempSpace()
unsigned long size, avail;
if( K3b::kbFreeOnFs( path, size, avail ) ) {
- m_labelFreeSpace->setText( KIO::convertSizeFromKB(avail) );
+ m_labelFreeSpace->setText( TDEIO::convertSizeFromKB(avail) );
if( avail < m_neededSize/1024 )
m_labelNeededSpace->setPaletteForegroundColor( TQt::red );
else
@@ -266,11 +266,11 @@ void K3bVideoDVDRippingWidget::slotUpdateFreeTempSpace()
}
-void K3bVideoDVDRippingWidget::setNeededSize( KIO::filesize_t size )
+void K3bVideoDVDRippingWidget::setNeededSize( TDEIO::filesize_t size )
{
m_neededSize = size;
if( size > 0 )
- m_labelNeededSpace->setText( KIO::convertSize( size ) );
+ m_labelNeededSpace->setText( TDEIO::convertSize( size ) );
else
m_labelNeededSpace->setText( i18n("unknown") );
diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h
index 032ecb1..1642bbc 100644
--- a/src/rip/videodvd/k3bvideodvdrippingwidget.h
+++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h
@@ -46,7 +46,7 @@ class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget
void setSelectedAudioBitrate( int bitrate );
void setSelectedPictureSize( const TQSize& );
- void setNeededSize( KIO::filesize_t );
+ void setNeededSize( TDEIO::filesize_t );
signals:
void changed();
@@ -60,7 +60,7 @@ class K3bVideoDVDRippingWidget : public base_K3bVideoDVDRippingWidget
private:
TQTimer* m_freeSpaceUpdateTimer;
- KIO::filesize_t m_neededSize;
+ TDEIO::filesize_t m_neededSize;
TQSize m_customVideoSize;
};