summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:29 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:19:29 -0600
commit2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5 (patch)
tree36de2281c8b4cf238a5e27a76b5c6e07f40151ab /src
parent2a3289ab87c52551fd2f5655492988ca02c17892 (diff)
downloadk3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.tar.gz
k3b-2a3ced9fbd85b4fdbfa9b0a91f8d22e35ceaf6b5.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/k3b.cpp10
-rw-r--r--src/k3bapplication.cpp4
-rw-r--r--src/k3bburnprogressdialog.cpp2
-rw-r--r--src/k3bdebuggingoutputdialog.cpp2
-rw-r--r--src/k3bemptydiscwaiter.cpp4
-rw-r--r--src/k3bfiletreeview.cpp2
-rw-r--r--src/k3bflatbutton.cpp2
-rw-r--r--src/k3binteractiondialog.cpp2
-rw-r--r--src/k3bjobprogressosd.cpp2
-rw-r--r--src/k3blsofwrapper.cpp4
-rw-r--r--src/k3bservicemenuinstaller.cpp4
-rw-r--r--src/k3bsystemproblemdialog.cpp8
-rw-r--r--src/k3bthememanager.cpp8
-rw-r--r--src/main.cpp4
-rw-r--r--src/option/k3bexternalbinwidget.cpp6
-rw-r--r--src/option/k3bmiscoptiontab.cpp2
-rw-r--r--src/option/k3boptiondialog.cpp16
-rw-r--r--src/option/k3bpluginoptiontab.cpp10
-rw-r--r--src/projects/k3baudiotracktrmlookupdialog.cpp2
-rw-r--r--src/projects/k3bdataurladdingdialog.cpp4
-rw-r--r--src/projects/k3bfillstatusdisplay.cpp10
-rw-r--r--src/projects/k3bmovixoptionswidget.cpp2
-rw-r--r--src/rip/k3bpatternparser.cpp4
-rw-r--r--src/rip/k3bvideocdinfo.cpp14
-rw-r--r--src/rip/k3bvideocdinfo.h6
-rw-r--r--src/rip/k3bvideocdrip.cpp14
-rw-r--r--src/rip/k3bvideocdrip.h6
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingdialog.cpp8
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingpreview.cpp10
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingpreview.h6
-rw-r--r--src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp4
31 files changed, 91 insertions, 91 deletions
diff --git a/src/k3b.cpp b/src/k3b.cpp
index 962caa6..a2c7940 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -620,7 +620,7 @@ void K3bMainWindow::saveProperties( KConfig* c )
// 3. save the url of the project (might be something like "AudioCD1") in the config
// 4. save the status of every project (modified/saved)
- TQString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
+ TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
// 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
@@ -675,7 +675,7 @@ void K3bMainWindow::readProperties( KConfig* c )
// 3. reset the saved urls and the modified state
// 4. delete "~/.trinity/share/apps/k3b/sessions/" + KApp->sessionId()
- TQString saveDir = KGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
+ TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
// 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
@@ -1290,9 +1290,9 @@ void K3bMainWindow::slotProjectAddFiles()
void K3bMainWindow::slotK3bSetup()
{
- KProcess p;
- p << "tdesu" << "kcmshell k3bsetup2 --lang " + KGlobal::locale()->language();
- if( !p.start( KProcess::DontCare ) )
+ TDEProcess p;
+ p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language();
+ if( !p.start( TDEProcess::DontCare ) )
KMessageBox::error( 0, i18n("Could not find tdesu to run K3bSetup with root privileges. "
"Please run it manually as root.") );
}
diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp
index 1fa5d3f..ee1d36a 100644
--- a/src/k3bapplication.cpp
+++ b/src/k3bapplication.cpp
@@ -69,8 +69,8 @@ K3bApplication::K3bApplication()
m_needToInit(true)
{
// insert library i18n data
- KGlobal::locale()->insertCatalogue( "libk3bdevice" );
- KGlobal::locale()->insertCatalogue( "libk3b" );
+ TDEGlobal::locale()->insertCatalogue( "libk3bdevice" );
+ TDEGlobal::locale()->insertCatalogue( "libk3b" );
m_core = new Core( TQT_TQOBJECT(this) );
diff --git a/src/k3bburnprogressdialog.cpp b/src/k3bburnprogressdialog.cpp
index bea7c60..a143610 100644
--- a/src/k3bburnprogressdialog.cpp
+++ b/src/k3bburnprogressdialog.cpp
@@ -128,7 +128,7 @@ void K3bBurnProgressDialog::slotDeviceBuffer( int b )
void K3bBurnProgressDialog::slotWriteSpeed( int s, int multiplicator )
{
- m_labelWritingSpeed->setText( TQString("%1 KB/s (%2x)").arg(s).arg(KGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) );
+ m_labelWritingSpeed->setText( TQString("%1 KB/s (%2x)").arg(s).arg(TDEGlobal::locale()->formatNumber((double)s/(double)multiplicator,2)) );
}
#include "k3bburnprogressdialog.moc"
diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp
index 47b88d0..426b652 100644
--- a/src/k3bdebuggingoutputdialog.cpp
+++ b/src/k3bdebuggingoutputdialog.cpp
@@ -47,7 +47,7 @@ K3bDebuggingOutputDialog::K3bDebuggingOutputDialog( TQWidget* parent )
debugView = new TQTextEdit( this );
debugView->setReadOnly(true);
debugView->setTextFormat( TQTextEdit::PlainText );
- debugView->setCurrentFont( KGlobalSettings::fixedFont() );
+ debugView->setCurrentFont( TDEGlobalSettings::fixedFont() );
debugView->setWordWrap( TQTextEdit::NoWrap );
setMainWidget( debugView );
diff --git a/src/k3bemptydiscwaiter.cpp b/src/k3bemptydiscwaiter.cpp
index cf7138d..afeadf8 100644
--- a/src/k3bemptydiscwaiter.cpp
+++ b/src/k3bemptydiscwaiter.cpp
@@ -208,10 +208,10 @@ int K3bEmptyDiscWaiter::waitForDisc( int mediaState, int mediaType, const TQStri
d->labelRequest->setText( message );
if( d->wantedMediaType & K3bDevice::MEDIA_WRITABLE_DVD )
- d->pixLabel->setPixmap( KGlobal::instance()->iconLoader()->loadIcon( "dvd_unmount",
+ d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "dvd_unmount",
KIcon::NoGroup, KIcon::SizeMedium ) );
else
- d->pixLabel->setPixmap( KGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount",
+ d->pixLabel->setPixmap( TDEGlobal::instance()->iconLoader()->loadIcon( "cdwriter_unmount",
KIcon::NoGroup, KIcon::SizeMedium ) );
adjustSize();
diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp
index a1f52d5..6fb3d87 100644
--- a/src/k3bfiletreeview.cpp
+++ b/src/k3bfiletreeview.cpp
@@ -696,7 +696,7 @@ void K3bFileTreeView::slotSettingsChangedK3b(int category)
disconnect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)),
this, TQT_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int)));
- if( !KGlobalSettings::singleClick() )
+ if( !TDEGlobalSettings::singleClick() )
connect(this, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem*, const TQPoint &, int)),
this, TQT_SLOT(slotMouseButtonClickedK3b(int, TQListViewItem*, const TQPoint &, int)));
}
diff --git a/src/k3bflatbutton.cpp b/src/k3bflatbutton.cpp
index 4300c8c..e46c0b3 100644
--- a/src/k3bflatbutton.cpp
+++ b/src/k3bflatbutton.cpp
@@ -52,7 +52,7 @@ K3bFlatButton::K3bFlatButton( KAction* a, TQWidget *parent, const char *name )
setText( a->text() );
TQToolTip::add( this, a->toolTip() );
- setPixmap( KGlobal::iconLoader()->loadIcon( a->icon(), KIcon::NoGroup, 32 ) );
+ setPixmap( TDEGlobal::iconLoader()->loadIcon( a->icon(), KIcon::NoGroup, 32 ) );
connect( this, TQT_SIGNAL(clicked()), a, TQT_SLOT(activate()) );
}
diff --git a/src/k3binteractiondialog.cpp b/src/k3binteractiondialog.cpp
index af95c3e..a2bf746 100644
--- a/src/k3binteractiondialog.cpp
+++ b/src/k3binteractiondialog.cpp
@@ -143,7 +143,7 @@ K3bInteractionDialog::K3bInteractionDialog( TQWidget* parent,
// our buttons are always to the right of the dialog
int btl = 0;
#if KDE_IS_VERSION(3,3,0)
- btl = KGlobalSettings::buttonLayout();
+ btl = TDEGlobalSettings::buttonLayout();
#endif
switch( btl ) {
case 0: // KDE default
diff --git a/src/k3bjobprogressosd.cpp b/src/k3bjobprogressosd.cpp
index 1e8dfcf..ab2c310 100644
--- a/src/k3bjobprogressosd.cpp
+++ b/src/k3bjobprogressosd.cpp
@@ -118,7 +118,7 @@ void K3bJobProgressOSD::renderOSD()
// calculate needed size
if( K3bTheme* theme = k3bappcore->themeManager()->currentTheme() ) {
- TQPixmap icon = KGlobal::iconLoader()->loadIcon( "k3b", KIcon::NoGroup, 32 );
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "k3b", KIcon::NoGroup, 32 );
int margin = 10;
int textWidth = fontMetrics().width( m_text );
diff --git a/src/k3blsofwrapper.cpp b/src/k3blsofwrapper.cpp
index 0362de6..ee44f06 100644
--- a/src/k3blsofwrapper.cpp
+++ b/src/k3blsofwrapper.cpp
@@ -62,7 +62,7 @@ bool K3bLsofWrapper::checkDevice( K3bDevice::Device* dev )
return false;
// run lsof
- KProcess p;
+ TDEProcess p;
K3bProcessOutputCollector out( &p );
//
@@ -72,7 +72,7 @@ bool K3bLsofWrapper::checkDevice( K3bDevice::Device* dev )
//
p << d->lsofBin << "-Fpc" << dev->blockDeviceName();
- if( !p.start( KProcess::Block, KProcess::Stdout ) )
+ if( !p.start( TDEProcess::Block, TDEProcess::Stdout ) )
return false;
//
diff --git a/src/k3bservicemenuinstaller.cpp b/src/k3bservicemenuinstaller.cpp
index 43413d9..497c29a 100644
--- a/src/k3bservicemenuinstaller.cpp
+++ b/src/k3bservicemenuinstaller.cpp
@@ -33,7 +33,7 @@ public:
void update() {
// the list of installable servicemenus the application provides
- allServiceMenus = KGlobal::dirs()->findAllResources( "data",
+ allServiceMenus = TDEGlobal::dirs()->findAllResources( "data",
"k3b/servicemenus/*.desktop",
false,
true );
@@ -44,7 +44,7 @@ public:
allServiceMenuFiles.append( allServiceMenus[i].section( '/', -1 ) );
// the local konqueror servicemenu folder (we just create it here to be on the safe side)
- konqiServicemenusFolder = KGlobal::dirs()->saveLocation( "data", "konqueror/servicemenus/", true );
+ konqiServicemenusFolder = TDEGlobal::dirs()->saveLocation( "data", "konqueror/servicemenus/", true );
}
};
diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp
index 5af3e59..84fdb1d 100644
--- a/src/k3bsystemproblemdialog.cpp
+++ b/src/k3bsystemproblemdialog.cpp
@@ -607,9 +607,9 @@ void K3bSystemProblemDialog::checkSystem( TQWidget* parent,
void K3bSystemProblemDialog::slotK3bSetup()
{
- KProcess p;
- p << "tdesu" << "kcmshell k3bsetup2 --lang " + KGlobal::locale()->language();
- if( !p.start( KProcess::DontCare ) )
+ TDEProcess p;
+ p << "tdesu" << "kcmshell k3bsetup2 --lang " + TDEGlobal::locale()->language();
+ if( !p.start( TDEProcess::DontCare ) )
KMessageBox::error( 0, i18n("Unable to start K3bSetup2.") );
}
@@ -623,7 +623,7 @@ int K3bSystemProblemDialog::dmaActivated( K3bDevice::Device* dev )
K3bProcess p;
K3bProcessOutputCollector out( &p );
p << hdparm << "-d" << dev->blockDeviceName();
- if( !p.start( KProcess::Block, KProcess::AllOutput ) )
+ if( !p.start( TDEProcess::Block, TDEProcess::AllOutput ) )
return -1;
// output is something like:
diff --git a/src/k3bthememanager.cpp b/src/k3bthememanager.cpp
index 3471342..a73bb2b 100644
--- a/src/k3bthememanager.cpp
+++ b/src/k3bthememanager.cpp
@@ -42,7 +42,7 @@ TQColor K3bTheme::backgroundColor() const
if( m_bgColor.isValid() )
return m_bgColor;
else
- return KGlobalSettings::activeTitleColor();
+ return TDEGlobalSettings::activeTitleColor();
}
@@ -51,7 +51,7 @@ TQColor K3bTheme::foregroundColor() const
if( m_fgColor.isValid() )
return m_fgColor;
else
- return KGlobalSettings::activeTextColor();
+ return TDEGlobalSettings::activeTextColor();
}
@@ -256,7 +256,7 @@ void K3bThemeManager::loadThemes()
delete *it;
d->themes.clear();
- TQStringList dirs = KGlobal::dirs()->findDirs( "data", "k3b/pics" );
+ TQStringList dirs = TDEGlobal::dirs()->findDirs( "data", "k3b/pics" );
// now search for themes. As there may be multiple themes with the same name
// we only use the names from this list and then use findResourceDir to make sure
// the local is preferred over the global stuff (like testing a theme by copying it
@@ -299,7 +299,7 @@ void K3bThemeManager::loadThemes()
void K3bThemeManager::loadTheme( const TQString& name )
{
- TQString path = KGlobal::dirs()->findResource( "data", "k3b/pics/" + name + "/k3b.theme" );
+ TQString path = TDEGlobal::dirs()->findResource( "data", "k3b/pics/" + name + "/k3b.theme" );
if( !path.isEmpty() ) {
K3bTheme* t = new K3bTheme();
t->m_name = name;
diff --git a/src/main.cpp b/src/main.cpp
index 06a6d21..f9bd6b0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -138,9 +138,9 @@ int main( int argc, char* argv[] )
if( K3bApplication::start() ) {
TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
if( args->isSet("lang") )
- if( !KGlobal::locale()->setLanguage(args->getOption("lang")) )
+ if( !TDEGlobal::locale()->setLanguage(args->getOption("lang")) )
kdDebug() << "Unable to set to language " << args->getOption("lang")
- << " current is: " << KGlobal::locale()->language() << endl;
+ << " current is: " << TDEGlobal::locale()->language() << endl;
K3bApplication app;
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 );
diff --git a/src/projects/k3baudiotracktrmlookupdialog.cpp b/src/projects/k3baudiotracktrmlookupdialog.cpp
index 85a651b..d20838b 100644
--- a/src/projects/k3baudiotracktrmlookupdialog.cpp
+++ b/src/projects/k3baudiotracktrmlookupdialog.cpp
@@ -57,7 +57,7 @@ K3bAudioTrackTRMLookupDialog::K3bAudioTrackTRMLookupDialog( TQWidget* parent, co
m_infoLabel = new TQLabel( plainPage() );
TQLabel* pixLabel = new TQLabel( plainPage() );
- pixLabel->setPixmap( KGlobal::iconLoader()->loadIcon( "musicbrainz", KIcon::NoGroup, 64 ) );
+ pixLabel->setPixmap( TDEGlobal::iconLoader()->loadIcon( "musicbrainz", KIcon::NoGroup, 64 ) );
pixLabel->setScaledContents( false );
m_busyWidget = new K3bBusyWidget( plainPage() );
diff --git a/src/projects/k3bdataurladdingdialog.cpp b/src/projects/k3bdataurladdingdialog.cpp
index 287191c..a471308 100644
--- a/src/projects/k3bdataurladdingdialog.cpp
+++ b/src/projects/k3bdataurladdingdialog.cpp
@@ -562,8 +562,8 @@ void K3bDataUrlAddingDialog::slotAddUrls()
int dirFilter = TQDir::All|TQDir::Hidden|TQDir::System;
TQStringList dlist = newDir.entryList( dirFilter );
- const TQString& dot = KGlobal::staticQString( "." );
- const TQString& dotdot = KGlobal::staticQString( ".." );
+ const TQString& dot = TDEGlobal::staticQString( "." );
+ const TQString& dotdot = TDEGlobal::staticQString( ".." );
dlist.remove( dot );
dlist.remove( dotdot );
diff --git a/src/projects/k3bfillstatusdisplay.cpp b/src/projects/k3bfillstatusdisplay.cpp
index e71db6e..15534b5 100644
--- a/src/projects/k3bfillstatusdisplay.cpp
+++ b/src/projects/k3bfillstatusdisplay.cpp
@@ -287,7 +287,7 @@ public:
void maybeTip( const TQPoint& ) {
tip( parentWidget()->rect(),
KIO::convertSize( m_doc->size() ) +
- " (" + KGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " +
+ " (" + TDEGlobal::locale()->formatNumber( m_doc->size(), 0 ) + "), " +
m_doc->length().toString(false) + " " + i18n("min") +
" (" + i18n("Right click for media sizes") + ")");
}
@@ -542,13 +542,13 @@ void K3bFillStatusDisplay::slotCustomSize()
TQString mbS = i18n("mb");
TQString minS = i18n("min");
- TQRegExp rx( "(\\d+\\" + KGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + "|" + mbS + "|" + minS + ")?" );
+ TQRegExp rx( "(\\d+\\" + TDEGlobal::locale()->decimalSymbol() + "?\\d*)(" + gbS + "|" + mbS + "|" + minS + ")?" );
bool ok;
TQString size = KInputDialog::getText( i18n("Custom Size"),
i18n("<p>Please specify the size of the media. Use suffixes <b>gb</b>,<b>mb</b>, "
"and <b>min</b> for <em>gigabytes</em>, <em>megabytes</em>, and <em>minutes</em>"
" respectively."),
- d->showDvdSizes ? TQString("4%14%2").arg(KGlobal::locale()->decimalSymbol()).arg(gbS) :
+ d->showDvdSizes ? TQString("4%14%2").arg(TDEGlobal::locale()->decimalSymbol()).arg(gbS) :
(d->showTime ? TQString("74")+minS : TQString("650")+mbS),
&ok, this, (const char*)0,
new TQRegExpValidator( rx, TQT_TQOBJECT(this) ) );
@@ -556,9 +556,9 @@ void K3bFillStatusDisplay::slotCustomSize()
// determine size
if( rx.exactMatch( size ) ) {
TQString valStr = rx.cap(1);
- if( valStr.endsWith( KGlobal::locale()->decimalSymbol() ) )
+ if( valStr.endsWith( TDEGlobal::locale()->decimalSymbol() ) )
valStr += "0";
- double val = KGlobal::locale()->readNumber( valStr, &ok );
+ double val = TDEGlobal::locale()->readNumber( valStr, &ok );
if( ok ) {
TQString s = rx.cap(2);
if( s == gbS || (s.isEmpty() && d->showDvdSizes) )
diff --git a/src/projects/k3bmovixoptionswidget.cpp b/src/projects/k3bmovixoptionswidget.cpp
index 5041244..094de6e 100644
--- a/src/projects/k3bmovixoptionswidget.cpp
+++ b/src/projects/k3bmovixoptionswidget.cpp
@@ -46,7 +46,7 @@ public:
if( *it == i18n("default") )
m_box->insertItem( *it );
else {
- TQString lang = KGlobal::locale()->twoAlphaToLanguageName( *it );
+ TQString lang = TDEGlobal::locale()->twoAlphaToLanguageName( *it );
if( lang.isEmpty() )
lang = *it;
diff --git a/src/rip/k3bpatternparser.cpp b/src/rip/k3bpatternparser.cpp
index 0ab14d8..382c00d 100644
--- a/src/rip/k3bpatternparser.cpp
+++ b/src/rip/k3bpatternparser.cpp
@@ -171,7 +171,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
dir.append( s ); // I think it makes more sense to allow empty comments
break;
case DATE:
- dir.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
+ dir.append( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) );
break;
default:
dir.append( pattern.mid(i, len) );
@@ -247,7 +247,7 @@ TQString K3bPatternParser::parsePattern( const K3bCddbResultEntry& entry,
s = entry.cdExtInfo;
break;
case DATE:
- s = KGlobal::locale()->formatDate( TQDate::currentDate() );
+ s = TDEGlobal::locale()->formatDate( TQDate::currentDate() );
break;
default: // we must never get here,
break; // all choices should be covered
diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp
index ace8fb2..af29a37 100644
--- a/src/rip/k3bvideocdinfo.cpp
+++ b/src/rip/k3bvideocdinfo.cpp
@@ -67,21 +67,21 @@ void K3bVideoCdInfo::info( const TQString& device )
*m_process << "-q" << "--norip" << "-i" << device << "-o" << "-";
- connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
- this, TQT_SLOT( slotParseOutput( KProcess*, char*, int ) ) );
- connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
- this, TQT_SLOT( slotParseOutput( KProcess*, char*, int ) ) );
- connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ),
+ connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+ this, TQT_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) );
+ connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+ this, TQT_SLOT( slotParseOutput( TDEProcess*, char*, int ) ) );
+ connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( slotInfoFinished() ) );
- if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+ if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
kdDebug() << "(K3bVideoCdInfo::info) could not start vcdxrip" << endl;
cancelAll();
emit infoFinished( false );
}
}
-void K3bVideoCdInfo::slotParseOutput( KProcess*, char* output, int len )
+void K3bVideoCdInfo::slotParseOutput( TDEProcess*, char* output, int len )
{
TQString buffer = TQString::fromLocal8Bit( output, len );
diff --git a/src/rip/k3bvideocdinfo.h b/src/rip/k3bvideocdinfo.h
index 683a515..d6efd0a 100644
--- a/src/rip/k3bvideocdinfo.h
+++ b/src/rip/k3bvideocdinfo.h
@@ -24,7 +24,7 @@
#include <k3btoc.h>
#include <k3bcore.h>
-class KProcess;
+class TDEProcess;
class K3bVideoCdInfoResultEntry
{
@@ -90,7 +90,7 @@ class K3bVideoCdInfo : public TQObject
private slots:
void slotInfoFinished();
- void slotParseOutput( KProcess*, char* output, int len );
+ void slotParseOutput( TDEProcess*, char* output, int len );
private:
void cancelAll();
@@ -98,7 +98,7 @@ class K3bVideoCdInfo : public TQObject
K3bVideoCdInfoResult m_Result;
void parseXmlData();
- KProcess* m_process;
+ TDEProcess* m_process;
TQString m_xmlData;
bool m_isXml;
diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp
index be91fa9..7df8305 100644
--- a/src/rip/k3bvideocdrip.cpp
+++ b/src/rip/k3bvideocdrip.cpp
@@ -150,11 +150,11 @@ void K3bVideoCdRip::vcdxRip()
*m_process << "-o" << "/dev/null";
- connect( m_process, TQT_SIGNAL( receivedStderr( KProcess*, char*, int ) ),
- this, TQT_SLOT( slotParseVcdXRipOutput( KProcess*, char*, int ) ) );
- connect( m_process, TQT_SIGNAL( receivedStdout( KProcess*, char*, int ) ),
- this, TQT_SLOT( slotParseVcdXRipOutput( KProcess*, char*, int ) ) );
- connect( m_process, TQT_SIGNAL( processExited( KProcess* ) ),
+ connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+ this, TQT_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) );
+ connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+ this, TQT_SLOT( slotParseVcdXRipOutput( TDEProcess*, char*, int ) ) );
+ connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ),
this, TQT_SLOT( slotVcdXRipFinished() ) );
m_process->setWorkingDirectory( TQUrl( m_videooptions ->getVideoCdDestination() ).dirPath() );
@@ -174,7 +174,7 @@ void K3bVideoCdRip::vcdxRip()
emit infoMessage( i18n( "Start extracting." ), K3bJob::INFO );
emit infoMessage( i18n( "Extract files from %1 to %2." ).arg( m_videooptions ->getVideoCdSource() ).arg( m_videooptions ->getVideoCdDestination() ), K3bJob::INFO );
- if ( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) {
+ if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) {
kdDebug() << "(K3bVideoCdRip) could not start vcdxrip" << endl;
emit infoMessage( i18n( "Could not start %1." ).arg( "vcdxrip" ), K3bJob::ERROR );
cancelAll();
@@ -182,7 +182,7 @@ void K3bVideoCdRip::vcdxRip()
}
}
-void K3bVideoCdRip::slotParseVcdXRipOutput( KProcess*, char* output, int len )
+void K3bVideoCdRip::slotParseVcdXRipOutput( TDEProcess*, char* output, int len )
{
TQString buffer = TQString::fromLocal8Bit( output, len );
diff --git a/src/rip/k3bvideocdrip.h b/src/rip/k3bvideocdrip.h
index 21aade0..a6d4582 100644
--- a/src/rip/k3bvideocdrip.h
+++ b/src/rip/k3bvideocdrip.h
@@ -21,7 +21,7 @@
#include "k3bvideocdrippingoptions.h"
class TQString;
-class KProcess;
+class TDEProcess;
class TQDataStream;
class K3bVideoCdRip : public K3bJob
@@ -47,7 +47,7 @@ class K3bVideoCdRip : public K3bJob
protected slots:
void slotVcdXRipFinished();
- void slotParseVcdXRipOutput( KProcess*, char* output, int len );
+ void slotParseVcdXRipOutput( TDEProcess*, char* output, int len );
private:
void vcdxRip();
@@ -68,7 +68,7 @@ class K3bVideoCdRip : public K3bJob
bool m_canceled;
- KProcess* m_process;
+ TDEProcess* m_process;
};
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
index 95093de..3ba01b4 100644
--- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp
@@ -212,7 +212,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
//
ri.audioStream = 0;
for( unsigned int i = 0; i < m_dvd[*it-1].numAudioStreams(); ++i ) {
- if( m_dvd[*it-1].audioStream(i).langCode() == KGlobal::locale()->language() &&
+ if( m_dvd[*it-1].audioStream(i).langCode() == TDEGlobal::locale()->language() &&
m_dvd[*it-1].audioStream(i).format() != K3bVideoDVD::AUDIO_FORMAT_DTS ) {
ri.audioStream = i;
break;
@@ -226,7 +226,7 @@ void K3bVideoDVDRippingDialog::populateTitleView( const TQValueList<int>& titles
.arg( m_dvd[*it-1].audioStream(i).channels() )
.arg( m_dvd[*it-1].audioStream(i).langCode().isEmpty()
? i18n("unknown language")
- : KGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) )
+ : TDEGlobal::locale()->twoAlphaToLanguageName( m_dvd[*it-1].audioStream(i).langCode() ) )
.arg( m_dvd[*it-1].audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( m_dvd[*it-1].audioStream(i).codeExtension() )
: TQString() );
@@ -436,7 +436,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
break;
case PATTERN_LANGUAGE_NAME:
if( title.numAudioStreams() > 0 )
- f.append( KGlobal::locale()->twoAlphaToLanguageName( title.audioStream( info.audioStream ).langCode() ) );
+ f.append( TDEGlobal::locale()->twoAlphaToLanguageName( title.audioStream( info.audioStream ).langCode() ) );
break;
case PATTERN_AUDIO_FORMAT:
// FIXME: what about MPEG audio streams?
@@ -471,7 +471,7 @@ TQString K3bVideoDVDRippingDialog::createFilename( const K3bVideoDVDRippingJob::
f.append( "16:9" );
break;
case PATTERN_CURRENT_DATE:
- f.append( KGlobal::locale()->formatDate( TQDate::currentDate() ) );
+ f.append( TDEGlobal::locale()->formatDate( TQDate::currentDate() ) );
break;
default:
f.append( pattern[i-1] );
diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
index 2081d32..2f2b38e 100644
--- a/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingpreview.cpp
@@ -74,7 +74,7 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv
m_tempDir = new KTempDir();
m_tempDir->setAutoDelete( true );
- m_process = new KProcess();
+ m_process = new TDEProcess();
*m_process << bin->path;
*m_process << "-i" << dvd.device()->blockDeviceName();
*m_process << "-T" << TQString("%1,%2").arg(title).arg(chapter);
@@ -85,9 +85,9 @@ void K3bVideoDVDRippingPreview::generatePreview( const K3bVideoDVD::VideoDVD& dv
*m_process << "-Z" << "x200";
*m_process << "-o" << m_tempDir->name();
- connect( m_process, TQT_SIGNAL(processExited(KProcess*)),
- this, TQT_SLOT(slotTranscodeFinished(KProcess*)) );
- if( !m_process->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout
+ connect( m_process, TQT_SIGNAL(processExited(TDEProcess*)),
+ this, TQT_SLOT(slotTranscodeFinished(TDEProcess*)) );
+ if( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ) ) { // we use AllOutput to not pollute stdout
// something went wrong when starting the program
// it "should" be the executable
kdDebug() << "(K3bVideoDVDRippingPreview) Could not start transcode." << endl;
@@ -109,7 +109,7 @@ void K3bVideoDVDRippingPreview::cancel()
}
-void K3bVideoDVDRippingPreview::slotTranscodeFinished( KProcess* )
+void K3bVideoDVDRippingPreview::slotTranscodeFinished( TDEProcess* )
{
// read the image
TQString filename = m_tempDir->name() + "000000.ppm";// + tempTQDir->entryList( TQDir::Files ).first();
diff --git a/src/rip/videodvd/k3bvideodvdrippingpreview.h b/src/rip/videodvd/k3bvideodvdrippingpreview.h
index 7459ae8..92706dc 100644
--- a/src/rip/videodvd/k3bvideodvdrippingpreview.h
+++ b/src/rip/videodvd/k3bvideodvdrippingpreview.h
@@ -23,7 +23,7 @@
class KTempDir;
-class KProcess;
+class TDEProcess;
class K3bVideoDVDRippingPreview : public TQObject
{
@@ -51,12 +51,12 @@ class K3bVideoDVDRippingPreview : public TQObject
void previewDone( bool );
private slots:
- void slotTranscodeFinished( KProcess* );
+ void slotTranscodeFinished( TDEProcess* );
private:
TQImage m_preview;
KTempDir* m_tempDir;
- KProcess* m_process;
+ TDEProcess* m_process;
int m_title;
int m_chapter;
K3bVideoDVD::VideoDVD m_dvd;
diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
index d3f1e72..4d03c64 100644
--- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
+++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp
@@ -49,7 +49,7 @@ static TQString audioStreamString( const K3bVideoDVD::Title& title, unsigned int
.arg( title.audioStream(i).channels() )
.arg( title.audioStream(i).langCode().isEmpty()
? i18n("unknown language")
- : KGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) )
+ : TDEGlobal::locale()->twoAlphaToLanguageName( title.audioStream(i).langCode() ) )
.arg( includeExtInfo && title.audioStream(i).codeExtension() != K3bVideoDVD::AUDIO_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::audioCodeExtensionString( title.audioStream(i).codeExtension() )
: TQString() );
@@ -74,7 +74,7 @@ static TQString subpictureStreamString( const K3bVideoDVD::Title& title, unsigne
: i18n("Extended") )
.arg( title.subPictureStream(i).langCode().isEmpty()
? i18n("unknown language")
- : KGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) )
+ : TDEGlobal::locale()->twoAlphaToLanguageName( title.subPictureStream(i).langCode() ) )
.arg( includeExtInfo && title.subPictureStream(i).codeExtension() != K3bVideoDVD::SUBPIC_CODE_EXT_UNSPECIFIED
? TQString(" ") + K3bVideoDVD::subPictureCodeExtensionString( title.subPictureStream(i).codeExtension() )
: TQString() );