summaryrefslogtreecommitdiffstats
path: root/buildtools/lib
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools/lib')
-rw-r--r--buildtools/lib/parsers/autotools/Makefile.am2
-rw-r--r--buildtools/lib/parsers/autotools/autotools.yy2
-rw-r--r--buildtools/lib/parsers/autotools/tests/viewer.h2
-rw-r--r--buildtools/lib/parsers/autotools/tests/viewerbase.ui4
-rw-r--r--buildtools/lib/parsers/qmake/location.h (renamed from buildtools/lib/parsers/qmake/location.hh)10
-rw-r--r--buildtools/lib/parsers/qmake/position.h (renamed from buildtools/lib/parsers/qmake/position.hh)8
-rw-r--r--buildtools/lib/parsers/qmake/qmake.ll34
-rw-r--r--buildtools/lib/parsers/qmake/qmake.yy10
-rw-r--r--buildtools/lib/parsers/qmake/qmake_lex.h2
-rw-r--r--buildtools/lib/parsers/qmake/qmake_yacc.cpp6
-rw-r--r--buildtools/lib/parsers/qmake/qmake_yacc.h (renamed from buildtools/lib/parsers/qmake/qmake_yacc.hpp)8
-rw-r--r--buildtools/lib/parsers/qmake/qmakedriver.cpp2
-rw-r--r--buildtools/lib/parsers/qmake/stack.h (renamed from buildtools/lib/parsers/qmake/stack.hh)6
-rw-r--r--buildtools/lib/parsers/qmake/tests/viewer.h2
-rw-r--r--buildtools/lib/parsers/qmake/tests/viewerbase.ui4
-rw-r--r--buildtools/lib/widgets/addenvvardlg.cpp8
-rw-r--r--buildtools/lib/widgets/addenvvardlg.h2
-rw-r--r--buildtools/lib/widgets/addfilesdialog.cpp4
-rw-r--r--buildtools/lib/widgets/addfilesdialog.h2
-rw-r--r--buildtools/lib/widgets/environmentdisplaydialog.h2
-rw-r--r--buildtools/lib/widgets/environmentvariableswidget.cpp2
-rw-r--r--buildtools/lib/widgets/environmentvariableswidget.h2
-rw-r--r--buildtools/lib/widgets/environmentvariableswidgetbase.ui4
-rw-r--r--buildtools/lib/widgets/makeoptionswidget.cpp2
-rw-r--r--buildtools/lib/widgets/makeoptionswidget.h2
-rw-r--r--buildtools/lib/widgets/removesubprojectdialog.h2
-rw-r--r--buildtools/lib/widgets/removesubprojectdlgbase.ui4
-rw-r--r--buildtools/lib/widgets/runoptionswidget.cpp2
-rw-r--r--buildtools/lib/widgets/runoptionswidget.h2
-rw-r--r--buildtools/lib/widgets/runoptionswidgetbase.ui4
-rw-r--r--buildtools/lib/widgets/subclassesdlg.h2
-rw-r--r--buildtools/lib/widgets/subclassesdlgbase.ui4
32 files changed, 76 insertions, 76 deletions
diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am
index 340d0e38..950d6571 100644
--- a/buildtools/lib/parsers/autotools/Makefile.am
+++ b/buildtools/lib/parsers/autotools/Makefile.am
@@ -13,7 +13,7 @@ libkdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotoo
parser:
cd $(srcdir) ; \
bison -d autotools.yy -o autotools_yacc.cpp ; \
- mv -f autotools_yacc.hpp autotools_yacc.h ; \
+ mv -f autotools_yacc.h autotools_yacc.h ; \
flex -oautotools_lex.cpp autotools.ll
EXTRA_DIST = autotools.yy autotools.ll
diff --git a/buildtools/lib/parsers/autotools/autotools.yy b/buildtools/lib/parsers/autotools/autotools.yy
index d76cc5fe..c40e9c5b 100644
--- a/buildtools/lib/parsers/autotools/autotools.yy
+++ b/buildtools/lib/parsers/autotools/autotools.yy
@@ -49,7 +49,7 @@ struct Result {
Result(): node(0) {}
/**Type of semantic value for simple grammar rules.*/
- QString value;
+ TQString value;
/**Type of semantic value for grammar rules which are parts of AST.*/
AST *node;
/**Type of semantic value for "multiline_values" grammar rule.
diff --git a/buildtools/lib/parsers/autotools/tests/viewer.h b/buildtools/lib/parsers/autotools/tests/viewer.h
index ea300158..bb4a1a2a 100644
--- a/buildtools/lib/parsers/autotools/tests/viewer.h
+++ b/buildtools/lib/parsers/autotools/tests/viewer.h
@@ -29,7 +29,7 @@ namespace AutoTools { class ProjectAST; }
class TQListViewItem;
class Viewer: public ViewerBase {
-Q_OBJECT
+TQ_OBJECT
public:
Viewer(TQWidget *parent = 0, const char *name = 0);
diff --git a/buildtools/lib/parsers/autotools/tests/viewerbase.ui b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
index 3fb32462..139f1908 100644
--- a/buildtools/lib/parsers/autotools/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/autotools/tests/viewerbase.ui
@@ -210,11 +210,11 @@
<slot>tabWidget2_selected(const TQString&amp;)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>addAll_clicked()</slot>
<slot>choose_clicked()</slot>
<slot>files_currentChanged(TQListBoxItem*)</slot>
<slot>tabWidget2_selected(const TQString&amp;)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/buildtools/lib/parsers/qmake/location.hh b/buildtools/lib/parsers/qmake/location.h
index d6247645..f97af783 100644
--- a/buildtools/lib/parsers/qmake/location.hh
+++ b/buildtools/lib/parsers/qmake/location.h
@@ -33,16 +33,16 @@
version 2.2 of Bison. */
/**
- ** \file location.hh
+ ** \file location.h
** Define the TQMake::location class.
*/
-#ifndef BISON_LOCATION_HH
-# define BISON_LOCATION_HH
+#ifndef BISON_LOCATION_H
+# define BISON_LOCATION_H
# include <iostream>
# include <string>
-# include "position.hh"
+# include "position.h"
namespace TQMake
{
@@ -142,4 +142,4 @@ namespace TQMake
}
-#endif // not BISON_LOCATION_HH
+#endif // not BISON_LOCATION_H
diff --git a/buildtools/lib/parsers/qmake/position.hh b/buildtools/lib/parsers/qmake/position.h
index 6e95eb95..9f5951f0 100644
--- a/buildtools/lib/parsers/qmake/position.hh
+++ b/buildtools/lib/parsers/qmake/position.h
@@ -33,12 +33,12 @@
version 2.2 of Bison. */
/**
- ** \file position.hh
+ ** \file position.h
** Define the TQMake::position class.
*/
-#ifndef BISON_POSITION_HH
-# define BISON_POSITION_HH
+#ifndef BISON_POSITION_H
+# define BISON_POSITION_H
# include <iostream>
# include <string>
@@ -139,4 +139,4 @@ namespace TQMake
}
}
-#endif // not BISON_POSITION_HH
+#endif // not BISON_POSITION_H
diff --git a/buildtools/lib/parsers/qmake/qmake.ll b/buildtools/lib/parsers/qmake/qmake.ll
index a0289f6e..14d5e777 100644
--- a/buildtools/lib/parsers/qmake/qmake.ll
+++ b/buildtools/lib/parsers/qmake/qmake.ll
@@ -81,29 +81,29 @@ cont \\{ws}*{newline}
<INITIAL>{ws} {}
<vallist>{ws} {
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return Parser::token::token::LIST_WS;
}
<vallist,INITIAL>{cont} {
BEGIN(vallist);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return Parser::token::token::CONT;
}
<vallist,INITIAL>{comment_cont} {
BEGIN(vallist);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return Parser::token::token::COMMENT_CONT;
}
{id_simple} {
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return (Parser::token::token::ID_SIMPLE);
}
<funcargs>{id_args} {
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
mylval->value = mylval->value.mid(0, mylval->value.length()-1);
unput(')');
BEGIN(INITIAL);
@@ -112,43 +112,43 @@ cont \\{ws}*{newline}
<vallist>{var_value} {
BEGIN(vallist);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return Parser::token::token::VARIABLE_VALUE;
}
<vallist>{quoted_var_value} {
BEGIN(vallist);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return Parser::token::token::QUOTED_VARIABLE_VALUE;
}
"=" {
BEGIN(vallist);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return Parser::token::token::EQ;
}
"+=" {
BEGIN(vallist);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return Parser::token::token::PLUSEQ;
}
"-=" {
BEGIN(vallist);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return Parser::token::token::MINUSEQ;
}
"*=" {
BEGIN(vallist);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return Parser::token::token::STAREQ;
}
"~=" {
BEGIN(vallist);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return Parser::token::token::TILDEEQ;
}
@@ -175,28 +175,28 @@ cont \\{ws}*{newline}
}
":" {
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return Parser::token::token::COLON;
}
<vallist>{ws}{newline} {
BEGIN(INITIAL);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
setLineEndingFromString( mylval->value );
return Parser::token::token::NEWLINE;
}
<vallist,INITIAL>{newline} {
BEGIN(INITIAL);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
setLineEndingFromString( mylval->value );
return Parser::token::token::NEWLINE;
}
<vallist,INITIAL>{comment} {
BEGIN(INITIAL);
- mylval->value = QString::fromLocal8Bit( YYText(), YYLeng() );
+ mylval->value = TQString::fromLocal8Bit( YYText(), YYLeng() );
return (Parser::token::token::COMMENT);
}
@@ -214,7 +214,7 @@ namespace QMake
return yylex();
}
- void Lexer::setLineEndingFromString( const QString& str )
+ void Lexer::setLineEndingFromString( const TQString& str )
{
if( str.endsWith("\r\n") && m_lineEnding == None )
m_lineEnding = Windows;
diff --git a/buildtools/lib/parsers/qmake/qmake.yy b/buildtools/lib/parsers/qmake/qmake.yy
index 3cc0b79d..83cb60c8 100644
--- a/buildtools/lib/parsers/qmake/qmake.yy
+++ b/buildtools/lib/parsers/qmake/qmake.yy
@@ -51,7 +51,7 @@ struct Result {
Result(): node(0) {}
/**Type of semantic value for simple grammar rules.*/
- QString value;
+ TQString value;
/**Type of semantic value for grammar rules which are parts of AST.*/
AST *node;
/**Type of semantic value for "multiline_values" grammar rule.
@@ -71,7 +71,7 @@ struct Result {
</pre>
*/
QStringList values;
- QString indent;
+ TQString indent;
};
#define YYSTYPE Result
@@ -109,7 +109,7 @@ Don't forget to uncomment "yydebug = 1" line in qmakedriver.cpp.
*/
%}
-%skeleton "lalr1.cc"
+%skeleton "lalr1.cpp"
%define "parser_class_name" "Parser"
%name-prefix="QMake"
%parse-param { QMake::Lexer* lexer }
@@ -310,8 +310,8 @@ listws: LIST_WS
}
|
{
- $<value>$ = QString();
- $<indent>$ = QString();
+ $<value>$ = TQString();
+ $<indent>$ = TQString();
}
;
operator : EQ
diff --git a/buildtools/lib/parsers/qmake/qmake_lex.h b/buildtools/lib/parsers/qmake/qmake_lex.h
index 25aa402d..4bed35dd 100644
--- a/buildtools/lib/parsers/qmake/qmake_lex.h
+++ b/buildtools/lib/parsers/qmake/qmake_lex.h
@@ -20,7 +20,7 @@
#ifndef TQMAKE_LEX_H
#define TQMAKE_LEX_H
-#include "qmake_yacc.hpp"
+#include "qmake_yacc.h"
#include <iostream>
#ifndef DONT_INCLUDE_FLEXLEXER
diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.cpp b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
index f9dea804..25ae0e85 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.cpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.cpp
@@ -35,12 +35,12 @@
// Take the name prefix into account.
#define yylex TQMakelex
-#include "qmake_yacc.hpp"
+#include "qmake_yacc.h"
/* User implementation prologue. */
-/* Line 317 of lalr1.cc. */
+/* Line 317 of lalr1.cpp. */
#line 45 "tqmake_yacc.cpp"
#ifndef YY_
@@ -751,7 +751,7 @@ namespace TQMake
break;
- /* Line 675 of lalr1.cc. */
+ /* Line 675 of lalr1.cpp. */
#line 756 "tqmake_yacc.cpp"
default: break;
}
diff --git a/buildtools/lib/parsers/qmake/qmake_yacc.hpp b/buildtools/lib/parsers/qmake/qmake_yacc.h
index fd130e65..4c4e3042 100644
--- a/buildtools/lib/parsers/qmake/qmake_yacc.hpp
+++ b/buildtools/lib/parsers/qmake/qmake_yacc.h
@@ -39,7 +39,7 @@
#include <string>
#include <iostream>
-#include "stack.hh"
+#include "stack.h"
namespace TQMake
{
@@ -160,10 +160,10 @@ Don't forget to uncomment "yydebug = 1" line in qmakedriver.cpp.
*/
-/* Line 35 of lalr1.cc. */
-#line 165 "qmake_yacc.hpp"
+/* Line 35 of lalr1.cpp. */
+#line 165 "qmake_yacc.h"
-#include "location.hh"
+#include "location.h"
/* Enabling traces. */
#ifndef YYDEBUG
diff --git a/buildtools/lib/parsers/qmake/qmakedriver.cpp b/buildtools/lib/parsers/qmake/qmakedriver.cpp
index 40fd9bd9..8b9b722a 100644
--- a/buildtools/lib/parsers/qmake/qmakedriver.cpp
+++ b/buildtools/lib/parsers/qmake/qmakedriver.cpp
@@ -28,7 +28,7 @@
#include <sstream>
#include "qmake_lex.h"
-#include "qmake_yacc.hpp"
+#include "qmake_yacc.h"
namespace TQMake {
diff --git a/buildtools/lib/parsers/qmake/stack.hh b/buildtools/lib/parsers/qmake/stack.h
index dfc6c67e..1c18d4d0 100644
--- a/buildtools/lib/parsers/qmake/stack.hh
+++ b/buildtools/lib/parsers/qmake/stack.h
@@ -32,8 +32,8 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
-#ifndef BISON_STACK_HH
-# define BISON_STACK_HH
+#ifndef BISON_STACK_H
+# define BISON_STACK_H
#include <deque>
@@ -126,4 +126,4 @@ namespace TQMake
};
}
-#endif // not BISON_STACK_HH
+#endif // not BISON_STACK_H
diff --git a/buildtools/lib/parsers/qmake/tests/viewer.h b/buildtools/lib/parsers/qmake/tests/viewer.h
index 86fe70fe..996b8f46 100644
--- a/buildtools/lib/parsers/qmake/tests/viewer.h
+++ b/buildtools/lib/parsers/qmake/tests/viewer.h
@@ -31,7 +31,7 @@ class ProjectAST;
class TQListViewItem;
class Viewer: public ViewerBase {
-Q_OBJECT
+TQ_OBJECT
public:
Viewer(TQWidget *parent = 0, const char *name = 0);
diff --git a/buildtools/lib/parsers/qmake/tests/viewerbase.ui b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
index ad580b4c..970f6ee8 100644
--- a/buildtools/lib/parsers/qmake/tests/viewerbase.ui
+++ b/buildtools/lib/parsers/qmake/tests/viewerbase.ui
@@ -240,11 +240,11 @@
<slot>tabWidget2_selected(const TQString&amp;)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>addAll_clicked()</slot>
<slot>choose_clicked()</slot>
<slot>files_currentChanged( TQListBoxItem * )</slot>
<slot>tabWidget2_selected( const TQString &amp; )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
</UI>
diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp
index 8681e0d7..9e7c08b6 100644
--- a/buildtools/lib/widgets/addenvvardlg.cpp
+++ b/buildtools/lib/widgets/addenvvardlg.cpp
@@ -38,13 +38,13 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
varname_edit->setFocus();
varname_label->setBuddy(varname_edit);
- connect( varname_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
+ connect( varname_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) );
TQLabel *value_label = new TQLabel(i18n("&Value:"), this);
value_edit = new KLineEdit(this);
value_label->setBuddy(value_edit);
TQFontMetrics fm(value_edit->fontMetrics());
value_edit->setMinimumWidth(fm.width('X')*35);
- connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) );
+ connect( value_edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotTextChanged() ) );
TQVBoxLayout *layout = new TQVBoxLayout(this, 10);
@@ -65,8 +65,8 @@ AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name)
m_pOk = buttonbox->addButton( KStdGuiItem::ok());
TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel());
m_pOk->setDefault(true);
- connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) );
- connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) );
+ connect( m_pOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) );
+ connect( cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) );
buttonbox->layout();
layout->addWidget(buttonbox, 0);
slotTextChanged();
diff --git a/buildtools/lib/widgets/addenvvardlg.h b/buildtools/lib/widgets/addenvvardlg.h
index 9069f493..d4afadf6 100644
--- a/buildtools/lib/widgets/addenvvardlg.h
+++ b/buildtools/lib/widgets/addenvvardlg.h
@@ -29,7 +29,7 @@ Dialog to add environment variables.
*/
class AddEnvvarDialog : public TQDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp
index f02d5b56..64bb9471 100644
--- a/buildtools/lib/widgets/addfilesdialog.cpp
+++ b/buildtools/lib/widgets/addfilesdialog.cpp
@@ -36,7 +36,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter,
m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1);
m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2);
m_extraWidget->setCurrentItem(config->readNumEntry("Mode"));
- connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int)));
+ connect(m_extraWidget, TQ_SIGNAL(activated(int)), this, TQ_SLOT(storePreferred(int)));
setPreviewWidget(m_extraWidget);
@@ -55,7 +55,7 @@ AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter,
m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1);
m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2);
m_extraWidget->setCurrentItem(config->readNumEntry("Mode"));
- connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int)));
+ connect(m_extraWidget, TQ_SIGNAL(activated(int)), this, TQ_SLOT(storePreferred(int)));
setOperationMode(Opening);
}
diff --git a/buildtools/lib/widgets/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h
index 8a7ed5c9..e2b8b5cd 100644
--- a/buildtools/lib/widgets/addfilesdialog.h
+++ b/buildtools/lib/widgets/addfilesdialog.h
@@ -33,7 +33,7 @@ with the relative path (e.g. ../../dir/filename)
*/
class AddFilesDialog : public KFileDialog
{
- Q_OBJECT
+ TQ_OBJECT
public:
enum Mode { Copy, Link, Relative };
diff --git a/buildtools/lib/widgets/environmentdisplaydialog.h b/buildtools/lib/widgets/environmentdisplaydialog.h
index 28af5c6a..46b4bdb8 100644
--- a/buildtools/lib/widgets/environmentdisplaydialog.h
+++ b/buildtools/lib/widgets/environmentdisplaydialog.h
@@ -25,7 +25,7 @@
class EnvironmentDisplayDialog : public EnvironmentDisplayDialogBase
{
-Q_OBJECT
+TQ_OBJECT
public:
diff --git a/buildtools/lib/widgets/environmentvariableswidget.cpp b/buildtools/lib/widgets/environmentvariableswidget.cpp
index 3c3e448f..cf06d012 100644
--- a/buildtools/lib/widgets/environmentvariableswidget.cpp
+++ b/buildtools/lib/widgets/environmentvariableswidget.cpp
@@ -72,7 +72,7 @@ EnvironmentVariablesWidget::EnvironmentVariablesWidget(TQDomDocument &dom, const
m_dom(dom), m_configGroup(configGroup)
{
readEnvironment(dom, configGroup);
- connect( listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( editVarClicked() ) );
+ connect( listview, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( editVarClicked() ) );
}
diff --git a/buildtools/lib/widgets/environmentvariableswidget.h b/buildtools/lib/widgets/environmentvariableswidget.h
index c49badc3..c9c9946e 100644
--- a/buildtools/lib/widgets/environmentvariableswidget.h
+++ b/buildtools/lib/widgets/environmentvariableswidget.h
@@ -30,7 +30,7 @@ Environment variables widget.
*/
class EnvironmentVariablesWidget : public EnvironmentVariablesWidgetBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/buildtools/lib/widgets/environmentvariableswidgetbase.ui b/buildtools/lib/widgets/environmentvariableswidgetbase.ui
index e7246de3..53605001 100644
--- a/buildtools/lib/widgets/environmentvariableswidgetbase.ui
+++ b/buildtools/lib/widgets/environmentvariableswidgetbase.ui
@@ -189,12 +189,12 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>addVarClicked()</slot>
<slot>removeVarClicked()</slot>
<slot>editVarClicked()</slot>
<slot>environmentClicked()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/buildtools/lib/widgets/makeoptionswidget.cpp b/buildtools/lib/widgets/makeoptionswidget.cpp
index ef901cc8..c15b5a7a 100644
--- a/buildtools/lib/widgets/makeoptionswidget.cpp
+++ b/buildtools/lib/widgets/makeoptionswidget.cpp
@@ -33,7 +33,7 @@ MakeOptionsWidget::MakeOptionsWidget(TQDomDocument &dom, const TQString &configG
: MakeOptionsWidgetBase(parent, name),
m_dom(dom), m_configGroup(configGroup)
{
- env_var_group->setColumnLayout( 1, Qt::Vertical );
+ env_var_group->setColumnLayout( 1, TQt::Vertical );
m_environmentVariablesWidget = new EnvironmentVariablesWidget( dom, configGroup + "/make/envvars", env_var_group );
abort_box->setChecked(DomUtil::readBoolEntry(dom, configGroup + "/make/abortonerror", true ));
diff --git a/buildtools/lib/widgets/makeoptionswidget.h b/buildtools/lib/widgets/makeoptionswidget.h
index bc4f8878..4a44c437 100644
--- a/buildtools/lib/widgets/makeoptionswidget.h
+++ b/buildtools/lib/widgets/makeoptionswidget.h
@@ -31,7 +31,7 @@ Make options widget.
*/
class MakeOptionsWidget : public MakeOptionsWidgetBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/buildtools/lib/widgets/removesubprojectdialog.h b/buildtools/lib/widgets/removesubprojectdialog.h
index 89426eb8..7de20af3 100644
--- a/buildtools/lib/widgets/removesubprojectdialog.h
+++ b/buildtools/lib/widgets/removesubprojectdialog.h
@@ -27,7 +27,7 @@ Subproject removal dialog.
*/
class RemoveSubprojectDialog : public RemoveSubprojectDlgBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/buildtools/lib/widgets/removesubprojectdlgbase.ui b/buildtools/lib/widgets/removesubprojectdlgbase.ui
index d5206ac6..c9300c18 100644
--- a/buildtools/lib/widgets/removesubprojectdlgbase.ui
+++ b/buildtools/lib/widgets/removesubprojectdlgbase.ui
@@ -145,10 +145,10 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>accept()</slot>
<slot>reject()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>
diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp
index 6836ee77..717e9573 100644
--- a/buildtools/lib/widgets/runoptionswidget.cpp
+++ b/buildtools/lib/widgets/runoptionswidget.cpp
@@ -44,7 +44,7 @@ RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGro
m_dom(dom), m_configGroup(configGroup)
{
// Create the "Environment Variables" GUI
- env_var_group->setColumnLayout( 1, Qt::Vertical );
+ env_var_group->setColumnLayout( 1, TQt::Vertical );
m_environmentVariablesWidget = new EnvironmentVariablesWidget( dom, configGroup + "/run/envvars", env_var_group );
mainprogram_edit->completionObject()->setMode(KURLCompletion::FileCompletion);
diff --git a/buildtools/lib/widgets/runoptionswidget.h b/buildtools/lib/widgets/runoptionswidget.h
index f38c4a9e..2eaa8740 100644
--- a/buildtools/lib/widgets/runoptionswidget.h
+++ b/buildtools/lib/widgets/runoptionswidget.h
@@ -32,7 +32,7 @@ Run options widget.
*/
class RunOptionsWidget : public RunOptionsWidgetBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/buildtools/lib/widgets/runoptionswidgetbase.ui b/buildtools/lib/widgets/runoptionswidgetbase.ui
index 404af030..27ce6736 100644
--- a/buildtools/lib/widgets/runoptionswidgetbase.ui
+++ b/buildtools/lib/widgets/runoptionswidgetbase.ui
@@ -235,9 +235,9 @@
<tabstop>startinterminal_box</tabstop>
<tabstop>autocompile_box</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot>mainProgramChanged()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>
diff --git a/buildtools/lib/widgets/subclassesdlg.h b/buildtools/lib/widgets/subclassesdlg.h
index 373ce267..75ced25b 100644
--- a/buildtools/lib/widgets/subclassesdlg.h
+++ b/buildtools/lib/widgets/subclassesdlg.h
@@ -27,7 +27,7 @@ Subclass creation dialog.
*/
class SubclassesDlg : public SubclassesDlgBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/buildtools/lib/widgets/subclassesdlgbase.ui b/buildtools/lib/widgets/subclassesdlgbase.ui
index a87cbd34..22873790 100644
--- a/buildtools/lib/widgets/subclassesdlgbase.ui
+++ b/buildtools/lib/widgets/subclassesdlgbase.ui
@@ -205,12 +205,12 @@
<tabstop>buttonOk</tabstop>
<tabstop>buttonCancel</tabstop>
</tabstops>
-<Q_SLOTS>
+<slots>
<slot access="protected">changeCurrentURL(const TQString &amp;str)</slot>
<slot access="protected">removeRelation()</slot>
<slot access="protected">newRelation()</slot>
<slot access="protected">currentRelationChanged(TQListBoxItem *item)</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>