9 files changed, 9 insertions, 9 deletions
diff --git a/digikam/libs/dimg/README b/digikam/libs/dimg/README
index 8b79bde..b0ad1fd 100644
--- a/digikam/libs/dimg/README
+++ b/digikam/libs/dimg/README
@@ -60,7 +60,7 @@ the image)
 format. In QImage/Imlib2 the pixel data is stored as unsigned ints and to 
 access the individual colors you need to use bit-shifting to ensure 
 endian correctness. in DImg, the pixel data is stored as unsigned char. 
-the color layout is B,G,R,A (blue, green, red, alpha)
+the color tqlayout is B,G,R,A (blue, green, red, alpha)
 
 for 8bit images: you can access individual color components like this:
 
diff --git a/digikam/libs/dimg/dimgscale.cpp b/digikam/libs/dimg/dimgscale.cpp
index 850e36d..696554f 100644
--- a/digikam/libs/dimg/dimgscale.cpp
+++ b/digikam/libs/dimg/dimgscale.cpp
@@ -113,7 +113,7 @@ DImg DImg::smoothScale(int dw, int dh, TQSize::ScaleMode scaleMode)
         return DImg();
 
     TQSize newSize(w, h);
-    newSize.scale( TQSize(dw, dh), scaleMode );
+    newSize.tqscale( TQSize(dw, dh), scaleMode );
     if (!newSize.isValid())
         return DImg();
 
diff --git a/digikam/libs/dimg/loaders/jp2kloader.cpp b/digikam/libs/dimg/loaders/jp2kloader.cpp
index e485b13..1216957 100644
--- a/digikam/libs/dimg/loaders/jp2kloader.cpp
+++ b/digikam/libs/dimg/loaders/jp2kloader.cpp
@@ -195,7 +195,7 @@ bool JP2KLoader::load(const TQString& filePath, DImgLoaderObserver *observer)
     }
 
     // -------------------------------------------------------------------
-    // Check image geometry.
+    // Check image tqgeometry.
 
     imageWidth()  = jas_image_width(jp2_image);
     imageHeight() = jas_image_height(jp2_image);
diff --git a/digikam/libs/dimg/loaders/jp2ksettings.cpp b/digikam/libs/dimg/loaders/jp2ksettings.cpp
index 5d01639..32a2ca2 100644
--- a/digikam/libs/dimg/loaders/jp2ksettings.cpp
+++ b/digikam/libs/dimg/loaders/jp2ksettings.cpp
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 
 // KDE includes.
diff --git a/digikam/libs/dimg/loaders/jpegsettings.cpp b/digikam/libs/dimg/loaders/jpegsettings.cpp
index 36d78af..3b15dfa 100644
--- a/digikam/libs/dimg/loaders/jpegsettings.cpp
+++ b/digikam/libs/dimg/loaders/jpegsettings.cpp
@@ -25,7 +25,7 @@
 
 #include <tqstring.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqcombobox.h>
 
diff --git a/digikam/libs/dimg/loaders/pngloader.cpp b/digikam/libs/dimg/loaders/pngloader.cpp
index ac1fcf8..d84367e 100644
--- a/digikam/libs/dimg/loaders/pngloader.cpp
+++ b/digikam/libs/dimg/loaders/pngloader.cpp
@@ -628,7 +628,7 @@ bool PNGLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
     software.append(digikam_version);
     TQString libpngver(PNG_HEADER_VERSION_STRING);
     libpngver.replace('\n', ' ');
-    software.append(TQString(" (%1)").arg(libpngver));
+    software.append(TQString(" (%1)").tqarg(libpngver));
     png_text text;
     text.key  = (png_charp)("Software");
     text.text = (char *)software.ascii();
diff --git a/digikam/libs/dimg/loaders/pngsettings.cpp b/digikam/libs/dimg/loaders/pngsettings.cpp
index a530883..e140d46 100644
--- a/digikam/libs/dimg/loaders/pngsettings.cpp
+++ b/digikam/libs/dimg/loaders/pngsettings.cpp
@@ -25,7 +25,7 @@
 
 #include <tqstring.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 
 // KDE includes.
diff --git a/digikam/libs/dimg/loaders/tiffloader.cpp b/digikam/libs/dimg/loaders/tiffloader.cpp
index 2e55414..024692b 100644
--- a/digikam/libs/dimg/loaders/tiffloader.cpp
+++ b/digikam/libs/dimg/loaders/tiffloader.cpp
@@ -572,7 +572,7 @@ bool TIFFLoader::save(const TQString& filePath, DImgLoaderObserver *observer)
     TQString soft = metaData.getExifTagString("Exif.Image.Software");
     TQString libtiffver(TIFFLIB_VERSION_STR);
     libtiffver.replace('\n', ' ');
-    soft.append(TQString(" ( %1 )").arg(libtiffver));
+    soft.append(TQString(" ( %1 )").tqarg(libtiffver));
     TIFFSetField(tif, TIFFTAG_SOFTWARE, (const char*)soft.ascii());
 
     // NOTE: All others Exif tags will be written by Exiv2 (<= 0.18)
diff --git a/digikam/libs/dimg/loaders/tiffsettings.cpp b/digikam/libs/dimg/loaders/tiffsettings.cpp
index e6a043f..96d6d6a 100644
--- a/digikam/libs/dimg/loaders/tiffsettings.cpp
+++ b/digikam/libs/dimg/loaders/tiffsettings.cpp
@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 
 // KDE includes.