diff options
Diffstat (limited to 'languages')
-rw-r--r-- | languages/cpp/app_templates/kde4app/kapp4.cpp | 6 | ||||
-rw-r--r-- | languages/cpp/ccconfigwidget.cpp | 2 | ||||
-rw-r--r-- | languages/cpp/classgeneratorconfig.cpp | 4 | ||||
-rw-r--r-- | languages/cpp/cppsupportfactory.cpp | 6 | ||||
-rw-r--r-- | languages/cpp/cppsupportpart.cpp | 4 | ||||
-rw-r--r-- | languages/cpp/createpcsdialog.cpp | 2 | ||||
-rw-r--r-- | languages/cpp/debugger/stty.cpp | 2 | ||||
-rw-r--r-- | languages/cpp/doc/kde2book.toc | 2 | ||||
-rw-r--r-- | languages/cpp/main.cpp | 6 | ||||
-rw-r--r-- | languages/java/javasupportfactory.cpp | 6 | ||||
-rw-r--r-- | languages/java/javasupportpart.cpp | 2 | ||||
-rw-r--r-- | languages/php/phpcodecompletion.cpp | 2 | ||||
-rw-r--r-- | languages/php/phpconfigdata.cpp | 2 | ||||
-rw-r--r-- | languages/php/phpconfigwidget.cpp | 2 |
14 files changed, 24 insertions, 24 deletions
diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp index 5320898d..ec0d9dda 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4.cpp @@ -47,10 +47,10 @@ void %{APPNAME}::setupActions() { - KStandardAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStandardAction::quit(tqApp, TQT_SLOT(quit()), actionCollection()); + TDEStandardAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); + TDEStandardAction::quit(tqApp, TQT_SLOT(quit()), actionCollection()); - KStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + TDEStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View KAction *custom = new KAction(KIcon("colorize"), i18n("Swi&tch Colors"), this); diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index e1d2940a..f2041e35 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -232,7 +232,7 @@ void CCConfigWidget::slotRemovePCS() TQString db = advancedOptions->selectedItem() ->text( 0 ); TQString question = i18n( "Are you sure you want to delete the \"%1\" database?" ).arg( db ); - KStandardDirs *dirs = m_pPart->instance() ->dirs(); + TDEStandardDirs *dirs = m_pPart->instance() ->dirs(); TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash( db ) + ".db"; if ( KMessageBox::Continue == KMessageBox::warningContinueCancel( 0, question, i18n( "Delete Database" ), KStdGuiItem::del() ) ) diff --git a/languages/cpp/classgeneratorconfig.cpp b/languages/cpp/classgeneratorconfig.cpp index f3dba7fb..f8b42f52 100644 --- a/languages/cpp/classgeneratorconfig.cpp +++ b/languages/cpp/classgeneratorconfig.cpp @@ -165,7 +165,7 @@ void ClassGeneratorConfig::readConfig() reformat_box->setChecked( config->readBoolEntry( "Reformat Source", 0 ) ); - KStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); + TDEStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); cppHeaderText = templateText( dirs->findResource( "newclasstemplates", "cpp_header" ) ); cppSourceText = templateText( dirs->findResource( "newclasstemplates", "cpp_source" ) ); @@ -211,7 +211,7 @@ void ClassGeneratorConfig::storeConfig() config->writeEntry( "Reformat Source", reformat_box->isChecked() ); - KStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); + TDEStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); saveTemplateText( dirs->saveLocation( "newclasstemplates" ) + "cpp_header", cppHeader() ); saveTemplateText( dirs->saveLocation( "newclasstemplates" ) + "cpp_source", cppSource() ); diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp index 5080a3a1..3b3091d5 100644 --- a/languages/cpp/cppsupportfactory.cpp +++ b/languages/cpp/cppsupportfactory.cpp @@ -26,9 +26,9 @@ CppSupportFactory::CppSupportFactory() TDEInstance *CppSupportFactory::createInstance() { TDEInstance *instance = KDevGenericFactory<CppSupportPart>::createInstance(); - KStandardDirs *dirs = instance->dirs(); - dirs->addResourceType( "newclasstemplates", KStandardDirs::kde_default("data") + "kdevcppsupport/newclass/" ); - dirs->addResourceType( "pcs", KStandardDirs::kde_default( "data" ) + "kdevcppsupport/pcs/" ); + TDEStandardDirs *dirs = instance->dirs(); + dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "kdevcppsupport/newclass/" ); + dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "kdevcppsupport/pcs/" ); return instance; } diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index 8f66283d..75d6b918 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -1935,7 +1935,7 @@ void CppSupportPart::setupCatalog( ) { kdDebug( 9007 ) << "CppSupportPart::setupCatalog()" << endl; - KStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); + TDEStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); TQStringList pcsList = dirs->findAllResources( "pcs", "*.db", false, true ); TQStringList pcsIdxList = dirs->findAllResources( "pcs", "*.idx", false, true ); @@ -3039,7 +3039,7 @@ void CppSupportPart::buildSafeFileSet() { void CppSupportPart::addToRepository( ParsedFilePointer file ) { TQString catalogString( "automatic_" + KURL::encode_string_no_slash(m_projectDirectory) ); - KStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); + TDEStandardDirs *dirs = CppSupportFactory::instance() ->dirs(); TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + catalogString + ".db"; diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 5c747144..6100013a 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -299,7 +299,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) progressBar->setTotalSteps( fileList.size() ); progressBar->setPercentageVisible( true ); - KStandardDirs *dirs = m_part->instance() ->dirs(); + TDEStandardDirs *dirs = m_part->instance() ->dirs(); TQString dbName = dirs->saveLocation( "data", "kdevcppsupport/pcs" ) + KURL::encode_string_no_slash(filename_edit->text()) + ".db"; kdDebug( 9007 ) << "================================> dbName = " << dbName << endl; diff --git a/languages/cpp/debugger/stty.cpp b/languages/cpp/debugger/stty.cpp index 5c437938..5ae42d54 100644 --- a/languages/cpp/debugger/stty.cpp +++ b/languages/cpp/debugger/stty.cpp @@ -285,7 +285,7 @@ bool STTY::findExternalTTY(const TQString &termApp) { TQString appName(termApp.isEmpty() ? TQString("xterm") : termApp); - if ( KStandardDirs::findExe( termApp ).isEmpty() ) + if ( TDEStandardDirs::findExe( termApp ).isEmpty() ) { return false; } diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc index e0d2c61a..6dd08e6c 100644 --- a/languages/cpp/doc/kde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -1728,7 +1728,7 @@ <entry name="listings, KSpellDemo (spell-checking application), tdespelldemo.cpp class declaration" url="ch10lev1sec3.html"/> <entry name="listings, KSpellDemo (spell-checking application), tdespelldemo.h class definition" url="ch10lev1sec3.html"/> <entry name="listings, KSpellDemo (spell-checking application), main() method" url="ch10lev1sec3.html"/> -<entry name="listings, KStandardDialogs main.cpp" url="ch05lev1sec3.html"/> +<entry name="listings, TDEStandardDialogs main.cpp" url="ch05lev1sec3.html"/> <entry name="listings, KStatusBarDemo widget, kstatusbardemo.cpp class definition" url="ch05.html"/> <entry name="listings, KStatusBarDemo widget, kstatusbardemo.h class declaration" url="ch05.html"/> <entry name="listings, KStatusBarDemo widget, main() function" url="ch05.html"/> diff --git a/languages/cpp/main.cpp b/languages/cpp/main.cpp index d2ad2d94..845cc382 100644 --- a/languages/cpp/main.cpp +++ b/languages/cpp/main.cpp @@ -194,7 +194,7 @@ void parseDirectory( Driver& driver, TQDir& dir, bool rec, bool parseAllFiles ) int main( int argc, char* argv[] ) { - KStandardDirs stddir; + TDEStandardDirs stddir; if ( argc < 3 ) { @@ -205,8 +205,8 @@ int main( int argc, char* argv[] ) bool rec = false; bool parseAllFiles = false; - TQString datadir = stddir.localtdedir() + "/" + KStandardDirs::kde_default( "data" ); - if ( ! KStandardDirs::makeDir( datadir + "/kdevcppsupport/pcs/" ) ) + TQString datadir = stddir.localtdedir() + "/" + TDEStandardDirs::kde_default( "data" ); + if ( ! TDEStandardDirs::makeDir( datadir + "/kdevcppsupport/pcs/" ) ) { kdWarning() << "*error* " << "could not create " << datadir + "/kdevcppsupport/pcs/" << endl << endl; return -1; diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp index 11823c22..7aac989e 100644 --- a/languages/java/javasupportfactory.cpp +++ b/languages/java/javasupportfactory.cpp @@ -25,9 +25,9 @@ JavaSupportFactory::JavaSupportFactory() TDEInstance *JavaSupportFactory::createInstance() { TDEInstance *instance = KDevGenericFactory<JavaSupportPart>::createInstance(); - KStandardDirs *dirs = instance->dirs(); - dirs->addResourceType( "newclasstemplates", KStandardDirs::kde_default("data") + "kdevjavasupport/newclass/" ); - dirs->addResourceType( "pcs", KStandardDirs::kde_default( "data" ) + "kdevjavasupport/pcs/" ); + TDEStandardDirs *dirs = instance->dirs(); + dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "kdevjavasupport/newclass/" ); + dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "kdevjavasupport/pcs/" ); return instance; } diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index d5aaeda0..23ae1cc7 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -704,7 +704,7 @@ void JavaSupportPart::setupCatalog( ) TQStringList indexList = TQStringList() << "kind" << "name" << "scope" << "fileName"; - KStandardDirs *dirs = JavaSupportFactory::instance()->dirs(); + TDEStandardDirs *dirs = JavaSupportFactory::instance()->dirs(); TQStringList pcsList = dirs->findAllResources( "pcs", "*.db", false, true ); TQStringList pcsIdxList = dirs->findAllResources( "pcs", "*.idx", false, true ); diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index 6f42f411..eec46473 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -51,7 +51,7 @@ PHPCodeCompletion::~PHPCodeCompletion(){ } void PHPCodeCompletion::readGlobalPHPFunctionsFile(){ - KStandardDirs *dirs = PHPSupportFactory::instance()->dirs(); + TDEStandardDirs *dirs = PHPSupportFactory::instance()->dirs(); TQString phpFuncFile = dirs->findResource("data","kdevphpsupport/phpfunctions"); TQRegExp lineReg(":([0-9A-Za-z_]+) ([0-9A-Za-z_]+)\\((.*)\\)"); FunctionCompletionEntry e; diff --git a/languages/php/phpconfigdata.cpp b/languages/php/phpconfigdata.cpp index b710f264..51ab5982 100644 --- a/languages/php/phpconfigdata.cpp +++ b/languages/php/phpconfigdata.cpp @@ -23,7 +23,7 @@ #include <iostream> PHPConfigData::PHPConfigData(TQDomDocument* dom) { - TQString file = KStandardDirs::findExe("php"); + TQString file = TDEStandardDirs::findExe("php"); if (file.isEmpty()) file = "/usr/local/bin/php"; diff --git a/languages/php/phpconfigwidget.cpp b/languages/php/phpconfigwidget.cpp index 27ef1baf..6cddabdf 100644 --- a/languages/php/phpconfigwidget.cpp +++ b/languages/php/phpconfigwidget.cpp @@ -42,7 +42,7 @@ PHPConfigWidget::PHPConfigWidget(PHPConfigData* data,TQWidget* parent, const ch // page shell TQString exepath = configData->getPHPExecPath(); if (exepath.isEmpty()) { - TQString fiexepath = KStandardDirs::findExe("php"); + TQString fiexepath = TDEStandardDirs::findExe("php"); if (exepath.isEmpty()) exepath = "/usr/local/bin/php"; |