TDE
/
kaffeine
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kaffeine
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 73fd51d45c
commit cd27173bf5
26 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File

4
kaffeine/src/input/audiobrowser/googlefetcher.cpp
Unescape View File

@ -185,7 +185,7 @@ TQImage GoogleFetcher::galleryNext( bool &end )
} }
} }
else { else {
if(KIO::NetAccess::download( m_imageList[galleryImage].imageURL(), file, 0)) if(TDEIO::NetAccess::download( m_imageList[galleryImage].imageURL(), file, 0))
image = TQImage(file); image = TQImage(file);
else else
image = TQImage(); image = TQImage();
@ -195,7 +195,7 @@ TQImage GoogleFetcher::galleryNext( bool &end )
galleryImage = 0; galleryImage = 0;
++galleryPage; ++galleryPage;
} }
KIO::NetAccess::removeTempFile(file); TDEIO::NetAccess::removeTempFile(file);
return image; return image;
} }
} }

18
kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
Unescape View File

@ -190,12 +190,12 @@ TQPixmap GoogleFetcherDialog::pixmapFromURL(const KURL &url) const
{ {
TQString file; TQString file;
if(KIO::NetAccess::download(url, file, 0)) { if(TDEIO::NetAccess::download(url, file, 0)) {
TQPixmap pixmap = TQPixmap(file); TQPixmap pixmap = TQPixmap(file);
KIO::NetAccess::removeTempFile(file); TDEIO::NetAccess::removeTempFile(file);
return pixmap; return pixmap;
} }
KIO::NetAccess::removeTempFile(file); TDEIO::NetAccess::removeTempFile(file);
return TQPixmap(); return TQPixmap();
} }
@ -215,10 +215,10 @@ CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const GoogleImage &imag
// Start downloading the image. // Start downloading the image.
m_job = KIO::get(image.thumbURL(), false, false); m_job = TDEIO::get(image.thumbURL(), false, false);
connect(m_job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(imageResult(KIO::Job *))); connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(imageResult(TDEIO::Job *)));
connect(m_job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
this, TQT_SLOT(imageData(KIO::Job *, const TQByteArray &))); this, TQT_SLOT(imageData(TDEIO::Job *, const TQByteArray &)));
} }
CoverIconViewItem::~CoverIconViewItem() CoverIconViewItem::~CoverIconViewItem()
@ -234,14 +234,14 @@ CoverIconViewItem::~CoverIconViewItem()
} }
} }
void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data) void CoverIconViewItem::imageData(TDEIO::Job *, const TQByteArray &data)
{ {
int currentSize = m_buffer.size(); int currentSize = m_buffer.size();
m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim); m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim);
memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size()); memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size());
} }
void CoverIconViewItem::imageResult(KIO::Job *job) void CoverIconViewItem::imageResult(TDEIO::Job *job)
{ {
if(job->error()) if(job->error())
return; return;

8
kaffeine/src/input/audiobrowser/googlefetcherdialog.h
Unescape View File

@ -74,7 +74,7 @@ private:
TQString m_artist, m_album; TQString m_artist, m_album;
}; };
namespace KIO namespace TDEIO
{ {
class TransferJob; class TransferJob;
} }
@ -89,12 +89,12 @@ public:
~CoverIconViewItem(); ~CoverIconViewItem();
private slots: private slots:
void imageData(KIO::Job *job, const TQByteArray &data); void imageData(TDEIO::Job *job, const TQByteArray &data);
void imageResult(KIO::Job* job); void imageResult(TDEIO::Job* job);
private: private:
TQByteArray m_buffer; TQByteArray m_buffer;
TQGuardedPtr<KIO::TransferJob> m_job; TQGuardedPtr<TDEIO::TransferJob> m_job;
}; };
#endif /* GOOGLEFETCHERDIALOG_H */ #endif /* GOOGLEFETCHERDIALOG_H */

18
kaffeine/src/input/audiobrowser/playlist.cpp
Unescape View File

@ -339,7 +339,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
m_playlistDirectory = locateLocal("appdata", "playlists"); m_playlistDirectory = locateLocal("appdata", "playlists");
m_playlistDirectory.append("/"); m_playlistDirectory.append("/");
KIO::NetAccess::mkdir(m_playlistDirectory, mainWidget); TDEIO::NetAccess::mkdir(m_playlistDirectory, mainWidget);
kdDebug() << "PLAYLIST" << endl; kdDebug() << "PLAYLIST" << endl;
TQGridLayout* layout = new TQGridLayout( playlist, 4, 2, 3 ); TQGridLayout* layout = new TQGridLayout( playlist, 4, 2, 3 );
@ -364,7 +364,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
m_list->setColumnWidthMode(TRACK_COLUMN, TQListView::Manual); m_list->setColumnWidthMode(TRACK_COLUMN, TQListView::Manual);
m_list->setColumnWidthMode(LENGTH_COLUMN, TQListView::Manual); m_list->setColumnWidthMode(LENGTH_COLUMN, TQListView::Manual);
m_list->setResizeMode(TQListView::NoColumn); m_list->setResizeMode(TQListView::NoColumn);
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
m_list->restoreLayout(config, "Playlist Layout"); m_list->restoreLayout(config, "Playlist Layout");
m_list->setFullWidth(true); m_list->setFullWidth(true);
m_list->setSorting(-1); m_list->setSorting(-1);
@ -590,7 +590,7 @@ TQWidget* PlayList::inputMainWidget()
return mainWidget; return mainWidget;
} }
void PlayList::loadConfig(KConfig* config) void PlayList::loadConfig(TDEConfig* config)
{ {
TQValueList<int> sl; TQValueList<int> sl;
bool b; bool b;
@ -649,7 +649,7 @@ void PlayList::saveConfig()
saveConfig( TDEGlobal::config() ); saveConfig( TDEGlobal::config() );
} }
void PlayList::saveConfig(KConfig* config) void PlayList::saveConfig(TDEConfig* config)
{ {
saveCurrentPlaylist(); saveCurrentPlaylist();
config->setGroup("Playlist"); config->setGroup("Playlist");
@ -1710,7 +1710,7 @@ void PlayList::setCover( TQString s1, TQString s2, bool forceFetch )
TQString path = locate("appdata", "nocover.png"); TQString path = locate("appdata", "nocover.png");
if ( !path ) if ( !path )
path = locate("data", "kaffeine/nocover.png"); path = locate("data", "kaffeine/nocover.png");
KIO::file_copy( KURL::fromPathOrURL( path ), KURL::fromPathOrURL( fname ), -1, true ); TDEIO::file_copy( KURL::fromPathOrURL( path ), KURL::fromPathOrURL( fname ), -1, true );
} }
} }
} }
@ -1862,8 +1862,8 @@ void PlayList::slotNewPlaylistName(const TQString& text)
} }
TQString oldPl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine"; TQString oldPl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine";
kdDebug() << "Playlist: removing file: " << oldPl << endl; kdDebug() << "Playlist: removing file: " << oldPl << endl;
if (!KIO::NetAccess::del(oldPl, mainWidget)) if (!TDEIO::NetAccess::del(oldPl, mainWidget))
kdError() << "Playlist: " << KIO::NetAccess::lastErrorString() << endl; kdError() << "Playlist: " << TDEIO::NetAccess::lastErrorString() << endl;
kdDebug() << "PlayList: Set playlist name to: " << text << endl; kdDebug() << "PlayList: Set playlist name to: " << text << endl;
m_playlistSelector->changeItem(text, m_currentPlaylist); m_playlistSelector->changeItem(text, m_currentPlaylist);
@ -1890,8 +1890,8 @@ void PlayList::removeCurrentPlaylist()
if (code == KMessageBox::Continue) if (code == KMessageBox::Continue)
{ {
TQString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine"; TQString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine";
if (!KIO::NetAccess::del(pl, mainWidget)) if (!TDEIO::NetAccess::del(pl, mainWidget))
kdError() << "Playlist: " << KIO::NetAccess::lastErrorString() << endl; kdError() << "Playlist: " << TDEIO::NetAccess::lastErrorString() << endl;
m_playlistSelector->removeItem(m_currentPlaylist); m_playlistSelector->removeItem(m_currentPlaylist);
m_currentPlaylist = m_playlistSelector->currentItem(); m_currentPlaylist = m_playlistSelector->currentItem();

6
kaffeine/src/input/audiobrowser/playlist.h
Unescape View File

@ -50,7 +50,7 @@ class TQPixmap;
class KLineEdit; class KLineEdit;
class KComboBox; class KComboBox;
class KURLComboBox; class KURLComboBox;
class KConfig; class TDEConfig;
class KPushButton; class KPushButton;
class GoogleFetcher; class GoogleFetcher;
@ -173,8 +173,8 @@ public:
void removeCurrentPlaylist(); void removeCurrentPlaylist();
void saveCurrentPlaylist(); void saveCurrentPlaylist();
TQString queryCurrentPlaylist(); TQString queryCurrentPlaylist();
void loadConfig(KConfig*); void loadConfig(TDEConfig*);
void saveConfig(KConfig*); void saveConfig(TDEConfig*);
void clearList(); void clearList();
void setEndless(bool); void setEndless(bool);

10
kaffeine/src/input/audiobrowser/urllistview.cpp
Unescape View File

@ -274,11 +274,11 @@ void UrlListView::slotAddSubtitle()
openSubJobBuf = TQByteArray(); openSubJobBuf = TQByteArray();
openSubJob = KIO::http_post( "http://test.opensubtitles.org/xml-rpc", postData, false ); openSubJob = TDEIO::http_post( "http://test.opensubtitles.org/xml-rpc", postData, false );
openSubJob->addMetaData( "content-type", "Content-Type: text/xml" ); openSubJob->addMetaData( "content-type", "Content-Type: text/xml" );
connect( openSubJob, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(openSubResult(KIO::Job*)) ); connect( openSubJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(openSubResult(TDEIO::Job*)) );
connect( openSubJob, TQT_SIGNAL(data(KIO::Job*,const TQByteArray&) ), this, TQT_SLOT(openSubData(KIO::Job*, connect( openSubJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&) ), this, TQT_SLOT(openSubData(TDEIO::Job*,
const TQByteArray&)) ); const TQByteArray&)) );
kdDebug() << "\n\n" << xmlRequest << "\n\n" << endl;*/ kdDebug() << "\n\n" << xmlRequest << "\n\n" << endl;*/
@ -299,7 +299,7 @@ void UrlListView::slotAddSubtitle()
} }
void UrlListView::openSubResult( KIO::Job* job ) void UrlListView::openSubResult( TDEIO::Job* job )
{ {
if ( openSubJob!=job ) if ( openSubJob!=job )
return; return;
@ -317,7 +317,7 @@ void UrlListView::openSubResult( KIO::Job* job )
openSubJob = 0; openSubJob = 0;
} }
void UrlListView::openSubData( KIO::Job* job, const TQByteArray& data ) void UrlListView::openSubData( TDEIO::Job* job, const TQByteArray& data )
{ {
if ( openSubJob != job ) if ( openSubJob != job )
return; return;

8
kaffeine/src/input/audiobrowser/urllistview.h
Unescape View File

@ -32,7 +32,7 @@ class TQWidget;
class TQDragObject; class TQDragObject;
class PlaylistItem; class PlaylistItem;
class MRL; class MRL;
class KIO::Job; class TDEIO::Job;
class UrlListView : public KListView class UrlListView : public KListView
{ {
@ -66,8 +66,8 @@ private slots:
void slotPlayItem(); void slotPlayItem();
void slotClicked(TQListViewItem*, const TQPoint&, int); void slotClicked(TQListViewItem*, const TQPoint&, int);
void slotPlayNext(); void slotPlayNext();
void openSubResult( KIO::Job* ); void openSubResult( TDEIO::Job* );
void openSubData( KIO::Job*, const TQByteArray& ); void openSubData( TDEIO::Job*, const TQByteArray& );
protected: protected:
virtual bool acceptDrag(TQDropEvent* event) const; virtual bool acceptDrag(TQDropEvent* event) const;
@ -85,7 +85,7 @@ private:
PlaylistItem* m_itemOfContextMenu; PlaylistItem* m_itemOfContextMenu;
KPopupMenu* m_contextMenu; KPopupMenu* m_contextMenu;
KIO::Job *openSubJob; TDEIO::Job *openSubJob;
TQByteArray openSubJobBuf; TQByteArray openSubJobBuf;
}; };

4
kaffeine/src/input/disc/disc.cpp
Unescape View File

@ -237,7 +237,7 @@ bool Disc::execTarget( const TQString &target )
return false; return false;
} }
void Disc::loadConfig( KConfig* config ) void Disc::loadConfig( TDEConfig* config )
{ {
TQValueList<int> sl; TQValueList<int> sl;
@ -248,7 +248,7 @@ void Disc::loadConfig( KConfig* config )
void Disc::saveConfig() void Disc::saveConfig()
{ {
KConfig* config = TDEGlobal::config(); TDEConfig* config = TDEGlobal::config();
config->setGroup("Disc"); config->setGroup("Disc");
config->writeEntry( "SplitSizes", split->sizes() ); config->writeEntry( "SplitSizes", split->sizes() );

4
kaffeine/src/input/disc/disc.h
Unescape View File

@ -108,8 +108,8 @@ public:
TQVBox *playerBox; TQVBox *playerBox;
private: private:
void loadConfig( KConfig* config ); void loadConfig( TDEConfig* config );
void saveConfig( KConfig* config ); void saveConfig( TDEConfig* config );
void setCurrent( int n ); void setCurrent( int n );
void setupActions(); void setupActions();

2
kaffeine/src/input/disc/paranoia.cpp
Unescape View File

@ -50,7 +50,7 @@
#define DEFAULT_DRIVE "/dev/cdrom" #define DEFAULT_DRIVE "/dev/cdrom"
KiloConfig::KiloConfig( TQWidget *parent, KConfig *confile, const TQStringList &encoders ) : ParanoiaSettings( parent ) KiloConfig::KiloConfig( TQWidget *parent, TDEConfig *confile, const TQStringList &encoders ) : ParanoiaSettings( parent )
{ {
int i; int i;

4
kaffeine/src/input/disc/paranoia.h
Unescape View File

@ -43,7 +43,7 @@ class KiloConfig : public ParanoiaSettings
public: public:
KiloConfig( TQWidget *parent, KConfig *confile, const TQStringList &encoders ); KiloConfig( TQWidget *parent, TDEConfig *confile, const TQStringList &encoders );
~KiloConfig(); ~KiloConfig();
TQString getEncoder(); TQString getEncoder();
@ -58,7 +58,7 @@ public slots:
private: private:
KConfig *Conf; TDEConfig *Conf;
}; };
class Paranoia : public TQThread class Paranoia : public TQThread

2
kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
Unescape View File

@ -40,7 +40,7 @@ public:
virtual ~KaffeineAudioEncoder(); virtual ~KaffeineAudioEncoder();
// return false if the user's canceled. // return false if the user's canceled.
virtual bool options( TQWidget*, KConfig* ) {return false;} virtual bool options( TQWidget*, TDEConfig* ) {return false;}
// your file extension, e.g. ".ogg" // your file extension, e.g. ".ogg"
virtual TQString getExtension() {return TQString();} virtual TQString getExtension() {return TQString();}

4
kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
Unescape View File

@ -29,7 +29,7 @@
#include "klameenc.h" #include "klameenc.h"
#include "klameenc.moc" #include "klameenc.moc"
LameSettings::LameSettings( TQWidget *parent, KConfig *confile ) : LameConfig( parent ) LameSettings::LameSettings( TQWidget *parent, TDEConfig *confile ) : LameConfig( parent )
{ {
KIconLoader *icon = new KIconLoader(); KIconLoader *icon = new KIconLoader();
okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) ); okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
@ -101,7 +101,7 @@ TQString KLameEnc::getExtension()
return TQString(".mp3"); return TQString(".mp3");
} }
bool KLameEnc::options( TQWidget *parent, KConfig *conf ) bool KLameEnc::options( TQWidget *parent, TDEConfig *conf )
{ {
LameSettings dlg( parent, conf ); LameSettings dlg( parent, conf );
int ret = dlg.exec(); int ret = dlg.exec();

6
kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
Unescape View File

@ -33,7 +33,7 @@ class LameSettings : public LameConfig
Q_OBJECT Q_OBJECT
public: public:
LameSettings( TQWidget *parent, KConfig *confile ); LameSettings( TQWidget *parent, TDEConfig *confile );
~LameSettings(); ~LameSettings();
int getBitrate(); int getBitrate();
@ -43,7 +43,7 @@ public slots:
virtual void accept(); virtual void accept();
private: private:
KConfig *Conf; TDEConfig *Conf;
}; };
class KLameEnc : public KaffeineAudioEncoder class KLameEnc : public KaffeineAudioEncoder
@ -57,7 +57,7 @@ public:
~KLameEnc(); ~KLameEnc();
// Reimplemented from KaffeineAudioEncoder // Reimplemented from KaffeineAudioEncoder
bool options( TQWidget*, KConfig* ); bool options( TQWidget*, TDEConfig* );
TQString getExtension(); TQString getExtension();
void start( TQString title=0, TQString artist=0, TQString album=0, TQString tracknumber=0, TQString genre=0 ); void start( TQString title=0, TQString artist=0, TQString album=0, TQString tracknumber=0, TQString genre=0 );
char* getHeader( int &len ); char* getHeader( int &len );

4
kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
Unescape View File

@ -27,7 +27,7 @@
#include "koggenc.h" #include "koggenc.h"
#include "koggenc.moc" #include "koggenc.moc"
OggSettings::OggSettings( TQWidget *parent, KConfig *confile ) : OggConfig( parent ) OggSettings::OggSettings( TQWidget *parent, TDEConfig *confile ) : OggConfig( parent )
{ {
KIconLoader *icon = new KIconLoader(); KIconLoader *icon = new KIconLoader();
okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) ); okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
@ -81,7 +81,7 @@ TQString KOggEnc::getExtension()
return TQString(".ogg"); return TQString(".ogg");
} }
bool KOggEnc::options( TQWidget *parent, KConfig *conf ) bool KOggEnc::options( TQWidget *parent, TDEConfig *conf )
{ {
OggSettings dlg( parent, conf ); OggSettings dlg( parent, conf );
int ret = dlg.exec(); int ret = dlg.exec();

6
kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
Unescape View File

@ -41,7 +41,7 @@ class OggSettings : public OggConfig
Q_OBJECT Q_OBJECT
public: public:
OggSettings( TQWidget *parent, KConfig *confile ); OggSettings( TQWidget *parent, TDEConfig *confile );
~OggSettings(); ~OggSettings();
int getQuality(); int getQuality();
@ -50,7 +50,7 @@ public slots:
virtual void accept(); virtual void accept();
private: private:
KConfig *Conf; TDEConfig *Conf;
}; };
class KOggEnc : public KaffeineAudioEncoder class KOggEnc : public KaffeineAudioEncoder
@ -64,7 +64,7 @@ public:
~KOggEnc(); ~KOggEnc();
// Reimplemented from KaffeineAudioEncoder // Reimplemented from KaffeineAudioEncoder
bool options( TQWidget*, KConfig* ); bool options( TQWidget*, TDEConfig* );
TQString getExtension(); TQString getExtension();
void start( TQString title=0, TQString artist=0, TQString album=0, TQString tracknumber=0, TQString genre=0 ); void start( TQString title=0, TQString artist=0, TQString album=0, TQString tracknumber=0, TQString genre=0 );
char* getHeader( int &len ); char* getHeader( int &len );

10
kaffeine/src/input/dvb/dvbconfig.cpp
Unescape View File

@ -151,7 +151,7 @@ DVBconfig::DVBconfig( const TQString &dvbConf )
dir.setPath( dvbConfigIconsDir ); dir.setPath( dvbConfigIconsDir );
if ( !dir.exists() ) if ( !dir.exists() )
dir.mkdir( dvbConfigIconsDir ); dir.mkdir( dvbConfigIconsDir );
config = new KConfig( dvbConfigDir+"dvbrc" ); config = new TDEConfig( dvbConfigDir+"dvbrc" );
downProgress = 0; downProgress = 0;
sizeFile = 0; sizeFile = 0;
categories.setAutoDelete( true ); categories.setAutoDelete( true );
@ -286,11 +286,11 @@ bool DVBconfig::loadDvbData( TQWidget *parent )
downProgress->progressBar()->setTotalSteps( 100 ); downProgress->progressBar()->setTotalSteps( 100 );
//job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false ); //job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false );
job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false ); job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false );
connect( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(setDownloadResult(KIO::Job*)) ); connect( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(setDownloadResult(TDEIO::Job*)) );
connect( job, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(KIO::Job*,unsigned long)) ); connect( job, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(TDEIO::Job*,unsigned long)) );
downProgress->exec(); downProgress->exec();
disconnect( job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(setDownloadResult(KIO::Job*)) ); disconnect( job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(setDownloadResult(TDEIO::Job*)) );
disconnect( job, TQT_SIGNAL(percent(KIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(KIO::Job*,unsigned long)) ); disconnect( job, TQT_SIGNAL(percent(TDEIO::Job*,unsigned long)), this, TQT_SLOT(setDownloadPercent(TDEIO::Job*,unsigned long)) );
if ( downProgress ) { if ( downProgress ) {
delete downProgress; delete downProgress;
downProgress = 0; downProgress = 0;

8
kaffeine/src/input/dvb/dvbconfig.h
Unescape View File

@ -40,7 +40,7 @@
#define MAX_DEVICES 8 #define MAX_DEVICES 8
using namespace KIO; using namespace TDEIO;
class MSpinBox : public TQSpinBox class MSpinBox : public TQSpinBox
{ {
@ -183,7 +183,7 @@ public:
void removeCategory( const TQString &name ); void removeCategory( const TQString &name );
void changeIconCategory( const TQString &name, const TQString &icon ); void changeIconCategory( const TQString &name, const TQString &icon );
KConfig *config; TDEConfig *config;
TQString recordDir, shiftDir, filenameFormat; TQString recordDir, shiftDir, filenameFormat;
int beginMargin, endMargin, instantDuration, sizeFile; int beginMargin, endMargin, instantDuration, sizeFile;
TQSize epgSize, scanSize, timerSize; TQSize epgSize, scanSize, timerSize;
@ -208,8 +208,8 @@ private:
private slots: private slots:
void setDownloadResult( KIO::Job *job ); void setDownloadResult( TDEIO::Job *job );
void setDownloadPercent( KIO::Job *job, unsigned long percent ); void setDownloadPercent( TDEIO::Job *job, unsigned long percent );
}; };

4
kaffeine/src/input/dvbclient/cdwidget.cpp
Unescape View File

@ -140,7 +140,7 @@ CdWidget::~CdWidget()
void CdWidget::loadConfig( KConfig* config ) void CdWidget::loadConfig( TDEConfig* config )
{ {
TQValueList<int> sl; TQValueList<int> sl;
@ -157,7 +157,7 @@ void CdWidget::loadConfig( KConfig* config )
void CdWidget::saveConfig() void CdWidget::saveConfig()
{ {
KConfig* config = TDEGlobal::config(); TDEConfig* config = TDEGlobal::config();
config->setGroup("DVBClient"); config->setGroup("DVBClient");
config->writeEntry( "SplitSizes", split->sizes() ); config->writeEntry( "SplitSizes", split->sizes() );
} }

4
kaffeine/src/input/dvbclient/cdwidget.h
Unescape View File

@ -76,8 +76,8 @@ public slots:
void pauseLiveTV(); void pauseLiveTV();
private: private:
void loadConfig( KConfig* config ); void loadConfig( TDEConfig* config );
void saveConfig( KConfig* config ); void saveConfig( TDEConfig* config );
TQSplitter *split; TQSplitter *split;
CdDump *dump; CdDump *dump;

6
kaffeine/src/kaffeine.cpp
Unescape View File

@ -294,7 +294,7 @@ void Kaffeine::updateArgs()
if ((url.left(1) != "/") && (!url.contains("://")) && (url.lower() != "dvd") && (url.lower() != "vcd") if ((url.left(1) != "/") && (!url.contains("://")) && (url.lower() != "dvd") && (url.lower() != "vcd")
&& (url.lower() != "audiocd") && (url.lower() != "cdda") && (url.lower() != "dvb")) { && (url.lower() != "audiocd") && (url.lower() != "cdda") && (url.lower() != "dvb")) {
#if KDE_IS_VERSION(3,5,0) #if KDE_IS_VERSION(3,5,0)
KURL u = KIO::NetAccess::mostLocalURL(args->url(i), 0); KURL u = TDEIO::NetAccess::mostLocalURL(args->url(i), 0);
if (u.isLocalFile()) if (u.isLocalFile())
url = path.absFilePath(u.path()); url = path.absFilePath(u.path());
else else
@ -751,7 +751,7 @@ void Kaffeine::slotDVBNextBack(int dir)
void Kaffeine::loadConfig() void Kaffeine::loadConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
bool b; bool b;
config->setGroup("General Options"); config->setGroup("General Options");
@ -818,7 +818,7 @@ void Kaffeine::loadConfig()
void Kaffeine::saveConfig() void Kaffeine::saveConfig()
{ {
KConfig* config = kapp->config(); TDEConfig* config = kapp->config();
if (!m_fullscreen->isChecked()) if (!m_fullscreen->isChecked())
{ {

8
kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
Unescape View File

@ -193,7 +193,7 @@ bool GStreamerPart::openURL(const MRL& mrl)
{ {
kdDebug() << "GStreamerPart: Check for kaffeine/noatun/m3u/pls/asx playlist\n"; kdDebug() << "GStreamerPart: Check for kaffeine/noatun/m3u/pls/asx playlist\n";
TQString localFile; TQString localFile;
if ( KIO::NetAccess::download(m_mrl.kurl(), localFile, widget()) ) { if ( TDEIO::NetAccess::download(m_mrl.kurl(), localFile, widget()) ) {
TQFile file( localFile ); TQFile file( localFile );
file.open( IO_ReadOnly ); file.open( IO_ReadOnly );
TQTextStream stream( &file ); TQTextStream stream( &file );
@ -223,7 +223,7 @@ bool GStreamerPart::openURL(const MRL& mrl)
} }
} }
else else
kdError() << "GStreamerPart: " << KIO::NetAccess::lastErrorString() << endl; kdError() << "GStreamerPart: " << TDEIO::NetAccess::lastErrorString() << endl;
} }
/* check for ram playlist */ /* check for ram playlist */
if ( (ext == "ra") || (ext == "rm") || (ext == "ram") || (ext == "lsc") || (ext == "pl") ) { if ( (ext == "ra") || (ext == "rm") || (ext == "ram") || (ext == "lsc") || (ext == "pl") ) {
@ -652,7 +652,7 @@ void GStreamerPart::slotContextMenu( const TQPoint& pos )
void GStreamerPart::loadConfig() void GStreamerPart::loadConfig()
{ {
kdDebug() << "GStreamerPart: Load config" << endl; kdDebug() << "GStreamerPart: Load config" << endl;
KConfig* config = instance()->config(); TDEConfig* config = instance()->config();
config->setGroup("General Options"); config->setGroup("General Options");
m_audioSinkName = config->readEntry("Audio Sink", "alsasink"); m_audioSinkName = config->readEntry("Audio Sink", "alsasink");
@ -668,7 +668,7 @@ void GStreamerPart::saveConfig()
{ {
kdDebug() << "GStreamerPart: Save config" << endl; kdDebug() << "GStreamerPart: Save config" << endl;
KConfig* config = instance()->config(); TDEConfig* config = instance()->config();
config->setGroup("General Options"); config->setGroup("General Options");
config->writeEntry( "Audio Sink", m_audioSinkName ); config->writeEntry( "Audio Sink", m_audioSinkName );

6
kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
Unescape View File

@ -449,12 +449,12 @@ bool PlaylistImport::ram(const MRL& playlist, TQValueList<MRL>& mrls, TQWidget*
kdDebug() << "PlaylistImport: Seems to be a ram playlist!" << endl; kdDebug() << "PlaylistImport: Seems to be a ram playlist!" << endl;
TQString localFile, url; TQString localFile, url;
if (KIO::NetAccess::mimetype(playlist.kurl(), parent) == "application/vnd.rn-realmedia") { if (TDEIO::NetAccess::mimetype(playlist.kurl(), parent) == "application/vnd.rn-realmedia") {
kdDebug() << "PlaylistImport: Seems to be a real media file" << endl; kdDebug() << "PlaylistImport: Seems to be a real media file" << endl;
return false; return false;
} }
if (KIO::NetAccess::download(playlist.kurl(), localFile, parent)) if (TDEIO::NetAccess::download(playlist.kurl(), localFile, parent))
{ {
TQFile plFile(localFile); TQFile plFile(localFile);
if (!plFile.open(IO_ReadOnly)) return false; if (!plFile.open(IO_ReadOnly)) return false;
@ -475,7 +475,7 @@ bool PlaylistImport::ram(const MRL& playlist, TQValueList<MRL>& mrls, TQWidget*
} }
} }
else { else {
kdError() << "PlaylistImport: " << KIO::NetAccess::lastErrorString() << endl; kdError() << "PlaylistImport: " << TDEIO::NetAccess::lastErrorString() << endl;
return false; return false;
} }

4
kaffeine/src/player-parts/xine-part/equalizer.cpp
Unescape View File

@ -199,7 +199,7 @@ void Equalizer::slotSetDefaultValues()
/******* read from config-file ********/ /******* read from config-file ********/
void Equalizer::ReadValues(KConfig* config) void Equalizer::ReadValues(TDEConfig* config)
{ {
config->setGroup("Equalizer"); config->setGroup("Equalizer");
@ -226,7 +226,7 @@ void Equalizer::ReadValues(KConfig* config)
/************** save in config file *************/ /************** save in config file *************/
void Equalizer::SaveValues(KConfig* config) void Equalizer::SaveValues(TDEConfig* config)
{ {
config->setGroup("Equalizer"); config->setGroup("Equalizer");

4
kaffeine/src/player-parts/xine-part/equalizer.h
Unescape View File

@ -40,8 +40,8 @@ public:
Equalizer(TQWidget *parent=0, const char *name=0); Equalizer(TQWidget *parent=0, const char *name=0);
~Equalizer(); ~Equalizer();
void ReadValues(KConfig* config); void ReadValues(TDEConfig* config);
void SaveValues(KConfig* config); void SaveValues(TDEConfig* config);
signals: signals:
void signalNewEq30(int); void signalNewEq30(int);

12
kaffeine/src/player-parts/xine-part/xine_part.cpp
Unescape View File

@ -185,7 +185,7 @@ bool XinePart::openURL(const MRL& mrl)
{ {
kdDebug() << "XinePart: Check for kaffeine/noatun/m3u/pls/asx playlist\n"; kdDebug() << "XinePart: Check for kaffeine/noatun/m3u/pls/asx playlist\n";
TQString localFile; TQString localFile;
if (KIO::NetAccess::download(m_mrl.kurl(), localFile, widget())) if (TDEIO::NetAccess::download(m_mrl.kurl(), localFile, widget()))
{ {
TQFile file(localFile); TQFile file(localFile);
file.open(IO_ReadOnly); file.open(IO_ReadOnly);
@ -235,7 +235,7 @@ bool XinePart::openURL(const MRL& mrl)
} }
} }
else else
kdError() << "XinePart: " << KIO::NetAccess::lastErrorString() << endl; kdError() << "XinePart: " << TDEIO::NetAccess::lastErrorString() << endl;
} }
/* check for ram playlist */ /* check for ram playlist */
if ( (ext == "ra") || (ext == "rm") || (ext == "ram") || (ext == "lsc") || (ext == "pl") ) if ( (ext == "ra") || (ext == "rm") || (ext == "ram") || (ext == "lsc") || (ext == "pl") )
@ -321,7 +321,7 @@ void XinePart::slotPlay(bool forcePlay)
kdDebug() << "XinePart: Protocol not supported by xine, try to download it..." << endl; kdDebug() << "XinePart: Protocol not supported by xine, try to download it..." << endl;
TQString localFile; TQString localFile;
if (KIO::NetAccess::download(mrl.kurl(), localFile, widget())) if (TDEIO::NetAccess::download(mrl.kurl(), localFile, widget()))
{ {
m_xine->clearQueue(); m_xine->clearQueue();
m_xine->appendToQueue(localFile); m_xine->appendToQueue(localFile);
@ -334,7 +334,7 @@ void XinePart::slotPlay(bool forcePlay)
TQTimer::singleShot(0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotPlay())); TQTimer::singleShot(0, TQT_TQOBJECT(m_xine), TQT_SLOT(slotPlay()));
} }
else else
kdError() << "XinePart: " << KIO::NetAccess::lastErrorString() << endl; kdError() << "XinePart: " << TDEIO::NetAccess::lastErrorString() << endl;
} }
} }
@ -1487,7 +1487,7 @@ void XinePart::loadConfig()
{ {
kdDebug() << "XinePart: load config" << endl; kdDebug() << "XinePart: load config" << endl;
KConfig* config = instance()->config(); TDEConfig* config = instance()->config();
config->setGroup("General Options"); config->setGroup("General Options");
if (m_xine->SoftwareMixing()) if (m_xine->SoftwareMixing())
@ -1538,7 +1538,7 @@ void XinePart::saveConfig()
kdDebug() << "XinePart: save config" << endl; kdDebug() << "XinePart: save config" << endl;
KConfig* config = instance()->config(); TDEConfig* config = instance()->config();
config->setGroup("General Options"); config->setGroup("General Options");
config->writeEntry("Volume", m_volume->value()); config->writeEntry("Volume", m_volume->value());

Write Preview
Loading…
Cancel
Save