Finish rebranding of Krita as Chalk

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1238363 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 5 insertions, 5 deletions

diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp
index 53c9e4fe..57868746 100644
--- a/lib/kofficecore/KoGlobal.cpp
+++ b/lib/kofficecore/KoGlobal.cpp
@@ -64,7 +64,7 @@ KoGlobal::KoGlobal()
     // Another way to get the DPI of the display would be TQPaintDeviceMetrics,
     // but we have no widget here (and moving this to KoView wouldn't allow
     // using this from the document easily).
-#ifdef TQ_WS_X11
+#ifdef Q_WS_X11
     m_dpiX = TQPaintDevice::x11AppDpiX();
     m_dpiY = TQPaintDevice::x11AppDpiY();
 #else
diff --git a/lib/kofficecore/tests/filterchain_test.cpp b/lib/kofficecore/tests/filterchain_test.cpp
index 773bd02f..05592b92 100644
--- a/lib/kofficecore/tests/filterchain_test.cpp
+++ b/lib/kofficecore/tests/filterchain_test.cpp
@@ -41,12 +41,12 @@ int main( int /*argc*/, char ** /*argv*/ )
         chain->dump();
     }
 
-    mimeType = "application/x-krita";
+    mimeType = "application/x-chalk";
     chain = g.chain( manager, mimeType );
     if ( !chain )
-        kdDebug() << "Chain for 'application/x-krita' is not available, OK" << endl;
+        kdDebug() << "Chain for 'application/x-chalk' is not available, OK" << endl;
     else {
-        kdError() << "Chain 'application/x-krita' is available!" << endl;
+        kdError() << "Chain 'application/x-chalk' is available!" << endl;
         chain->dump();
     }
 
diff --git a/lib/kofficecore/tests/koxmlreadertest.cpp b/lib/kofficecore/tests/koxmlreadertest.cpp
index f8e6ed89..aec06fae 100644
--- a/lib/kofficecore/tests/koxmlreadertest.cpp
+++ b/lib/kofficecore/tests/koxmlreadertest.cpp
@@ -606,7 +606,7 @@ void testDocument()
   xmlstream << "<koffice>";
   xmlstream << "  <kword/>\n";
   xmlstream << "  <kpresenter/>\n";
-  xmlstream << "  <krita/>\n";
+  xmlstream << "  <chalk/>\n";
   xmlstream << "</koffice>";
 
   KoXmlDocument doc;