diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:19:29 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:19:29 -0600 |
commit | 2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (patch) | |
tree | 36de2281c8b4cf238a5e27a76b5c6e07f40151ab /src/option | |
parent | 2a3289ab87c52551fd2f5655492988ca02c17892 (diff) | |
download | k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.tar.gz k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/option')
-rw-r--r-- | src/option/k3bexternalbinwidget.cpp | 6 | ||||
-rw-r--r-- | src/option/k3bmiscoptiontab.cpp | 2 | ||||
-rw-r--r-- | src/option/k3boptiondialog.cpp | 16 | ||||
-rw-r--r-- | src/option/k3bpluginoptiontab.cpp | 10 |
4 files changed, 17 insertions, 17 deletions
diff --git a/src/option/k3bexternalbinwidget.cpp b/src/option/k3bexternalbinwidget.cpp index 28c6375..13904e4 100644 --- a/src/option/k3bexternalbinwidget.cpp +++ b/src/option/k3bexternalbinwidget.cpp @@ -49,9 +49,9 @@ K3bExternalBinWidget::K3bExternalProgramViewItem::K3bExternalProgramViewItem( K3 TQFont f( listView()->font() ); f.setBold(true); setFont( 0, f ); - setBackgroundColor( 0, KGlobalSettings::alternateBackgroundColor() ); - setBackgroundColor( 1, KGlobalSettings::alternateBackgroundColor() ); - setBackgroundColor( 2, KGlobalSettings::alternateBackgroundColor() ); + setBackgroundColor( 0, TDEGlobalSettings::alternateBackgroundColor() ); + setBackgroundColor( 1, TDEGlobalSettings::alternateBackgroundColor() ); + setBackgroundColor( 2, TDEGlobalSettings::alternateBackgroundColor() ); setText( 0, p->name() ); setSelectable( false ); } diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp index 04e660d..19d3b28 100644 --- a/src/option/k3bmiscoptiontab.cpp +++ b/src/option/k3bmiscoptiontab.cpp @@ -80,7 +80,7 @@ void K3bMiscOptionTab::readSettings() K3bInteractionDialog::LOAD_SAVED_SETTINGS ) ); m_checkSystemConfig->setChecked( c->readBoolEntry( "check system config", true ) ); - TQString tempdir = c->readPathEntry( "Temp Dir", KGlobal::dirs()->resourceDirs( "tmp" ).first() ); + TQString tempdir = c->readPathEntry( "Temp Dir", TDEGlobal::dirs()->resourceDirs( "tmp" ).first() ); m_editTempDir->setURL( tempdir ); // if( c->readEntry( "Multiple Instances", "smart" ) == "smart" ) diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp index 2b2b6af..d222134 100644 --- a/src/option/k3boptiondialog.cpp +++ b/src/option/k3boptiondialog.cpp @@ -127,7 +127,7 @@ void K3bOptionDialog::slotDefault() void K3bOptionDialog::setupBurningPage() { TQFrame* frame = addPage( i18n("Advanced"), i18n("Advanced Settings"), - KGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount", KIcon::NoGroup, KIcon::SizeMedium ) ); TQGridLayout* _frameLayout = new TQGridLayout( frame ); _frameLayout->setSpacing( 0 ); @@ -141,7 +141,7 @@ void K3bOptionDialog::setupBurningPage() void K3bOptionDialog::setupProgramsPage() { TQFrame* frame = addPage( i18n("Programs"), i18n("Setup External Programs"), - KGlobal::instance()->iconLoader()->loadIcon( "exec", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "exec", KIcon::NoGroup, KIcon::SizeMedium ) ); TQGridLayout* _frameLayout = new TQGridLayout( frame ); _frameLayout->setSpacing( 0 ); @@ -155,7 +155,7 @@ void K3bOptionDialog::setupProgramsPage() void K3bOptionDialog::setupCddbPage() { TQFrame* frame = addPage( i18n("CDDB"), i18n("Setup the CDDB Server"), - KGlobal::instance()->iconLoader()->loadIcon( "connect_established", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "connect_established", KIcon::NoGroup, KIcon::SizeMedium ) ); TQGridLayout* mainGrid = new TQGridLayout( frame ); mainGrid->setSpacing(0); @@ -173,7 +173,7 @@ void K3bOptionDialog::setupCddbPage() void K3bOptionDialog::setupDevicePage() { TQFrame* frame = addPage( i18n("Devices"), i18n("Setup Devices"), - KGlobal::instance()->iconLoader()->loadIcon( "blockdevice", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "blockdevice", KIcon::NoGroup, KIcon::SizeMedium ) ); TQHBoxLayout* box = new TQHBoxLayout( frame ); box->setSpacing(0); @@ -186,7 +186,7 @@ void K3bOptionDialog::setupDevicePage() void K3bOptionDialog::setupMiscPage() { TQFrame* frame = addPage( i18n("Misc"), i18n("Miscellaneous Settings"), - KGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) ); + TDEGlobal::instance()->iconLoader()->loadIcon( "misc", KIcon::NoGroup, KIcon::SizeMedium ) ); TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); @@ -200,7 +200,7 @@ void K3bOptionDialog::setupMiscPage() void K3bOptionDialog::setupNotifyPage() { TQFrame* frame = addPage( i18n("Notifications"), i18n("System Notifications"), - KGlobal::instance()->iconLoader()->loadIcon( "knotify", + TDEGlobal::instance()->iconLoader()->loadIcon( "knotify", KIcon::NoGroup, KIcon::SizeMedium ) ); TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); @@ -214,7 +214,7 @@ void K3bOptionDialog::setupNotifyPage() void K3bOptionDialog::setupPluginPage() { TQFrame* frame = addPage( i18n("Plugins"), i18n("K3b Plugin Configuration"), - KGlobal::instance()->iconLoader()->loadIcon( "gear", + TDEGlobal::instance()->iconLoader()->loadIcon( "gear", KIcon::NoGroup, KIcon::SizeMedium ) ); TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); @@ -228,7 +228,7 @@ void K3bOptionDialog::setupPluginPage() void K3bOptionDialog::setupThemePage() { TQFrame* frame = addPage( i18n("Themes"), i18n("K3b GUI Themes"), - KGlobal::instance()->iconLoader()->loadIcon( "style", + TDEGlobal::instance()->iconLoader()->loadIcon( "style", KIcon::NoGroup, KIcon::SizeMedium ) ); TQVBoxLayout* box = new TQVBoxLayout( frame ); box->setSpacing( 0 ); diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp index 6072e0a..37a66c8 100644 --- a/src/option/k3bpluginoptiontab.cpp +++ b/src/option/k3bpluginoptiontab.cpp @@ -97,11 +97,11 @@ void K3bPluginOptionTab::readSettings() TQFont f( font() ); f.setBold(true); groupViewItem->setFont( 0, f ); - groupViewItem->setBackgroundColor( 0, KGlobalSettings::alternateBackgroundColor() ); - groupViewItem->setBackgroundColor( 1, KGlobalSettings::alternateBackgroundColor() ); - groupViewItem->setBackgroundColor( 2, KGlobalSettings::alternateBackgroundColor() ); - groupViewItem->setBackgroundColor( 3, KGlobalSettings::alternateBackgroundColor() ); - groupViewItem->setBackgroundColor( 4, KGlobalSettings::alternateBackgroundColor() ); + groupViewItem->setBackgroundColor( 0, TDEGlobalSettings::alternateBackgroundColor() ); + groupViewItem->setBackgroundColor( 1, TDEGlobalSettings::alternateBackgroundColor() ); + groupViewItem->setBackgroundColor( 2, TDEGlobalSettings::alternateBackgroundColor() ); + groupViewItem->setBackgroundColor( 3, TDEGlobalSettings::alternateBackgroundColor() ); + groupViewItem->setBackgroundColor( 4, TDEGlobalSettings::alternateBackgroundColor() ); groupViewItem->setSelectable( false ); TQPtrList<K3bPlugin> fl = k3bcore->pluginManager()->plugins( group ); |