Replaced various '#define' with actual strings - part 5

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

kipi-plugins/calendar/calwidget.cpp

@@ -76,7 +76,7 @@ void CalWidget::recreate()
     pix_->resize(params.width,params.height);
 
     if (!calPainter_)
-        calPainter_ = new CalPainter(TQT_TQPAINTDEVICE(pix_));
+        calPainter_ = new CalPainter(pix_);
 
     calPainter_->setYearMonth(TDEGlobal::locale()->calendar()->year(TQDate::currentDate()),
                               TDEGlobal::locale()->calendar()->month(TQDate::currentDate()));

kipi-plugins/gpssync/kmlexport.cpp

@@ -168,7 +168,7 @@ void kmlExport::generateImagesthumb(KIPI::Interface* interface, const KURL& imag
         return;
     }
 
-    TQString imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&imageFile));
+    TQString imageFormat = TQImageIO::imageFormat(&imageFile);
     if (imageFormat.isEmpty()) 
     {
         logWarning(i18n("Format of image '%1' is unknown").arg(path));

kipi-plugins/htmlexport/generator.cpp

@@ -236,7 +236,7 @@ struct Generator::Private {
 			return;
 		}
 		
-		TQString imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&imageFile));
+		TQString imageFormat = TQImageIO::imageFormat(&imageFile);
 		if (imageFormat.isEmpty()) {
 			logWarning(i18n("Format of image '%1' is unknown").arg(path));
 			return;