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/imageviewcontroller.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp
index 8293b44..f24a2e8 100644
--- a/src/gvcore/imageviewcontroller.cpp
+++ b/src/gvcore/imageviewcontroller.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // TQt
 #include <tqcursor.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpopupmenu.h>
 #include <tqvbox.h>
 #include <tqwidgetstack.h>
@@ -275,12 +275,12 @@ ImageViewController::ImageViewController(TQWidget* parent, Document* document, K
 
 	d->mContainer=new TQWidget(parent);
 	d->mContainer->setMinimumWidth(1); // Make sure we can resize the toolbar smaller than its minimum size
-	TQVBoxLayout* layout=new TQVBoxLayout(d->mContainer);
+	TQVBoxLayout* tqlayout=new TQVBoxLayout(d->mContainer);
 	d->mToolBar=new KToolBar(d->mContainer, "", true);
 
-	layout->add(d->mToolBar);
+	tqlayout->add(d->mToolBar);
 	d->mStack=new TQWidgetStack(d->mContainer);
-	layout->add(d->mStack);
+	tqlayout->add(d->mStack);
 	
 	d->mImageView=new ImageView(d->mStack, document, actionCollection);
 	d->mStack->addWidget(d->mImageView);
-- 
cgit v1.2.1