summaryrefslogtreecommitdiffstats
path: root/kommander/factory/kommanderfactory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kommander/factory/kommanderfactory.cpp')
-rw-r--r--kommander/factory/kommanderfactory.cpp240
1 files changed, 118 insertions, 122 deletions
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp
index 81549438..f3cbb0e1 100644
--- a/kommander/factory/kommanderfactory.cpp
+++ b/kommander/factory/kommanderfactory.cpp
@@ -25,10 +25,6 @@
#include "kommanderfactory.h"
#include <kommanderplugin.h>
-#ifdef TQT_NO_SQL
-#define TQT_NO_SQL
-#endif // TQT_NO_SQL
-
#include <tqfeatures.h>
#include "config.h"
#ifndef TQT_NO_SQL
@@ -135,7 +131,7 @@ TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector,
if (!qwf_currFileName)
qwf_currFileName = new TQString();
*qwf_currFileName = uiFile;
- TQWidget *w = KommanderFactory::create( TQT_TQIODEVICE(&f), connector, parent, name );
+ TQWidget *w = KommanderFactory::create( &f, connector, parent, name );
if ( !qwf_forms )
qwf_forms = new TQMap<TQWidget*, TQString>;
qwf_forms->insert( w, uiFile );
@@ -217,7 +213,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
if ( !imageCollection.isNull() )
widgetFactory->loadImageCollection( imageCollection );
- widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", TQWIDGET_OBJECT_NAME_STRING) );
+ widgetFactory->createWidgetInternal( widget, parent, 0, widget.attribute("class", "TQWidget") );
TQWidget *w = widgetFactory->toplevel;
if ( !w ) {
delete widgetFactory;
@@ -266,7 +262,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
}
for ( TQMap<TQString, TQStringList>::Iterator it = widgetFactory->dbTables.begin(); it != widgetFactory->dbTables.end(); ++it ) {
- TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), TQDATATABLE_OBJECT_NAME_STRING );
+ TQDataTable *table = (TQDataTable*)widgetFactory->toplevel->child( it.key(), "TQDataTable" );
if ( !table )
continue;
if ( widgetFactory->noDatabaseWidgets.find( table->name() ) != widgetFactory->noDatabaseWidgets.end() )
@@ -292,8 +288,8 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg
}
for ( TQMap<TQString, TQString>::Iterator it = widgetFactory->buddies.begin(); it != widgetFactory->buddies.end(); ++it ) {
- TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key(), TQLABEL_OBJECT_NAME_STRING );
- TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( *it, TQWIDGET_OBJECT_NAME_STRING );
+ TQLabel *label = (TQLabel*)widgetFactory->toplevel->child( it.key().utf8(), "TQLabel" );
+ TQWidget *buddy = (TQWidget*)widgetFactory->toplevel->child( (*it).utf8(), "TQWidget" );
if ( label && buddy )
label->setBuddy( buddy );
}
@@ -315,77 +311,77 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi
TQString className = literalClassName;
// create widgets we know
- if (className == TQPUSHBUTTON_OBJECT_NAME_STRING)
+ if (className == "TQPushButton")
return new TQPushButton(parent, name);
- else if (className == TQTOOLBUTTON_OBJECT_NAME_STRING)
+ else if (className == "TQToolButton")
return new TQToolButton(parent, name);
- else if (className == TQCHECKBOX_OBJECT_NAME_STRING)
+ else if (className == "TQCheckBox")
return new TQCheckBox(parent, name);
- else if (className == TQRADIOBUTTON_OBJECT_NAME_STRING)
+ else if (className == "TQRadioButton")
return new TQRadioButton(parent, name);
- else if (className == TQGROUPBOX_OBJECT_NAME_STRING)
+ else if (className == "TQGroupBox")
return new TQGroupBox(parent, name);
- else if (className == TQBUTTONGROUP_OBJECT_NAME_STRING)
+ else if (className == "TQButtonGroup")
return new TQButtonGroup(parent, name);
- else if (className == TQICONVIEW_OBJECT_NAME_STRING)
+ else if (className == "TQIconView")
{
#if !defined(TQT_NO_ICONVIEW)
return new TQIconView(parent, name);
#endif
}
- else if (className == TQTABLE_OBJECT_NAME_STRING)
+ else if (className == "TQTable")
{
#if !defined(TQT_NO_TABLE)
return new TQTable(parent, name);
#endif
}
- else if (className == TQLISTBOX_OBJECT_NAME_STRING)
+ else if (className == "TQListBox")
return new TQListBox(parent, name);
- else if (className == TQLISTVIEW_OBJECT_NAME_STRING)
+ else if (className == "TQListView")
return new TQListView(parent, name);
- else if (className == TQLINEEDIT_OBJECT_NAME_STRING)
+ else if (className == "TQLineEdit")
return new TQLineEdit(parent, name);
- else if (className == TQSPINBOX_OBJECT_NAME_STRING)
+ else if (className == "TQSpinBox")
return new TQSpinBox(parent, name);
- else if (className == TQMULTILINEEDIT_OBJECT_NAME_STRING)
+ else if (className == "TQMultiLineEdit")
return new TQMultiLineEdit(parent, name);
- else if (className == TQLABEL_OBJECT_NAME_STRING)
+ else if (className == "TQLabel")
return new TQLabel(parent, name);
- else if (className == TQLAYOUTWIDGET_OBJECT_NAME_STRING)
+ else if (className == "TQLayoutWidget")
return new TQWidget(parent, name);
- else if (className == TQTABWIDGET_OBJECT_NAME_STRING)
+ else if (className == "TQTabWidget")
return new TQTabWidget(parent, name);
- else if (className == TQCOMBOBOX_OBJECT_NAME_STRING)
+ else if (className == "TQComboBox")
return new TQComboBox(false, parent, name);
- else if (className == TQWIDGET_OBJECT_NAME_STRING)
+ else if (className == "TQWidget")
{
if (!qwf_stays_on_top)
return new TQWidget(parent, name);
return new TQWidget(parent, name, TQt::WStyle_StaysOnTop);
}
- else if (className == TQDIALOG_OBJECT_NAME_STRING)
+ else if (className == "TQDialog")
{
if (!qwf_stays_on_top)
return new TQDialog(parent, name);
return new TQDialog(parent, name, false, TQt::WStyle_StaysOnTop);
}
- else if (className == TQWIZARD_OBJECT_NAME_STRING)
+ else if (className == "TQWizard")
return new TQWizard(parent, name);
- else if (className == TQLCDNUMBER_OBJECT_NAME_STRING)
+ else if (className == "TQLCDNumber")
return new TQLCDNumber(parent, name);
- else if (className == TQPROGRESSBAR_OBJECT_NAME_STRING)
+ else if (className == "TQProgressBar")
return new TQProgressBar(parent, name);
- else if (className == TQTEXTVIEW_OBJECT_NAME_STRING)
+ else if (className == "TQTextView")
return new TQTextView(parent, name);
- else if (className == TQTEXTBROWSER_OBJECT_NAME_STRING)
+ else if (className == "TQTextBrowser")
return new TQTextBrowser(parent, name);
- else if (className == TQDIAL_OBJECT_NAME_STRING)
+ else if (className == "TQDial")
return new TQDial(parent, name);
- else if (className == TQSLIDER_OBJECT_NAME_STRING)
+ else if (className == "TQSlider")
return new TQSlider(parent, name);
- else if (className == TQFRAME_OBJECT_NAME_STRING)
+ else if (className == "TQFrame")
return new TQFrame(parent, name);
- else if (className == TQSPLITTER_OBJECT_NAME_STRING)
+ else if (className == "TQSplitter")
return new TQSplitter(parent, name);
else if (className == "Line")
{
@@ -393,21 +389,21 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi
f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
return f;
}
- else if (className == TQTEXTEDIT_OBJECT_NAME_STRING)
+ else if (className == "TQTextEdit")
return new TQTextEdit(parent, name);
- else if (className == TQDATEEDIT_OBJECT_NAME_STRING)
+ else if (className == "TQDateEdit")
return new TQDateEdit(parent, name);
- else if (className == TQTIMEEDIT_OBJECT_NAME_STRING)
+ else if (className == "TQTimeEdit")
return new TQTimeEdit(parent, name);
- else if (className == TQDATETIMEEDIT_OBJECT_NAME_STRING)
+ else if (className == "TQDateTimeEdit")
return new TQDateTimeEdit(parent, name);
- else if (className == TQSCROLLBAR_OBJECT_NAME_STRING)
+ else if (className == "TQScrollBar")
return new TQScrollBar(parent, name);
- else if (className == TQPOPUPMENU_OBJECT_NAME_STRING)
+ else if (className == "TQPopupMenu")
return new TQPopupMenu(parent, name);
- else if (className == TQWIDGETSTACK_OBJECT_NAME_STRING)
+ else if (className == "TQWidgetStack")
return new TQWidgetStack(parent, name);
- else if (className == TQMAINWINDOW_OBJECT_NAME_STRING)
+ else if (className == "TQMainWindow")
{
TQMainWindow *mw = 0;
if (!qwf_stays_on_top)
@@ -420,11 +416,11 @@ TQWidget *KommanderFactory::createWidget( const TQString &literalClassName, TQWi
return mw;
}
#if !defined(TQT_NO_SQL)
- else if (className == TQDATATABLE_OBJECT_NAME_STRING)
+ else if (className == "TQDataTable")
return new TQDataTable(parent, name);
- else if (className == TQDATABROWSER_OBJECT_NAME_STRING)
+ else if (className == "TQDataBrowser")
return new QDesignerDataBrowser2(parent, name);
- else if (className == TQDATAVIEW_OBJECT_NAME_STRING)
+ else if (className == "TQDataView")
return new QDesignerDataView2(parent, name);
#endif
@@ -515,13 +511,13 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
if ( colspan < 1 )
colspan = 1;
if ( !className.isEmpty() ) {
- if ( !layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
- className = TQWIDGET_OBJECT_NAME_STRING;
- if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
+ if ( !layout && className == "TQLayoutWidget" )
+ className = "TQWidget";
+ if ( layout && className == "TQLayoutWidget" ) {
// hide layout widgets
w = parent;
} else {
- obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, parent, 0 ));
+ obj = KommanderFactory::createWidget( className, parent, 0 );
if ( !obj )
{
return 0;
@@ -529,7 +525,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
w = (TQWidget*)obj;
if ( !toplevel )
toplevel = w;
- if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
+ if ( w->inherits( "TQMainWindow" ) )
w = ( (TQMainWindow*)w )->centralWidget();
if ( layout ) {
switch( layoutType( layout ) ) {
@@ -559,39 +555,39 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
createSpacer( n, layout );
} else if ( n.tagName() == "widget" ) {
TQMap< TQString, TQString> *oldDbControls = dbControls;
- createWidgetInternal( n, w, layout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
+ createWidgetInternal( n, w, layout, n.attribute( "class", "TQWidget" ) );
dbControls = oldDbControls;
} else if ( n.tagName() == "hbox" ) {
TQLayout *parentLayout = layout;
- if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+ if ( layout && layout->inherits( "TQGridLayout" ) )
layout = createLayout( 0, 0, KommanderFactory::HBox );
else
layout = createLayout( w, layout, KommanderFactory::HBox );
- obj = TQT_TQOBJECT(layout);
+ obj = layout;
n = n.firstChild().toElement();
- if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+ if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "grid" ) {
TQLayout *parentLayout = layout;
- if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+ if ( layout && layout->inherits( "TQGridLayout" ) )
layout = createLayout( 0, 0, KommanderFactory::Grid );
else
layout = createLayout( w, layout, KommanderFactory::Grid );
- obj = TQT_TQOBJECT(layout);
+ obj = layout;
n = n.firstChild().toElement();
- if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+ if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "vbox" ) {
TQLayout *parentLayout = layout;
- if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+ if ( layout && layout->inherits( "TQGridLayout" ) )
layout = createLayout( 0, 0, KommanderFactory::VBox );
else
layout = createLayout( w, layout, KommanderFactory::VBox );
- obj = TQT_TQOBJECT(layout);
+ obj = layout;
n = n.firstChild().toElement();
- if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+ if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) )
( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 );
continue;
} else if ( n.tagName() == "property" && obj ) {
@@ -599,14 +595,14 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge
} else if ( n.tagName() == "attribute" && w ) {
TQString attrib = n.attribute( "name" );
TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() );
- if ( parent->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
+ if ( parent->inherits( "TQTabWidget" ) ) {
if ( attrib == "title" )
( (TQTabWidget*)parent )->insertTab( w, translate(v.toString()) );
} else
- if ( parent->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) ) {
+ if ( parent->inherits( "TQToolBox" ) ) {
if ( attrib == "label" )
( (TQToolBox*)parent )->addItem( w, translate(v.toString()) );
- }else if ( parent->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
+ }else if ( parent->inherits( "TQWizard" ) ) {
if ( attrib == "title" )
( (TQWizard*)parent )->addPage( w, translate(v.toString()) );
}
@@ -627,20 +623,20 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L
int spacing = defSpacing;
int margin = defMargin;
- if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+ if ( !layout && widget && widget->inherits( "TQTabWidget" ) )
widget = ((TQTabWidget*)widget)->currentPage();
- if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
+ if ( !layout && widget && widget->inherits( "TQToolBox" ) )
widget = ((TQToolBox*)widget)->currentItem();
- if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
+ if ( !layout && widget && widget->inherits( "TQWizard" ) )
widget = ((TQWizard*)widget)->currentPage();
- if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
+ if ( !layout && widget && widget->inherits( "TQWidgetStack" ) )
widget = ((TQWidgetStack*)widget)->visibleWidget();
- if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
+ if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) {
TQGroupBox *gb = (TQGroupBox*)widget;
- gb->setColumnLayout( 0, Qt::Vertical );
+ gb->setColumnLayout( 0, TQt::Vertical );
gb->layout()->setMargin( 0 );
gb->layout()->setSpacing( 0 );
TQLayout *l;
@@ -717,18 +713,18 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L
KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *layout ) const
{
- if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
+ if ( layout->inherits( "TQHBoxLayout" ) )
return HBox;
- else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
+ else if ( layout->inherits( "TQVBoxLayout" ) )
return VBox;
- else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+ else if ( layout->inherits( "TQGridLayout" ) )
return Grid;
return NoLayout;
}
void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const TQDomElement &e )
{
- const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, true ), true );
+ const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop.latin1(), true ), true );
TQVariant defVariant;
if ( e.tagName() == "font" ) {
@@ -767,8 +763,8 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
TQWhatsThis::add( (TQWidget*)obj, translate(v.toString()) );
}
#ifndef TQT_NO_SQL
- if ( prop == "database" && !obj->inherits( TQDATAVIEW_OBJECT_NAME_STRING )
- && !obj->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) ) {
+ if ( prop == "database" && !obj->inherits( "TQDataView" )
+ && !obj->inherits( "TQDataBrowser" ) ) {
TQStringList lst = DomTool::elementToVariant( e, TQVariant( TQStringList() ) ).toStringList();
if ( lst.count() > 2 ) {
if ( dbControls )
@@ -778,7 +774,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
}
} else if ( prop == "database" ) {
TQStringList lst = DomTool::elementToVariant( e, TQVariant( TQStringList() ) ).toStringList();
- if ( lst.count() == 2 && obj->inherits( TQWIDGET_OBJECT_NAME_STRING ) ) {
+ if ( lst.count() == 2 && obj->inherits( "TQWidget" ) ) {
SqlWidgetConnection conn( lst[ 0 ], lst[ 1 ] );
sqlWidgetConnections.insert( (TQWidget*)obj, conn );
dbControls = conn.dbControls;
@@ -792,7 +788,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
noDatabaseWidgets << obj->name();
}
} else if ( prop == "buttonGroupId" ) {
- if ( obj->inherits( TQBUTTON_OBJECT_NAME_STRING ) && obj->parent()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) )
+ if ( obj->inherits( "TQButton" ) && obj->parent()->inherits( "TQButtonGroup" ) )
( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, v.toInt() );
}
@@ -820,24 +816,24 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
v = TQPalette( p );
} else if ( e.tagName() == "enum" && p && p->isEnumType() ) {
TQString key( v.toString() );
- v = TQVariant( p->keyToValue( key ) );
+ v = TQVariant( p->keyToValue( key.utf8() ) );
} else if ( e.tagName() == "set" && p && p->isSetType() ) {
TQString keys( v.toString() );
TQStringList lst = TQStringList::split( '|', keys );
TQStrList l;
for ( TQStringList::Iterator it = lst.begin(); it != lst.end(); ++it )
- l.append( *it );
+ l.append( (*it).utf8() );
v = TQVariant( p->keysToValue( l ) );
}
if ( prop == "geometry" ) {
- if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) {
+ if ( obj == toplevel ) {
toplevel->resize( v.toRect().size() );
return;
}
}
- obj->setProperty( prop, v );
+ obj->setProperty( prop.latin1(), v );
}
void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
@@ -848,7 +844,7 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
int rowspan = e.attribute( "rowspan" ).toInt();
int colspan = e.attribute( "colspan" ).toInt();
- Qt::Orientation orient = Qt::Horizontal;
+ TQt::Orientation orient = TQt::Horizontal;
int w = 0, h = 0;
TQSizePolicy::SizeType sizeType = TQSizePolicy::Preferred;
while ( !n.isNull() ) {
@@ -856,9 +852,9 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
TQString prop = n.attribute( "name" );
if ( prop == "orientation" ) {
if ( n.firstChild().firstChild().toText().data() == "Horizontal" )
- orient = Qt::Horizontal;
+ orient = TQt::Horizontal;
else
- orient = Qt::Vertical;
+ orient = TQt::Vertical;
} else if ( prop == "sizeType" ) {
if ( n.firstChild().firstChild().toText().data() == "Fixed" )
sizeType = TQSizePolicy::Fixed;
@@ -884,14 +880,14 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
rowspan = 1;
if ( colspan < 1 )
colspan = 1;
- TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum,
- orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum );
+ TQSpacerItem *item = new TQSpacerItem( w, h, orient == TQt::Horizontal ? sizeType : TQSizePolicy::Minimum,
+ orient == TQt::Vertical ? sizeType : TQSizePolicy::Minimum );
if ( layout ) {
- if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
+ if ( layout->inherits( "TQBoxLayout" ) )
( (TQBoxLayout*)layout )->addItem( item );
else
( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1,
- orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter );
+ orient == TQt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter );
}
}
@@ -924,7 +920,7 @@ static TQImage loadImageData( TQDomElement &n2 )
::uncompress( (uchar*) baunzip.data(), &len, (uchar*) ba, data.length()/2 );
img.loadFromData( (const uchar*)baunzip.data(), len, "XPM" );
} else {
- img.loadFromData( (const uchar*)ba, data.length() / 2, format );
+ img.loadFromData( (const uchar*)ba, data.length() / 2, format.utf8() );
}
delete [] ba;
@@ -1025,12 +1021,12 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
while ( !n2.isNull() ) {
if ( n2.tagName() == "sender" ) {
TQString name = n2.firstChild().toText().data();
- if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) {
- conn.sender = TQT_TQOBJECT(toplevel);
+ if ( name == "this" || name == toplevel->name() ) {
+ conn.sender = toplevel;
} else {
if ( name == "this" )
name = toplevel->name();
- TQObjectList *l = toplevel->queryList( 0, name, false );
+ TQObjectList *l = toplevel->queryList( 0, name.utf8(), false );
if ( l ) {
if ( l->first() )
conn.sender = l->first();
@@ -1040,13 +1036,13 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
if ( !conn.sender )
conn.sender = findAction( name );
} else if ( n2.tagName() == "signal" ) {
- conn.signal = n2.firstChild().toText().data();
+ conn.signal = n2.firstChild().toText().data().utf8();
} else if ( n2.tagName() == "receiver" ) {
TQString name = n2.firstChild().toText().data();
- if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) {
- conn.receiver = TQT_TQOBJECT(toplevel);
+ if ( name == "this" || name == toplevel->name() ) {
+ conn.receiver = toplevel;
} else {
- TQObjectList *l = toplevel->queryList( 0, name, false );
+ TQObjectList *l = toplevel->queryList( 0, name.utf8(), false );
if ( l ) {
if ( l->first() )
conn.receiver = l->first();
@@ -1054,7 +1050,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
}
}
} else if ( n2.tagName() == "slot" ) {
- conn.slot = n2.firstChild().toText().data();
+ conn.slot = n2.firstChild().toText().data().utf8();
}
n2 = n2.nextSibling().toElement();
}
@@ -1065,7 +1061,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
TQObject *sender = 0, *receiver = 0;
TQObjectList *l = toplevel->queryList( 0, conn.sender->name(), false );
if ( qstrcmp( conn.sender->name(), toplevel->name() ) == 0 ) {
- sender = TQT_TQOBJECT(toplevel);
+ sender = toplevel;
} else {
if ( !l || !l->first() ) {
delete l;
@@ -1079,7 +1075,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
sender = findAction( conn.sender->name() );
if ( qstrcmp( conn.receiver->name(), toplevel->name() ) == 0 ) {
- receiver = TQT_TQOBJECT(toplevel);
+ receiver = toplevel;
} else {
l = toplevel->queryList( 0, conn.receiver->name(), false );
if ( !l || !l->first() ) {
@@ -1101,7 +1097,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
TQStrList slotList = receiver->metaObject()->slotNames( true );
// if this is a connection to a custom slot and we have a connector, try this as receiver
- if ( slotList.find( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) {
+ if ( slotList.find( conn.slot ) == -1 && receiver == toplevel && connector ) {
slotList = connector->metaObject()->slotNames( true );
receiver = connector;
}
@@ -1112,7 +1108,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect
n = n.nextSibling().toElement();
continue;
}
- TQObject::connect( sender, s, receiver, s2 );
+ TQObject::connect( sender, s.utf8(), receiver, s2.utf8() );
} else {
EventFunction ef = eventMap[ conn.sender ];
ef.events.append( conn.signal );
@@ -1134,7 +1130,7 @@ void KommanderFactory::loadTabOrder( const TQDomElement &e )
while ( !n.isNull() ) {
if ( n.tagName() == "tabstop" ) {
TQString name = n.firstChild().toText().data();
- TQObjectList *l = toplevel->queryList( 0, name, false );
+ TQObjectList *l = toplevel->queryList( 0, name.utf8(), false );
if ( l ) {
if ( l->first() ) {
TQWidget *w = (TQWidget*)l->first();
@@ -1151,7 +1147,7 @@ void KommanderFactory::loadTabOrder( const TQDomElement &e )
void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget )
{
- if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) && e.tagName() == "column" ) {
+ if ( widget->inherits( "TQListView" ) && e.tagName() == "column" ) {
TQListView *lv = (TQListView*)widget;
TQDomElement n = e.firstChild().toElement();
TQPixmap pix;
@@ -1185,10 +1181,10 @@ void KommanderFactory::createColumn( const TQDomElement &e, TQWidget *widget )
lv->header()->setResizeEnabled( resizeable, i );
}
#ifndef TQT_NO_TABLE
- else if ( widget->inherits( TQTABLE_OBJECT_NAME_STRING ) ) {
+ else if ( widget->inherits( "TQTable" ) ) {
TQTable *table = (TQTable*)widget;
#ifndef TQT_NO_SQL
- bool isSql = (widget->inherits( TQDATATABLE_OBJECT_NAME_STRING ));
+ bool isSql = (widget->inherits( "TQDataTable" ));
#endif
bool isRow;
if ( ( isRow = e.tagName() == "row" ) )
@@ -1273,14 +1269,14 @@ void KommanderFactory::loadItem( const TQDomElement &e, TQPixmap &pix, TQString
void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i )
{
- if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) {
+ if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) {
TQDomElement n = e.firstChild().toElement();
TQPixmap pix;
bool hasPixmap = false;
TQString txt;
loadItem( n, pix, txt, hasPixmap );
TQListBox *lb = 0;
- if ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) )
+ if ( widget->inherits( "TQListBox" ) )
lb = (TQListBox*)widget;
else
lb = ( (TQComboBox*)widget)->listBox();
@@ -1290,7 +1286,7 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi
new TQListBoxText( lb, txt );
}
#ifndef TQT_NO_ICONVIEW
- } else if ( widget->inherits( TQICONVIEW_OBJECT_NAME_STRING ) ) {
+ } else if ( widget->inherits( "TQIconView" ) ) {
TQDomElement n = e.firstChild().toElement();
TQPixmap pix;
bool hasPixmap = false;
@@ -1300,7 +1296,7 @@ void KommanderFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLi
TQIconView *iv = (TQIconView*)widget;
new TQIconViewItem( iv, txt, pix );
#endif
- } else if ( widget->inherits( TQLISTVIEW_OBJECT_NAME_STRING ) ) {
+ } else if ( widget->inherits( "TQListView" ) ) {
TQDomElement n = e.firstChild().toElement();
TQPixmap pix;
TQValueList<TQPixmap> pixmaps;
@@ -1361,7 +1357,7 @@ void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e
}
n2 = n2.nextSibling().toElement();
}
- if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) )
+ if ( !parent->inherits( "TQAction" ) )
actionList.append( a );
} else if ( n.tagName() == "actiongroup" ) {
a = new TQActionGroup( parent );
@@ -1378,7 +1374,7 @@ void KommanderFactory::loadChildAction( TQObject *parent, const TQDomElement &e
}
n2 = n2.nextSibling().toElement();
}
- if ( !parent->inherits( TQACTION_OBJECT_NAME_STRING ) )
+ if ( !parent->inherits( "TQAction" ) )
actionList.append( a );
}
if ( a )
@@ -1390,9 +1386,9 @@ void KommanderFactory::loadActions( const TQDomElement &e )
TQDomElement n = e.firstChild().toElement();
while ( !n.isNull() ) {
if ( n.tagName() == "action" ) {
- loadChildAction( TQT_TQOBJECT(toplevel), n );
+ loadChildAction( toplevel, n );
} else if ( n.tagName() == "actiongroup" ) {
- loadChildAction( TQT_TQOBJECT(toplevel), n );
+ loadChildAction( toplevel, n );
}
n = n.nextSibling().toElement();
}
@@ -1408,7 +1404,7 @@ void KommanderFactory::loadToolBars( const TQDomElement &e )
TQt::Dock dock = (TQt::Dock)n.attribute( "dock" ).toInt();
tb = new TQToolBar( TQString(), mw, dock );
tb->setLabel( n.attribute( "label" ) );
- tb->setName( n.attribute( "name" ) );
+ tb->setName( n.attribute( "name" ).utf8() );
TQDomElement n2 = n.firstChild().toElement();
while ( !n2.isNull() ) {
if ( n2.tagName() == "action" ) {
@@ -1418,9 +1414,9 @@ void KommanderFactory::loadToolBars( const TQDomElement &e )
} else if ( n2.tagName() == "separator" ) {
tb->addSeparator();
} else if ( n2.tagName() == "widget" ) {
- (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
+ (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", "TQWidget" ) );
} else if ( n2.tagName() == "property" ) {
- setProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() );
+ setProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() );
}
n2 = n2.nextSibling().toElement();
}
@@ -1437,7 +1433,7 @@ void KommanderFactory::loadMenuBar( const TQDomElement &e )
while ( !n.isNull() ) {
if ( n.tagName() == "item" ) {
TQPopupMenu *popup = new TQPopupMenu( mw );
- popup->setName( n.attribute( "name" ) );
+ popup->setName( n.attribute( "name" ).utf8() );
TQDomElement n2 = n.firstChild().toElement();
while ( !n2.isNull() ) {
if ( n2.tagName() == "action" ) {
@@ -1451,7 +1447,7 @@ void KommanderFactory::loadMenuBar( const TQDomElement &e )
}
mb->insertItem( translate( n.attribute( "text" ) ), popup );
} else if ( n.tagName() == "property" ) {
- setProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() );
+ setProperty( mb, n.attribute( "name" ), n.firstChild().toElement() );
}
n = n.nextSibling().toElement();
}
@@ -1463,7 +1459,7 @@ TQAction *KommanderFactory::findAction( const TQString &name )
for ( TQAction *a = actionList.first(); a; a = actionList.next() ) {
if ( TQString( a->name() ) == name )
return a;
- TQAction *ac = (TQAction*)a->child( name.latin1(), TQACTION_OBJECT_NAME_STRING );
+ TQAction *ac = (TQAction*)a->child( name.latin1(), "TQAction" );
if ( ac )
return ac;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-04-28 10:34:25 +0000