From 247f828db1b8dcdc9346c1568d81cfa00db99c9e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 8 Dec 2011 17:45:16 -0600 Subject: Rename additional KDE strings --- languages/cpp/kdevdriver.cpp | 6 +++--- languages/cpp/main.cpp | 8 ++++---- languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp | 12 ++++++------ src/plugincontroller.cpp | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/languages/cpp/kdevdriver.cpp b/languages/cpp/kdevdriver.cpp index fd11556c..35d0a3ee 100644 --- a/languages/cpp/kdevdriver.cpp +++ b/languages/cpp/kdevdriver.cpp @@ -101,9 +101,9 @@ void KDevDriver::setup() addMacro( Macro( "__cplusplus", "1" ) ); ///@todo maybe remove the following? Is there any normal user who has his environment set up correctly so this is of any use? - TQString kdedir = getenv( "TDEDIR" ); - if( !kdedir.isNull() ) - addIncludePath( kdedir + "/include" ); + TQString tdedir = getenv( "TDEDIR" ); + if( !tdedir.isNull() ) + addIncludePath( tdedir + "/include" ); TQString qmakespec = getenv( "QMAKESPEC" ); if ( qmakespec.isNull() ) diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index f285d083..d2ad2d94 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -82,9 +82,9 @@ public: // code provided by Reginald Stadlbauer void setup() { - TQString kdedir = getenv( "TDEDIR" ); - if ( !kdedir.isNull() ) - addIncludePath( kdedir + "/include" ); + TQString tdedir = getenv( "TDEDIR" ); + if ( !tdedir.isNull() ) + addIncludePath( tdedir + "/include" ); TQString qtdir = getenv( "QTDIR" ); if ( !qtdir.isNull() ) @@ -205,7 +205,7 @@ int main( int argc, char* argv[] ) bool rec = false; bool parseAllFiles = false; - TQString datadir = stddir.localkdedir() + "/" + KStandardDirs::kde_default( "data" ); + TQString datadir = stddir.localtdedir() + "/" + KStandardDirs::kde_default( "data" ); if ( ! KStandardDirs::makeDir( datadir + "/kdevcppsupport/pcs/" ) ) { kdWarning() << "*error* " << "could not create " << datadir + "/kdevcppsupport/pcs/" << endl << endl; diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp index a6d95acf..331831c6 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp @@ -42,13 +42,13 @@ SettingsDialog::SettingsDialog( TQWidget* parent, const char* name, WFlags fl ) : SettingsDialogBase( parent, name, fl ) { KApplication::kApplication()->dirs()->addResourceType("include","include"); - TQStringList kdedirs=KApplication::kApplication()->dirs()->findDirs("include",""); - for( TQStringList::Iterator it=kdedirs.begin(); it!=kdedirs.end(); ++it ) + TQStringList tdedirs=KApplication::kApplication()->dirs()->findDirs("include",""); + for( TQStringList::Iterator it=tdedirs.begin(); it!=tdedirs.end(); ++it ) { - TQString kdedir = *it; - if ( !kdedir.isEmpty() && isValidKDELibsDir( kdedir ) ) - if ( !kdeListBox->findItem( kdedir, ExactMatch ) ) - kdeListBox->insertItem( kdedir ); + TQString tdedir = *it; + if ( !tdedir.isEmpty() && isValidKDELibsDir( tdedir ) ) + if ( !kdeListBox->findItem( tdedir, ExactMatch ) ) + kdeListBox->insertItem( tdedir ); } kdeUrl->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 25fb335c..5ec5a72c 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -80,7 +80,7 @@ PluginController::PluginController() : KDevPluginController() { /* m_defaultProfile = TQString::tqfromLatin1( "FullIDE" ); - m_defaultProfilePath = kapp->dirs()->localkdedir() + "/" + + m_defaultProfilePath = kapp->dirs()->localtdedir() + "/" + KStandardDirs::kde_default( "data" ) + TQString::tqfromLatin1("/tdevelop/profiles/FullIDE");*/ -- cgit v1.2.3