diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:19:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-31 13:19:08 -0600 |
| commit | ac04782336b6a026b44df9d51ba9ca008a712da2 (patch) | |
| tree | 62ad1da391a6dad027a2d371671b19e5306acee0 /chalk | |
| parent | f7055674768fa7f0267da4a14b9061e60ebab3fc (diff) | |
| download | koffice-ac04782336b6a026b44df9d51ba9ca008a712da2.tar.gz koffice-ac04782336b6a026b44df9d51ba9ca008a712da2.zip | |
Rename KStandard for enhanced compatibility with KDE4
Diffstat (limited to 'chalk')
| -rw-r--r-- | chalk/core/kis_meta_registry.cc | 4 | ||||
| -rw-r--r-- | chalk/ui/kis_factory.cc | 20 |
2 files changed, 12 insertions, 12 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")); |