From 9ba04742771370f59740e32e11c5f3a1e6a1b70a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 15:55:57 -0600 Subject: Initial TQt conversion --- kjsembed/tools/Doxyfile | 8 +- kjsembed/tools/coverage/allqobjects.txt | 290 ++++++++-------- kjsembed/tools/coverage/supported.txt | 102 +++--- kjsembed/tools/coverage/unsupported.txt | 190 +++++------ kjsembed/tools/create_bindings.sh | 14 +- kjsembed/tools/doxygen2cons_cpp.xsl | 14 +- kjsembed/tools/doxygen2imp_cpp.xsl | 68 ++-- kjsembed/tools/headers/qbrush.h | 58 ++-- kjsembed/tools/headers/qcanvas.h | 564 ++++++++++++++++---------------- kjsembed/tools/headers/qdir.h | 144 ++++---- kjsembed/tools/headers/qpen.h | 54 +-- kjsembed/tools/headers/qtimer.h | 28 +- 12 files changed, 767 insertions(+), 767 deletions(-) (limited to 'kjsembed/tools') diff --git a/kjsembed/tools/Doxyfile b/kjsembed/tools/Doxyfile index e2686a09..38387502 100644 --- a/kjsembed/tools/Doxyfile +++ b/kjsembed/tools/Doxyfile @@ -171,7 +171,7 @@ SHOW_INCLUDE_FILES = YES # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen # will interpret the first line (until the first dot) of a JavaDoc-style # comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an +# comments will behave just like the Qt-style comments (thus retquiring an # explict @brief command for a brief description. JAVADOC_AUTOBRIEF = YES @@ -265,10 +265,10 @@ SHOW_USED_FILES = YES # configuration options related to warning and progress messages #--------------------------------------------------------------------------- -# The QUIET tag can be used to turn on/off the messages that are generated +# The TQUIET tag can be used to turn on/off the messages that are generated # by doxygen. Possible values are YES and NO. If left blank NO is used. -QUIET = YES +TTQUIET = YES # The WARNINGS tag can be used to turn on/off the warning messages that are # generated by doxygen. Possible values are YES and NO. If left blank @@ -470,7 +470,7 @@ ENUM_VALUES_PER_LINE = 4 # If the GENERATE_TREEVIEW tag is set to YES, a side panel will be # generated containing a tree-like index structure (just like the one that # is generated for HTML Help). For this to work a browser that supports -# JavaScript and frames is required (for instance Netscape 4.0+ +# JavaScript and frames is retquired (for instance Netscape 4.0+ # or Internet explorer 4.0+). GENERATE_TREEVIEW = NO diff --git a/kjsembed/tools/coverage/allqobjects.txt b/kjsembed/tools/coverage/allqobjects.txt index 853e9e1d..b394f402 100644 --- a/kjsembed/tools/coverage/allqobjects.txt +++ b/kjsembed/tools/coverage/allqobjects.txt @@ -1,145 +1,145 @@ -QAccel -QAccessibleObject -QAction -QActionGroup -QApplication -QAquaStyle -QAssistantClient -QAxObject -QAxWidget -QBoxLayout -QButton -QButtonGroup -QCDEStyle -QCanvas -QCanvasView -QCheckBox -QClipboard -QColorDialog -QColorDrag -QComboBox -QCommonStyle -QCopChannel -QDataBrowser -QDataPump -QDataTable -QDataView -QDateEdit -QDateTimeEdit -QDateTimeEditBase -QDesktopWidget -QDial -QDialog -QDns -QDockArea -QDockWindow -QDoubleValidator -QDragObject -QEditorFactory -QErrorMessage -QEventLoop -QFileDialog -QFileIconProvider -QFontDialog -QFrame -QFtp -QGLWidget -QGrid -QGridLayout -QGridView -QGroupBox -QHBox -QHBoxLayout -QHButtonGroup -QHGroupBox -QHeader -QHttp -QIconDrag -QIconView -QImageDrag -QInputDialog -QIntValidator -QLCDNumber -QLabel -QLayout -QLineEdit -QListBox -QListView -QLocalFs -QMacStyle -QMainWindow -QMenuBar -QMessageBox -QMotif -QMotifDialog -QMotifPlusStyle -QMotifStyle -QMotifWidget -QMultiLineEdit -QNPInstance -QNPWidget -QNetworkOperation -QNetworkProtocol -QObject -QObjectCleanupHandler -QPlatinumStyle -QPopupMenu -QProcess -QProgressBar -QProgressDialog -QPushButton -QRadioButton -QRegExpValidator -QSGIStyle -QScrollBar -QScrollView -QServerSocket -QSessionManager -QSignal -QSignalMapper -QSizeGrip -QSlider -QSocket -QSocketNotifier -QSound -QSpinBox -QSplashScreen -QSplitter -QSqlDatabase -QSqlDriver -QSqlEditorFactory -QSqlForm -QStatusBar -QStoredDrag -QStyle -QStyleSheet -QTabBar -QTabDialog -QTabWidget -QTable -QTextBrowser -QTextDrag -QTextEdit -QTextView -QTimeEdit -QTimer -QToolBar -QToolBox -QToolButton -QToolTipGroup -QTranslator -QUriDrag -QUrlOperator -QVBox -QVBoxLayout -QVButtonGroup -QVGroupBox -QValidator -QWSKeyboardHandler -QWidget -QWidgetStack -QWindowsStyle -QWindowsXPStyle -QWizard -QWorkspace -QXtWidget +TTQAccel +TTQAccessibleObject +TTQAction +TTQActionGroup +TTQApplication +TTQAquaStyle +TTQAssistantClient +TTQAxObject +TTQAxWidget +TTQBoxLayout +TTQButton +TTQButtonGroup +TTQCDEStyle +TTQCanvas +TTQCanvasView +TTQCheckBox +TTQClipboard +TTQColorDialog +TTQColorDrag +TTQComboBox +TTQCommonStyle +TTQCopChannel +TTQDataBrowser +TTQDataPump +TTQDataTable +TTQDataView +TTQDateEdit +TTQDateTimeEdit +TTQDateTimeEditBase +TTQDesktopWidget +TTQDial +TTQDialog +TTQDns +TTQDockArea +TTQDockWindow +TTQDoubleValidator +TTQDragObject +TTQEditorFactory +TTQErrorMessage +TTQEventLoop +TTQFileDialog +TTQFileIconProvider +TTQFontDialog +TTQFrame +TTQFtp +TTQGLWidget +TTQGrid +TTQGridLayout +TTQGridView +TTQGroupBox +TTQHBox +TTQHBoxLayout +TTQHButtonGroup +TTQHGroupBox +TTQHeader +TTQHttp +TTQIconDrag +TTQIconView +TTQImageDrag +TTQInputDialog +TTQIntValidator +TTQLCDNumber +TTQLabel +TTQLayout +TTQLineEdit +TTQListBox +TTQListView +TTQLocalFs +TTQMacStyle +TTQMainWindow +TTQMenuBar +TTQMessageBox +TTQMotif +TTQMotifDialog +TTQMotifPlusStyle +TTQMotifStyle +TTQMotifWidget +TTQMultiLineEdit +TTQNPInstance +TTQNPWidget +TTQNetworkOperation +TTQNetworkProtocol +TTQObject +TTQObjectCleanupHandler +TTQPlatinumStyle +TTQPopupMenu +TTQProcess +TTQProgressBar +TTQProgressDialog +TTQPushButton +TTQRadioButton +TTQRegExpValidator +TTQSGIStyle +TTQScrollBar +TTQScrollView +TTQServerSocket +TTQSessionManager +TTQSignal +TTQSignalMapper +TTQSizeGrip +TTQSlider +TTQSocket +TTQSocketNotifier +TTQSound +TTQSpinBox +TTQSplashScreen +TTQSplitter +TTQSqlDatabase +TTQSqlDriver +TTQSqlEditorFactory +TTQSqlForm +TTQStatusBar +TTQStoredDrag +TTQStyle +TTQStyleSheet +TTQTabBar +TTQTabDialog +TTQTabWidget +TTQTable +TTQTextBrowser +TTQTextDrag +TTQTextEdit +TTQTextView +TTQTimeEdit +TTQTimer +TTQToolBar +TTQToolBox +TTQToolButton +TTQToolTipGroup +TTQTranslator +TTQUriDrag +TTQUrlOperator +TTQVBox +TTQVBoxLayout +TTQVButtonGroup +TTQVGroupBox +TTQValidator +TTQWSKeyboardHandler +TTQWidget +TTQWidgetStack +TTQWindowsStyle +TTQWindowsXPStyle +TTQWizard +TTQWorkspace +TTQXtWidget diff --git a/kjsembed/tools/coverage/supported.txt b/kjsembed/tools/coverage/supported.txt index dbf96951..f17ad56d 100644 --- a/kjsembed/tools/coverage/supported.txt +++ b/kjsembed/tools/coverage/supported.txt @@ -9,57 +9,57 @@ Painter Pen Pixmap PixmapLabel -QBoxLayout -QButtonGroup -QCanvasView -QCheckBox -QComboBox -QDataBrowser -QDataTable -QDataView -QDateEdit -QDateTimeEdit -QDial -QDialog -QFrame -QGrid -QGroupBox -QHBox -QHBoxLayout -QIconView -QLCDNumber -QLabel -QLayout -QLayoutWidget -QLineEdit -QListBox -QListView -QMainWindow -QMultiLineEdit -QObject -QPopupMenu -QProgressBar -QPushButton -QRadioButton -QScrollBar -QScrollView -QSlider -QSpinBox -QSplitter -QTabWidget -QTable -QTextBrowser -QTextEdit -QTextView -QTimeEdit -QTimer -QToolBox -QToolButton -QVBox -QVBoxLayout -QWidget -QWidgetStack -QWizard +TTQBoxLayout +TTQButtonGroup +TTQCanvasView +TTQCheckBox +TTQComboBox +TTQDataBrowser +TTQDataTable +TTQDataView +TTQDateEdit +TTQDateTimeEdit +TTQDial +TTQDialog +TTQFrame +TTQGrid +TTQGroupBox +TTQHBox +TTQHBoxLayout +TTQIconView +TTQLCDNumber +TTQLabel +TTQLayout +TTQLayoutWidget +TTQLineEdit +TTQListBox +TTQListView +TTQMainWindow +TTQMultiLineEdit +TTQObject +TTQPopupMenu +TTQProgressBar +TTQPushButton +TTQRadioButton +TTQScrollBar +TTQScrollView +TTQSlider +TTQSpinBox +TTQSplitter +TTQTabWidget +TTQTable +TTQTextBrowser +TTQTextEdit +TTQTextView +TTQTimeEdit +TTQTimer +TTQToolBox +TTQToolButton +TTQVBox +TTQVBoxLayout +TTQWidget +TTQWidgetStack +TTQWizard RangeError ReferenceError SqlDatabase diff --git a/kjsembed/tools/coverage/unsupported.txt b/kjsembed/tools/coverage/unsupported.txt index 1ea2eb7b..4e5f43ee 100644 --- a/kjsembed/tools/coverage/unsupported.txt +++ b/kjsembed/tools/coverage/unsupported.txt @@ -1,95 +1,95 @@ -QAccel MISSING -QAccessibleObject MISSING -QAction MISSING -QActionGroup MISSING -QApplication MISSING -QAquaStyle MISSING -QAssistantClient MISSING -QAxObject MISSING -QAxWidget MISSING -QButton MISSING -QCDEStyle MISSING -QCanvas MISSING -QClipboard MISSING -QColorDialog MISSING -QColorDrag MISSING -QCommonStyle MISSING -QCopChannel MISSING -QDataPump MISSING -QDateTimeEditBase MISSING -QDesktopWidget MISSING -QDns MISSING -QDockArea MISSING -QDockWindow MISSING -QDoubleValidator MISSING -QDragObject MISSING -QEditorFactory MISSING -QErrorMessage MISSING -QEventLoop MISSING -QFileDialog MISSING -QFileIconProvider MISSING -QFontDialog MISSING -QFtp MISSING -QGLWidget MISSING -QGridLayout MISSING -QGridView MISSING -QHButtonGroup MISSING -QHGroupBox MISSING -QHeader MISSING -QHttp MISSING -QIconDrag MISSING -QImageDrag MISSING -QInputDialog MISSING -QIntValidator MISSING -QLocalFs MISSING -QMacStyle MISSING -QMenuBar MISSING -QMessageBox MISSING -QMotif MISSING -QMotifDialog MISSING -QMotifPlusStyle MISSING -QMotifStyle MISSING -QMotifWidget MISSING -QNPInstance MISSING -QNPWidget MISSING -QNetworkOperation MISSING -QNetworkProtocol MISSING -QObjectCleanupHandler MISSING -QPlatinumStyle MISSING -QProcess MISSING -QProgressDialog MISSING -QRegExpValidator MISSING -QSGIStyle MISSING -QServerSocket MISSING -QSessionManager MISSING -QSignal MISSING -QSignalMapper MISSING -QSizeGrip MISSING -QSocket MISSING -QSocketNotifier MISSING -QSound MISSING -QSplashScreen MISSING -QSqlDatabase MISSING -QSqlDriver MISSING -QSqlEditorFactory MISSING -QSqlForm MISSING -QStatusBar MISSING -QStoredDrag MISSING -QStyle MISSING -QStyleSheet MISSING -QTabBar MISSING -QTabDialog MISSING -QTextDrag MISSING -QToolBar MISSING -QToolTipGroup MISSING -QTranslator MISSING -QUriDrag MISSING -QUrlOperator MISSING -QVButtonGroup MISSING -QVGroupBox MISSING -QValidator MISSING -QWSKeyboardHandler MISSING -QWindowsStyle MISSING -QWindowsXPStyle MISSING -QWorkspace MISSING -QXtWidget MISSING +TTQAccel MISSING +TTQAccessibleObject MISSING +TTQAction MISSING +TTQActionGroup MISSING +TTQApplication MISSING +TTQAquaStyle MISSING +TTQAssistantClient MISSING +TTQAxObject MISSING +TTQAxWidget MISSING +TTQButton MISSING +TTQCDEStyle MISSING +TTQCanvas MISSING +TTQClipboard MISSING +TTQColorDialog MISSING +TTQColorDrag MISSING +TTQCommonStyle MISSING +TTQCopChannel MISSING +TTQDataPump MISSING +TTQDateTimeEditBase MISSING +TTQDesktopWidget MISSING +TTQDns MISSING +TTQDockArea MISSING +TTQDockWindow MISSING +TTQDoubleValidator MISSING +TTQDragObject MISSING +TTQEditorFactory MISSING +TTQErrorMessage MISSING +TTQEventLoop MISSING +TTQFileDialog MISSING +TTQFileIconProvider MISSING +TTQFontDialog MISSING +TTQFtp MISSING +TTQGLWidget MISSING +TTQGridLayout MISSING +TTQGridView MISSING +TTQHButtonGroup MISSING +TTQHGroupBox MISSING +TTQHeader MISSING +TTQHttp MISSING +TTQIconDrag MISSING +TTQImageDrag MISSING +TTQInputDialog MISSING +TTQIntValidator MISSING +TTQLocalFs MISSING +TTQMacStyle MISSING +TTQMenuBar MISSING +TTQMessageBox MISSING +TTQMotif MISSING +TTQMotifDialog MISSING +TTQMotifPlusStyle MISSING +TTQMotifStyle MISSING +TTQMotifWidget MISSING +TTQNPInstance MISSING +TTQNPWidget MISSING +TTQNetworkOperation MISSING +TTQNetworkProtocol MISSING +TTQObjectCleanupHandler MISSING +TTQPlatinumStyle MISSING +TTQProcess MISSING +TTQProgressDialog MISSING +TTQRegExpValidator MISSING +TTQSGIStyle MISSING +TTQServerSocket MISSING +TTQSessionManager MISSING +TTQSignal MISSING +TTQSignalMapper MISSING +TTQSizeGrip MISSING +TTQSocket MISSING +TTQSocketNotifier MISSING +TTQSound MISSING +TTQSplashScreen MISSING +TTQSqlDatabase MISSING +TTQSqlDriver MISSING +TTQSqlEditorFactory MISSING +TTQSqlForm MISSING +TTQStatusBar MISSING +TTQStoredDrag MISSING +TTQStyle MISSING +TTQStyleSheet MISSING +TTQTabBar MISSING +TTQTabDialog MISSING +TTQTextDrag MISSING +TTQToolBar MISSING +TTQToolTipGroup MISSING +TTQTranslator MISSING +TTQUriDrag MISSING +TTQUrlOperator MISSING +TTQVButtonGroup MISSING +TTQVGroupBox MISSING +TTQValidator MISSING +TTQWSKeyboardHandler MISSING +TTQWindowsStyle MISSING +TTQWindowsXPStyle MISSING +TTQWorkspace MISSING +TTQXtWidget MISSING diff --git a/kjsembed/tools/create_bindings.sh b/kjsembed/tools/create_bindings.sh index 54c65965..045fcf14 100755 --- a/kjsembed/tools/create_bindings.sh +++ b/kjsembed/tools/create_bindings.sh @@ -10,14 +10,14 @@ function bind_class() doxygen -bind_class QComboBox qcombobox +bind_class TQComboBox qcombobox bind_class Qt qnamespace bind_class KPopupTitle kpopupmenu -#bind_class QDir qdir -#bind_class QListViewItem qlistview +#bind_class TQDir qdir +#bind_class TQListViewItem qlistview -#bind_class QTimer qtimer -#bind_class QBrush qbrush -#bind_class QPen qpen -#bind_class QPainter qpainter +#bind_class TQTimer qtimer +#bind_class TQBrush qbrush +#bind_class TQPen qpen +#bind_class TQPainter qpainter diff --git a/kjsembed/tools/doxygen2cons_cpp.xsl b/kjsembed/tools/doxygen2cons_cpp.xsl index e352246f..91bad62b 100644 --- a/kjsembed/tools/doxygen2cons_cpp.xsl +++ b/kjsembed/tools/doxygen2cons_cpp.xsl @@ -35,7 +35,7 @@ KJS::Object Cons::construct( KJS::ExecState *exe break; } - QString msg = i18n("Cons has no constructor with id '%1'").arg(id); + TQString msg = i18n("Cons has no constructor with id '%1'").arg(id); KJS::Object err = KJS::Error::create( exec, KJS::ReferenceError, msg.utf8() ); exec->setException( err ); return err; @@ -51,11 +51,11 @@ KJS::Object Cons:: - - QString arg = (args.size() >= ) ? args[].toString(exec).qstring() : QString::null; + + TQString arg = (args.size() >= ) ? args[].toString(exec).qstring() : TQString::null; - - QString arg = (args.size() >= ) ? args[].toString(exec).qstring() : QString::null; + + TQString arg = (args.size() >= ) ? args[].toString(exec).qstring() : TQString::null; const char *arg = (args.size() >= ) ? args[].toString(exec).ascii() : 0; @@ -72,8 +72,8 @@ KJS::Object Cons:: bool arg = (args.size() >= ) ? args[].toBoolean(exec) : false; - - QStringList arg; + + TQStringList arg; if ( args.size() >= ) { // TODO: populate the list } diff --git a/kjsembed/tools/doxygen2imp_cpp.xsl b/kjsembed/tools/doxygen2imp_cpp.xsl index 4e8d73bf..c485188c 100644 --- a/kjsembed/tools/doxygen2imp_cpp.xsl +++ b/kjsembed/tools/doxygen2imp_cpp.xsl @@ -86,9 +86,9 @@ void Imp::addBindings( KJS::ExecState *exec, KJS { JSObjectProxy *ob = JSProxy::toObjectProxy( self.imp() ); if ( ob ) { - QObject *obj = ob->object(); + TQObject *obj = ob->object(); if ( obj ) - return dynamic_cast<QComboBox *>( obj ); + return dynamic_cast<TQComboBox *>( obj ); } JSOpaqueProxy *op = JSProxy::toOpaqueProxy( self.imp() ); @@ -122,7 +122,7 @@ KJS::Value Imp::call( KJS::ExecState *exec, KJS: break; } - QString msg = i18n( "Imp has no method with id '%1'" ).arg( mid ); + TQString msg = i18n( "Imp has no method with id '%1'" ).arg( mid ); KJS::Object err = KJS::Error::create( exec, KJS::ReferenceError, msg.utf8() ); exec->setException( err ); return err; @@ -141,11 +141,11 @@ KJS::Value ( KJS::ExecState *exec, KJS::Object { - - QString arg = (args.size() >= ) ? args[].toString(exec).qstring() : QString::null; + + TQString arg = (args.size() >= ) ? args[].toString(exec).qstring() : TQString::null; - - QString arg = (args.size() >= ) ? args[].toString(exec).qstring() : QString::null; + + TQString arg = (args.size() >= ) ? args[].toString(exec).qstring() : TQString::null; const char *arg = (args.size() >= ) ? args[].toString(exec).ascii() : 0; @@ -162,44 +162,44 @@ KJS::Value ( KJS::ExecState *exec, KJS::Object bool arg = (args.size() >= ) ? args[].toBoolean(exec) : false; - - QFont arg; // TODO + + TQFont arg; // TODO - - QPalette arg; // TODO + + TQPalette arg; // TODO - - QStringList arg = extractQStringList(exec, args, ); + + TQStringList arg = extractTQStringList(exec, args, ); - - QStrList arg; + + TQStrList arg; if ( args.size() >= ) { // TODO: populate the list } - - QRect arg = extractQRect(exec, args, ); + + TQRect arg = extractTQRect(exec, args, ); - - QSize arg = extractQSize(exec, args, ); + + TQSize arg = extractTQSize(exec, args, ); - - QPixmap arg = extractQPixmap(exec, args, ); + + TQPixmap arg = extractTQPixmap(exec, args, ); - - QColor arg = extractQColor(exec, args, ); + + TQColor arg = extractTQColor(exec, args, ); - - QDate arg = extractQDate(exec, args, ); + + TQDate arg = extractTQDate(exec, args, ); - - QTime arg = extractQTime(exec, args, ); + + TQTime arg = extractTQTime(exec, args, ); - - QDateTime arg = extractQDateTime(exec, args, ); + + TQDateTime arg = extractTQDateTime(exec, args, ); - QComboBox::Policy arg; // TODO (hack for combo box) + TQComboBox::Policy arg; // TODO (hack for combo box) // Unsupported parameter @@ -250,8 +250,8 @@ KJS::Value ( KJS::ExecState *exec, KJS::Object return KJS::Number( ret ); - - QString ret; + + TQString ret; ret = instance->( arg, ); return KJS::String( ret ); @@ -264,8 +264,8 @@ KJS::Value ( KJS::ExecState *exec, KJS::Object return KJS::String( ret ); - - QStringList ret; + + TQStringList ret; ret = instance->( arg, ); diff --git a/kjsembed/tools/headers/qbrush.h b/kjsembed/tools/headers/qbrush.h index 82b00044..93f17e28 100644 --- a/kjsembed/tools/headers/qbrush.h +++ b/kjsembed/tools/headers/qbrush.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** -** Definition of TQBrush class +** Definition of TTQBrush class ** ** Created : 940112 ** @@ -11,7 +11,7 @@ ** ** This file may be distributed under the terms of the Q Public License ** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. +** LICENSE.TQPL included in the packaging of this file. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -27,7 +27,7 @@ ** ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for ** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/qpl/ for QPL licensing information. +** See http://www.trolltech.com/qpl/ for TQPL licensing information. ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are @@ -35,8 +35,8 @@ ** **********************************************************************/ -#ifndef QBRUSH_H -#define QBRUSH_H +#ifndef TQBRUSH_H +#define TQBRUSH_H #ifndef QT_H #include "tqcolor.h" @@ -44,48 +44,48 @@ #endif // QT_H -class Q_EXPORT TQBrush: public Qt +class Q_EXPORT TTQBrush: public Qt { -friend class TQPainter; +friend class TTQPainter; public: - TQBrush(); - TQBrush( BrushStyle ); - TQBrush( const TQColor &, BrushStyle=SolidPattern ); - TQBrush( const TQColor &, const TQPixmap & ); - TQBrush( const TQBrush & ); - ~TQBrush(); - TQBrush &operator=( const TQBrush & ); + TTQBrush(); + TTQBrush( BrushStyle ); + TTQBrush( const TTQColor &, BrushStyle=SolidPattern ); + TTQBrush( const TTQColor &, const TTQPixmap & ); + TTQBrush( const TTQBrush & ); + ~TTQBrush(); + TTQBrush &operator=( const TTQBrush & ); BrushStyle style() const { return data->style; } void setStyle( BrushStyle ); - const TQColor &color()const { return data->color; } - void setColor( const TQColor & ); - TQPixmap *pixmap() const { return data->pixmap; } - void setPixmap( const TQPixmap & ); + const TTQColor &color()const { return data->color; } + void setColor( const TTQColor & ); + TTQPixmap *pixmap() const { return data->pixmap; } + void setPixmap( const TTQPixmap & ); - bool operator==( const TQBrush &p ) const; - bool operator!=( const TQBrush &b ) const + bool operator==( const TTQBrush &p ) const; + bool operator!=( const TTQBrush &b ) const { return !(operator==(b)); } private: - QBrush copy() const; + TQBrush copy() const; void detach(); - void init( const TQColor &, BrushStyle ); - struct QBrushData : public QShared { // brush data + void init( const TTQColor &, BrushStyle ); + struct TQBrushData : public TQShared { // brush data BrushStyle style; - QColor color; - QPixmap *pixmap; + TQColor color; + TQPixmap *pixmap; } *data; }; /***************************************************************************** - TQBrush stream functions + TTQBrush stream functions *****************************************************************************/ #ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & ); +Q_EXPORT TTQDataStream &operator<<( TTQDataStream &, const TTQBrush & ); +Q_EXPORT TTQDataStream &operator>>( TTQDataStream &, TTQBrush & ); #endif -#endif // QBRUSH_H +#endif // TQBRUSH_H diff --git a/kjsembed/tools/headers/qcanvas.h b/kjsembed/tools/headers/qcanvas.h index 8eb70959..b89fd795 100644 --- a/kjsembed/tools/headers/qcanvas.h +++ b/kjsembed/tools/headers/qcanvas.h @@ -1,7 +1,7 @@ /********************************************************************** ** ** -** Definition of TQCanvas classes +** Definition of TTQCanvas classes ** ** Created : 991211 ** @@ -11,7 +11,7 @@ ** ** This file may be distributed under the terms of the Q Public License ** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. +** LICENSE.TQPL included in the packaging of this file. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -27,7 +27,7 @@ ** ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for ** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/qpl/ for QPL licensing information. +** See http://www.trolltech.com/qpl/ for TQPL licensing information. ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are @@ -35,8 +35,8 @@ ** **********************************************************************/ -#ifndef QCANVAS_H -#define QCANVAS_H +#ifndef TQCANVAS_H +#define TQCANVAS_H #ifndef QT_H #include "tqscrollview.h" @@ -49,44 +49,44 @@ #endif // QT_H #if !defined( QT_MODULE_CANVAS ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_CANVAS ) -#define QM_EXPORT_CANVAS -#define QM_TEMPLATE_EXTERN_CANVAS +#define TQM_EXPORT_CANVAS +#define TQM_TEMPLATE_EXTERN_CANVAS #else -#define QM_EXPORT_CANVAS Q_EXPORT -#define QM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN +#define TQM_EXPORT_CANVAS Q_EXPORT +#define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN #endif #ifndef QT_NO_CANVAS -class TQCanvasSprite; -class TQCanvasPolygonalItem; -class TQCanvasRectangle; -class TQCanvasPolygon; -class TQCanvasEllipse; -class TQCanvasText; -class TQCanvasLine; -class TQCanvasChunk; -class TQCanvas; -class TQCanvasItem; -class TQCanvasView; -class TQCanvasPixmap; +class TTQCanvasSprite; +class TTQCanvasPolygonalItem; +class TTQCanvasRectangle; +class TTQCanvasPolygon; +class TTQCanvasEllipse; +class TTQCanvasText; +class TTQCanvasLine; +class TTQCanvasChunk; +class TTQCanvas; +class TTQCanvasItem; +class TTQCanvasView; +class TTQCanvasPixmap; -class QM_EXPORT_CANVAS TQCanvasItemList : public TQValueList { +class TQM_EXPORT_CANVAS TTQCanvasItemList : public TTQValueList { public: void sort(); - void drawUnique( TQPainter& painter ); + void drawUnique( TTQPainter& painter ); }; -class TQCanvasItemExtra; +class TTQCanvasItemExtra; -class QM_EXPORT_CANVAS TQCanvasItem : public Qt +class TQM_EXPORT_CANVAS TTQCanvasItem : public Qt { public: - TQCanvasItem(TQCanvas* canvas); - virtual ~TQCanvasItem(); + TTQCanvasItem(TTQCanvas* canvas); + virtual ~TTQCanvasItem(); double x() const { return myx; } @@ -110,13 +110,13 @@ public: double yVelocity() const; virtual void advance(int stage); - virtual bool collidesWith( const TQCanvasItem* ) const=0; + virtual bool collidesWith( const TTQCanvasItem* ) const=0; - TQCanvasItemList collisions(bool exact /* NO DEFAULT */ ) const; + TTQCanvasItemList collisions(bool exact /* NO DEFAULT */ ) const; - virtual void setCanvas(TQCanvas*); + virtual void setCanvas(TTQCanvas*); - virtual void draw(TQPainter&)=0; + virtual void draw(TTQPainter&)=0; void show(); void hide(); @@ -159,10 +159,10 @@ public: virtual int rtti() const; static int RTTI; - virtual TQRect boundingRect() const=0; - virtual TQRect boundingRectAdvanced() const; + virtual TTQRect boundingRect() const=0; + virtual TTQRect boundingRectAdvanced() const; - TQCanvas* canvas() const + TTQCanvas* canvas() const { return cnv; } protected: @@ -171,30 +171,30 @@ protected: private: // For friendly subclasses... - friend class TQCanvasPolygonalItem; - friend class TQCanvasSprite; - friend class TQCanvasRectangle; - friend class TQCanvasPolygon; - friend class TQCanvasEllipse; - friend class TQCanvasText; - friend class TQCanvasLine; + friend class TTQCanvasPolygonalItem; + friend class TTQCanvasSprite; + friend class TTQCanvasRectangle; + friend class TTQCanvasPolygon; + friend class TTQCanvasEllipse; + friend class TTQCanvasText; + friend class TTQCanvasLine; - virtual TQPointArray chunks() const; + virtual TTQPointArray chunks() const; virtual void addToChunks(); virtual void removeFromChunks(); virtual void changeChunks(); - virtual bool collidesWith( const TQCanvasSprite*, - const TQCanvasPolygonalItem*, - const TQCanvasRectangle*, - const TQCanvasEllipse*, - const TQCanvasText* ) const = 0; + virtual bool collidesWith( const TTQCanvasSprite*, + const TTQCanvasPolygonalItem*, + const TTQCanvasRectangle*, + const TTQCanvasEllipse*, + const TTQCanvasText* ) const = 0; // End of friend stuff - TQCanvas* cnv; - static TQCanvas* current_canvas; + TTQCanvas* cnv; + static TTQCanvas* current_canvas; double myx,myy,myz; - TQCanvasItemExtra *ext; - TQCanvasItemExtra& extra(); + TTQCanvasItemExtra *ext; + TTQCanvasItemExtra& extra(); uint ani:1; uint vis:1; uint val:1; @@ -204,25 +204,25 @@ private: }; -class TQCanvasData; +class TTQCanvasData; -class QM_EXPORT_CANVAS TQCanvas : public QObject +class TQM_EXPORT_CANVAS TTQCanvas : public TQObject { Q_OBJECT public: - TQCanvas( TQObject* parent = 0, const char* name = 0 ); - TQCanvas(int w, int h); - TQCanvas( TQPixmap p, int h, int v, int tilewidth, int tileheight ); + TTQCanvas( TTQObject* parent = 0, const char* name = 0 ); + TTQCanvas(int w, int h); + TTQCanvas( TTQPixmap p, int h, int v, int tilewidth, int tileheight ); - virtual ~TQCanvas(); + virtual ~TTQCanvas(); - virtual void setTiles( TQPixmap tiles, int h, int v, + virtual void setTiles( TTQPixmap tiles, int h, int v, int tilewidth, int tileheight ); - virtual void setBackgroundPixmap( const TQPixmap& p ); - TQPixmap backgroundPixmap() const; + virtual void setBackgroundPixmap( const TTQPixmap& p ); + TTQPixmap backgroundPixmap() const; - virtual void setBackgroundColor( const TQColor& c ); - TQColor backgroundColor() const; + virtual void setBackgroundColor( const TTQColor& c ); + TTQColor backgroundColor() const; virtual void setTile( int x, int y, int tilenum ); int tile( int x, int y ) const @@ -243,17 +243,17 @@ public: { return awidth; } int height() const { return aheight; } - TQSize size() const - { return TQSize(awidth,aheight); } - TQRect rect() const - { return TQRect( 0, 0, awidth, aheight ); } + TTQSize size() const + { return TTQSize(awidth,aheight); } + TTQRect rect() const + { return TTQRect( 0, 0, awidth, aheight ); } bool onCanvas( int x, int y ) const { return x>=0 && y>=0 && x=0 && y>=0 && x, TQPtrList hotspots); + TTQCanvasPixmapArray(TTQPtrList, TTQPtrList hotspots); - TQCanvasPixmapArray(TQValueList, TQPointArray hotspots = TQPointArray() ); - ~TQCanvasPixmapArray(); + TTQCanvasPixmapArray(TTQValueList, TTQPointArray hotspots = TTQPointArray() ); + ~TTQCanvasPixmapArray(); #ifndef QT_NO_IMAGEIO - bool readPixmaps(const TQString& datafilenamepattern, int framecount=0); - bool readCollisionMasks(const TQString& filenamepattern); + bool readPixmaps(const TTQString& datafilenamepattern, int framecount=0); + bool readCollisionMasks(const TTQString& filenamepattern); #endif // deprecated bool operator!(); // Failure check. bool isValid() const; - TQCanvasPixmap* image(int i) const + TTQCanvasPixmap* image(int i) const { return img ? img[i] : 0; } - void setImage(int i, TQCanvasPixmap* p); + void setImage(int i, TTQCanvasPixmap* p); uint count() const { return (uint)framecount; } private: #if defined(Q_DISABLE_COPY) - TQCanvasPixmapArray( const TQCanvasPixmapArray & ); - TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & ); + TTQCanvasPixmapArray( const TTQCanvasPixmapArray & ); + TTQCanvasPixmapArray &operator=( const TTQCanvasPixmapArray & ); #endif #ifndef QT_NO_IMAGEIO - bool readPixmaps(const TQString& datafilenamepattern, int framecount, bool maskonly); + bool readPixmaps(const TTQString& datafilenamepattern, int framecount, bool maskonly); #endif void reset(); int framecount; - TQCanvasPixmap** img; + TTQCanvasPixmap** img; }; -class QM_EXPORT_CANVAS TQCanvasSprite : public QCanvasItem +class TQM_EXPORT_CANVAS TTQCanvasSprite : public TQCanvasItem { public: - TQCanvasSprite(TQCanvasPixmapArray* array, TQCanvas* canvas); + TTQCanvasSprite(TTQCanvasPixmapArray* array, TTQCanvas* canvas); - void setSequence(TQCanvasPixmapArray* seq); + void setSequence(TTQCanvasPixmapArray* seq); - virtual ~TQCanvasSprite(); + virtual ~TTQCanvasSprite(); void move(double x, double y); virtual void move(double x, double y, int frame); @@ -490,9 +490,9 @@ public: int rtti() const; static int RTTI; - bool collidesWith( const TQCanvasItem* ) const; + bool collidesWith( const TTQCanvasItem* ) const; - TQRect boundingRect() const; + TTQRect boundingRect() const; // is there a reason for these to be protected? Lars //protected: @@ -509,20 +509,20 @@ public: int topEdge(int ny) const; int rightEdge(int nx) const; int bottomEdge(int ny) const; - TQCanvasPixmap* image() const + TTQCanvasPixmap* image() const { return images->image(frm); } - virtual TQCanvasPixmap* imageAdvanced() const; - TQCanvasPixmap* image(int f) const + virtual TTQCanvasPixmap* imageAdvanced() const; + TTQCanvasPixmap* image(int f) const { return images->image(f); } virtual void advance(int stage); public: - void draw(TQPainter& painter); + void draw(TTQPainter& painter); private: #if defined(Q_DISABLE_COPY) - TQCanvasSprite( const TQCanvasSprite & ); - TQCanvasSprite &operator=( const TQCanvasSprite & ); + TTQCanvasSprite( const TTQCanvasSprite & ); + TTQCanvasSprite &operator=( const TTQCanvasSprite & ); #endif void addToChunks(); void removeFromChunks(); @@ -532,46 +532,46 @@ private: ushort anim_val; uint anim_state:2; uint anim_type:14; - bool collidesWith( const TQCanvasSprite*, - const TQCanvasPolygonalItem*, - const TQCanvasRectangle*, - const TQCanvasEllipse*, - const TQCanvasText* ) const; + bool collidesWith( const TTQCanvasSprite*, + const TTQCanvasPolygonalItem*, + const TTQCanvasRectangle*, + const TTQCanvasEllipse*, + const TTQCanvasText* ) const; - friend bool qt_testCollision( const TQCanvasSprite* s1, - const TQCanvasSprite* s2 ); + friend bool qt_testCollision( const TTQCanvasSprite* s1, + const TTQCanvasSprite* s2 ); - TQCanvasPixmapArray* images; + TTQCanvasPixmapArray* images; }; -class TQPolygonalProcessor; +class TTQPolygonalProcessor; -class QM_EXPORT_CANVAS TQCanvasPolygonalItem : public QCanvasItem +class TQM_EXPORT_CANVAS TTQCanvasPolygonalItem : public TQCanvasItem { public: - TQCanvasPolygonalItem(TQCanvas* canvas); - virtual ~TQCanvasPolygonalItem(); + TTQCanvasPolygonalItem(TTQCanvas* canvas); + virtual ~TTQCanvasPolygonalItem(); - bool collidesWith( const TQCanvasItem* ) const; + bool collidesWith( const TTQCanvasItem* ) const; - virtual void setPen(TQPen p); - virtual void setBrush(TQBrush b); + virtual void setPen(TTQPen p); + virtual void setBrush(TTQBrush b); - TQPen pen() const + TTQPen pen() const { return pn; } - TQBrush brush() const + TTQBrush brush() const { return br; } - virtual TQPointArray areaPoints() const=0; - virtual TQPointArray areaPointsAdvanced() const; - TQRect boundingRect() const; + virtual TTQPointArray areaPoints() const=0; + virtual TTQPointArray areaPointsAdvanced() const; + TTQRect boundingRect() const; int rtti() const; static int RTTI; protected: - void draw(TQPainter &); - virtual void drawShape(TQPainter &) = 0; + void draw(TTQPainter &); + virtual void drawShape(TTQPainter &) = 0; bool winding() const; void setWinding(bool); @@ -581,88 +581,88 @@ protected: { return (bool)val; } private: - void scanPolygon( const TQPointArray& pa, int winding, - TQPolygonalProcessor& process ) const; - TQPointArray chunks() const; - - bool collidesWith( const TQCanvasSprite*, - const TQCanvasPolygonalItem*, - const TQCanvasRectangle*, - const TQCanvasEllipse*, - const TQCanvasText* ) const; - - TQBrush br; - TQPen pn; + void scanPolygon( const TTQPointArray& pa, int winding, + TTQPolygonalProcessor& process ) const; + TTQPointArray chunks() const; + + bool collidesWith( const TTQCanvasSprite*, + const TTQCanvasPolygonalItem*, + const TTQCanvasRectangle*, + const TTQCanvasEllipse*, + const TTQCanvasText* ) const; + + TTQBrush br; + TTQPen pn; uint wind:1; }; -class QM_EXPORT_CANVAS TQCanvasRectangle : public QCanvasPolygonalItem +class TQM_EXPORT_CANVAS TTQCanvasRectangle : public TQCanvasPolygonalItem { public: - TQCanvasRectangle(TQCanvas* canvas); - TQCanvasRectangle(const TQRect&, TQCanvas* canvas); - TQCanvasRectangle(int x, int y, int width, int height, TQCanvas* canvas); + TTQCanvasRectangle(TTQCanvas* canvas); + TTQCanvasRectangle(const TTQRect&, TTQCanvas* canvas); + TTQCanvasRectangle(int x, int y, int width, int height, TTQCanvas* canvas); - ~TQCanvasRectangle(); + ~TTQCanvasRectangle(); int width() const; int height() const; void setSize(int w, int h); - TQSize size() const - { return TQSize(w,h); } - TQPointArray areaPoints() const; - TQRect rect() const - { return TQRect(int(x()),int(y()),w,h); } + TTQSize size() const + { return TTQSize(w,h); } + TTQPointArray areaPoints() const; + TTQRect rect() const + { return TTQRect(int(x()),int(y()),w,h); } - bool collidesWith( const TQCanvasItem* ) const; + bool collidesWith( const TTQCanvasItem* ) const; int rtti() const; static int RTTI; protected: - void drawShape(TQPainter &); - TQPointArray chunks() const; + void drawShape(TTQPainter &); + TTQPointArray chunks() const; private: - bool collidesWith( const TQCanvasSprite*, - const TQCanvasPolygonalItem*, - const TQCanvasRectangle*, - const TQCanvasEllipse*, - const TQCanvasText* ) const; + bool collidesWith( const TTQCanvasSprite*, + const TTQCanvasPolygonalItem*, + const TTQCanvasRectangle*, + const TTQCanvasEllipse*, + const TTQCanvasText* ) const; int w, h; }; -class QM_EXPORT_CANVAS TQCanvasPolygon : public QCanvasPolygonalItem +class TQM_EXPORT_CANVAS TTQCanvasPolygon : public TQCanvasPolygonalItem { public: - TQCanvasPolygon(TQCanvas* canvas); - ~TQCanvasPolygon(); - void setPoints(TQPointArray); - TQPointArray points() const; + TTQCanvasPolygon(TTQCanvas* canvas); + ~TTQCanvasPolygon(); + void setPoints(TTQPointArray); + TTQPointArray points() const; void moveBy(double dx, double dy); - TQPointArray areaPoints() const; + TTQPointArray areaPoints() const; int rtti() const; static int RTTI; protected: - void drawShape(TQPainter &); - TQPointArray poly; + void drawShape(TTQPainter &); + TTQPointArray poly; }; -class QM_EXPORT_CANVAS TQCanvasSpline : public QCanvasPolygon +class TQM_EXPORT_CANVAS TTQCanvasSpline : public TQCanvasPolygon { public: - TQCanvasSpline(TQCanvas* canvas); - ~TQCanvasSpline(); + TTQCanvasSpline(TTQCanvas* canvas); + ~TTQCanvasSpline(); - void setControlPoints(TQPointArray, bool closed=TRUE); - TQPointArray controlPoints() const; + void setControlPoints(TTQPointArray, bool closed=TRUE); + TTQPointArray controlPoints() const; bool closed() const; int rtti() const; @@ -670,47 +670,47 @@ public: private: void recalcPoly(); - TQPointArray bez; + TTQPointArray bez; bool cl; }; -class QM_EXPORT_CANVAS TQCanvasLine : public QCanvasPolygonalItem +class TQM_EXPORT_CANVAS TTQCanvasLine : public TQCanvasPolygonalItem { public: - TQCanvasLine(TQCanvas* canvas); - ~TQCanvasLine(); + TTQCanvasLine(TTQCanvas* canvas); + ~TTQCanvasLine(); void setPoints(int x1, int y1, int x2, int y2); - TQPoint startPoint() const - { return TQPoint(x1,y1); } - TQPoint endPoint() const - { return TQPoint(x2,y2); } + TTQPoint startPoint() const + { return TTQPoint(x1,y1); } + TTQPoint endPoint() const + { return TTQPoint(x2,y2); } int rtti() const; static int RTTI; - void setPen(TQPen p); + void setPen(TTQPen p); protected: - void drawShape(TQPainter &); - TQPointArray areaPoints() const; + void drawShape(TTQPainter &); + TTQPointArray areaPoints() const; private: int x1,y1,x2,y2; }; -class QM_EXPORT_CANVAS TQCanvasEllipse : public QCanvasPolygonalItem +class TQM_EXPORT_CANVAS TTQCanvasEllipse : public TQCanvasPolygonalItem { public: - TQCanvasEllipse( TQCanvas* canvas ); - TQCanvasEllipse( int width, int height, TQCanvas* canvas ); - TQCanvasEllipse( int width, int height, int startangle, int angle, - TQCanvas* canvas ); + TTQCanvasEllipse( TTQCanvas* canvas ); + TTQCanvasEllipse( int width, int height, TTQCanvas* canvas ); + TTQCanvasEllipse( int width, int height, int startangle, int angle, + TTQCanvas* canvas ); - ~TQCanvasEllipse(); + ~TTQCanvasEllipse(); int width() const; int height() const; @@ -720,44 +720,44 @@ public: { return a1; } int angleLength() const { return a2; } - TQPointArray areaPoints() const; + TTQPointArray areaPoints() const; - bool collidesWith( const TQCanvasItem* ) const; + bool collidesWith( const TTQCanvasItem* ) const; int rtti() const; static int RTTI; protected: - void drawShape(TQPainter &); + void drawShape(TTQPainter &); private: - bool collidesWith( const TQCanvasSprite*, - const TQCanvasPolygonalItem*, - const TQCanvasRectangle*, - const TQCanvasEllipse*, - const TQCanvasText* ) const; + bool collidesWith( const TTQCanvasSprite*, + const TTQCanvasPolygonalItem*, + const TTQCanvasRectangle*, + const TTQCanvasEllipse*, + const TTQCanvasText* ) const; int w, h; int a1, a2; }; -class TQCanvasTextExtra; +class TTQCanvasTextExtra; -class QM_EXPORT_CANVAS TQCanvasText : public QCanvasItem +class TQM_EXPORT_CANVAS TTQCanvasText : public TQCanvasItem { public: - TQCanvasText(TQCanvas* canvas); - TQCanvasText(const TQString&, TQCanvas* canvas); - TQCanvasText(const TQString&, TQFont, TQCanvas* canvas); + TTQCanvasText(TTQCanvas* canvas); + TTQCanvasText(const TTQString&, TTQCanvas* canvas); + TTQCanvasText(const TTQString&, TTQFont, TTQCanvas* canvas); - virtual ~TQCanvasText(); + virtual ~TTQCanvasText(); - void setText( const TQString& ); - void setFont( const TQFont& ); - void setColor( const TQColor& ); - TQString text() const; - TQFont font() const; - TQColor color() const; + void setText( const TTQString& ); + void setFont( const TTQFont& ); + void setColor( const TTQColor& ); + TTQString text() const; + TTQFont font() const; + TTQColor color() const; void moveBy(double dx, double dy); @@ -765,42 +765,42 @@ public: { return flags; } void setTextFlags(int); - TQRect boundingRect() const; + TTQRect boundingRect() const; - bool collidesWith( const TQCanvasItem* ) const; + bool collidesWith( const TTQCanvasItem* ) const; int rtti() const; static int RTTI; protected: - virtual void draw(TQPainter&); + virtual void draw(TTQPainter&); private: #if defined(Q_DISABLE_COPY) - TQCanvasText( const TQCanvasText & ); - TQCanvasText &operator=( const TQCanvasText & ); + TTQCanvasText( const TTQCanvasText & ); + TTQCanvasText &operator=( const TTQCanvasText & ); #endif void addToChunks(); void removeFromChunks(); void changeChunks(); void setRect(); - TQRect brect; - TQString txt; + TTQRect brect; + TTQString txt; int flags; - TQFont fnt; - TQColor col; - TQCanvasTextExtra* extra; - - bool collidesWith( const TQCanvasSprite*, - const TQCanvasPolygonalItem*, - const TQCanvasRectangle*, - const TQCanvasEllipse*, - const TQCanvasText* ) const; + TTQFont fnt; + TTQColor col; + TTQCanvasTextExtra* extra; + + bool collidesWith( const TTQCanvasSprite*, + const TTQCanvasPolygonalItem*, + const TTQCanvasRectangle*, + const TTQCanvasEllipse*, + const TTQCanvasText* ) const; }; #define Q_DEFINED_QCANVAS #include "tqwinexport.h" #endif // QT_NO_CANVAS -#endif // QCANVAS_H +#endif // TQCANVAS_H diff --git a/kjsembed/tools/headers/qdir.h b/kjsembed/tools/headers/qdir.h index 200514dd..4db56e03 100644 --- a/kjsembed/tools/headers/qdir.h +++ b/kjsembed/tools/headers/qdir.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** -** Definition of TQDir class +** Definition of TTQDir class ** ** Created : 950427 ** @@ -11,7 +11,7 @@ ** ** This file may be distributed under the terms of the Q Public License ** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. +** LICENSE.TQPL included in the packaging of this file. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -27,7 +27,7 @@ ** ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for ** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/qpl/ for QPL licensing information. +** See http://www.trolltech.com/qpl/ for TQPL licensing information. ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are @@ -35,8 +35,8 @@ ** **********************************************************************/ -#ifndef QDIR_H -#define QDIR_H +#ifndef TQDIR_H +#define TQDIR_H #ifndef QT_H #include "tqglobal.h" @@ -46,13 +46,13 @@ #ifndef QT_NO_DIR -typedef TQPtrList QFileInfoList; -typedef TQPtrListIterator QFileInfoListIterator; -class TQStringList; -template class TQDeepCopy; +typedef TTQPtrList TQFileInfoList; +typedef TTQPtrListIterator TQFileInfoListIterator; +class TTQStringList; +template class TTQDeepCopy; -class Q_EXPORT QDir +class Q_EXPORT TQDir { public: enum FilterSpec { Dirs = 0x001, @@ -85,34 +85,34 @@ public: IgnoreCase = 0x10, DefaultSort = -1 }; - TQDir(); - TQDir( const TQString &path, const TQString &nameFilter = TQString::null, + TTQDir(); + TTQDir( const TTQString &path, const TTQString &nameFilter = TTQString::null, int sortSpec = Name | IgnoreCase, int filterSpec = All ); - TQDir( const TQDir & ); + TTQDir( const TTQDir & ); - virtual ~TQDir(); + virtual ~TTQDir(); - TQDir &operator=( const TQDir & ); - TQDir &operator=( const TQString &path ); + TTQDir &operator=( const TTQDir & ); + TTQDir &operator=( const TTQString &path ); - virtual void setPath( const TQString &path ); - virtual TQString path() const; - virtual TQString absPath() const; - virtual TQString canonicalPath() const; + virtual void setPath( const TTQString &path ); + virtual TTQString path() const; + virtual TTQString absPath() const; + virtual TTQString canonicalPath() const; - virtual TQString dirName() const; - virtual TQString filePath( const TQString &fileName, + virtual TTQString dirName() const; + virtual TTQString filePath( const TTQString &fileName, bool acceptAbsPath = TRUE ) const; - virtual TQString absFilePath( const TQString &fileName, + virtual TTQString absFilePath( const TTQString &fileName, bool acceptAbsPath = TRUE ) const; - static TQString convertSeparators( const TQString &pathName ); + static TTQString convertSeparators( const TTQString &pathName ); - virtual bool cd( const TQString &dirName, bool acceptAbsPath = TRUE ); + virtual bool cd( const TTQString &dirName, bool acceptAbsPath = TRUE ); virtual bool cdUp(); - QString nameFilter() const; - virtual void setNameFilter( const TQString &nameFilter ); + TQString nameFilter() const; + virtual void setNameFilter( const TTQString &nameFilter ); FilterSpec filter() const; virtual void setFilter( int filterSpec ); SortSpec sorting() const; @@ -122,30 +122,30 @@ public: virtual void setMatchAllDirs( bool ); uint count() const; - QString operator[]( int ) const; + TQString operator[]( int ) const; - virtual TQStrList encodedEntryList( int filterSpec = DefaultFilter, + virtual TTQStrList encodedEntryList( int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; - virtual TQStrList encodedEntryList( const TQString &nameFilter, + virtual TTQStrList encodedEntryList( const TTQString &nameFilter, int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; - virtual TQStringList entryList( int filterSpec = DefaultFilter, + virtual TTQStringList entryList( int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; - virtual TQStringList entryList( const TQString &nameFilter, + virtual TTQStringList entryList( const TTQString &nameFilter, int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; - virtual const QFileInfoList *entryInfoList( int filterSpec = DefaultFilter, + virtual const TQFileInfoList *entryInfoList( int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; - virtual const QFileInfoList *entryInfoList( const TQString &nameFilter, + virtual const TQFileInfoList *entryInfoList( const TTQString &nameFilter, int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const; - static const QFileInfoList *drives(); + static const TQFileInfoList *drives(); - virtual bool mkdir( const TQString &dirName, + virtual bool mkdir( const TTQString &dirName, bool acceptAbsPath = TRUE ) const; - virtual bool rmdir( const TQString &dirName, + virtual bool rmdir( const TTQString &dirName, bool acceptAbsPath = TRUE ) const; virtual bool isReadable() const; @@ -155,92 +155,92 @@ public: virtual bool isRelative() const; virtual void convertToAbs(); - virtual bool operator==( const TQDir & ) const; - virtual bool operator!=( const TQDir & ) const; + virtual bool operator==( const TTQDir & ) const; + virtual bool operator!=( const TTQDir & ) const; - virtual bool remove( const TQString &fileName, + virtual bool remove( const TTQString &fileName, bool acceptAbsPath = TRUE ); - virtual bool rename( const TQString &name, const TQString &newName, + virtual bool rename( const TTQString &name, const TTQString &newName, bool acceptAbsPaths = TRUE ); - virtual bool exists( const TQString &name, + virtual bool exists( const TTQString &name, bool acceptAbsPath = TRUE ); static char separator(); - static bool setCurrent( const TQString &path ); - static TQDir current(); - static TQDir home(); - static TQDir root(); - static TQString currentDirPath(); - static TQString homeDirPath(); - static TQString rootDirPath(); - - static bool match( const TQStringList &filters, const TQString &fileName ); - static bool match( const TQString &filter, const TQString &fileName ); - static TQString cleanDirPath( const TQString &dirPath ); - static bool isRelativePath( const TQString &path ); + static bool setCurrent( const TTQString &path ); + static TTQDir current(); + static TTQDir home(); + static TTQDir root(); + static TTQString currentDirPath(); + static TTQString homeDirPath(); + static TTQString rootDirPath(); + + static bool match( const TTQStringList &filters, const TTQString &fileName ); + static bool match( const TTQString &filter, const TTQString &fileName ); + static TTQString cleanDirPath( const TTQString &dirPath ); + static bool isRelativePath( const TTQString &path ); void refresh() const; private: #ifdef Q_OS_MAC typedef struct FSSpec FSSpec; - static FSSpec *make_spec(const TQString &); + static FSSpec *make_spec(const TTQString &); #endif void init(); - virtual bool readDirEntries( const TQString &nameFilter, + virtual bool readDirEntries( const TTQString &nameFilter, int FilterSpec, int SortSpec ); - static void slashify( TQString & ); + static void slashify( TTQString & ); - QString dPath; - TQStringList *fList; - QFileInfoList *fiList; - QString nameFilt; + TQString dPath; + TTQStringList *fList; + TQFileInfoList *fiList; + TQString nameFilt; FilterSpec filtS; SortSpec sortS; uint dirty : 1; uint allDirs : 1; void detach(); - friend class TQDeepCopy< TQDir >; + friend class TTQDeepCopy< TTQDir >; }; -inline TQString TQDir::path() const +inline TTQString TTQDir::path() const { return dPath; } -inline TQString TQDir::nameFilter() const +inline TTQString TTQDir::nameFilter() const { return nameFilt; } -inline TQDir::FilterSpec TQDir::filter() const +inline TTQDir::FilterSpec TTQDir::filter() const { return filtS; } -inline TQDir::SortSpec TQDir::sorting() const +inline TTQDir::SortSpec TTQDir::sorting() const { return sortS; } -inline bool TQDir::matchAllDirs() const +inline bool TTQDir::matchAllDirs() const { return allDirs; } -inline bool TQDir::operator!=( const TQDir &d ) const +inline bool TTQDir::operator!=( const TTQDir &d ) const { return !(*this == d); } -struct QDirSortItem { - TQString filename_cache; - TQFileInfo* item; +struct TQDirSortItem { + TTQString filename_cache; + TTQFileInfo* item; }; #endif // QT_NO_DIR -#endif // QDIR_H +#endif // TQDIR_H diff --git a/kjsembed/tools/headers/qpen.h b/kjsembed/tools/headers/qpen.h index 585e7af2..e1a5c582 100644 --- a/kjsembed/tools/headers/qpen.h +++ b/kjsembed/tools/headers/qpen.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** -** Definition of TQPen class +** Definition of TTQPen class ** ** Created : 940112 ** @@ -11,7 +11,7 @@ ** ** This file may be distributed under the terms of the Q Public License ** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. +** LICENSE.TQPL included in the packaging of this file. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -27,7 +27,7 @@ ** ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for ** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/qpl/ for QPL licensing information. +** See http://www.trolltech.com/qpl/ for TQPL licensing information. ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are @@ -35,8 +35,8 @@ ** **********************************************************************/ -#ifndef QPEN_H -#define QPEN_H +#ifndef TQPEN_H +#define TQPEN_H #ifndef QT_H #include "tqcolor.h" @@ -44,56 +44,56 @@ #endif // QT_H -class Q_EXPORT TQPen: public Qt +class Q_EXPORT TTQPen: public Qt { public: - TQPen(); - TQPen( PenStyle ); - TQPen( const TQColor &color, uint width=0, PenStyle style=SolidLine ); - TQPen( const TQColor &cl, uint w, PenStyle s, PenCapStyle c, PenJoinStyle j); - TQPen( const TQPen & ); - ~TQPen(); - TQPen &operator=( const TQPen & ); + TTQPen(); + TTQPen( PenStyle ); + TTQPen( const TTQColor &color, uint width=0, PenStyle style=SolidLine ); + TTQPen( const TTQColor &cl, uint w, PenStyle s, PenCapStyle c, PenJoinStyle j); + TTQPen( const TTQPen & ); + ~TTQPen(); + TTQPen &operator=( const TTQPen & ); PenStyle style() const { return data->style; } void setStyle( PenStyle ); uint width() const { return data->width; } void setWidth( uint ); - const TQColor &color() const { return data->color; } - void setColor( const TQColor & ); + const TTQColor &color() const { return data->color; } + void setColor( const TTQColor & ); PenCapStyle capStyle() const; void setCapStyle( PenCapStyle ); PenJoinStyle joinStyle() const; void setJoinStyle( PenJoinStyle ); - bool operator==( const TQPen &p ) const; - bool operator!=( const TQPen &p ) const + bool operator==( const TTQPen &p ) const; + bool operator!=( const TTQPen &p ) const { return !(operator==(p)); } private: - friend class TQPainter; + friend class TTQPainter; #ifdef Q_WS_WIN - friend class QFontEngineWin; + friend class TQFontEngineWin; #endif - QPen copy() const; + TQPen copy() const; void detach(); - void init( const TQColor &, uint, uint ); - struct QPenData : public QShared { // pen data + void init( const TTQColor &, uint, uint ); + struct TQPenData : public TQShared { // pen data PenStyle style; uint width; - QColor color; + TQColor color; Q_UINT16 linest; } *data; }; /***************************************************************************** - TQPen stream functions + TTQPen stream functions *****************************************************************************/ #ifndef QT_NO_DATASTREAM -Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & ); -Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & ); +Q_EXPORT TTQDataStream &operator<<( TTQDataStream &, const TTQPen & ); +Q_EXPORT TTQDataStream &operator>>( TTQDataStream &, TTQPen & ); #endif -#endif // QPEN_H +#endif // TQPEN_H diff --git a/kjsembed/tools/headers/qtimer.h b/kjsembed/tools/headers/qtimer.h index 311e5e08..e61b4124 100644 --- a/kjsembed/tools/headers/qtimer.h +++ b/kjsembed/tools/headers/qtimer.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ** -** Definition of TQTimer class +** Definition of TTQTimer class ** ** Created : 931111 ** @@ -11,7 +11,7 @@ ** ** This file may be distributed under the terms of the Q Public License ** as defined by Trolltech AS of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. +** LICENSE.TQPL included in the packaging of this file. ** ** This file may be distributed and/or modified under the terms of the ** GNU General Public License version 2 as published by the Free Software @@ -27,7 +27,7 @@ ** ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for ** information about Qt Commercial License Agreements. -** See http://www.trolltech.com/qpl/ for QPL licensing information. +** See http://www.trolltech.com/qpl/ for TQPL licensing information. ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are @@ -35,20 +35,20 @@ ** **********************************************************************/ -#ifndef QTIMER_H -#define QTIMER_H +#ifndef TQTIMER_H +#define TQTIMER_H #ifndef QT_H #include "tqobject.h" #endif // QT_H -class Q_EXPORT TQTimer : public QObject +class Q_EXPORT TTQTimer : public TQObject { Q_OBJECT public: - TQTimer( TQObject *parent=0, const char *name=0 ); - ~TQTimer(); + TTQTimer( TTQObject *parent=0, const char *name=0 ); + ~TTQTimer(); bool isActive() const; @@ -56,7 +56,7 @@ public: void changeInterval( int msec ); void stop(); - static void singleShot( int msec, TQObject *receiver, const char *member ); + static void singleShot( int msec, TTQObject *receiver, const char *member ); int timerId() const { return id; } @@ -64,7 +64,7 @@ signals: void timeout(); protected: - bool event( TQEvent * ); + bool event( TTQEvent * ); private: int id; @@ -73,16 +73,16 @@ private: private: // Disabled copy constructor and operator= #if defined(Q_DISABLE_COPY) - TQTimer( const TQTimer & ); - TQTimer &operator=( const TQTimer & ); + TTQTimer( const TTQTimer & ); + TTQTimer &operator=( const TTQTimer & ); #endif }; -inline bool TQTimer::isActive() const +inline bool TTQTimer::isActive() const { return id >= 0; } -#endif // QTIMER_H +#endif // TQTIMER_H -- cgit v1.2.1