summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2022-02-07 10:15:56 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2022-02-07 10:16:21 +0900
commit669546ae13394c0e9de9070ab344b2cbee336395 (patch)
treeac207ddba8810c4b8736ee1547e865e8c9737b4c
parentfde4a570b6e4c48b112c911d937f845b88839bee (diff)
downloadtdewebdev-669546ae13394c0e9de9070ab344b2cbee336395.tar.gz
tdewebdev-669546ae13394c0e9de9070ab344b2cbee336395.zip
Removed TQT_NON_COMMERCIAL check and related code.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit dba2864aa3f9fb73ca33d80efd3258f4d82e1bb6)
-rw-r--r--kommander/editor/propertyeditor.cpp4
-rw-r--r--kommander/editor/resource.cpp9
2 files changed, 0 insertions, 13 deletions
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index f02ff466..57d31eed 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -2197,11 +2197,7 @@ void PropertyPaletteItem::getPalette()
if ( w->inherits( "TQScrollView" ) )
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;
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index 05f3b01b..7aafdbb7 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -303,17 +303,8 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
if ( !customWidgets.isNull() )
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) )
return false;
-#endif
if ( !forwards.isNull() ) {
for ( TQDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() )