diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /kutils/ksettings/dialog.cpp | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kutils/ksettings/dialog.cpp')
| -rw-r--r-- | kutils/ksettings/dialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kutils/ksettings/dialog.cpp b/kutils/ksettings/dialog.cpp index 8fbe74c81..c64e2e64a 100644 --- a/kutils/ksettings/dialog.cpp +++ b/kutils/ksettings/dialog.cpp @@ -428,7 +428,7 @@ KCMultiDialog * Dialog::dialog() TQValueList<KService::Ptr> Dialog::instanceServices() const { kdDebug( 700 ) << k_funcinfo << endl; - TQString instanceName = KGlobal::instance()->instanceName(); + TQString instanceName = TDEGlobal::instance()->instanceName(); d->registeredComponents.append( instanceName ); kdDebug( 700 ) << "calling KServiceGroup::childGroup( " << instanceName << " )" << endl; @@ -533,8 +533,8 @@ void Dialog::createDialogFromServices() { // read .setdlg files TQString setdlgpath = locate( "appdata", - KGlobal::instance()->instanceName() + ".setdlg" ); - TQStringList setdlgaddon = KGlobal::dirs()->findAllResources( "appdata", + TDEGlobal::instance()->instanceName() + ".setdlg" ); + TQStringList setdlgaddon = TDEGlobal::dirs()->findAllResources( "appdata", "ksettingsdialog/*.setdlg" ); if( ! setdlgpath.isNull() ) parseGroupFile( setdlgpath ); |