diff options
Diffstat (limited to 'tools')
31 files changed, 55 insertions, 55 deletions
diff --git a/tools/designer/designer/connectionitems.cpp b/tools/designer/designer/connectionitems.cpp index 0c44135a7..d570660fb 100644 --- a/tools/designer/designer/connectionitems.cpp +++ b/tools/designer/designer/connectionitems.cpp @@ -43,7 +43,7 @@ #include <ntqcombobox.h> #include <ntqlistbox.h> #include <ntqaction.h> -#include <ntqdatabrowser.h> +#include <tqdatabrowser.h> static const char* const ignore_slots[] = { "destroyed()", diff --git a/tools/designer/designer/database.cpp b/tools/designer/designer/database.cpp index 602e9c236..3c1c8a2c8 100644 --- a/tools/designer/designer/database.cpp +++ b/tools/designer/designer/database.cpp @@ -44,10 +44,10 @@ #include "mainwindow.h" #endif -#include <ntqsqldatabase.h> -#include <ntqsqlform.h> -#include <ntqsqlcursor.h> -#include <ntqsqlrecord.h> +#include <tqsqldatabase.h> +#include <tqsqlform.h> +#include <tqsqlcursor.h> +#include <tqsqlrecord.h> DatabaseSupport::DatabaseSupport() { diff --git a/tools/designer/designer/database.h b/tools/designer/designer/database.h index 31e0a1eb9..bfb7e1e7b 100644 --- a/tools/designer/designer/database.h +++ b/tools/designer/designer/database.h @@ -37,9 +37,9 @@ #include "ntqfeatures.h" #ifndef TQT_NO_SQL -#include <ntqdataview.h> -#include <ntqdatabrowser.h> -#include <ntqsqlcursor.h> +#include <tqdataview.h> +#include <tqdatabrowser.h> +#include <tqsqlcursor.h> #include <ntqstring.h> class TQSqlDatabase; diff --git a/tools/designer/designer/database2.h b/tools/designer/designer/database2.h index 41a636b4f..4bd1215ed 100644 --- a/tools/designer/designer/database2.h +++ b/tools/designer/designer/database2.h @@ -37,9 +37,9 @@ #include "ntqfeatures.h" #ifndef TQT_NO_SQL -#include <ntqdataview.h> -#include <ntqdatabrowser.h> -#include <ntqsqlcursor.h> +#include <tqdataview.h> +#include <tqdatabrowser.h> +#include <tqsqlcursor.h> #include <ntqstring.h> class TQSqlDatabase; diff --git a/tools/designer/designer/dbconnectionimpl.cpp b/tools/designer/designer/dbconnectionimpl.cpp index fd9cf4eb0..c14ded90c 100644 --- a/tools/designer/designer/dbconnectionimpl.cpp +++ b/tools/designer/designer/dbconnectionimpl.cpp @@ -40,7 +40,7 @@ #include <ntqspinbox.h> #include <ntqlineedit.h> #include <ntqlayout.h> -#include <ntqsqldatabase.h> +#include <tqsqldatabase.h> DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent, const char* name, bool modal, WFlags fl ) diff --git a/tools/designer/designer/dbconnectionsimpl.cpp b/tools/designer/designer/dbconnectionsimpl.cpp index 29c216cd1..8aaf45217 100644 --- a/tools/designer/designer/dbconnectionsimpl.cpp +++ b/tools/designer/designer/dbconnectionsimpl.cpp @@ -41,7 +41,7 @@ #include <ntqspinbox.h> #include <ntqlineedit.h> #include <ntqpushbutton.h> -#include <ntqsqldatabase.h> +#include <tqsqldatabase.h> #include <ntqmessagebox.h> #include <ntqapplication.h> #include "mainwindow.h" diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp index 725e1ced1..aa066d177 100644 --- a/tools/designer/designer/project.cpp +++ b/tools/designer/designer/project.cpp @@ -56,9 +56,9 @@ #include <ntqworkspace.h> #ifndef TQT_NO_SQL -#include <ntqsqldatabase.h> -#include <ntqsqlrecord.h> -#include <ntqdatatable.h> +#include <tqsqldatabase.h> +#include <tqsqlrecord.h> +#include <tqdatatable.h> #endif #include <stdlib.h> diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp index 99dfa2542..bb4a94837 100644 --- a/tools/designer/designer/propertyeditor.cpp +++ b/tools/designer/designer/propertyeditor.cpp @@ -87,7 +87,7 @@ #include <ntqdrawutil.h> #include <ntqmultilineedit.h> // FIXME: obsolete #include <ntqsplitter.h> -#include <ntqdatatable.h> +#include <tqdatatable.h> #include <ntqtextview.h> #include <limits.h> diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp index 99a016e5f..2244f2f86 100644 --- a/tools/designer/designer/resource.cpp +++ b/tools/designer/designer/resource.cpp @@ -72,7 +72,7 @@ #include <ntqtabbar.h> #ifndef TQT_NO_TABLE #include <ntqtable.h> -#include <ntqdatatable.h> +#include <tqdatatable.h> #endif #include <ntqtabwidget.h> #include <ntqtabwidget.h> diff --git a/tools/designer/designer/tableeditorimpl.cpp b/tools/designer/designer/tableeditorimpl.cpp index 2a82127fb..e60ce6122 100644 --- a/tools/designer/designer/tableeditorimpl.cpp +++ b/tools/designer/designer/tableeditorimpl.cpp @@ -46,7 +46,7 @@ #include "command.h" #include <ntqvaluelist.h> #include <ntqtabwidget.h> -#include <ntqdatatable.h> +#include <tqdatatable.h> #include "project.h" #include "metadatabase.h" #include "mainwindow.h" diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp index 6ad1b02d0..72b05d758 100644 --- a/tools/designer/designer/widgetfactory.cpp +++ b/tools/designer/designer/widgetfactory.cpp @@ -61,7 +61,7 @@ #include <ntqtable.h> #endif #ifndef TQT_NO_SQL -#include <ntqdatatable.h> +#include <tqdatatable.h> #endif #include <ntqdatetimeedit.h> #include <ntqlineedit.h> diff --git a/tools/designer/examples/book/book1/main.cpp b/tools/designer/examples/book/book1/main.cpp index b3ebdad0c..e101e2711 100644 --- a/tools/designer/examples/book/book1/main.cpp +++ b/tools/designer/examples/book/book1/main.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include <ntqapplication.h> -#include <ntqsqldatabase.h> +#include <tqsqldatabase.h> #include "book.h" #include "../connection.h" diff --git a/tools/designer/examples/book/book2/main.cpp b/tools/designer/examples/book/book2/main.cpp index b3ebdad0c..e101e2711 100644 --- a/tools/designer/examples/book/book2/main.cpp +++ b/tools/designer/examples/book/book2/main.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include <ntqapplication.h> -#include <ntqsqldatabase.h> +#include <tqsqldatabase.h> #include "book.h" #include "../connection.h" diff --git a/tools/designer/examples/book/book3/main.cpp b/tools/designer/examples/book/book3/main.cpp index ea5125718..db0977fb1 100644 --- a/tools/designer/examples/book/book3/main.cpp +++ b/tools/designer/examples/book/book3/main.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include <ntqapplication.h> -#include <ntqsqldatabase.h> +#include <tqsqldatabase.h> #include "book.h" #include "../connection.h" diff --git a/tools/designer/examples/book/book4/main.cpp b/tools/designer/examples/book/book4/main.cpp index 1abe5a9ad..234e8e7f0 100644 --- a/tools/designer/examples/book/book4/main.cpp +++ b/tools/designer/examples/book/book4/main.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include <ntqapplication.h> -#include <ntqsqldatabase.h> +#include <tqsqldatabase.h> #include "book.h" #include "../connection.h" diff --git a/tools/designer/examples/book/book5/book.ui b/tools/designer/examples/book/book5/book.ui index ce056dab0..63f3b6963 100644 --- a/tools/designer/examples/book/book5/book.ui +++ b/tools/designer/examples/book/book5/book.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>BookForm</class> -<include location="local" impldecl="in declaration">ntqdatabrowser.h</include> +<include location="local" impldecl="in declaration">tqdatabrowser.h</include> <include location="local" impldecl="in declaration">editbook.h</include> <include location="local" implDecl="in declaration">book.ui.h</include> <layoutdefaults spacing="6" margin="11"/> diff --git a/tools/designer/examples/book/book5/main.cpp b/tools/designer/examples/book/book5/main.cpp index b3ebdad0c..e101e2711 100644 --- a/tools/designer/examples/book/book5/main.cpp +++ b/tools/designer/examples/book/book5/main.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include <ntqapplication.h> -#include <ntqsqldatabase.h> +#include <tqsqldatabase.h> #include "book.h" #include "../connection.h" diff --git a/tools/designer/examples/book/book6/book.ui b/tools/designer/examples/book/book6/book.ui index 8adbb2bb6..3581befbf 100644 --- a/tools/designer/examples/book/book6/book.ui +++ b/tools/designer/examples/book/book6/book.ui @@ -1,8 +1,8 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>BookForm</class> -<include location="global" impldecl="in declaration">ntqsqlrecord.h</include> +<include location="global" impldecl="in declaration">tqsqlrecord.h</include> <include location="local" impldecl="in declaration">editbook.h</include> -<include location="global" impldecl="in declaration">ntqdatabrowser.h</include> +<include location="global" impldecl="in declaration">tqdatabrowser.h</include> <include location="local" implDecl="in declaration">book.ui.h</include> <layoutdefaults spacing="6" margin="11"/> <widget class="TQDialog"> diff --git a/tools/designer/examples/book/book6/editbook.ui b/tools/designer/examples/book/book6/editbook.ui index b91628725..c09fc244d 100644 --- a/tools/designer/examples/book/book6/editbook.ui +++ b/tools/designer/examples/book/book6/editbook.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>EditBookForm</class> -<include location="global" impldecl="in declaration">ntqsqlrecord.h</include> +<include location="global" impldecl="in declaration">tqsqlrecord.h</include> <include location="local" implDecl="in declaration">editbook.ui.h</include> <forward>class TQSqlRecord;</forward> <layoutdefaults spacing="6" margin="11"/> diff --git a/tools/designer/examples/book/book6/main.cpp b/tools/designer/examples/book/book6/main.cpp index b3ebdad0c..e101e2711 100644 --- a/tools/designer/examples/book/book6/main.cpp +++ b/tools/designer/examples/book/book6/main.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include <ntqapplication.h> -#include <ntqsqldatabase.h> +#include <tqsqldatabase.h> #include "book.h" #include "../connection.h" diff --git a/tools/designer/examples/book/book7/book.ui b/tools/designer/examples/book/book7/book.ui index 4a03ee6da..d44537a88 100644 --- a/tools/designer/examples/book/book7/book.ui +++ b/tools/designer/examples/book/book7/book.ui @@ -1,8 +1,8 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>BookForm</class> -<include location="global" impldecl="in declaration">ntqsqlrecord.h</include> +<include location="global" impldecl="in declaration">tqsqlrecord.h</include> <include location="local" impldecl="in declaration">editbook.h</include> -<include location="global" impldecl="in declaration">ntqdatabrowser.h</include> +<include location="global" impldecl="in declaration">tqdatabrowser.h</include> <include location="local" implDecl="in declaration">book.ui.h</include> <layoutdefaults spacing="6" margin="11"/> <widget class="TQDialog"> diff --git a/tools/designer/examples/book/book7/editbook.ui b/tools/designer/examples/book/book7/editbook.ui index 635d82fea..12f60a9ec 100644 --- a/tools/designer/examples/book/book7/editbook.ui +++ b/tools/designer/examples/book/book7/editbook.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>EditBookForm</class> -<include location="global" impldecl="in declaration">ntqsqlrecord.h</include> +<include location="global" impldecl="in declaration">tqsqlrecord.h</include> <include location="local" implDecl="in declaration">editbook.ui.h</include> <forward>class TQSqlRecord;</forward> <layoutdefaults spacing="6" margin="11"/> diff --git a/tools/designer/examples/book/book7/main.cpp b/tools/designer/examples/book/book7/main.cpp index b3ebdad0c..e101e2711 100644 --- a/tools/designer/examples/book/book7/main.cpp +++ b/tools/designer/examples/book/book7/main.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include <ntqapplication.h> -#include <ntqsqldatabase.h> +#include <tqsqldatabase.h> #include "book.h" #include "../connection.h" diff --git a/tools/designer/examples/book/book8/book.ui b/tools/designer/examples/book/book8/book.ui index 4a03ee6da..d44537a88 100644 --- a/tools/designer/examples/book/book8/book.ui +++ b/tools/designer/examples/book/book8/book.ui @@ -1,8 +1,8 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>BookForm</class> -<include location="global" impldecl="in declaration">ntqsqlrecord.h</include> +<include location="global" impldecl="in declaration">tqsqlrecord.h</include> <include location="local" impldecl="in declaration">editbook.h</include> -<include location="global" impldecl="in declaration">ntqdatabrowser.h</include> +<include location="global" impldecl="in declaration">tqdatabrowser.h</include> <include location="local" implDecl="in declaration">book.ui.h</include> <layoutdefaults spacing="6" margin="11"/> <widget class="TQDialog"> diff --git a/tools/designer/examples/book/book8/editbook.ui b/tools/designer/examples/book/book8/editbook.ui index 901f65dec..e8119a2d9 100644 --- a/tools/designer/examples/book/book8/editbook.ui +++ b/tools/designer/examples/book/book8/editbook.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>EditBookForm</class> -<include location="global" impldecl="in declaration">ntqsqlrecord.h</include> +<include location="global" impldecl="in declaration">tqsqlrecord.h</include> <include location="local" implDecl="in declaration">editbook.ui.h</include> <forward>class TQSqlRecord;</forward> <variable>TQMap<TQString,int> authorMap;</variable> diff --git a/tools/designer/examples/book/book8/main.cpp b/tools/designer/examples/book/book8/main.cpp index b3ebdad0c..e101e2711 100644 --- a/tools/designer/examples/book/book8/main.cpp +++ b/tools/designer/examples/book/book8/main.cpp @@ -8,7 +8,7 @@ *****************************************************************************/ #include <ntqapplication.h> -#include <ntqsqldatabase.h> +#include <tqsqldatabase.h> #include "book.h" #include "../connection.h" diff --git a/tools/designer/examples/book/connection.cpp b/tools/designer/examples/book/connection.cpp index d9b0df31f..ff56e15d0 100644 --- a/tools/designer/examples/book/connection.cpp +++ b/tools/designer/examples/book/connection.cpp @@ -6,7 +6,7 @@ ** program may be used, distributed and modified without limitation. ** *****************************************************************************/ -#include <ntqsqldatabase.h> +#include <tqsqldatabase.h> #include "connection.h" bool createConnections() diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp index adb283a79..62e003cd3 100644 --- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp +++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp @@ -51,12 +51,12 @@ #include <limits.h> #ifndef TQT_NO_SQL -#include <ntqdatatable.h> -#include <ntqdatabrowser.h> -#include <ntqdataview.h> -#include <ntqsqleditorfactory.h> -#include <ntqsqlindex.h> -#include <ntqsqlcursor.h> +#include <tqdatatable.h> +#include <tqdatabrowser.h> +#include <tqdataview.h> +#include <tqsqleditorfactory.h> +#include <tqsqlindex.h> +#include <tqsqlcursor.h> #endif SqlFormWizard::SqlFormWizard( TQUnknownInterface *aIface, TQWidget *w, diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp index baa3c1be5..6cbc34ac0 100644 --- a/tools/designer/shared/widgetdatabase.cpp +++ b/tools/designer/shared/widgetdatabase.cpp @@ -263,7 +263,7 @@ void WidgetDatabase::setupDataBase( int id ) #if !defined(TQT_NO_SQL) r = new WidgetDatabaseRecord; r->iconSet = "designer_datatable.png"; - r->includeFile = "ntqdatatable.h"; + r->includeFile = "tqdatatable.h"; r->name = "TQDataTable"; r->group = widgetGroup( "Database" ); r->toolTip = "Data Table"; @@ -552,7 +552,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; r->name = "TQDataBrowser"; - r->includeFile = "ntqdatabrowser.h"; + r->includeFile = "tqdatabrowser.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data Browser"; r->iconSet = "designer_databrowser.png"; @@ -563,7 +563,7 @@ void WidgetDatabase::setupDataBase( int id ) r = new WidgetDatabaseRecord; r->iconSet = ""; r->name = "TQDataView"; - r->includeFile = "ntqdataview.h"; + r->includeFile = "tqdataview.h"; r->group = widgetGroup( "Database" ); r->toolTip = "Data View"; r->iconSet = "designer_dataview.png"; diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp index 42ee08cb1..4706675e0 100644 --- a/tools/designer/uic/form.cpp +++ b/tools/designer/uic/form.cpp @@ -753,9 +753,9 @@ void Uic::createFormImpl( const TQDomElement &e ) registerDatabases( e ); dbConnections = unique( dbConnections ); if ( dbConnections.count() ) - globalIncludes += "ntqsqldatabase.h"; + globalIncludes += "tqsqldatabase.h"; if ( dbCursors.count() ) - globalIncludes += "ntqsqlcursor.h"; + globalIncludes += "tqsqlcursor.h"; bool dbForm = FALSE; if ( dbForms[ "(default)" ].count() ) dbForm = TRUE; @@ -769,8 +769,8 @@ void Uic::createFormImpl( const TQDomElement &e ) } } if ( dbForm || subDbForms ) { - globalIncludes += "ntqsqlform.h"; - globalIncludes += "ntqsqlrecord.h"; + globalIncludes += "tqsqlform.h"; + globalIncludes += "tqsqlrecord.h"; } // do the local includes afterwards, since global includes have priority on clashes diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp index 78600c582..8f0fc999e 100644 --- a/tools/designer/uilib/qwidgetfactory.cpp +++ b/tools/designer/uilib/qwidgetfactory.cpp @@ -53,9 +53,9 @@ #include <ntqdragobject.h> #ifndef TQT_NO_SQL -#include <ntqsqlrecord.h> -#include <ntqsqldatabase.h> -#include <ntqdatatable.h> +#include <tqsqlrecord.h> +#include <tqsqldatabase.h> +#include <tqdatatable.h> #endif // include all TQt widgets we support |