10 files changed, 14 insertions, 14 deletions
diff --git a/lib/configure.in.mid b/lib/configure.in.mid
index 7fc54555..718d6d35 100644
--- a/lib/configure.in.mid
+++ b/lib/configure.in.mid
@@ -29,7 +29,7 @@ AC_MSG_CHECKING([whether kopainter should be compiled])
 # first check which main application we could compile
 for args in $SUBDIRLIST ; do
     case $args in
-        krita) COMPILE_LIB_FOR_KRITA="$args " ;;
+        chalk) COMPILE_LIB_FOR_KRITA="$args " ;;
         karbon) COMPILE_LIB_FOR_KARBON="$args " ;;
         kivio) COMPILE_LIB_FOR_KIVIO="$args " ;;
     esac
@@ -39,7 +39,7 @@ done
 COMPILE_LIB_FOR_KPRESENTER="#"
 for args in $DO_NOT_COMPILE ; do
     case $args in
-        krita) COMPILE_LIB_FOR_KRITA= ;;
+        chalk) COMPILE_LIB_FOR_KRITA= ;;
         karbon) COMPILE_LIB_FOR_KARBON= ;;
         kivio) COMPILE_LIB_FOR_KIVIO= ;;
 	kpresenter) COMPILE_LIB_FOR_KPRESENTER= ;;
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;
diff --git a/lib/kopainter/koIconChooser.h b/lib/kopainter/koIconChooser.h
index df69fd72..59057f2e 100644
--- a/lib/kopainter/koIconChooser.h
+++ b/lib/kopainter/koIconChooser.h
@@ -119,7 +119,7 @@ private:
 };
 
 // This is a first attempt at a pattern chooser widget abstraction which is at least
-// useful for two applications(karbon and krita). It is really a light version of
+// useful for two applications(karbon and chalk). It is really a light version of
 // kis_patternchooser. (Rob)
 class KOPAINTER_EXPORT KoPatternChooser : public TQWidget
 {
diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cc
index 64b15366..22df059b 100644
--- a/lib/kopainter/ko_rgb_widget.cc
+++ b/lib/kopainter/ko_rgb_widget.cc
@@ -1,5 +1,5 @@
 /*
- * This file is part of Krita
+ * This file is part of Chalk
  *
  * Copyright (c) 1999 Matthias Elter (me@kde.org)
  * Copyright (c) 2001-2002 Igor Jansen (rm@kde.org)
diff --git a/lib/kopainter/kogradientmanager.cc b/lib/kopainter/kogradientmanager.cc
index 7c936c4b..242b5470 100644
--- a/lib/kopainter/kogradientmanager.cc
+++ b/lib/kopainter/kogradientmanager.cc
@@ -50,7 +50,7 @@ KoGradient* KoGradientManager::loadGradient(const TQString& filename)
 	{
 		if(strExt == ".ggr")
 		{
-			return loadKritaGradient(&f);
+			return loadChalkGradient(&f);
 		}
         else if(strExt==".kgr")
 		{
@@ -89,7 +89,7 @@ KoGradient* KoGradientManager::loadKarbonGradient(TQFile* file)
 	return 0;
 }
 
-KoGradient* KoGradientManager::loadKritaGradient(TQFile* file)
+KoGradient* KoGradientManager::loadChalkGradient(TQFile* file)
 {
 	KoGradient* grad = new KoGradient();
 	
diff --git a/lib/kopainter/kogradientmanager.h b/lib/kopainter/kogradientmanager.h
index 86130480..b898ce89 100644
--- a/lib/kopainter/kogradientmanager.h
+++ b/lib/kopainter/kogradientmanager.h
@@ -103,7 +103,7 @@ public:
 
 private:
 	KoGradient* loadKarbonGradient(TQFile* file);
-	KoGradient* loadKritaGradient(TQFile* file);
+	KoGradient* loadChalkGradient(TQFile* file);
 	KoGradient* loadSvgGradient(TQFile* file);
 	KoGradient* parseKarbonGradient(const TQDomElement& element);
 	KoGradient* parseSvgGradient(const TQDomElement& element);
diff --git a/lib/kotext/KoTextZoomHandler.cpp b/lib/kotext/KoTextZoomHandler.cpp
index e7e6d1b4..acd2285d 100644
--- a/lib/kotext/KoTextZoomHandler.cpp
+++ b/lib/kotext/KoTextZoomHandler.cpp
@@ -40,7 +40,7 @@ double KoTextZoomHandler::tqlayoutUnitToFontSize( int luSize, bool /*forPrint*/
 {
     // TQt will use TQPaintDevice::x11AppDpiY() to go from pt to pixel for fonts
     return tqlayoutUnitPtToPt( luSize ) * m_zoomedResolutionY
-#ifdef TQ_WS_X11
+#ifdef Q_WS_X11
         / POINT_TO_INCH(TQPaintDevice::x11AppDpiY())
 #endif
         ;
diff --git a/lib/kross/test/testcase.rb b/lib/kross/test/testcase.rb
index 71354ea2..34f73c13 100644
--- a/lib/kross/test/testcase.rb
+++ b/lib/kross/test/testcase.rb
@@ -4,7 +4,7 @@ class TestKross < Test::Unit::TestCase
 	def setup:
 		require "krosstestpluginmodule"
 		testpluginobject1 = Krosstestpluginmodule::get("testpluginobject1")
-		#Krosskritacore::get("KritaDocument")
+		#Krosschalkcore::get("ChalkDocument")
 		#testpluginobject1.func1()
 	#def test_primitive
 	#	print "---------------- 1\n"