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

This reverts commit 996381f5af9d39777caa6c48bac35d8ff92ad99e.
---
 qtruby/rubylib/designer/rbuic/form.cpp           | 2 +-
 qtruby/rubylib/designer/rbuic/uic.h              | 4 ++--
 qtruby/rubylib/designer/rbuic/widgetdatabase.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'qtruby/rubylib/designer/rbuic')

diff --git a/qtruby/rubylib/designer/rbuic/form.cpp b/qtruby/rubylib/designer/rbuic/form.cpp
index a5e0718c..42ec751f 100644
--- a/qtruby/rubylib/designer/rbuic/form.cpp
+++ b/qtruby/rubylib/designer/rbuic/form.cpp
@@ -368,7 +368,7 @@ void Uic::createFormImpl( const TQDomElement &e )
 	for ( i = 1; i < (int) nl.length(); i++ ) { // start at 1, 0 is the toplevel widget
 	    TQString name = getClassName( nl.item(i).toElement() );
 	    if ( name == "Spacer" ) {
-		globalIncludes += "layout.h";
+		globalIncludes += "tqlayout.h";
 		globalIncludes += "tqapplication.h";
 		continue;
 	    }
diff --git a/qtruby/rubylib/designer/rbuic/uic.h b/qtruby/rubylib/designer/rbuic/uic.h
index 74e53c4d..ddfcc1be 100644
--- a/qtruby/rubylib/designer/rbuic/uic.h
+++ b/qtruby/rubylib/designer/rbuic/uic.h
@@ -25,8 +25,8 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqmap.h>
-#include <textstream.h>
-#include <palette.h>
+#include <tqtextstream.h>
+#include <tqpalette.h>
 
 
 class RubyIndent
diff --git a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp b/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
index 5d3f487c..f8a0f0fd 100644
--- a/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
+++ b/qtruby/rubylib/designer/rbuic/widgetdatabase.cpp
@@ -30,7 +30,7 @@
 #include <tqstrlist.h>
 #include <tqdict.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqcleanuphandler.h>
 
 #include <tqfeatures.h>
-- 
cgit v1.2.3