summaryrefslogtreecommitdiffstats
path: root/kivio
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-31 13:19:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-31 13:19:08 -0600
commitac04782336b6a026b44df9d51ba9ca008a712da2 (patch)
tree62ad1da391a6dad027a2d371671b19e5306acee0 /kivio
parentf7055674768fa7f0267da4a14b9061e60ebab3fc (diff)
downloadkoffice-ac04782336b6a026b44df9d51ba9ca008a712da2.tar.gz
koffice-ac04782336b6a026b44df9d51ba9ca008a712da2.zip
Rename KStandard for enhanced compatibility with KDE4
Diffstat (limited to 'kivio')
-rw-r--r--kivio/kiviopart/kivio_doc.cpp2
-rw-r--r--kivio/kiviopart/kivio_factory.cpp4
-rw-r--r--kivio/kiviopart/kiviostencilsetaction.cpp2
-rw-r--r--kivio/kiviopart/kiviostencilsetinstaller.cpp2
-rw-r--r--kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp2
5 files changed, 6 insertions, 6 deletions
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();