From ac04782336b6a026b44df9d51ba9ca008a712da2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 31 Jan 2013 13:19:08 -0600 Subject: [PATCH] Rename KStandard for enhanced compatibility with KDE4 --- chalk/core/kis_meta_registry.cc | 4 ++-- chalk/ui/kis_factory.cc | 20 +++++++++---------- karbon/karbon_factory.cc | 10 +++++----- karbon/karbon_resourceserver.cc | 2 +- kchart/kchart_factory.cc | 2 +- kchart/kchart_view.cc | 2 +- kexi/3rdparty/kolibs/koGlobal.cc | 2 +- kexi/core/kexidbconnectionset.cpp | 6 +++--- kexi/core/kexidbconnectionset.h | 2 +- kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp | 2 +- kexi/main/startup/KexiStartup_p.cpp | 2 +- kformula/kformula_factory.cc | 2 +- kivio/kiviopart/kivio_doc.cpp | 2 +- kivio/kiviopart/kivio_factory.cpp | 4 ++-- kivio/kiviopart/kiviostencilsetaction.cpp | 2 +- kivio/kiviopart/kiviostencilsetinstaller.cpp | 2 +- .../kiviopart/ui/kivioaddstencilsetpanel.cpp | 2 +- kplato/kptfactory.cc | 6 +++--- kplato/kptreportview.cc | 2 +- kpresenter/KPrFactory.cpp | 6 +++--- kpresenter/KPrView.cpp | 6 +++--- kspread/kspread_factory.cc | 8 ++++---- kspread/kspread_view.cc | 2 +- kugar/kudesigner/kudesigner_factory.cpp | 2 +- kword/KWFactory.cpp | 10 +++++----- kword/KWView.cpp | 2 +- lib/kformula/kformuladocument.cc | 2 +- lib/kofficecore/KoGlobal.cpp | 2 +- lib/kofficecore/KoTemplates.cpp | 4 ++-- lib/kofficeui/KoTemplateCreateDia.cpp | 2 +- lib/kotext/KoAutoFormatDia.cpp | 2 +- 31 files changed, 62 insertions(+), 62 deletions(-) diff --git a/chalk/core/kis_meta_registry.cc b/chalk/core/kis_meta_registry.cc index 82912da5..99dc77a9 100644 --- a/chalk/core/kis_meta_registry.cc +++ b/chalk/core/kis_meta_registry.cc @@ -34,10 +34,10 @@ KisMetaRegistry::KisMetaRegistry() // Create the colorspaces and load the profiles TDEGlobal::instance()->dirs()->addResourceType("kis_profiles", - KStandardDirs::kde_default("data") + "chalk/profiles/"); + TDEStandardDirs::kde_default("data") + "chalk/profiles/"); // Add those things here as well, since we are not yet using KisDoc's KisFactory instance (which inits these as well) - TDEGlobal::instance()->dirs()->addResourceType("kis_profiles", KStandardDirs::kde_default("data") + "chalk/profiles/"); + TDEGlobal::instance()->dirs()->addResourceType("kis_profiles", TDEStandardDirs::kde_default("data") + "chalk/profiles/"); TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", "/usr/share/color/icc"); TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.icc/")); TDEGlobal::instance()->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.color/icc/")); diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc index 04bca5f9..9048935b 100644 --- a/chalk/ui/kis_factory.cc +++ b/chalk/ui/kis_factory.cc @@ -109,37 +109,37 @@ TDEInstance* KisFactory::instance() s_instance = new TDEInstance(s_aboutData); TQ_CHECK_PTR(s_instance); - s_instance->dirs()->addResourceType("chalk_template", KStandardDirs::kde_default("data") + "chalk/templates"); + s_instance->dirs()->addResourceType("chalk_template", TDEStandardDirs::kde_default("data") + "chalk/templates"); // XXX: Are these obsolete? - s_instance->dirs()->addResourceType("kis", KStandardDirs::kde_default("data") + "chalk/"); + s_instance->dirs()->addResourceType("kis", TDEStandardDirs::kde_default("data") + "chalk/"); - s_instance->dirs()->addResourceType("kis_pics", KStandardDirs::kde_default("data") + "chalk/pics/"); + s_instance->dirs()->addResourceType("kis_pics", TDEStandardDirs::kde_default("data") + "chalk/pics/"); - s_instance->dirs()->addResourceType("kis_images", KStandardDirs::kde_default("data") + "chalk/images/"); + s_instance->dirs()->addResourceType("kis_images", TDEStandardDirs::kde_default("data") + "chalk/images/"); - s_instance->dirs()->addResourceType("toolbars", KStandardDirs::kde_default("data") + "koffice/toolbar/"); + s_instance->dirs()->addResourceType("toolbars", TDEStandardDirs::kde_default("data") + "koffice/toolbar/"); // Create spec - s_instance->dirs()->addResourceType("kis_brushes", KStandardDirs::kde_default("data") + "chalk/brushes/"); + s_instance->dirs()->addResourceType("kis_brushes", TDEStandardDirs::kde_default("data") + "chalk/brushes/"); s_instance->dirs()->addResourceDir("kis_brushes", "/usr/share/create/brushes/gimp"); s_instance->dirs()->addResourceDir("kis_brushes", TQDir::homeDirPath() + TQString("/.create/brushes/gimp")); - s_instance->dirs()->addResourceType("kis_patterns", KStandardDirs::kde_default("data") + "chalk/patterns/"); + s_instance->dirs()->addResourceType("kis_patterns", TDEStandardDirs::kde_default("data") + "chalk/patterns/"); s_instance->dirs()->addResourceDir("kis_patterns", "/usr/share/create/patterns/gimp"); s_instance->dirs()->addResourceDir("kis_patterns", TQDir::homeDirPath() + TQString("/.create/patterns/gimp")); - s_instance->dirs()->addResourceType("kis_gradients", KStandardDirs::kde_default("data") + "chalk/gradients/"); + s_instance->dirs()->addResourceType("kis_gradients", TDEStandardDirs::kde_default("data") + "chalk/gradients/"); s_instance->dirs()->addResourceDir("kis_gradients", "/usr/share/create/gradients/gimp"); s_instance->dirs()->addResourceDir("kis_gradients", TQDir::homeDirPath() + TQString("/.create/gradients/gimp")); - s_instance->dirs()->addResourceType("kis_profiles", KStandardDirs::kde_default("data") + "chalk/profiles/"); + s_instance->dirs()->addResourceType("kis_profiles", TDEStandardDirs::kde_default("data") + "chalk/profiles/"); s_instance->dirs()->addResourceDir("kis_profiles", "/usr/share/color/icc"); s_instance->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.icc")); s_instance->dirs()->addResourceDir("kis_profiles", TQDir::homeDirPath() + TQString("/.color/icc")); - s_instance->dirs()->addResourceType("kis_palettes", KStandardDirs::kde_default("data") + "chalk/palettes/"); + s_instance->dirs()->addResourceType("kis_palettes", TDEStandardDirs::kde_default("data") + "chalk/palettes/"); s_instance->dirs()->addResourceDir("kis_palettes", "/usr/share/create/swatches"); s_instance->dirs()->addResourceDir("kis_palettes", TQDir::homeDirPath() + TQString("/.create/swatches")); diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc index 67ffb0bd..f7e3dc07 100644 --- a/karbon/karbon_factory.cc +++ b/karbon/karbon_factory.cc @@ -112,17 +112,17 @@ KarbonFactory::instance() // Add any application-specific resource directories here s_instance->dirs()->addResourceType( "kis_brushes", - KStandardDirs::kde_default( "data" ) + "chalk/brushes/" ); + TDEStandardDirs::kde_default( "data" ) + "chalk/brushes/" ); s_instance->dirs()->addResourceType( "kis_pattern", - KStandardDirs::kde_default( "data" ) + "chalk/patterns/" ); + TDEStandardDirs::kde_default( "data" ) + "chalk/patterns/" ); s_instance->dirs()->addResourceType( "karbon_gradient", - KStandardDirs::kde_default( "data" ) + "karbon/gradients/" ); + TDEStandardDirs::kde_default( "data" ) + "karbon/gradients/" ); s_instance->dirs()->addResourceType( "karbon_clipart", - KStandardDirs::kde_default( "data" ) + "karbon/cliparts/" ); - s_instance->dirs()->addResourceType( "karbon_template", KStandardDirs::kde_default("data") + "karbon/templates/" ); + TDEStandardDirs::kde_default( "data" ) + "karbon/cliparts/" ); + s_instance->dirs()->addResourceType( "karbon_template", TDEStandardDirs::kde_default("data") + "karbon/templates/" ); // Tell the iconloader about share/apps/koffice/icons s_instance->iconLoader()->addAppDir("koffice"); } diff --git a/karbon/karbon_resourceserver.cc b/karbon/karbon_resourceserver.cc index 3e96adcf..92c94fdf 100644 --- a/karbon/karbon_resourceserver.cc +++ b/karbon/karbon_resourceserver.cc @@ -378,7 +378,7 @@ KarbonResourceServer::addClipart( VObject* clipart, double width, double height char buffer[ 20 ]; sprintf( buffer, "%04d.kclp", i++ ); - while( KStandardDirs::exists( KarbonFactory::instance()->dirs()->saveLocation( "karbon_clipart" ) + buffer ) ) + while( TDEStandardDirs::exists( KarbonFactory::instance()->dirs()->saveLocation( "karbon_clipart" ) + buffer ) ) sprintf( buffer, "%04d.kclp", i++ ); TQString filename = KarbonFactory::instance()->dirs()->saveLocation( "karbon_clipart" ) + buffer; diff --git a/kchart/kchart_factory.cc b/kchart/kchart_factory.cc index 4c3f7864..f45e6aed 100644 --- a/kchart/kchart_factory.cc +++ b/kchart/kchart_factory.cc @@ -70,7 +70,7 @@ TDEInstance* KChartFactory::global() { s_global = new TDEInstance(aboutData()); s_global->dirs()->addResourceType( "kchart_template", - KStandardDirs::kde_default("data") + "kchart/templates/"); + TDEStandardDirs::kde_default("data") + "kchart/templates/"); // Tell the iconloader about share/apps/koffice/icons s_global->iconLoader()->addAppDir("koffice"); } diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc index 2d1f0799..00606e81 100644 --- a/kchart/kchart_view.cc +++ b/kchart/kchart_view.cc @@ -754,7 +754,7 @@ void KChartView::extraCreateTemplate() tempFile.name(), pix, this ); KChartFactory::global()->dirs()->addResourceType("kchart_template", - KStandardDirs::kde_default( "data" ) + + TDEStandardDirs::kde_default( "data" ) + "kchart/templates/"); } diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index 739c6126..fc21f3a5 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -52,7 +52,7 @@ KoGlobal::KoGlobal() KImageIO::registerFormats(); - // Tell KStandardDirs about the koffice prefix + // Tell TDEStandardDirs about the koffice prefix TDEGlobal::dirs()->addPrefix(PREFIX); // Tell the iconloader about share/apps/koffice/icons diff --git a/kexi/core/kexidbconnectionset.cpp b/kexi/core/kexidbconnectionset.cpp index 69828d07..b608c46d 100644 --- a/kexi/core/kexidbconnectionset.cpp +++ b/kexi/core/kexidbconnectionset.cpp @@ -73,11 +73,11 @@ bool KexiDBConnectionSet::addConnectionData(KexiDB::ConnectionData *data, const return false; TQString baseFilename( dir + (data->hostName.isEmpty() ? "localhost" : data->hostName) ); int i = 0; - while (KStandardDirs::exists(baseFilename+(i>0 ? TQString::number(i) : TQString())+".kexic")) + while (TDEStandardDirs::exists(baseFilename+(i>0 ? TQString::number(i) : TQString())+".kexic")) i++; - if (!KStandardDirs::exists(dir)) { + if (!TDEStandardDirs::exists(dir)) { //make 'connections' dir and protect it - if (!KStandardDirs::makeDir(dir, 0700)) + if (!TDEStandardDirs::makeDir(dir, 0700)) return false; } filename = baseFilename+(i>0 ? TQString::number(i) : TQString())+".kexic"; diff --git a/kexi/core/kexidbconnectionset.h b/kexi/core/kexidbconnectionset.h index fc831cdc..4e75b4d9 100644 --- a/kexi/core/kexidbconnectionset.h +++ b/kexi/core/kexidbconnectionset.h @@ -34,7 +34,7 @@ public: /*! Loads connection data set from storage, currently from .kexic files saved in dirs returned by - KStandardDirs::findDirs("data", "connections") */ + TDEStandardDirs::findDirs("data", "connections") */ void load(); /*! Adds \a data as connection data. diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp index af82b583..71ba2321 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp @@ -55,7 +55,7 @@ SQLiteVacuum::~SQLiteVacuum() tristate SQLiteVacuum::run() { - const TQString ksqlite_app = KStandardDirs::findExe( "ksqlite" ); + const TQString ksqlite_app = TDEStandardDirs::findExe( "ksqlite" ); if (ksqlite_app.isEmpty()) { m_result = false; return m_result; diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp index 287bd846..136ea3c6 100644 --- a/kexi/main/startup/KexiStartup_p.cpp +++ b/kexi/main/startup/KexiStartup_p.cpp @@ -50,7 +50,7 @@ tristate SQLite2ToSQLite3Migration::run() if (m_run) return false; m_run = true; - const TQString ksqlite2to3_app = KStandardDirs::findExe( "ksqlite2to3" ); + const TQString ksqlite2to3_app = TDEStandardDirs::findExe( "ksqlite2to3" ); if (ksqlite2to3_app.isEmpty()) return false; diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cc index e324c063..a23b7b64 100644 --- a/kformula/kformula_factory.cc +++ b/kformula/kformula_factory.cc @@ -59,7 +59,7 @@ TDEInstance* KFormulaFactory::global() { s_global = new TDEInstance(aboutData()); s_global->dirs()->addResourceType( "toolbar", - KStandardDirs::kde_default("data") + "koffice/toolbar/"); + TDEStandardDirs::kde_default("data") + "koffice/toolbar/"); // Tell the iconloader about share/apps/koffice/icons*/ s_global->iconLoader()->addAppDir("koffice"); } diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp index 1245d707..2a5cec25 100644 --- a/kivio/kiviopart/kivio_doc.cpp +++ b/kivio/kiviopart/kivio_doc.cpp @@ -552,7 +552,7 @@ bool KivioDoc::loadXML( TQIODevice *, const TQDomDocument& doc ) bool KivioDoc::loadStencilSpawnerSet(const TQString &id, bool hidden) { - KStandardDirs *dirs = TDEGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); TQStringList dirList = dirs->findDirs("data", "kivio/stencils"); TQString rootDir; diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp index 20140fcc..3d4624bf 100644 --- a/kivio/kiviopart/kivio_factory.cpp +++ b/kivio/kiviopart/kivio_factory.cpp @@ -67,8 +67,8 @@ TDEInstance* KivioFactory::global() if ( !s_global ) { s_global = new TDEInstance(aboutData()); - s_global->dirs()->addResourceType( "kivio_template", KStandardDirs::kde_default("data") + "kivio/templates/" ); - s_global->dirs()->addResourceType( "toolbar", KStandardDirs::kde_default("data") + "koffice/toolbar/"); + s_global->dirs()->addResourceType( "kivio_template", TDEStandardDirs::kde_default("data") + "kivio/templates/" ); + s_global->dirs()->addResourceType( "toolbar", TDEStandardDirs::kde_default("data") + "koffice/toolbar/"); s_global->iconLoader()->addAppDir("koffice"); } diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp index 79342465..bccbe0aa 100644 --- a/kivio/kiviopart/kiviostencilsetaction.cpp +++ b/kivio/kiviopart/kiviostencilsetaction.cpp @@ -184,7 +184,7 @@ void KivioStencilSetAction::updateMenu() m_collectionIdList.clear(); clearCollectionMenuList(); - KStandardDirs *dirs = TDEGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); TQStringList dirList = dirs->findDirs("data", "kivio/stencils"); dirList.sort(); diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp index 158a4415..a72dfbca 100644 --- a/kivio/kiviopart/kiviostencilsetinstaller.cpp +++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp @@ -128,7 +128,7 @@ namespace Kivio { bool StencilSetInstaller::installStencilSets(const KArchiveDirectory* rootDir, const TQStringList& dirs) { TQString installDir = locateLocal("data", "kivio/stencils"); - KStandardDirs::makeDir(installDir); + TDEStandardDirs::makeDir(installDir); const KArchiveDirectory* currentDir = 0; bool ok = true; diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp index 9cbe4385..7e2a937a 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp @@ -72,7 +72,7 @@ namespace Kivio { void AddStencilSetPanel::updateList() { - KStandardDirs *dirs = TDEGlobal::dirs(); + TDEStandardDirs *dirs = TDEGlobal::dirs(); TQStringList dirList = dirs->findDirs("data", "kivio/stencils"); dirList.sort(); m_stencilSetLView->clear(); diff --git a/kplato/kptfactory.cc b/kplato/kptfactory.cc index 7e5c5405..6922ed2d 100644 --- a/kplato/kptfactory.cc +++ b/kplato/kptfactory.cc @@ -85,10 +85,10 @@ TDEInstance* Factory::global() // Add any application-specific resource directories here s_global->dirs()->addResourceType("kplato_template", - KStandardDirs::kde_default("data") + "kplato/templates/"); - s_global->dirs()->addResourceType( "expression", KStandardDirs::kde_default("data") + "kplato/expression/"); + TDEStandardDirs::kde_default("data") + "kplato/templates/"); + s_global->dirs()->addResourceType( "expression", TDEStandardDirs::kde_default("data") + "kplato/expression/"); s_global->dirs()->addResourceType("toolbar", - KStandardDirs::kde_default("data") + "koffice/toolbar/"); + TDEStandardDirs::kde_default("data") + "koffice/toolbar/"); // Tell the iconloader about share/apps/koffice/icons s_global->iconLoader()->addAppDir("koffice"); diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc index edf1019d..24a541f4 100644 --- a/kplato/kptreportview.cc +++ b/kplato/kptreportview.cc @@ -217,7 +217,7 @@ void ReportView::initReportList() { //kdDebug()<clear(); - KStandardDirs std; + TDEStandardDirs std; TQStringList reportDesktopFiles = std.findAllResources("data", "kplato/reports/*.desktop", true, true); for (TQStringList::iterator it = reportDesktopFiles.begin(); it != reportDesktopFiles.end(); ++it) { KDesktopFile file((*it), true); diff --git a/kpresenter/KPrFactory.cpp b/kpresenter/KPrFactory.cpp index 5a1a6be0..994b14e4 100644 --- a/kpresenter/KPrFactory.cpp +++ b/kpresenter/KPrFactory.cpp @@ -70,11 +70,11 @@ TDEInstance* KPrFactory::global() s_global = new TDEInstance(aboutData()); s_global->dirs()->addResourceType("kpresenter_template", - KStandardDirs::kde_default("data") + "kpresenter/templates/"); + TDEStandardDirs::kde_default("data") + "kpresenter/templates/"); s_global->dirs()->addResourceType("autoforms", - KStandardDirs::kde_default("data") + "kpresenter/autoforms/"); + TDEStandardDirs::kde_default("data") + "kpresenter/autoforms/"); s_global->dirs()->addResourceType("slideshow", - KStandardDirs::kde_default("data") + "kpresenter/slideshow/"); + TDEStandardDirs::kde_default("data") + "kpresenter/slideshow/"); // Tell the iconloader about share/apps/koffice/icons s_global->iconLoader()->addAppDir("koffice"); } diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index bf57df2e..d6407823 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -1353,7 +1353,7 @@ void KPrView::extraCreateTemplate() KoTemplateCreateDia::createTemplate( "kpresenter_template", KPrFactory::global(), tempFile.name(), pix, this); KPrFactory::global()->dirs()->addResourceType("kpresenter_template", - KStandardDirs::kde_default( "data" ) + + TDEStandardDirs::kde_default( "data" ) + "kpresenter/templates/"); } @@ -1504,7 +1504,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ ) m_canvas->setToolEditMode( TEM_MOUSE ); if ( m_canvas && !presStarted ) { - const TQString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver"); + const TQString xdgScreenSaver = TDEStandardDirs::findExe("xdg-screensaver"); if (!xdgScreenSaver.isEmpty()) { TDEProcess proc; proc << xdgScreenSaver; @@ -1628,7 +1628,7 @@ void KPrView::screenStop() m_canvas->setMouseTracking( true ); m_canvas->setBackgroundMode( TQt::NoBackground ); - const TQString xdgScreenSaver = KStandardDirs::findExe("xdg-screensaver"); + const TQString xdgScreenSaver = TDEStandardDirs::findExe("xdg-screensaver"); if (!xdgScreenSaver.isEmpty()) { TDEProcess proc; proc << xdgScreenSaver; diff --git a/kspread/kspread_factory.cc b/kspread/kspread_factory.cc index 63f393a7..861b9d96 100644 --- a/kspread/kspread_factory.cc +++ b/kspread/kspread_factory.cc @@ -79,12 +79,12 @@ TDEInstance* Factory::global() s_global = new TDEInstance(aboutData()); s_global->dirs()->addResourceType( "kspread_template", - KStandardDirs::kde_default("data") + "kspread/templates/"); + TDEStandardDirs::kde_default("data") + "kspread/templates/"); s_global->dirs()->addResourceType( "toolbar", - KStandardDirs::kde_default("data") + "koffice/toolbar/"); - s_global->dirs()->addResourceType( "extensions", KStandardDirs::kde_default("data") + "kspread/extensions/"); - s_global->dirs()->addResourceType( "sheet-styles", KStandardDirs::kde_default("data") + "kspread/sheetstyles/"); + TDEStandardDirs::kde_default("data") + "koffice/toolbar/"); + s_global->dirs()->addResourceType( "extensions", TDEStandardDirs::kde_default("data") + "kspread/extensions/"); + s_global->dirs()->addResourceType( "sheet-styles", TDEStandardDirs::kde_default("data") + "kspread/sheetstyles/"); // Tell the iconloader about share/apps/koffice/icons s_global->iconLoader()->addAppDir("koffice"); } diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index d709c6c0..6de55b61 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -2868,7 +2868,7 @@ void View::createTemplate() tempFile.name(), pix, this ); Factory::global()->dirs()->addResourceType("kspread_template", - KStandardDirs::kde_default( "data" ) + + TDEStandardDirs::kde_default( "data" ) + "kspread/templates/"); } diff --git a/kugar/kudesigner/kudesigner_factory.cpp b/kugar/kudesigner/kudesigner_factory.cpp index 82b88f03..e9fec1f8 100644 --- a/kugar/kudesigner/kudesigner_factory.cpp +++ b/kugar/kudesigner/kudesigner_factory.cpp @@ -88,7 +88,7 @@ TDEInstance* KudesignerFactory::global() s_global = new TDEInstance( aboutData() ); // Add any application-specific resource directories here s_global->dirs() ->addResourceType( "kudesigner_template", - KStandardDirs::kde_default( "data" ) + "kudesigner/templates/" ); + TDEStandardDirs::kde_default( "data" ) + "kudesigner/templates/" ); // Tell the iconloader about share/apps/koffice/icons s_global->iconLoader() ->addAppDir( "koffice" ); diff --git a/kword/KWFactory.cpp b/kword/KWFactory.cpp index 5077e45f..1cd3f498 100644 --- a/kword/KWFactory.cpp +++ b/kword/KWFactory.cpp @@ -71,14 +71,14 @@ TDEInstance* KWFactory::instance() s_instance = new TDEInstance( aboutData() ); s_instance->dirs()->addResourceType( "kword_template", - KStandardDirs::kde_default("data") + "kword/templates/"); - s_instance->dirs()->addResourceType( "expression", KStandardDirs::kde_default("data") + "kword/expression/"); - s_instance->dirs()->addResourceType( "horizontalLine", KStandardDirs::kde_default("data") + "kword/horizontalline/"); + TDEStandardDirs::kde_default("data") + "kword/templates/"); + s_instance->dirs()->addResourceType( "expression", TDEStandardDirs::kde_default("data") + "kword/expression/"); + s_instance->dirs()->addResourceType( "horizontalLine", TDEStandardDirs::kde_default("data") + "kword/horizontalline/"); s_instance->dirs()->addResourceType( "toolbar", - KStandardDirs::kde_default("data") + "koffice/toolbar/"); + TDEStandardDirs::kde_default("data") + "koffice/toolbar/"); s_instance->dirs()->addResourceType( "toolbar", - KStandardDirs::kde_default("data") + "kformula/pics/"); + TDEStandardDirs::kde_default("data") + "kformula/pics/"); s_instance->iconLoader()->addAppDir("koffice"); } return s_instance; diff --git a/kword/KWView.cpp b/kword/KWView.cpp index 941c0562..68386e29 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -4071,7 +4071,7 @@ void KWView::extraCreateTemplate() tempFile.name(), pix, this ); KWFactory::instance()->dirs()->addResourceType("kword_template", - KStandardDirs::kde_default( "data" ) + + TDEStandardDirs::kde_default( "data" ) + "kword/templates/"); } diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc index 36b691de..1b440b99 100644 --- a/lib/kformula/kformuladocument.cc +++ b/lib/kformula/kformuladocument.cc @@ -437,7 +437,7 @@ void DocumentWrapper::setCommandStack( KoCommandHistory* history ) void DocumentWrapper::createActions( KActionCollection* collection ) { TDEGlobal::dirs()->addResourceType( "toolbar", - KStandardDirs::kde_default("data") + + TDEStandardDirs::kde_default("data") + "kformula/pics/" ); m_addNegThinSpaceAction = new KAction( i18n( "Add Negative Thin Space" ), diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp index 56639797..40050232 100644 --- a/lib/kofficecore/KoGlobal.cpp +++ b/lib/kofficecore/KoGlobal.cpp @@ -55,7 +55,7 @@ KoGlobal::KoGlobal() KImageIO::registerFormats(); - // Tell KStandardDirs about the koffice prefix + // Tell TDEStandardDirs about the koffice prefix TDEGlobal::dirs()->addPrefix(PREFIX); // Tell the iconloader about share/apps/koffice/icons diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp index 2d65368e..68daddb0 100644 --- a/lib/kofficecore/KoTemplates.cpp +++ b/lib/kofficecore/KoTemplates.cpp @@ -160,7 +160,7 @@ void KoTemplateTree::writeTemplateTree() { //kdDebug() << "touched" << endl; if(!group->isHidden()) { //kdDebug() << "not hidden" << endl; - KStandardDirs::makeDir(localDir+group->name()); // create the local group dir + TDEStandardDirs::makeDir(localDir+group->name()); // create the local group dir } else { //kdDebug() << "hidden" << endl; @@ -171,7 +171,7 @@ void KoTemplateTree::writeTemplateTree() { } else { //kdDebug() << "global" << endl; - KStandardDirs::makeDir(localDir+group->name()); + TDEStandardDirs::makeDir(localDir+group->name()); } } } diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index 2e939954..a42b580f 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -294,7 +294,7 @@ void KoTemplateCreateDia::slotOk() { ignore = true; } - if(!KStandardDirs::makeDir(templateDir) || !KStandardDirs::makeDir(iconDir)) { + if(!TDEStandardDirs::makeDir(templateDir) || !TDEStandardDirs::makeDir(iconDir)) { d->m_tree->writeTemplateTree(); KDialogBase::slotCancel(); return; diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index eacf63a3..bc582bd5 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -498,7 +498,7 @@ void KoAutoFormatDia::setupTab3() exceptionLanguageName.insert( i18n("Default"), ""); exceptionLanguageName.insert( i18n("All Languages"), "all_languages"); - KStandardDirs *standard = new KStandardDirs(); + TDEStandardDirs *standard = new TDEStandardDirs(); TQStringList tmp = standard->findDirs("data", "koffice/autocorrect/"); TQString path = *(tmp.end()); for ( TQStringList::Iterator it = tmp.begin(); it != tmp.end(); ++it )