TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KStandard for enhanced compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent f705567476
commit ac04782336
31 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File

4
chalk/core/kis_meta_registry.cc
Unescape View File

@ -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/"));

20
chalk/ui/kis_factory.cc
Unescape View File

@ -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"));

10
karbon/karbon_factory.cc
Unescape View File

@ -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");
}

2
karbon/karbon_resourceserver.cc
Unescape View File

@ -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;

2
kchart/kchart_factory.cc
Unescape View File

@ -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");
}

2
kchart/kchart_view.cc
Unescape View File

@ -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/");
}

2
kexi/3rdparty/kolibs/koGlobal.cc vendored
Unescape View File

@ -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

6
kexi/core/kexidbconnectionset.cpp
Unescape View File

@ -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";

2
kexi/core/kexidbconnectionset.h
Unescape View File

@ -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.

2
kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
Unescape View File

@ -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;

2
kexi/main/startup/KexiStartup_p.cpp
Unescape View File

@ -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;

2
kformula/kformula_factory.cc
Unescape View File

@ -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");
}

2
kivio/kiviopart/kivio_doc.cpp
Unescape View File

@ -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;

4
kivio/kiviopart/kivio_factory.cpp
Unescape View File

@ -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");
}

2
kivio/kiviopart/kiviostencilsetaction.cpp
Unescape View File

@ -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();

2
kivio/kiviopart/kiviostencilsetinstaller.cpp
Unescape View File

@ -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;

2
kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
Unescape View File

@ -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();

6
kplato/kptfactory.cc
Unescape View File

@ -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");

2
kplato/kptreportview.cc
Unescape View File

@ -217,7 +217,7 @@ void ReportView::initReportList() {
//kdDebug()<<k_funcinfo<<endl;
TQStringList list;
m_reportList->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);

6
kpresenter/KPrFactory.cpp
Unescape View File

@ -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");
}

6
kpresenter/KPrView.cpp
Unescape View File

@ -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;

8
kspread/kspread_factory.cc
Unescape View File

@ -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");
}

2
kspread/kspread_view.cc
Unescape View File

@ -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/");
}

2
kugar/kudesigner/kudesigner_factory.cpp
Unescape View File

@ -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" );

10
kword/KWFactory.cpp
Unescape View File

@ -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;

2
kword/KWView.cpp
Unescape View File

@ -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/");
}

2
lib/kformula/kformuladocument.cc
Unescape View File

@ -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" ),

2
lib/kofficecore/KoGlobal.cpp
Unescape View File

@ -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

4
lib/kofficecore/KoTemplates.cpp
Unescape View File

@ -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());
}
}
}

2
lib/kofficeui/KoTemplateCreateDia.cpp
Unescape View File

@ -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;

2
lib/kotext/KoAutoFormatDia.cpp
Unescape View File

@ -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 )

Write Preview
Loading…
Cancel
Save