Removed TQT_NON_COMMERCIAL check and related code.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/18/head
Michele Calgaro 2 years ago
parent f79893bdbf
commit 29ea77f821
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -201,12 +201,7 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
singleProject = single;
statusBar()->clear();
#if defined(TQT_NON_COMMERCIAL)
statusBar()->addWidget( new TQLabel(i18n("Ready - This is the non-commercial version of TQt - "
"For commercial evaluations, use the help menu to register with Trolltech."), statusBar()), 1 );
#else
statusBar()->addWidget( new TQLabel("Ready", statusBar()), 1 );
#endif
set_splash_status( "Setting up GUI..." );

@ -408,9 +408,6 @@ private:
TQAction* actionCurrentTool;
DesignerAction *actionHelpContents, *actionHelpAbout, *actionHelpAboutTQt, *actionHelpWhatsThis;
DesignerAction *actionHelpManual;
#if defined(TQT_NON_COMMERCIAL)
DesignerAction *actionHelpRegister;
#endif
DesignerAction *actionToolsCustomWidget, *actionEditPreferences;
DesignerAction *actionWindowTile, *actionWindowCascade, *actionWindowClose, *actionWindowCloseAll;
DesignerAction *actionWindowNext, *actionWindowPrevious;

@ -999,14 +999,6 @@ void MainWindow::setupHelpActions()
actionHelpAboutTQt->setWhatsThis( whatsThisFrom( "Help|About TQt" ) );
connect( actionHelpAboutTQt, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpAboutTQt() ) );
#if 0 //defined(TQT_NON_COMMERCIAL)
// ### not used anymore -- should be deleted?
actionHelpRegister = new DesignerAction( i18n("Register TQt"), TQPixmap(), i18n("&Register TQt..."), 0, TQT_TQOBJECT(this), 0 );
actionHelpRegister->setStatusTip( i18n("Opens a web browser at the evaluation form on www.trolltech.com") );
actionHelpRegister->setWhatsThis( i18n("Register with Trolltech") );
connect( actionHelpRegister, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpRegister() ) );
#endif
actionHelpWhatsThis = new DesignerAction( i18n("What's This?"), TQIconSet( whatsthis_image, whatsthis_image ),
i18n("What's This?"), SHIFT + Key_F1, TQT_TQOBJECT(this), 0 );
actionHelpWhatsThis->setStatusTip( i18n("\"What's This?\" context sensitive help") );
@ -1027,11 +1019,6 @@ void MainWindow::setupHelpActions()
menu->insertSeparator();
actionHelpAbout->addTo( menu );
actionHelpAboutTQt->addTo( menu );
#if 0 //defined(TQT_NON_COMMERCIAL)
// ### not used anymore -- should be deleted?
actionHelpRegister->addTo( menu );
#endif
menu->insertSeparator();
actionHelpWhatsThis->addTo( menu );
}

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

@ -491,17 +491,8 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
if ( !customWidgets.isNull() )
loadCustomWidgets( customWidgets, this );
#if defined (TQT_NON_COMMERCIAL)
bool previewMode = MainWindow::self ? MainWindow::self->isPreviewing() : FALSE;
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) )
return FALSE;
#endif
if ( !forwards.isNull() ) {
for ( TQDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() )

@ -853,20 +853,12 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
dia = new QDesignerDialog( (FormWindow*)parent, parent, name );
else
dia = new TQDialog( parent, name );
#if defined(TQT_NON_COMMERCIAL)
if ( ::tqqt_cast<MainWindow*>(parent) )
#else
if ( parent )
#endif
dia->reparent( parent, TQPoint( 0, 0 ), TRUE );
return dia;
} else if ( className == TQWIZARD_OBJECT_NAME_STRING ) {
TQWizard *wiz = new QDesignerWizard( parent, name );
#if defined(TQT_NON_COMMERCIAL)
if ( ::tqqt_cast<MainWindow*>(parent) )
#else
if ( parent )
#endif
wiz->reparent( parent, TQPoint( 0, 0 ), TRUE );
if ( init && ::tqqt_cast<FormWindow*>(parent) ) {
QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" );

Loading…
Cancel
Save