Remove temporary code required for the tqinterface migration phase introduced in commit 8ac0e970HEADmaster

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

1 files changed, 5 insertions, 34 deletions

diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index f3174378..4fd0d79b 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -60,28 +60,6 @@ static TQPluginManager<WidgetInterface> *widgetPluginManager = 0;
 static bool plugins_set_up = FALSE;
 static bool was_in_setup = FALSE;
 
-// This is temporary code required till the integration of tqtinterface into tqt3 is completed.
-// It will be removed afterwards
-static TQString converted_widgets[] =
-{
-    "TQButton", "TQButtonGroup",
-    "TQCheckBox", "TQColorDialog", "TQComboBox",
-    "TQDateTimeEdit", "TQDesktopWidget", "TQDial", "TQDialog", "TQDockArea", "TQDockWindow",
-    "TQFileDialog", "TQFrame",
-    "TQGrid", "TQGridView", "TQGroupBox",
-    "TQHBox", "TQHButtonGroup", "TQHeader", "TQHGroupBox",
-    "TQIconView", "TQInputDialog",
-    "TQLabel", "TQLCDNumber", "TQLineEdit", "TQListBox", "TQListView", 
-    "TQMainWindow", "TQMenuBar", "TQMessageBox", "TQMultiLineEdit",
-    "TQPopupMenu", "TQPrintDialog", "TQProgressBar", "TQProgressDialog", "TQPushButton",
-    "TQRadioButton",
-    "TQScrollBar", "TQScrollView", "TQSizeGrip", "TQSlider", "TQSpinBox", "TQStatusBar",
-    "TQTabBar", "TQTabDialog", "TQTabWidget", "TQTable", "TQTextBrowser", "TQTextEdit", "TQTextView", "TQToolBar", "TQToolBox", "TQToolButton", "TQToolTip",
-    "TQVBox", "TQVButtonGroup", "TQVGroupBox",
-    "TQWidget", "TQWidgetStack", "TQWizard", "TQWorkspace"
-};
-size_t converted_widgets_size = sizeof(converted_widgets) / sizeof(TQString);
-
 TQCleanupHandler<TQPluginManager<WidgetInterface> > cleanup_manager;
 
 WidgetDatabaseRecord::WidgetDatabaseRecord()
@@ -741,18 +719,11 @@ TQString WidgetDatabase::includeFile( int id )
     WidgetDatabaseRecord *r = at( id );
     if ( !r )
 	return TQString::null;
-    if ( r->includeFile.isNull() ) {
-	TQString rq = r->name;
-	for (size_t i = 0; i < converted_widgets_size; ++i)
-	{
-	    if (rq == converted_widgets[i])
-	    {
-	        return rq.lower() + ".h";
-	    }
-	}
-	if ( rq[ 0 ] == 'T' && rq[ 1 ] == 'Q')
-	    rq = rq.mid(1);
-	return "nt" + rq.lower() + ".h";
+    // Must use 'isNull()' and not 'isEmpty()' here, otherwise the code
+    // will FTBFS due to the 'TQLayoutWidget' class
+    if ( r->includeFile.isNull() ) 
+    {
+	return r->name.lower() + ".h";
     }
     return r->includeFile;
 }