From 676f6ed378c861a872de8cfce3dd5efe1780f769 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:55:46 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 2b7143e0539396c75306f6e78bf0a5641ed1acfc.
---
 src/gvcore/document.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/gvcore/document.cpp')

diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp
index b81a229..caa93f5 100644
--- a/src/gvcore/document.cpp
+++ b/src/gvcore/document.cpp
@@ -343,7 +343,7 @@ void Document::slotLoaded() {
 //
 //---------------------------------------------------------------------
 void Document::reload() {
-	Cache::instance()->invalidate( url());
+	Cache::instance()->tqinvalidate( url());
 	load();
 	emit reloaded(url());
 }
@@ -378,7 +378,7 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) {
 	TQString t = "true";
 	TQString f = "false";
 
-	int alignment = (printer->option("app-gwenview-position").isEmpty() ?
+	int tqalignment = (printer->option("app-gwenview-position").isEmpty() ?
 		TQt::AlignCenter : printer->option("app-gwenview-position").toInt());
 
 	// Compute filename offset
@@ -407,7 +407,7 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) {
 	if (scaling==GV_FITTOPAGE /* Fit to page */) {
 		bool enlargeToFit = printer->option( "app-gwenview-enlargeToFit" ) != f;
 		if ((image.width() > pdWidth || image.height() > pdHeight) || enlargeToFit) {
-			size.scale( pdWidth, pdHeight, TQSize::ScaleMin );
+			size.tqscale( pdWidth, pdHeight, TQSize::ScaleMin );
 		}
 	} else {
 		if (scaling==GV_SCALE /* Scale To */) {
@@ -452,24 +452,24 @@ void Document::doPaint(KPrinter *printer, TQPainter *painter) {
 				printer->abort();
 				return;
 			} else if (resp == KMessageBox::No) { // Shrink
-				size.scale(pdWidth, pdHeight, TQSize::ScaleMin);
+				size.tqscale(pdWidth, pdHeight, TQSize::ScaleMin);
 			}
 		}
 	}
 
 	// Compute x and y
-	if ( alignment & TQt::AlignHCenter )
+	if ( tqalignment & TQt::AlignHCenter )
 		x = (pdWidth - size.width())/2;
-	else if ( alignment & TQt::AlignLeft )
+	else if ( tqalignment & TQt::AlignLeft )
 		x = 0;
-	else if ( alignment & TQt::AlignRight )
+	else if ( tqalignment & TQt::AlignRight )
 		x = pdWidth - size.width();
 
-	if ( alignment & TQt::AlignVCenter )
+	if ( tqalignment & TQt::AlignVCenter )
 		y = (pdHeight - size.height())/2;
-	else if ( alignment & TQt::AlignTop )
+	else if ( tqalignment & TQt::AlignTop )
 		y = 0;
-	else if ( alignment & TQt::AlignBottom )
+	else if ( tqalignment & TQt::AlignBottom )
 		y = pdHeight - size.height();
 
 	// Draw, the image will be scaled to fit the given area if necessary
@@ -532,7 +532,7 @@ void Document::saveBeforeClosing() {
 	if (!d->mModified) return;
 
 	TQString msg=i18n("<qt>The image <b>%1</b> has been modified, do you want to save the changes?</qt>")
-		.arg(url().prettyURL());
+		.tqarg(url().prettyURL());
 
 	int result=KMessageBox::questionYesNo(dialogParentWidget(), msg, TQString(),
 		KStdGuiItem::save(), KStdGuiItem::discard(), CONFIG_SAVE_AUTOMATICALLY);		
@@ -605,7 +605,7 @@ TQString Document::saveInternal(const KURL& url, const TQCString& format) {
 	
 	LOG("Save failed: " << msg);
 	return TQString("<qt><b>%1</b><br/>")
-		.arg(i18n("Could not save the image to %1.").arg(url.prettyURL()))
+		.tqarg(i18n("Could not save the image to %1.").tqarg(url.prettyURL()))
 		+ msg + "</qt>";
 }
 
-- 
cgit v1.2.1