diff options
Diffstat (limited to 'tools/designer/plugins')
| -rw-r--r-- | tools/designer/plugins/cppeditor/cppbrowser.cpp | 4 | ||||
| -rw-r--r-- | tools/designer/plugins/cppeditor/cppeditor.cpp | 2 | ||||
| -rw-r--r-- | tools/designer/plugins/dlg/dlg2ui.cpp | 14 | ||||
| -rw-r--r-- | tools/designer/plugins/glade/glade2ui.cpp | 2 | ||||
| -rw-r--r-- | tools/designer/plugins/wizards/mainwindowwizard.ui | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/tools/designer/plugins/cppeditor/cppbrowser.cpp b/tools/designer/plugins/cppeditor/cppbrowser.cpp index 8d03931b7..0d2044a40 100644 --- a/tools/designer/plugins/cppeditor/cppbrowser.cpp +++ b/tools/designer/plugins/cppeditor/cppbrowser.cpp @@ -35,8 +35,8 @@ #include "cppbrowser.h" #include <private/qrichtext_p.h> #include <ntqprocess.h> -#include <ntqmainwindow.h> -#include <ntqstatusbar.h> +#include <tqmainwindow.h> +#include <tqstatusbar.h> #include <editor.h> CppEditorBrowser::CppEditorBrowser( Editor *e ) diff --git a/tools/designer/plugins/cppeditor/cppeditor.cpp b/tools/designer/plugins/cppeditor/cppeditor.cpp index 8b567ab20..d06bdf388 100644 --- a/tools/designer/plugins/cppeditor/cppeditor.cpp +++ b/tools/designer/plugins/cppeditor/cppeditor.cpp @@ -39,7 +39,7 @@ #include "cppbrowser.h" #include <parenmatcher.h> #include <ntqsettings.h> -#include <ntqpopupmenu.h> +#include <tqpopupmenu.h> #include <ntqinputdialog.h> #include <designerinterface.h> diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp index 2f6a6b1b4..bb18507c5 100644 --- a/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/tools/designer/plugins/dlg/dlg2ui.cpp @@ -109,8 +109,8 @@ static const struct { { "DlgWidget", "FocusPolicy", "focusPolicy", "enum" }, { "DlgWidget", "Font", "font", "qfont" }, { "DlgWidget", "FontPropagation", 0, 0 }, - { "DlgWidget", "MaximumSize", "maximumSize", "qsize" }, - { "DlgWidget", "MinimumSize", "minimumSize", "qsize" }, + { "DlgWidget", "MaximumSize", "maximumSize", "tqsize" }, + { "DlgWidget", "MinimumSize", "minimumSize", "tqsize" }, { "DlgWidget", "Name", 0, 0 }, { "DlgWidget", "Palette", "palette", "qpalette" }, { "DlgWidget", "PalettePropagation", 0, 0 }, @@ -573,7 +573,7 @@ void Dlg2Ui::emitSpacer( int spacing, int stretch ) TQString("Spacer%1").arg(uniqueSpacer++).latin1() ); emitProperty( TQString("orientation"), orientationStr, TQString("enum") ); if ( spacing > 0 ) - emitProperty( TQString("sizeHint"), sizeHint, TQString("qsize") ); + emitProperty( TQString("sizeHint"), sizeHint, TQString("tqsize") ); emitProperty( TQString("sizeType"), sizeType, TQString("enum") ); emitClosing( TQString("spacer") ); } @@ -902,7 +902,7 @@ TQVariant Dlg2Ui::getValue( const TQDomElement& e, const TQString& tagName, } else { TQDomNodeList children = e.childNodes(); - if ( type == TQString("qsize") ) { + if ( type == TQString("tqsize") ) { int width = getValue( children, TQString("Width"), TQString("integer") ).toInt(); int height = getValue( children, TQString("Height"), @@ -1373,12 +1373,12 @@ void Dlg2Ui::matchWidgetLayoutCommon( const TQDomElement& widgetLayoutCommon ) #if 1 TQPoint initialPos = getValue( children, TQString("InitialPos"), TQString("qpoint") ).toPoint(); - TQSize size = getValue( children, TQString("Size"), TQString("qsize") ) + TQSize size = getValue( children, TQString("Size"), TQString("tqsize") ) .toSize(); #endif - TQSize minSize = getValue( children, TQString("MinSize"), TQString("qsize") ) + TQSize minSize = getValue( children, TQString("MinSize"), TQString("tqsize") ) .toSize(); - TQSize maxSize = getValue( children, TQString("MaxSize"), TQString("qsize") ) + TQSize maxSize = getValue( children, TQString("MaxSize"), TQString("tqsize") ) .toSize(); #if 1 diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp index cd7d7f7e0..d9de3f14f 100644 --- a/tools/designer/plugins/glade/glade2ui.cpp +++ b/tools/designer/plugins/glade/glade2ui.cpp @@ -43,7 +43,7 @@ #include <ntqmessagebox.h> #include <ntqrect.h> #include <ntqregexp.h> -#include <ntqsizepolicy.h> +#include <tqsizepolicy.h> #include <ctype.h> diff --git a/tools/designer/plugins/wizards/mainwindowwizard.ui b/tools/designer/plugins/wizards/mainwindowwizard.ui index f8688e861..5f0fb9eb8 100644 --- a/tools/designer/plugins/wizards/mainwindowwizard.ui +++ b/tools/designer/plugins/wizards/mainwindowwizard.ui @@ -34,7 +34,7 @@ *********************************************************************</comment> <include location="global" impldecl="in implementation">designerinterface.h</include> <include location="global" impldecl="in implementation">tqiconset.h</include> -<include location="global" impldecl="in implementation">ntqaction.h</include> +<include location="global" impldecl="in implementation">tqaction.h</include> <include location="global" impldecl="in implementation">ntqpixmap.h</include> <include location="global" impldecl="in implementation">ntqdict.h</include> <include location="local" implDecl="in declaration">mainwindowwizard.ui.h</include> |