Removed TQT_NON_COMMERCIAL check and related code.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/16/head
Michele Calgaro 3 years ago
parent a9e454973f
commit dba2864aa3
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -2197,11 +2197,7 @@ void PropertyPaletteItem::getPalette()
if ( w->inherits( "TQScrollView" ) ) if ( w->inherits( "TQScrollView" ) )
w = ( (TQScrollView*)w )->viewport(); w = ( (TQScrollView*)w )->viewport();
TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(),
#if defined(TQT_NON_COMMERCIAL)
w->backgroundMode(), listview->topLevelWidget(),
#else
w->backgroundMode(), listview, w->backgroundMode(), listview,
#endif
"choose_palette", listview->propertyEditor()->formWindow() ); "choose_palette", listview->propertyEditor()->formWindow() );
if ( !ok ) if ( !ok )
return; return;

@ -303,17 +303,8 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
if ( !customWidgets.isNull() ) if ( !customWidgets.isNull() )
loadCustomWidgets( customWidgets, this ); loadCustomWidgets( customWidgets, this );
#if defined (TQT_NON_COMMERCIAL)
bool previewMode = MainWindow::self->isPreviewing();
TQWidget *w = (TQWidget*)createObject( widget, !previewMode ? (TQWidget*)formwindow : MainWindow::self);
if ( !w )
return false;
if ( previewMode )
w->reparent( MainWindow::self, TQt::WType_TopLevel, w->pos(), true );
#else
if ( !createObject( widget, formwindow) ) if ( !createObject( widget, formwindow) )
return false; return false;
#endif
if ( !forwards.isNull() ) { if ( !forwards.isNull() ) {
for ( TQDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) for ( TQDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() )

Loading…
Cancel
Save