diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:48 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:19:48 -0600 |
| commit | 73fd51d45ccea8e66e8c079d7e4e15b5d6d45432 (patch) | |
| tree | a4f2a2b31d27f0d88c0bfb48284418eb0b70f48b /kaffeine/src/input/disc | |
| parent | 1f0ac02d8b63730b11fdb95965469554c9ffc74c (diff) | |
| download | kaffeine-73fd51d45ccea8e66e8c079d7e4e15b5d6d45432.tar.gz kaffeine-73fd51d45ccea8e66e8c079d7e4e15b5d6d45432.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kaffeine/src/input/disc')
| -rw-r--r-- | kaffeine/src/input/disc/disc.cpp | 10 | ||||
| -rw-r--r-- | kaffeine/src/input/disc/paranoia.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp index 31bba0c..dc66a77 100644 --- a/kaffeine/src/input/disc/disc.cpp +++ b/kaffeine/src/input/disc/disc.cpp @@ -113,8 +113,8 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine h1->addWidget( ripBtn ); vb->addLayout( h1 ); - cdBtn->setIconSet( KGlobal::iconLoader()->loadIconSet("cdaudio_unmount", KIcon::Toolbar) ); - ripBtn->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Toolbar) ); + cdBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("cdaudio_unmount", KIcon::Toolbar) ); + ripBtn->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Toolbar) ); connect( cdBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startCD()) ); connect( ripBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(startRIP()) ); @@ -160,7 +160,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine enc->setTextLabel( i18n("Encode...") ); enc->setTextPosition( TQToolButton::Under ); enc->setUsesTextLabel( true ); - enc->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) ); + enc->setIconSet( TDEGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) ); enc->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) ); connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) ); vb->addWidget( encodeWidget ); @@ -180,7 +180,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine setXMLFile("kaffeinedisc.rc"); setupActions(); - loadConfig( KGlobal::config() ); + loadConfig( TDEGlobal::config() ); para = NULL; trackCurrent = 0; @@ -248,7 +248,7 @@ void Disc::loadConfig( KConfig* config ) void Disc::saveConfig() { - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); config->setGroup("Disc"); config->writeEntry( "SplitSizes", split->sizes() ); diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp index 36b052a..ee86993 100644 --- a/kaffeine/src/input/disc/paranoia.cpp +++ b/kaffeine/src/input/disc/paranoia.cpp @@ -250,7 +250,7 @@ bool Paranoia::encode( const TQStringList &list, TQWidget *parent ) return false; } - KiloConfig dlg( myParent, KGlobal::config(), encoderName ); + KiloConfig dlg( myParent, TDEGlobal::config(), encoderName ); int ret = dlg.exec(); if ( ret!=TQDialog::Accepted ) return false; @@ -269,7 +269,7 @@ bool Paranoia::encode( const TQStringList &list, TQWidget *parent ) if ( !loadEncoder( myParent ) ) return false; - if ( !currentEncoder->options( myParent, KGlobal::config() ) ) { + if ( !currentEncoder->options( myParent, TDEGlobal::config() ) ) { unloadEncoder(); return false; } |