summaryrefslogtreecommitdiffstats
path: root/kalzium/src/kalzium.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:44:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:44:46 -0600
commitcee429821aa6f1acc97fb482d325fb4eb37376ca (patch)
tree4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /kalzium/src/kalzium.cpp
parentab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff)
downloadtdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz
tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kalzium/src/kalzium.cpp')
-rw-r--r--kalzium/src/kalzium.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp
index 8ff66e4d..53470b2e 100644
--- a/kalzium/src/kalzium.cpp
+++ b/kalzium/src/kalzium.cpp
@@ -85,11 +85,11 @@ Kalzium::Kalzium()
setupActions();
// adding the libtdeedu catalog
- KGlobal::locale()->insertCatalogue( "libtdeedu" );
+ TDEGlobal::locale()->insertCatalogue( "libtdeedu" );
// creating the glossary dialog and loading the glossaries we have
m_glossarydlg = new GlossaryDialog( true, this, "glossary" );
- TQString dir = KGlobal::dirs()->findResourceDir( "data", "kalzium/data/" );
+ TQString dir = TDEGlobal::dirs()->findResourceDir( "data", "kalzium/data/" );
TQString picturepath = dir + "kalzium/data/bg.jpg";
KURL u = dir + "kalzium/data/knowledge.xml";
Glossary *g = Glossary::readFromXML( u );