TDE
/
soundkonverter
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/soundkonverter
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent bece9aa3ad
commit 87e49a06e2
8 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File

8
src/config.cpp
Unescape View File

@ -58,7 +58,7 @@ void Config::read()
loadPlugins();
readProfiles();
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
TQStringList listDefaults;
int intDefault;
bool boolDefault;
@ -266,7 +266,7 @@ void Config::write( bool sync )
writeServiceMenu();
writeAmarokScript();
KConfig *conf = kapp->config();
TDEConfig *conf = kapp->config();
conf->setGroup( "Ripper" );
conf->writeEntry( "ripper", (currentRipper)?currentRipper->rip.bin:"kio_audiocd" );
@ -640,10 +640,10 @@ void Config::writeAmarokScript()
KStandardDirs* stdDirs = new KStandardDirs();
if( !TQFile::exists(locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb")) ) {
KIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/soundKonverter.rb"), locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb"), 0755, true );
TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/soundKonverter.rb"), locateLocal("data","amarok/scripts/soundKonverter/soundKonverter.rb"), 0755, true );
}
if( !TQFile::exists(locateLocal("data","amarok/scripts/soundKonverter/README")) ) {
KIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/README"), locateLocal("data","amarok/scripts/soundKonverter/README"), -1, true );
TDEIO::NetAccess::file_copy( stdDirs->findResource("data","soundkonverter/amarokscript/README"), locateLocal("data","amarok/scripts/soundKonverter/README"), -1, true );
}
delete stdDirs;
}

36
src/configpluginspage.cpp
Unescape View File

@ -230,14 +230,14 @@ void ConfigPluginsPage::getPlugin()
TQString filePathName = KURL::decode_string( url );
TQString fileName = filePathName.right( filePathName.length() - filePathName.findRev("/") );
getPluginFilePathName = locateLocal("data","soundkonverter/plugins/") + fileName;
getPluginJob = KIO::file_copy( url, getPluginFilePathName, -1, true, false, false );
connect( getPluginJob, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(getPluginFinished(KIO::Job*))
getPluginJob = TDEIO::file_copy( url, getPluginFilePathName, -1, true, false, false );
connect( getPluginJob, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(getPluginFinished(TDEIO::Job*))
);
}
}
void ConfigPluginsPage::getPluginFinished( KIO::Job* job )
void ConfigPluginsPage::getPluginFinished( TDEIO::Job* job )
{
if( job->error() == 0 ) {
ConvertPluginLoader* convertPluginLoader = new ConvertPluginLoader();
@ -248,7 +248,7 @@ void ConfigPluginsPage::getPluginFinished( KIO::Job* job )
replaygainPluginLoader->verifyFile(getPluginFilePathName) == -1 &&
ripperPluginLoader->verifyFile(getPluginFilePathName) == -1 )
{
KIO::del( getPluginFilePathName, false, false );
TDEIO::del( getPluginFilePathName, false, false );
KMessageBox::error( this,
i18n("The plugin could not be installed. Please ensure that you have selected a valid soundKonverter plugin file."),
i18n("Error while installing plugin") );
@ -428,14 +428,14 @@ void ConfigPluginsPage::refreshOnlinePlugins()
{
pRefreshOnlinePlugins->setEnabled( false );
refreshOnlinePluginsJob = KIO::file_copy( "http://kaligames.de/downloads/soundkonverter/plugins/download.php?version=" + TQString::number(config->data.app.configVersion),
refreshOnlinePluginsJob = TDEIO::file_copy( "http://kaligames.de/downloads/soundkonverter/plugins/download.php?version=" + TQString::number(config->data.app.configVersion),
locateLocal("data","soundkonverter/pluginlist.txt"), -1, true, false, false );
connect( refreshOnlinePluginsJob, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(refreshOnlinePluginsFinished(KIO::Job*))
connect( refreshOnlinePluginsJob, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(refreshOnlinePluginsFinished(TDEIO::Job*))
);
}
void ConfigPluginsPage::refreshOnlinePluginsFinished( KIO::Job* job )
void ConfigPluginsPage::refreshOnlinePluginsFinished( TDEIO::Job* job )
{
if( job->error() == 0 ) {
lOnlinePlugins->clear();
@ -503,14 +503,14 @@ void ConfigPluginsPage::getOnlinePlugin()
name.replace( "Ü", "Ü" );
name.replace( "ß", "ß" );
KURL::encode_string( name );
getOnlinePluginJob = KIO::file_copy( "http://kaligames.de/downloads/soundkonverter/plugins/getfile.php?version=" + TQString::number(config->data.app.configVersion) + "&file=" + name,
getOnlinePluginJob = TDEIO::file_copy( "http://kaligames.de/downloads/soundkonverter/plugins/getfile.php?version=" + TQString::number(config->data.app.configVersion) + "&file=" + name,
locateLocal("data","soundkonverter/plugins/newplugin.xml"), -1, true, false, false );
connect( getOnlinePluginJob, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(getOnlinePluginFinished(KIO::Job*))
connect( getOnlinePluginJob, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(getOnlinePluginFinished(TDEIO::Job*))
);
}
void ConfigPluginsPage::getOnlinePluginFinished( KIO::Job* job )
void ConfigPluginsPage::getOnlinePluginFinished( TDEIO::Job* job )
{
if( job->error() == 0 ) {
TQString name;
@ -541,7 +541,7 @@ void ConfigPluginsPage::getOnlinePluginFinished( KIO::Job* job )
replaygainPluginLoader->verifyFile(getPluginFilePathName) == -1 &&
ripperPluginLoader->verifyFile(getPluginFilePathName) == -1 )
{
KIO::del( getPluginFilePathName, false, false );
TDEIO::del( getPluginFilePathName, false, false );
KMessageBox::error( this,
i18n("The plugin could not be installed. Please ensure that you have selected a valid soundKonverter plugin file."),
i18n("Error while installing plugin") );
@ -602,14 +602,14 @@ void ConfigPluginsPage::aboutOnlinePlugin()
name.replace( "Ü", "Ü" );
name.replace( "ß", "ß" );
KURL::encode_string( name );
aboutOnlinePluginJob = KIO::file_copy( "http://kaligames.de/downloads/soundkonverter/plugins/info.php?file=" + name + "&lang=" + TQLocale::languageToString(TQLocale::system().language()),
aboutOnlinePluginJob = TDEIO::file_copy( "http://kaligames.de/downloads/soundkonverter/plugins/info.php?file=" + name + "&lang=" + TQLocale::languageToString(TQLocale::system().language()),
locateLocal("data","soundkonverter/plugin_info.txt"), -1, true, false, false );
connect( aboutOnlinePluginJob, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(aboutOnlinePluginFinished(KIO::Job*))
connect( aboutOnlinePluginJob, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(aboutOnlinePluginFinished(TDEIO::Job*))
);
}
void ConfigPluginsPage::aboutOnlinePluginFinished( KIO::Job* job )
void ConfigPluginsPage::aboutOnlinePluginFinished( TDEIO::Job* job )
{
if( job->error() == 0 ) {
TQString name = lOnlinePlugins->currentText();

16
src/configpluginspage.h
Unescape View File

@ -34,17 +34,17 @@ public:
private:
KListBox* lPlugins;
KPushButton* pAddPlugin;
KIO::FileCopyJob* getPluginJob;
TDEIO::FileCopyJob* getPluginJob;
KPushButton* pRemovePlugin;
KPushButton* pAboutPlugin;
KListBox* lOnlinePlugins;
KPushButton* pRefreshOnlinePlugins;
KIO::FileCopyJob* refreshOnlinePluginsJob;
TDEIO::FileCopyJob* refreshOnlinePluginsJob;
KPushButton* pInstallOnlinePlugin;
KIO::FileCopyJob* getOnlinePluginJob;
TDEIO::FileCopyJob* getOnlinePluginJob;
KPushButton* pUpgradeOnlinePlugins;
KPushButton* pAboutOnlinePlugin;
KIO::FileCopyJob* aboutOnlinePluginJob;
TDEIO::FileCopyJob* aboutOnlinePluginJob;
TQCheckBox* cCheckOnlinePlugins;
TQString getPluginFilePathName;
@ -65,17 +65,17 @@ private slots:
void pluginsSelectionChanged( int );
void refreshPlugins();
void getPlugin();
void getPluginFinished( KIO::Job* );
void getPluginFinished( TDEIO::Job* );
void removePlugin();
void aboutPlugin();
void onlinePluginsSelectionChanged( int );
void refreshOnlinePlugins();
void refreshOnlinePluginsFinished( KIO::Job* );
void refreshOnlinePluginsFinished( TDEIO::Job* );
void getOnlinePlugin();
void getOnlinePluginFinished( KIO::Job* );
void getOnlinePluginFinished( TDEIO::Job* );
void aboutOnlinePlugin();
void aboutOnlinePluginFinished( KIO::Job* );
void aboutOnlinePluginFinished( TDEIO::Job* );
};

54
src/convert.cpp
Unescape View File

@ -101,12 +101,12 @@ void Convert::get( ConvertItem* item )
item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
else {
item->moveJob = new KIO::FileCopyJob( source, destination, -1, false, true, false, false );
connect( item->moveJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)),
this, TQT_SLOT(moveProgress(KIO::Job*,unsigned long))
item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, true, false, false );
connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)),
this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long))
);
connect( item->moveJob, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(moveFinished(KIO::Job*))
connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(moveFinished(TDEIO::Job*))
);
}
}
@ -142,12 +142,12 @@ void Convert::getCorrection( ConvertItem* item )
item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
else {
item->moveJob = new KIO::FileCopyJob( source, destination, -1, false, true, false, false );
connect( item->moveJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)),
this, TQT_SLOT(moveProgress(KIO::Job*,unsigned long))
item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, true, false, false );
connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)),
this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long))
);
connect( item->moveJob, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(moveFinished(KIO::Job*))
connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(moveFinished(TDEIO::Job*))
);
}
}
@ -190,12 +190,12 @@ void Convert::rip( ConvertItem* item )
item->fileListItem->setText( fileList->columnByName(i18n("State")), i18n("Ripping")+"... 00 %" );
item->fileListItem->ripping = true;
item->moveJob = new KIO::FileCopyJob( source, dest, -1, false, true, false, false );
connect( item->moveJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)),
this, TQT_SLOT(moveProgress(KIO::Job*,unsigned long))
item->moveJob = new TDEIO::FileCopyJob( source, dest, -1, false, true, false, false );
connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)),
this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long))
);
connect( item->moveJob, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(moveFinished(KIO::Job*))
connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(moveFinished(TDEIO::Job*))
);
}
else {
@ -634,12 +634,12 @@ void Convert::put( ConvertItem* item )
item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
else {
item->moveJob = new KIO::FileCopyJob( source, destination, -1, false, false, false, false );
connect( item->moveJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)),
this, TQT_SLOT(moveProgress(KIO::Job*,unsigned long))
item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, false, false, false );
connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)),
this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long))
);
connect( item->moveJob, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(moveFinished(KIO::Job*))
connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(moveFinished(TDEIO::Job*))
);
}
}
@ -673,12 +673,12 @@ void Convert::putCorrection( ConvertItem* item )
item->convertProcess->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput );
}
else {
item->moveJob = new KIO::FileCopyJob( source, destination, -1, false, false, false, false );
connect( item->moveJob, TQT_SIGNAL(percent(KIO::Job*,unsigned long)),
this, TQT_SLOT(moveProgress(KIO::Job*,unsigned long))
item->moveJob = new TDEIO::FileCopyJob( source, destination, -1, false, false, false, false );
connect( item->moveJob, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)),
this, TQT_SLOT(moveProgress(TDEIO::Job*,unsigned long))
);
connect( item->moveJob, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(moveFinished(KIO::Job*))
connect( item->moveJob, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(moveFinished(TDEIO::Job*))
);
}
}
@ -830,7 +830,7 @@ void Convert::executeNextStep( ConvertItem* item )
}
}
void Convert::moveProgress( KIO::Job* job, unsigned long percent )
void Convert::moveProgress( TDEIO::Job* job, unsigned long percent )
{
// search the item list for our item
for( TQValueList<ConvertItem*>::Iterator item = items.begin(); item != items.end(); item++ ) {
@ -840,7 +840,7 @@ void Convert::moveProgress( KIO::Job* job, unsigned long percent )
}
}
void Convert::moveFinished( KIO::Job* job )
void Convert::moveFinished( TDEIO::Job* job )
{
// search the item list for our item
for( TQValueList<ConvertItem*>::Iterator item = items.begin(); item != items.end(); item++ ) {

6
src/convert.h
Unescape View File

@ -69,7 +69,7 @@ public:
/** if we need to encode, decode, etc. here we have our processes */
TDEProcess* convertProcess;
/** for moving the file to the temporary or output directory */
KIO::Job* moveJob;
TDEIO::Job* moveJob;
KTempFile* tempInFile;
KTempFile* tempWavFile;
@ -213,13 +213,13 @@ private slots:
* The file is being moved
* @p job The pinter to the job
*/
void moveProgress( KIO::Job* job, unsigned long percent );
void moveProgress( TDEIO::Job* job, unsigned long percent );
/**
* The file has been moved
* @p job The pinter to the job
*/
void moveFinished( KIO::Job* job );
void moveFinished( TDEIO::Job* job );
/**
* Get the process' output

14
src/options.cpp
Unescape View File

@ -143,10 +143,10 @@ Options::Options( Config* _config, const TQString &text, TQWidget *parent, const
/* NOTE kaligames.de is down
if( config->data.plugins.checkForUpdates ) {
config->onlinePluginsChanged = false;
getPluginListJob = KIO::file_copy("http://kaligames.de/downloads/soundkonverter/plugins/download.php?version=" + TQString::number(config->data.app.configVersion),
getPluginListJob = TDEIO::file_copy("http://kaligames.de/downloads/soundkonverter/plugins/download.php?version=" + TQString::number(config->data.app.configVersion),
locateLocal("data","soundkonverter/pluginlist_new.txt"), -1, true, false, false );
connect( getPluginListJob, TQT_SIGNAL(result(KIO::Job*)),
this, TQT_SLOT(getPluginListFinished(KIO::Job*))
connect( getPluginListJob, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(getPluginListFinished(TDEIO::Job*))
);
}
*/
@ -162,7 +162,7 @@ Options::Options( Config* _config, const TQString &text, TQWidget *parent, const
Options::~Options()
{}
// void Options::getPluginListFinished( KIO::Job* job )
// void Options::getPluginListFinished( TDEIO::Job* job )
// {
// if( job->error() == 0 ) {
// TQFile file( locateLocal("data","soundkonverter/pluginlist.txt") );
@ -170,7 +170,7 @@ Options::~Options()
//
// if( !file.exists() ) { // TODO check against the installed plugins
// pPluginsNotify->show();
// KIO::file_move( locateLocal("data","soundkonverter/pluginlist_new.txt"), locateLocal("data","soundkonverter/pluginlist.txt"), -1, true, false, false );
// TDEIO::file_move( locateLocal("data","soundkonverter/pluginlist_new.txt"), locateLocal("data","soundkonverter/pluginlist.txt"), -1, true, false, false );
// config->onlinePluginsChanged = true;
// return;
// }
@ -183,7 +183,7 @@ Options::~Options()
// file.close();
// newFile.close();
// pPluginsNotify->show();
// KIO::file_move( locateLocal("data","soundkonverter/pluginlist_new.txt"), locateLocal("data","soundkonverter/pluginlist.txt"), -1, true, false, false );
// TDEIO::file_move( locateLocal("data","soundkonverter/pluginlist_new.txt"), locateLocal("data","soundkonverter/pluginlist.txt"), -1, true, false, false );
// config->onlinePluginsChanged = true;
// return;
// }
@ -192,7 +192,7 @@ Options::~Options()
// file.close();
// newFile.close();
// pPluginsNotify->show();
// KIO::file_move( locateLocal("data","soundkonverter/pluginlist_new.txt"), locateLocal("data","soundkonverter/pluginlist.txt"), -1, true, false, false );
// TDEIO::file_move( locateLocal("data","soundkonverter/pluginlist_new.txt"), locateLocal("data","soundkonverter/pluginlist.txt"), -1, true, false, false );
// config->onlinePluginsChanged = true;
// return;
// }

4
src/options.h
Unescape View File

@ -102,7 +102,7 @@ private:
Config *config;
KIO::FileCopyJob* getPluginListJob;
TDEIO::FileCopyJob* getPluginListJob;
// /** Copy all options from the detailed tab to the simple tab / find the matching profile */
//void updateSimpleTab();
@ -111,7 +111,7 @@ private slots:
void tabChanged( TQWidget* );
void somethingChanged();
void configChanged();
// void getPluginListFinished( KIO::Job* job );
// void getPluginListFinished( TDEIO::Job* job );
// void showConfigDialogPlugins();
void showConfigDialogBackends();

4
src/soundkonverter.cpp
Unescape View File

@ -75,13 +75,13 @@ soundKonverter::soundKonverter()
// (re)move the 0.2 config file
if( config->data.app.configVersion < 280 ) {
KIO::rename( locateLocal("config","soundkonverterrc"), locateLocal("config","soundkonverterrc.back"), true );
TDEIO::rename( locateLocal("config","soundkonverterrc"), locateLocal("config","soundkonverterrc.back"), true );
// KMessageBox::information( this, "You are using a pre-release of soundKonverter. This version is designed for testing only.\nThere are a few things not implemented at the moment but it should run without crashes and big problems. So feel free to report such an error if you find one.\nPlease have a look at the README.\n\nYour old configuration file has been moved to soundkonverterrc.back." );
}
// if( config->data.app.configVersion < 290 ) {
// TQFile plugin_dir( locateLocal("data","soundkonverter/plugins") );
// if( plugin_dir.exists() ) {
// KIO::rename( locateLocal("data","soundkonverter/plugins"), locateLocal("data","soundkonverter/plugins.back"), true );
// TDEIO::rename( locateLocal("data","soundkonverter/plugins"), locateLocal("data","soundkonverter/plugins.back"), true );
// int ret = KMessageBox::questionYesNo( this, i18n("soundKonverter has cleaned up it's old installation. It seems to be necessary to restart soundKonverter!\n\nDo you want to restart soundKonverter now?") );
// if( ret == KMessageBox::Yes ) {
// config->write();

Write Preview
Loading…
Cancel
Save