diff options
Diffstat (limited to 'languages/java')
30 files changed, 182 insertions, 182 deletions
diff --git a/languages/java/JavaAST.hpp b/languages/java/JavaAST.h index 7108fca1..4d89452e 100644 --- a/languages/java/JavaAST.hpp +++ b/languages/java/JavaAST.h @@ -1,8 +1,8 @@ #ifndef JAVAAST_HPP #define JAVAAST_HPP -#include <antlr/CommonAST.hpp> -#include <antlr/ASTFactory.hpp> +#include <antlr/CommonAST.h> +#include <antlr/ASTFactory.h> class JavaAST; typedef ANTLR_USE_NAMESPACE(antlr)ASTRefCount<JavaAST> RefJavaAST; diff --git a/languages/java/JavaLexer.cpp b/languages/java/JavaLexer.cpp index 623e816f..4230b156 100644 --- a/languages/java/JavaLexer.cpp +++ b/languages/java/JavaLexer.cpp @@ -1,12 +1,12 @@ /* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaLexer.cpp"$ */ -#include "JavaLexer.hpp" -#include <antlr/CharBuffer.hpp> -#include <antlr/TokenStreamException.hpp> -#include <antlr/TokenStreamIOException.hpp> -#include <antlr/TokenStreamRecognitionException.hpp> -#include <antlr/CharStreamException.hpp> -#include <antlr/CharStreamIOException.hpp> -#include <antlr/NoViableAltForCharException.hpp> +#include "JavaLexer.h" +#include <antlr/CharBuffer.h> +#include <antlr/TokenStreamException.h> +#include <antlr/TokenStreamIOException.h> +#include <antlr/TokenStreamRecognitionException.h> +#include <antlr/CharStreamException.h> +#include <antlr/CharStreamIOException.h> +#include <antlr/NoViableAltForCharException.h> #line 1041 "java.g" diff --git a/languages/java/JavaLexer.hpp b/languages/java/JavaLexer.h index 9d185686..e5b6fb1d 100644 --- a/languages/java/JavaLexer.hpp +++ b/languages/java/JavaLexer.h @@ -1,10 +1,10 @@ -#ifndef INC_JavaLexer_hpp_ -#define INC_JavaLexer_hpp_ +#ifndef INC_JavaLexer_h_ +#define INC_JavaLexer_h_ #line 2 "java.g" #include "driver.h" - #include "JavaAST.hpp" + #include "JavaAST.h" #include <tqlistview.h> #include <kdebug.h> @@ -15,14 +15,14 @@ RefJavaAST(ast)->setColumn( t->getColumn() ); \ } -#line 19 "JavaLexer.hpp" -#include <antlr/config.hpp> -/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaLexer.hpp"$ */ -#include <antlr/CommonToken.hpp> -#include <antlr/InputBuffer.hpp> -#include <antlr/BitSet.hpp> -#include "JavaTokenTypes.hpp" -#include <antlr/CharScanner.hpp> +#line 19 "JavaLexer.h" +#include <antlr/config.h> +/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaLexer.h"$ */ +#include <antlr/CommonToken.h> +#include <antlr/InputBuffer.h> +#include <antlr/BitSet.h> +#include "JavaTokenTypes.h" +#include <antlr/CharScanner.h> class CUSTOM_API JavaLexer : public ANTLR_USE_NAMESPACE(antlr)CharScanner, public JavaTokenTypes { #line 1058 "java.g" @@ -45,7 +45,7 @@ public: virtual void reportWarning( const ANTLR_USE_NAMESPACE(std)string& warnMessage ){ m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(warnMessage.c_str()), getLine(), getColumn()) ); } -#line 30 "JavaLexer.hpp" +#line 30 "JavaLexer.h" private: void initLiterals(); public: @@ -129,4 +129,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_4; }; -#endif /*INC_JavaLexer_hpp_*/ +#endif /*INC_JavaLexer_h_*/ diff --git a/languages/java/JavaRecognizer.cpp b/languages/java/JavaRecognizer.cpp index 1021c6a0..7d010b49 100644 --- a/languages/java/JavaRecognizer.cpp +++ b/languages/java/JavaRecognizer.cpp @@ -1,8 +1,8 @@ /* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaRecognizer.cpp"$ */ -#include "JavaRecognizer.hpp" -#include <antlr/NoViableAltException.hpp> -#include <antlr/SemanticException.hpp> -#include <antlr/ASTFactory.hpp> +#include "JavaRecognizer.h" +#include <antlr/NoViableAltException.h> +#include <antlr/SemanticException.h> +#include <antlr/ASTFactory.h> #line 1 "java.g" #line 8 "JavaRecognizer.cpp" JavaRecognizer::JavaRecognizer(ANTLR_USE_NAMESPACE(antlr)TokenBuffer& tokenBuf, int k) diff --git a/languages/java/JavaRecognizer.hpp b/languages/java/JavaRecognizer.h index fab59972..32311a3d 100644 --- a/languages/java/JavaRecognizer.hpp +++ b/languages/java/JavaRecognizer.h @@ -1,10 +1,10 @@ -#ifndef INC_JavaRecognizer_hpp_ -#define INC_JavaRecognizer_hpp_ +#ifndef INC_JavaRecognizer_h_ +#define INC_JavaRecognizer_h_ #line 2 "java.g" #include "driver.h" - #include "JavaAST.hpp" + #include "JavaAST.h" #include <tqlistview.h> #include <kdebug.h> @@ -15,13 +15,13 @@ RefJavaAST(ast)->setColumn( t->getColumn() ); \ } -#line 19 "JavaRecognizer.hpp" -#include <antlr/config.hpp> -/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaRecognizer.hpp"$ */ -#include <antlr/TokenStream.hpp> -#include <antlr/TokenBuffer.hpp> -#include "JavaTokenTypes.hpp" -#include <antlr/LLkParser.hpp> +#line 19 "JavaRecognizer.h" +#include <antlr/config.h> +/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaRecognizer.h"$ */ +#include <antlr/TokenStream.h> +#include <antlr/TokenBuffer.h> +#include "JavaTokenTypes.h" +#include <antlr/LLkParser.h> /** Java 1.3 Recognizer * @@ -157,7 +157,7 @@ public: void reportMessage( const ANTLR_USE_NAMESPACE(std)string& message ){ m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(message.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); } -#line 142 "JavaRecognizer.hpp" +#line 142 "JavaRecognizer.h" public: void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory ); protected: @@ -420,4 +420,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_66; }; -#endif /*INC_JavaRecognizer_hpp_*/ +#endif /*INC_JavaRecognizer_h_*/ diff --git a/languages/java/JavaStoreWalker.cpp b/languages/java/JavaStoreWalker.cpp index 1bdb9522..763f95e7 100644 --- a/languages/java/JavaStoreWalker.cpp +++ b/languages/java/JavaStoreWalker.cpp @@ -1,11 +1,11 @@ /* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalker.cpp"$ */ -#include "JavaStoreWalker.hpp" -#include <antlr/Token.hpp> -#include <antlr/AST.hpp> -#include <antlr/NoViableAltException.hpp> -#include <antlr/MismatchedTokenException.hpp> -#include <antlr/SemanticException.hpp> -#include <antlr/BitSet.hpp> +#include "JavaStoreWalker.h" +#include <antlr/Token.h> +#include <antlr/AST.h> +#include <antlr/NoViableAltException.h> +#include <antlr/MismatchedTokenException.h> +#include <antlr/SemanticException.h> +#include <antlr/BitSet.h> #line 1 "java.store.g" #line 11 "JavaStoreWalker.cpp" JavaStoreWalker::JavaStoreWalker() diff --git a/languages/java/JavaStoreWalker.hpp b/languages/java/JavaStoreWalker.h index 676163ad..244c0978 100644 --- a/languages/java/JavaStoreWalker.hpp +++ b/languages/java/JavaStoreWalker.h @@ -1,21 +1,21 @@ -#ifndef INC_JavaStoreWalker_hpp_ -#define INC_JavaStoreWalker_hpp_ +#ifndef INC_JavaStoreWalker_h_ +#define INC_JavaStoreWalker_h_ #line 3 "java.store.g" #include <codemodel.h> - #include "JavaAST.hpp" + #include "JavaAST.h" #include <tqstring.h> #include <tqstringlist.h> #include <tqvaluestack.h> #include <tqfileinfo.h> -#line 15 "JavaStoreWalker.hpp" -#include <antlr/config.hpp> -#include "JavaStoreWalkerTokenTypes.hpp" -/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalker.hpp"$ */ -#include <antlr/TreeParser.hpp> +#line 15 "JavaStoreWalker.h" +#include <antlr/config.h> +#include "JavaStoreWalkerTokenTypes.h" +/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalker.h"$ */ +#include <antlr/TreeParser.h> #line 13 "java.store.g" @@ -23,7 +23,7 @@ #include <kdebug.h> -#line 27 "JavaStoreWalker.hpp" +#line 27 "JavaStoreWalker.h" /** Java 1.2 AST Recognizer Grammar * * Author: @@ -70,7 +70,7 @@ public: initializeASTFactory (ast_factory); setASTFactory (&ast_factory); } -#line 44 "JavaStoreWalker.hpp" +#line 44 "JavaStoreWalker.h" public: JavaStoreWalker(); static void initializeASTFactory( ANTLR_USE_NAMESPACE(antlr)ASTFactory& factory ); @@ -161,4 +161,4 @@ private: static const ANTLR_USE_NAMESPACE(antlr)BitSet _tokenSet_1; }; -#endif /*INC_JavaStoreWalker_hpp_*/ +#endif /*INC_JavaStoreWalker_h_*/ diff --git a/languages/java/JavaStoreWalkerTokenTypes.hpp b/languages/java/JavaStoreWalkerTokenTypes.h index 44322944..d8a07893 100644 --- a/languages/java/JavaStoreWalkerTokenTypes.hpp +++ b/languages/java/JavaStoreWalkerTokenTypes.h @@ -1,7 +1,7 @@ -#ifndef INC_JavaStoreWalkerTokenTypes_hpp_ -#define INC_JavaStoreWalkerTokenTypes_hpp_ +#ifndef INC_JavaStoreWalkerTokenTypes_h_ +#define INC_JavaStoreWalkerTokenTypes_h_ -/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalkerTokenTypes.hpp"$ */ +/* $ANTLR 2.7.7 (20061129): "java.store.g" -> "JavaStoreWalkerTokenTypes.h"$ */ #ifndef CUSTOM_API # define CUSTOM_API @@ -166,4 +166,4 @@ struct CUSTOM_API JavaStoreWalkerTokenTypes { #ifdef __cplusplus }; #endif -#endif /*INC_JavaStoreWalkerTokenTypes_hpp_*/ +#endif /*INC_JavaStoreWalkerTokenTypes_h_*/ diff --git a/languages/java/JavaTokenTypes.hpp b/languages/java/JavaTokenTypes.h index e36fa54c..8689c5ef 100644 --- a/languages/java/JavaTokenTypes.hpp +++ b/languages/java/JavaTokenTypes.h @@ -1,7 +1,7 @@ -#ifndef INC_JavaTokenTypes_hpp_ -#define INC_JavaTokenTypes_hpp_ +#ifndef INC_JavaTokenTypes_h_ +#define INC_JavaTokenTypes_h_ -/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaTokenTypes.hpp"$ */ +/* $ANTLR 2.7.7 (20061129): "java.g" -> "JavaTokenTypes.h"$ */ #ifndef CUSTOM_API # define CUSTOM_API @@ -165,4 +165,4 @@ struct CUSTOM_API JavaTokenTypes { #ifdef __cplusplus }; #endif -#endif /*INC_JavaTokenTypes_hpp_*/ +#endif /*INC_JavaTokenTypes_h_*/ diff --git a/languages/java/KDevJavaSupportIface.h b/languages/java/KDevJavaSupportIface.h index d0c4d441..d9653bb8 100644 --- a/languages/java/KDevJavaSupportIface.h +++ b/languages/java/KDevJavaSupportIface.h @@ -9,7 +9,7 @@ class JavaSupportPart; class KDevJavaSupportIface : public TQObject, public DCOPObject { - Q_OBJECT + TQ_OBJECT // K_DCOP public: diff --git a/languages/java/Makefile.am b/languages/java/Makefile.am index a1a1e812..f4a05f62 100644 --- a/languages/java/Makefile.am +++ b/languages/java/Makefile.am @@ -22,10 +22,10 @@ JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp kdevdri EXTRA_DIST = java.g java.tree.g java.store.g -#JavaLexer.hpp JavaLexer.cpp JavaRecognizer.hpp JavaRecognizer.cpp: # java.g +#JavaLexer.h JavaLexer.cpp JavaRecognizer.h JavaRecognizer.cpp: # java.g # antlr java.g -#JavaStoreWalker.hpp JavaStoreWalker.cpp: # java.store.g +#JavaStoreWalker.h JavaStoreWalker.cpp: # java.store.g # antlr java.store.g METASOURCES = AUTO diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java index 40bc6b93..50f3bff1 100644 --- a/languages/java/app_templates/kappjava/app.java +++ b/languages/java/app_templates/kappjava/app.java @@ -43,10 +43,10 @@ public class %{APPNAME} extends TDEMainWindow setupGUI(); // allow the view to change the statusbar and caption - connect(m_view, SIGNAL("signalChangeStatusbar(String)"), - this, SLOT("changeStatusbar(String)")); - connect(m_view, SIGNAL("signalChangeCaption(String)"), - this, SLOT("changeCaption(String)")); + connect(m_view, TQ_SIGNAL("signalChangeStatusbar(String)"), + this, TQ_SLOT("changeStatusbar(String)")); + connect(m_view, TQ_SIGNAL("signalChangeCaption(String)"), + this, TQ_SLOT("changeCaption(String)")); } @@ -77,19 +77,19 @@ public void load(KURL url) public void setupActions() { TDEApplication kapp = TDEApplication.kApplication(); - KStdAction.openNew(this, SLOT("fileNew()"), actionCollection()); - KStdAction.open(this, SLOT("fileOpen()"), actionCollection()); - KStdAction.save(this, SLOT("fileSave()"), actionCollection()); - KStdAction.saveAs(this, SLOT("fileSaveAs()"), actionCollection()); - KStdAction.print(this, SLOT("filePrint()"), actionCollection()); - KStdAction.quit(kapp, SLOT("quit()"), actionCollection()); + KStdAction.openNew(this, TQ_SLOT("fileNew()"), actionCollection()); + KStdAction.open(this, TQ_SLOT("fileOpen()"), actionCollection()); + KStdAction.save(this, TQ_SLOT("fileSave()"), actionCollection()); + KStdAction.saveAs(this, TQ_SLOT("fileSaveAs()"), actionCollection()); + KStdAction.print(this, TQ_SLOT("filePrint()"), actionCollection()); + KStdAction.quit(kapp, TQ_SLOT("quit()"), actionCollection()); - KStdAction.preferences(this, SLOT("optionsPreferences()"), actionCollection()); + KStdAction.preferences(this, TQ_SLOT("optionsPreferences()"), actionCollection()); // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item TDEAction custom = new TDEAction(tr("Cus&tom Menuitem"), new TDEShortcut(), - this, SLOT("optionsPreferences()"), + this, TQ_SLOT("optionsPreferences()"), actionCollection(), "custom_action"); } diff --git a/languages/java/app_templates/kappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java index 9648cfad..ab327d4c 100644 --- a/languages/java/app_templates/kappjava/app_client.java +++ b/languages/java/app_templates/kappjava/app_client.java @@ -19,10 +19,10 @@ int main(int argc, char **argv) QByteArray data; QDataStream ds(data, IO_WriteOnly); if (argc > 1) - ds << QString(argv[1]); + ds << TQString(argv[1]); else - ds << QString("http://www.kde.org"); - client->send("%{APPNAMELC}", "%{APPNAME}Iface", "openURL(QString)", data); + ds << TQString("http://www.kde.org"); + client->send("%{APPNAMELC}", "%{APPNAME}Iface", "openURL(TQString)", data); return app.exec(); } diff --git a/languages/java/app_templates/kappjava/appview.java b/languages/java/app_templates/kappjava/appview.java index 347ff58f..4a1e9f84 100644 --- a/languages/java/app_templates/kappjava/appview.java +++ b/languages/java/app_templates/kappjava/appview.java @@ -17,12 +17,12 @@ import org.kde.koala.*; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -public class %{APPNAME}View extends QWidget +public class %{APPNAME}View extends TQWidget { QHBoxLayout top_layout; -public %{APPNAME}View(QWidget parent) +public %{APPNAME}View(TQWidget parent) { super(parent, null); // setup our layout manager to automatically add our widgets @@ -71,10 +71,10 @@ public %{APPNAME}View(QWidget parent) return; } - connect(m_html, SIGNAL("setWindowCaption(String)"), - this, SLOT("slotSetTitle(String)")); - connect(m_html, SIGNAL("setStatusBarText(String)"), - this, SLOT("slotOnURL(String)")); + connect(m_html, TQ_SIGNAL("setWindowCaption(String)"), + this, TQ_SLOT("slotSetTitle(String)")); + connect(m_html, TQ_SIGNAL("setStatusBarText(String)"), + this, TQ_SLOT("slotOnURL(String)")); } diff --git a/languages/java/app_templates/kappjava/pref.java b/languages/java/app_templates/kappjava/pref.java index a50fdb31..90e8e533 100644 --- a/languages/java/app_templates/kappjava/pref.java +++ b/languages/java/app_templates/kappjava/pref.java @@ -28,7 +28,7 @@ public %{APPNAME}Preferences() } public class %{APPNAME}PrefPageOne extends QFrame { -public %{APPNAME}PrefPageOne(QWidget parent) +public %{APPNAME}PrefPageOne(TQWidget parent) { super(parent); QHBoxLayout layout = new QHBoxLayout(this); @@ -39,7 +39,7 @@ public %{APPNAME}PrefPageOne(QWidget parent) } public class %{APPNAME}PrefPageTwo extends QFrame { -public %{APPNAME}PrefPageTwo(QWidget parent) +public %{APPNAME}PrefPageTwo(TQWidget parent) { super(parent); QHBoxLayout layout = new QHBoxLayout(this); diff --git a/languages/java/app_templates/superwaba/superwaba b/languages/java/app_templates/superwaba/superwaba index eddcce86..82fb4752 100644 --- a/languages/java/app_templates/superwaba/superwaba +++ b/languages/java/app_templates/superwaba/superwaba @@ -16,14 +16,14 @@ Type=value Value=JAVA Comment=Path to your java root Default=/usr/lib/java -ValueType=QString +ValueType=TQString [WABA] Type=value Value=WABA Comment=Path to your SuperWaba root Default=/usr/lib -ValueType=QString +ValueType=TQString [GNU] Type=install archive diff --git a/languages/java/app_templates/superwaba/superwaba.kdevtemplate b/languages/java/app_templates/superwaba/superwaba.kdevtemplate index a14c511a..3711dbc4 100644 --- a/languages/java/app_templates/superwaba/superwaba.kdevtemplate +++ b/languages/java/app_templates/superwaba/superwaba.kdevtemplate @@ -16,14 +16,14 @@ Type=value Value=JAVA Comment=Path to your java root Default=/usr/lib/java -ValueType=QString +ValueType=TQString [WABA] Type=value Value=WABA Comment=Path to your SuperWaba root Default=/usr/lib -ValueType=QString +ValueType=TQString [GNU] Type=install archive diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index d6a034e4..7c63a63f 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -137,7 +137,7 @@ public: void push_back( const TQString& fileName, bool readFromDisk=false ) { TQMutexLocker locker( &m_mutex ); - m_fileList.append( tqMakePair(fileName, readFromDisk) ); /// \FIXME ROBE deepcopy?! + m_fileList.append( qMakePair(fileName, readFromDisk) ); /// \FIXME ROBE deepcopy?! } void pop_front() diff --git a/languages/java/backgroundparser.h b/languages/java/backgroundparser.h index fee2bc78..4823cf43 100644 --- a/languages/java/backgroundparser.h +++ b/languages/java/backgroundparser.h @@ -13,7 +13,7 @@ #define BACKGROUNDPARSER_H #include "driver.h" -#include "JavaAST.hpp" +#include "JavaAST.h" #include <tqthread.h> #include <tqwaitcondition.h> diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui index 9bea48d7..c253e1d4 100644 --- a/languages/java/configproblemreporter.ui +++ b/languages/java/configproblemreporter.ui @@ -234,7 +234,7 @@ <tabstop>pushButton5</tabstop> <tabstop>pushButton6</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>destroy()</slot> <slot>accept()</slot> @@ -244,7 +244,7 @@ <slot>removeSpecialHeader()</slot> <slot>moveUpSpecialHeader()</slot> <slot>moveDownSpecialHeader()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includes> diff --git a/languages/java/driver.cpp b/languages/java/driver.cpp index c22bc9ce..3fbcd07b 100644 --- a/languages/java/driver.cpp +++ b/languages/java/driver.cpp @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ -#include "JavaAST.hpp" -#include "JavaLexer.hpp" -#include "JavaRecognizer.hpp" +#include "JavaAST.h" +#include "JavaLexer.h" +#include "JavaRecognizer.h" #include <kdebug.h> #include <stdlib.h> diff --git a/languages/java/driver.h b/languages/java/driver.h index def7e400..3575ccfb 100644 --- a/languages/java/driver.h +++ b/languages/java/driver.h @@ -20,7 +20,7 @@ #ifndef DRIVER_H #define DRIVER_H -#include "JavaAST.hpp" +#include "JavaAST.h" #include <tqpair.h> #include <tqvaluestack.h> diff --git a/languages/java/java.g b/languages/java/java.g index 1f825ec5..15ccf63d 100644 --- a/languages/java/java.g +++ b/languages/java/java.g @@ -1,7 +1,7 @@ header "pre_include_hpp" { #include "driver.h" - #include "JavaAST.hpp" + #include "JavaAST.h" #include <qlistview.h> #include <kdebug.h> @@ -157,18 +157,18 @@ private: public: void setDriver( Driver* d ) { m_driver = d; } - void setFileName( const QString& fileName ) { m_driver->currentFileName() = fileName; } + void setFileName( const TQString& fileName ) { m_driver->currentFileName() = fileName; } void reportError( const ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); } void reportError( const ANTLR_USE_NAMESPACE(std)string& errorMessage ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(errorMessage.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(errorMessage.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); } void reportMessage( const ANTLR_USE_NAMESPACE(std)string& message ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(message.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(message.c_str()), LT(1)->getLine(), LT(1)->getColumn()) ); } } @@ -1061,18 +1061,18 @@ private: public: void setDriver( Driver* d ) { m_driver = d; } - void setFileName( const QString& fileName ) { m_driver->currentFileName() = fileName; } + void setFileName( const TQString& fileName ) { m_driver->currentFileName() = fileName; } virtual void reportError( const ANTLR_USE_NAMESPACE(antlr)RecognitionException& ex ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(ex.getMessage().c_str()), ex.getLine(), ex.getColumn()) ); } virtual void reportError( const ANTLR_USE_NAMESPACE(std)string& errorMessage ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(errorMessage.c_str()), getLine(), getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(errorMessage.c_str()), getLine(), getColumn()) ); } virtual void reportWarning( const ANTLR_USE_NAMESPACE(std)string& warnMessage ){ - m_driver->addProblem( m_driver->currentFileName(), Problem( QString::fromLocal8Bit(warnMessage.c_str()), getLine(), getColumn()) ); + m_driver->addProblem( m_driver->currentFileName(), Problem( TQString::fromLocal8Bit(warnMessage.c_str()), getLine(), getColumn()) ); } } diff --git a/languages/java/java.store.g b/languages/java/java.store.g index b69b7323..bf996974 100644 --- a/languages/java/java.store.g +++ b/languages/java/java.store.g @@ -2,7 +2,7 @@ header "pre_include_hpp" { #include <codemodel.h> - #include "JavaAST.hpp" + #include "JavaAST.h" #include <qstring.h> #include <qstringlist.h> @@ -72,26 +72,26 @@ public: } } -compilationUnit { QString package; QString imp; QStringList imports; } +compilationUnit { TQString package; TQString imp; QStringList imports; } : { init(); } (package=packageDefinition)? (imp=importDefinition { imports << imp; } )* (typeDefinition)* ; -packageDefinition returns [ QString id ] +packageDefinition returns [ TQString id ] : #( PACKAGE_DEF id=identifier ) ; -importDefinition returns [ QString id ] +importDefinition returns [ TQString id ] : #( IMPORT id=identifierStar ) ; -typeDefinition { QStringList bases; QString className; ClassDom klass; QStringList m;} +typeDefinition { QStringList bases; TQString className; ClassDom klass; QStringList m;} : #(CLASS_DEF m=modifiers IDENT { klass = m_model->create<ClassModel>(); - QString name = QString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() ); + TQString name = TQString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() ); QStringList path = QStringList::split( ".", name ); className = path.back(); @@ -125,7 +125,7 @@ typeDefinition { QStringList bases; QString className; ClassDom klass; QStringLi | #(INTERFACE_DEF m=modifiers IDENT { klass = m_model->create<ClassModel>(); - QString name = QString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() ); + TQString name = TQString::fromUtf8( #IDENT->getText().c_str(), #IDENT->getText().length() ); QStringList path = QStringList::split( ".", name ); className = path.back(); @@ -154,16 +154,16 @@ typeDefinition { QStringList bases; QString className; ClassDom klass; QStringLi ) ; -typeSpec returns [ QString tp ] +typeSpec returns [ TQString tp ] : #(TYPE tp=typeSpecArray) ; -typeSpecArray returns [ QString tp ] +typeSpecArray returns [ TQString tp ] : #( ARRAY_DECLARATOR tp=typeSpecArray ) { tp += "[]"; } | tp=type ; -type returns [ QString tp ] +type returns [ TQString tp ] : tp=identifier | b:builtInType { tp = #b->getText().c_str(); } ; @@ -199,11 +199,11 @@ modifier | "volatile" ; -extendsClause returns [ QStringList l ] { QString id; } +extendsClause returns [ QStringList l ] { TQString id; } : #(EXTENDS_CLAUSE (id=identifier { l << id; } )* ) ; -implementsClause returns [ QStringList l ] { QString id; } +implementsClause returns [ QStringList l ] { TQString id; } : #(IMPLEMENTS_CLAUSE (id=identifier { l << id; } )* ) ; @@ -256,7 +256,7 @@ ctorDef returns [ FunctionDom meth ] { methodDecl returns [ FunctionDom meth ] { QStringList m; - QString tp; + TQString tp; meth = m_model->create<FunctionModel>(); meth->setFileName( m_file->name() ); } @@ -274,7 +274,7 @@ methodDecl returns [ FunctionDom meth ] { methodDef returns [ FunctionDom meth ] { QStringList m; - QString tp; + TQString tp; meth = m_model->create<FunctionModel>(); meth->setFileName( m_file->name() ); } @@ -292,7 +292,7 @@ methodDef returns [ FunctionDom meth ] { variableDef returns [ VariableDom attr ] { QStringList m; - QString tp; + TQString tp; attr = m_model->create<VariableModel>(); attr->setFileName( m_file->name() ); } @@ -311,7 +311,7 @@ variableDef returns [ VariableDom attr ] { ; parameterDef returns [ ArgumentDom arg ] { - QString tp; + TQString tp; arg = m_model->create<ArgumentModel>(); } : #(PARAMETER_DEF modifiers tp=typeSpec IDENT ) @@ -360,21 +360,21 @@ throwsClause : #( "throws" (identifier)* ) ; -identifier returns [ QString id ] +identifier returns [ TQString id ] : IDENT { id = #IDENT->getText().c_str(); } | #( DOT id=identifier IDENT ) { - id += QString(".") + #IDENT->getText().c_str(); + id += TQString(".") + #IDENT->getText().c_str(); } ; -identifierStar returns [ QString id ] +identifierStar returns [ TQString id ] : IDENT { id = #IDENT->getText().c_str(); } - | #( DOT id=identifier (STAR { id += QString(".") + #STAR->getText().c_str(); } | - IDENT { id += QString(".") + #IDENT->getText().c_str(); }) ) + | #( DOT id=identifier (STAR { id += TQString(".") + #STAR->getText().c_str(); } | + IDENT { id += TQString(".") + #IDENT->getText().c_str(); }) ) ; slist diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp index 94e435f2..299e283f 100644 --- a/languages/java/javasupportfactory.cpp +++ b/languages/java/javasupportfactory.cpp @@ -14,11 +14,11 @@ #include <kdevplugininfo.h> #include "javasupportfactory.h" -static const KDevPluginInfo data("kdevjavasupport"); +static const KDevPluginInfo pluginData("kdevjavasupport"); K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory ) JavaSupportFactory::JavaSupportFactory() - : KDevGenericFactory<JavaSupportPart>( data ) + : KDevGenericFactory<JavaSupportPart>( pluginData ) { } @@ -34,6 +34,6 @@ TDEInstance *JavaSupportFactory::createInstance() const KDevPluginInfo *JavaSupportFactory::info() { - return &data; + return &pluginData; } diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index f9bbbd88..36f9dadc 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -23,8 +23,8 @@ #include "kdevdriver.h" #include "javasupport_utils.h" -#include "JavaStoreWalker.hpp" -#include "JavaAST.hpp" +#include "JavaStoreWalker.h" +#include "JavaAST.h" #include <tqheader.h> #include <tqdir.h> @@ -135,37 +135,37 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr m_backgroundParser = new BackgroundParser( this, &m_eventConsumed ); m_backgroundParser->start(); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); - connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), - this, TQT_SLOT(savedFile(const KURL&)) ); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(activePartChanged(KParts::Part*))); - connect( partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(partRemoved(KParts::Part*))); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(projectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(projectClosed()) ); + connect( partController(), TQ_SIGNAL(savedFile(const KURL&)), + this, TQ_SLOT(savedFile(const KURL&)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(activePartChanged(KParts::Part*))); + connect( partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(partRemoved(KParts::Part*))); m_problemReporter = new ProblemReporter( this, 0, "problemReporterWidget" ); m_problemReporter->setIcon( SmallIcon("application-vnd.tde.info") ); mainWindow( )->embedOutputView( m_problemReporter, i18n("Problems"), i18n("Problem reporter")); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - m_problemReporter, TQT_SLOT(configWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), - this, TQT_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + m_problemReporter, TQ_SLOT(configWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(configWidget(KDialogBase*)), + this, TQ_SLOT(configWidget(KDialogBase*)) ); TDEAction *action; action = new TDEAction(i18n("New Class..."), "classnew", 0, - this, TQT_SLOT(slotNewClass()), + this, TQ_SLOT(slotNewClass()), actionCollection(), "project_newclass"); action->setToolTip( i18n("Generate a new class") ); action->setWhatsThis( i18n("<b>New Class</b>Generates a new class.<p>") ); // daniel - connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, - TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); + connect( core( ), TQ_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, + TQ_SLOT( projectConfigWidget( KDialogBase* ) ) ); new KDevJavaSupportIface( this ); //(void) dcopClient(); @@ -288,8 +288,8 @@ void JavaSupportPart::activePartChanged(KParts::Part *part) if( !textHintIface ) return; - connect( view, TQT_SIGNAL(needTextHint(int,int,TQString&)), - this, TQT_SLOT(slotNeedTextHint(int,int,TQString&)) ); + connect( view, TQ_SIGNAL(needTextHint(int,int,TQString&)), + this, TQ_SLOT(slotNeedTextHint(int,int,TQString&)) ); textHintIface->enableTextHints( 1000 ); #endif @@ -302,20 +302,20 @@ void JavaSupportPart::projectOpened( ) m_projectDirectory = URLUtil::canonicalPath( project()->projectDirectory() ); - connect( project( ), TQT_SIGNAL( addedFilesToProject( const TQStringList & ) ), - this, TQT_SLOT( addedFilesToProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( removedFilesFromProject( const TQStringList &) ), - this, TQT_SLOT( removedFilesFromProject( const TQStringList & ) ) ); - connect( project( ), TQT_SIGNAL( changedFilesInProject( const TQStringList & ) ), - this, TQT_SLOT( changedFilesInProject( const TQStringList & ) ) ); - connect( project(), TQT_SIGNAL(projectCompiled()), - this, TQT_SLOT(slotProjectCompiled()) ); + connect( project( ), TQ_SIGNAL( addedFilesToProject( const TQStringList & ) ), + this, TQ_SLOT( addedFilesToProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( removedFilesFromProject( const TQStringList &) ), + this, TQ_SLOT( removedFilesFromProject( const TQStringList & ) ) ); + connect( project( ), TQ_SIGNAL( changedFilesInProject( const TQStringList & ) ), + this, TQ_SLOT( changedFilesInProject( const TQStringList & ) ) ); + connect( project(), TQ_SIGNAL(projectCompiled()), + this, TQ_SLOT(slotProjectCompiled()) ); m_timestamp.clear(); m_projectClosed = false; - TQTimer::singleShot( 500, this, TQT_SLOT( initialParse( ) ) ); + TQTimer::singleShot( 500, this, TQ_SLOT( initialParse( ) ) ); } @@ -531,7 +531,7 @@ JavaSupportPart::parseProject( ) uint offset; stream >> fn >> ts >> offset; - pcs[ fn ] = tqMakePair( ts, offset ); + pcs[ fn ] = qMakePair( ts, offset ); } } } diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h index a69e3524..69495e65 100644 --- a/languages/java/javasupportpart.h +++ b/languages/java/javasupportpart.h @@ -48,7 +48,7 @@ namespace KTextEditor class JavaSupportPart : public KDevLanguageSupport { - Q_OBJECT + TQ_OBJECT public: diff --git a/languages/java/kdevdriver.cpp b/languages/java/kdevdriver.cpp index d19a20c3..d3cffb68 100644 --- a/languages/java/kdevdriver.cpp +++ b/languages/java/kdevdriver.cpp @@ -1,6 +1,6 @@ #include "kdevdriver.h" -#include "JavaLexer.hpp" +#include "JavaLexer.h" #include <unistd.h> #include <tqfileinfo.h> diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index e1fc4174..e5a158b6 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -97,17 +97,17 @@ ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const m_timer = new TQTimer( this ); - connect( part->partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), - this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partAdded(KParts::Part*)), - this, TQT_SLOT(slotPartAdded(KParts::Part*)) ); - connect( part->partController(), TQT_SIGNAL(partRemoved(KParts::Part*)), - this, TQT_SLOT(slotPartRemoved(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(activePartChanged(KParts::Part*)), + this, TQ_SLOT(slotActivePartChanged(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partAdded(KParts::Part*)), + this, TQ_SLOT(slotPartAdded(KParts::Part*)) ); + connect( part->partController(), TQ_SIGNAL(partRemoved(KParts::Part*)), + this, TQ_SLOT(slotPartRemoved(KParts::Part*)) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(reparse()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(reparse()) ); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotSelected(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotSelected(TQListViewItem*)) ); configure(); } @@ -137,7 +137,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) if( !m_javaSupport->isValidSource(m_fileName) ) return; - connect( m_document, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotTextChanged()) ); + connect( m_document, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotTextChanged()) ); m_markIface = dynamic_cast<KTextEditor::MarkInterface*>( part ); if( !m_javaSupport->backgroundParser() ) @@ -239,8 +239,8 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) ConfigureProblemReporter* w = new ConfigureProblemReporter( vbox ); //FIXME adymo: unused functionality w->groupBox3->hide(); - connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept())); - connect(dlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(configure())); + connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept())); + connect(dlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(configure())); } void ProblemReporter::slotPartAdded( KParts::Part* part ) diff --git a/languages/java/problemreporter.h b/languages/java/problemreporter.h index a70d81c6..6147bf80 100644 --- a/languages/java/problemreporter.h +++ b/languages/java/problemreporter.h @@ -37,7 +37,7 @@ namespace KTextEditor{ } class ProblemReporter: public TDEListView{ - Q_OBJECT + TQ_OBJECT public: ProblemReporter( JavaSupportPart* part, TQWidget* parent=0, const char* name=0 ); |