3 files changed, 13 insertions, 15 deletions
diff --git a/kdevdesigner/uilib/database2.h b/kdevdesigner/uilib/database2.h
index ada42364..c8881736 100644
--- a/kdevdesigner/uilib/database2.h
+++ b/kdevdesigner/uilib/database2.h
@@ -56,25 +56,25 @@ protected:
 
 };
 
-class TQDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2
+class QDesignerDataBrowser2 : public TQDataBrowser, public DatabaseSupport2
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerDataBrowser2( TQWidget *tqparent, const char *name );
+    QDesignerDataBrowser2( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
 };
 
-class TQDesignerDataView2 : public TQDataView, public DatabaseSupport2
+class QDesignerDataView2 : public TQDataView, public DatabaseSupport2
 {
     Q_OBJECT
   TQ_OBJECT
 
 public:
-    TQDesignerDataView2( TQWidget *tqparent, const char *name );
+    QDesignerDataView2( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
@@ -82,8 +82,8 @@ protected:
 };
 
 #define DatabaseSupport DatabaseSupport2
-#define TQDesignerDataBrowser TQDesignerDataBrowser2
-#define TQDesignerDataView TQDesignerDataView2
+#define TQDesignerDataBrowser QDesignerDataBrowser2
+#define TQDesignerDataView QDesignerDataView2
 
 #endif
 
diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp
index b19d7d14..7b5cf28b 100644
--- a/kdevdesigner/uilib/qwidgetfactory.cpp
+++ b/kdevdesigner/uilib/qwidgetfactory.cpp
@@ -41,7 +41,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqobjectlist.h>
-#include <private/tqpluginmanager_p.h>
+#include <tqpluginmanager_p.h>
 #include <tqmime.h>
 #include <tqdragobject.h>
 
@@ -354,11 +354,11 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
 	    if ( widgetFactory->noDatabaseWidgets.tqfind( cit.key()->name() ) !=
 		 widgetFactory->noDatabaseWidgets.end() )
 		continue;
-	    if ( cit.key()->inherits( "TQDesignerDataBrowser2" ) )
-		( (TQDesignerDataBrowser2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
+	    if ( cit.key()->inherits( "QDesignerDataBrowser2" ) )
+		( (QDesignerDataBrowser2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
 								    TQT_TQOBJECT(cit.key()), *(*cit).dbControls );
-	    else if ( cit.key()->inherits( "TQDesignerDataView2" ) )
-		( (TQDesignerDataView2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
+	    else if ( cit.key()->inherits( "QDesignerDataView2" ) )
+		( (QDesignerDataView2*)cit.key() )->initPreview( (*cit).conn, (*cit).table,
 								 TQT_TQOBJECT(cit.key()), *(*cit).dbControls );
 	}
 
@@ -1516,9 +1516,9 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *tq
     else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) {
 	return new TQDataTable( tqparent, name );
     } else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) {
-	return new TQDesignerDataBrowser2( tqparent, name );
+	return new QDesignerDataBrowser2( tqparent, name );
     } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) {
-	return new TQDesignerDataView2( tqparent, name );
+	return new QDesignerDataView2( tqparent, name );
     }
 #endif
 
diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h
index c7028696..575a3630 100644
--- a/kdevdesigner/uilib/qwidgetfactory.h
+++ b/kdevdesigner/uilib/qwidgetfactory.h
@@ -27,7 +27,6 @@
 #ifndef TQWIDGETFACTORY_H
 #define TQWIDGETFACTORY_H
 
-#ifndef TQT_H
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqimage.h>
@@ -35,7 +34,6 @@
 #include <tqvaluelist.h>
 #include <tqmap.h>
 #include <tqaction.h>
-#endif // TQT_H
 
 class TQDomDocument;
 class TQDomElement;