diff options
803 files changed, 11983 insertions, 4378 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 4ac20f68..bfff7e4d 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,12 +9,15 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEL10n ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1bfc3c1d..84420a6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,13 +9,17 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### project( tdewebdev ) -set( VERSION R14.1.0 ) ##### include essential cmake modules ########### @@ -30,7 +34,6 @@ include( CheckCXXSourceCompiles ) ##### include our cmake modules ################# -set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) include( TDEMacros ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 6b936f76..7fc1c49b 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -59,24 +59,16 @@ if( (BUILD_QUANTA) OR (BUILD_KXSLDBG) OR (BUILD_KLINKSTATUS) ) tde_execute_process( COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=CXXFLAGS icu-uc OUTPUT_VARIABLE ICU_CXXFLAGS + OUTPUT_STRIP_TRAILING_WHITESPACE ) ##### check for libxml-2.0 - pkg_search_module( LIBXML libxml-2.0 ) + pkg_search_module( LIBXML libxml-2.0>=2.6 ) if( NOT LIBXML_FOUND ) - tde_message_fatal( "libxml-2.0 is required but was not found on your system" ) - elseif( ${LIBXML_VERSION} VERSION_LESS "2.6" ) - tde_message_fatal( "libxml-2.0 version must be, at least, up to 2.6" ) - else() - set( LIBXML_2_5 1 ) - tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) - set( CMAKE_REQUIRED_INCLUDES ${LIBXML_INCLUDE_DIRS} ) - set( CMAKE_REQUIRED_LIBRARIES ${LIBXML_LIBRARIES} ) - check_function_exists( xmlSetEntityReferenceFunc HAVE_INCLUDE_FIX ) - tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + tde_message_fatal( "libxml-2.0 version >= 2.6 is required but was not found on your system" ) endif( NOT LIBXML_FOUND ) @@ -128,7 +120,7 @@ if( (BUILD_QUANTA) OR (BUILD_KXSLDBG) OR (BUILD_KLINKSTATUS) ) tde_save( CMAKE_REQUIRED_INCLUDES ) set( CMAKE_REQUIRED_INCLUDES ${LIBXML_INCLUDE_DIRS} ) - check_include_file( "libxml/DOCBparser.h" LIBXML_DOCB_ENABLED ) + set( LIBXML_DOCB_ENABLED 1 CACHE BOOL "Enable docbook input files" ) check_include_file( "libxml/xinclude.h" LIBXML_XINCLUDE_ENABLED ) tde_restore( CMAKE_REQUIRED_INCLUDES ) diff --git a/admin b/admin -Subproject 8c7e0d40de084fe5d54e173918756639e0d4d63 +Subproject 59a8bf7c09f87fbccd6dc2987145c7216e043e7 diff --git a/config.h.cmake b/config.h.cmake index 121c38d9..2e2ebdf4 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -58,18 +58,12 @@ /* Defined if you build with cvsservice */ #cmakedefine ENABLE_CVSSERVICE 1 -/* Defined if libxml-2.0 is up to 2.6 */ -#cmakedefine LIBXML_2_5 1 - -/* Defined if you have <libxml/DOCBparser.h> header file */ +/* Defined if you build with enabled docbook input files */ #cmakedefine LIBXML_DOCB_ENABLED /* Defined if you have <libxml/xinclude.h> header file */ #cmakedefine LIBXML_XINCLUDE_ENABLED -/* Defined if you have xmlSetEntityReferenceFunc within libxml2 */ -#cmakedefine HAVE_INCLUDE_FIX 1 - /* Define the kmdr-executor executable path */ #cmakedefine KMDR_EXECUTOR_PATH "@KMDR_EXECUTOR_PATH@" diff --git a/doc/kommander/dcop.docbook b/doc/kommander/dcop.docbook index 1fd7c170..e13db5e6 100644 --- a/doc/kommander/dcop.docbook +++ b/doc/kommander/dcop.docbook @@ -30,7 +30,7 @@ This assumes you are inside a &kommander; file and have access to the special @p &kommander; evolved the much faster internal &DCOP; function. Using it from another application window (console &DCOP; is very slow) is more complicated because you must give lots of information, including a prototype of the call. The above call would become: (Note that @dcopid is actually internal to the dialog, but you could replace it with a valid process ID) </para> <screen> -@dcop(@dcopid, KommanderIf, <quote>enableWidget(QString, bool)</quote>, Widget, true) +@dcop(@dcopid, KommanderIf, <quote>enableWidget(TQString, bool)</quote>, Widget, true) </screen> <para> In the early &kommander; nesting &DCOP; calls inside script language structures (like <application>bash</application>) used console method calls. <emphasis>If you use internal &DCOP; all &kommander; specials will be executed first and then the script will be executed.</emphasis> Please read that again as it will cause you no end of grief with a <application>bash</application> loop using &kommander; specials. @@ -49,7 +49,7 @@ As you can see the new syntax is very easy, as well as consistent visually with <title>&DCOP; for Global Variables</title> <variablelist> <varlistentry> -<term>global(QString variableName)</term> +<term>global(TQString variableName)</term> <listitem> <para> Returns the value of the specified global variable. When a script is run from within a &kommander; window any (non-global) variables set in that script will cease to exist after the script completes and therfore will not be available to other script processes or in a new instance of the calling process. The global <quote>scope</quote> means the variable will exist for any process of the window until that window is closed. You may change these variables at any time with a new call to <function>@setGlobal</function>. @@ -57,10 +57,10 @@ Returns the value of the specified global variable. When a script is run from w </listitem> </varlistentry> <varlistentry> -<term>setGlobal(QString variableName, QString value)</term> +<term>setGlobal(TQString variableName, TQString value)</term> <listitem> <para> -Creates a variable that is global to the window process and assigns the value to it. This value can be retrieved with global(QString variableName) or set again. +Creates a variable that is global to the window process and assigns the value to it. This value can be retrieved with global(TQString variableName) or set again. </para> </listitem> </varlistentry> @@ -75,7 +75,7 @@ The following list is old and left here for reference purposes only. For a compl </para> <variablelist> <varlistentry> -<term>setText(QString text)</term> +<term>setText(TQString text)</term> <listitem> <para> This removes the text displayed in the widget and replaces it with the text supplied. @@ -99,7 +99,7 @@ Returns the text associated with the specified widget. This is not the same as </listitem> </varlistentry> <varlistentry> -<term>setAssociatedText(QString text)</term> +<term>setAssociatedText(TQString text)</term> <listitem> <para> This sets the &kommander; Text default string. This is typically set to <quote>@widgetText</quote> to display what is entered into the widget. It is unlikely you will have much need for this, but if you do it is there. Applies to all widgets that can contain data. @@ -113,7 +113,7 @@ This sets the &kommander; Text default string. This is typically set to <quote> <title>&DCOP; for ListBox and ComboBox Widgets</title> <variablelist> <varlistentry> -<term>addListItem(QString item, int index)</term> +<term>addListItem(TQString item, int index)</term> <listitem> <para> Adds an item to a ListBox widget at the specified index. List index starts at zero. To add to the end of the list use -1. @@ -129,7 +129,7 @@ This adds a list of strings all at once. The list should be delimited by <acron </listitem> </varlistentry> <varlistentry> -<term>addUniqueItem(QString item)</term> +<term>addUniqueItem(TQString item)</term> <listitem> <para> addUniqueItem will add an item to the end of the list only if it is unique. @@ -175,7 +175,7 @@ Set the current (or selected) item to the index specified. Applies to ListBox a <title>&DCOP; for CheckBox and RadioButton Widgets</title> <variablelist> <varlistentry> -<term>setChecked(QString widgetName, bool checked)</term> +<term>setChecked(TQString widgetName, bool checked)</term> <listitem> <para> Checks/unchecks CheckBox or RadioButton widgets. @@ -189,7 +189,7 @@ Checks/unchecks CheckBox or RadioButton widgets. <title>&DCOP; for TabWidget Widgets</title> <variablelist> <varlistentry> -<term>setCurrentTab(QString widgetName, int index)</term> +<term>setCurrentTab(TQString widgetName, int index)</term> <listitem> <para> Selected the tab by index for TabWidgets. Index starts at 0. diff --git a/doc/kommander/extending.docbook b/doc/kommander/extending.docbook index f4323828..8c5fce1c 100644 --- a/doc/kommander/extending.docbook +++ b/doc/kommander/extending.docbook @@ -61,33 +61,33 @@ dialog, we get something like this in the generated header file: class QShowEvent; class KomLineEdit : public KLineEdit, public KommanderWidget { - Q_OBJECT + TQ_OBJECT - TQ_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - KomLineEdit(QWidget *a_parent, const char *a_name); + KomLineEdit(TQWidget *a_parent, const char *a_name); ~KomLineEdit(); - virtual QString widgetText() const; + virtual TQString widgetText() const; virtual bool isKommanderWidget() const; virtual void setAssociatedText(const QStringList&); virtual QStringList associatedText() const; - virtual QString currentState() const; + virtual TQString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); public slots: - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); virtual void populate(); protected: void showEvent( QShowEvent *e ); signals: void widgetOpened(); - void widgetTextChanged(const QString &); + void widgetTextChanged(const TQString &); }; </screen> <para>Most of this is just template code that you don't need to worry about. @@ -99,7 +99,7 @@ widget we wish to integrate with &kommander;, and secondly from KommanderWidget. There are a few parts in the cpp file that are important to each particular widget. </para> <screen> -KomLineEdit::KomLineEdit(QWidget *a_parent, const char *a_name) +KomLineEdit::KomLineEdit(TQWidget *a_parent, const char *a_name) : KLineEdit(a_parent, a_name), KommanderWidget(this) { QStringList states; @@ -115,9 +115,9 @@ that had different kinds of states, such as a check box, you might set three states <emphasis>unchecked</emphasis>, <emphasis>semichecked</emphasis> and <emphasis>checked</emphasis> here. </para> <screen> -QString KomLineEdit::currentState() const +TQString KomLineEdit::currentState() const { - return QString("default"); + return TQString("default"); }</screen> <para>We set the states in the constructor above, and this just returns the current state of the widget. For our widget @@ -126,12 +126,12 @@ that checks what state your widget is currently in and return the appropriate string here. </para> <screen> -QString KomLineEdit::widgetText() const +TQString KomLineEdit::widgetText() const { return KLineEdit::text(); } -void KomLineEdit::setWidgetText(const QString &a_text) +void KomLineEdit::setWidgetText(const TQString &a_text) { KLineEdit::setText(a_text); emit widgetTextChanged(a_text); @@ -139,7 +139,7 @@ void KomLineEdit::setWidgetText(const QString &a_text) </screen> <para>These are the two most important methods, where the bulk of the functional code goes. -<emphasis>QString KomLineEdit::widgetText() const</emphasis> method returns the widget text of the +<emphasis>TQString KomLineEdit::widgetText() const</emphasis> method returns the widget text of the widget (the text that the <emphasis>@widgetText</emphasis> special is expanded to in text associations). For our widget, the widget text is simply the text inside the line edit, so we just return that. Similarly when setting the widget text, @@ -162,17 +162,17 @@ enum Functions { Function2, LastFunction }; -KomLineEdit::KomLineEdit(QWidget *a_parent, const char *a_name) +KomLineEdit::KomLineEdit(TQWidget *a_parent, const char *a_name) : KLineEdit(a_parent, a_name), KommanderWidget(this) { ... //code like described above KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(Function1, "function1(QString widget, QString arg1, int arg2)", i18n("Call function1 with two arguments, second is optional."), 2, 3); - KommanderPlugin::registerFunction(function2, "function2(QString widget)", i18n("Get a QString as a result of function2."), 1); + KommanderPlugin::registerFunction(Function1, "function1(TQString widget, TQString arg1, int arg2)", i18n("Call function1 with two arguments, second is optional."), 2, 3); + KommanderPlugin::registerFunction(function2, "function2(TQString widget)", i18n("Get a TQString as a result of function2."), 1); } </screen> <para>This registers two functions: <emphasis>function1 and function2</emphasis>. The number assigned to the functions (here <emphasis>1160</emphasis> and <emphasis>1161</emphasis>) must be unique, not used in any other plugin or -inside &kommander;. <emphasis>function1</emphasis> takes two arguments, one is optional, <emphasis>function2</emphasis> takes no argument and returns a string. The <emphasis>QString widget</emphasis> argument in the signatures notes that this functions work on a widget, like: <emphasis>KomLineEdit.function1("foo", 1)</emphasis>. +inside &kommander;. <emphasis>function1</emphasis> takes two arguments, one is optional, <emphasis>function2</emphasis> takes no argument and returns a string. The <emphasis>TQString widget</emphasis> argument in the signatures notes that this functions work on a widget, like: <emphasis>KomLineEdit.function1("foo", 1)</emphasis>. </para> <para>To teach &kommander; that the widget supports these functions, add a method like this: </para> @@ -187,7 +187,7 @@ function. The function code should be handled inside the handleDCOP method: </para> <screen> -QString KomLineEdit::handleDCOP(int function, const QStringList& args) +TQString KomLineEdit::handleDCOP(int function, const QStringList& args) { switch (function) { @@ -203,7 +203,7 @@ QString KomLineEdit::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString::null; + return TQString::null; } </screen> <para>There are cases when the widget should appear differently in the editor than in @@ -226,7 +226,7 @@ derive from QLabel, and use this in the constructor: functions, like in the <emphasis>execute</emphasis> function. Here is an example from the AboutDialog widget: </para> <screen> -QString AboutDialog::handleDCOP(int function, const QStringList& args) +TQString AboutDialog::handleDCOP(int function, const QStringList& args) { switch (function) { ... @@ -287,7 +287,7 @@ class MyKomPlugin : public KommanderPlugin { public: MyKomPlugin(); - virtual QWidget *create( const QString &className, QWidget *parent = 0, const char *name = 0 ); + virtual TQWidget *create( const TQString &className, TQWidget *parent = 0, const char *name = 0 ); }; </screen> <para> @@ -313,7 +313,7 @@ etc. Regarding the icon, the above example loads a medium sized icon called <emphasis>iconname</emphasis> from the standard &kde; icon location. </para> <screen> -QWidget *MyKomPlugin::create( const QString &className, QWidget *parent, const char *name ) +TQWidget *MyKomPlugin::create( const TQString &className, TQWidget *parent, const char *name ) { if( className == "KomLineEdit" ) return new KomLineEdit( parent, name ); @@ -410,8 +410,8 @@ You need to add to the <emphasis>editor/widgetfactory.cpp</emphasis> as well: ... #include "mywidget.h" ... -QWidget *WidgetFactory::createWidget( const QString &className, QWidget *parent, const char *name, bool init, - const QRect *r, Qt::Orientation orient ) +TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, + const QRect *r, TQt::Orientation orient ) { ... else if (className == "MyWidgetName") diff --git a/doc/kommander/parser.docbook b/doc/kommander/parser.docbook index a008c431..a8bec882 100644 --- a/doc/kommander/parser.docbook +++ b/doc/kommander/parser.docbook @@ -307,8 +307,8 @@ And now you access those with <emphasis>_xcount</emphasis> and <emphasis>_xquote </para> <para> DCOP can be complex, which is why we recommend using the tools we develop to enable creating DCOP for remote &kommander; dialogs with something like a function browser. Here is an example DCOP call issued from a dialog opened from a parent &kommander; window. Since it knows who its parent is it can send information back while it is open and freely access all its parent's functionality with the exception of slots. Of course that can be done internally with a script which can be called externally, so in practice there is no limit to what can be done. -<screen>dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(QString,QString)", "StatusBar8", "Hello")</screen> -Let's look at this piece by piece. First of all we add <emphasis>parentPid</emphasis> to "kmdr-executor-" as we make no assumption a &kommander; window was the caller. You could use this with Quanta or KSpread or whatever. Next we are addressing <emphasis>KommanderIf</emphasis>, which is a <emphasis>nice</emphasis> interface for end users which has been cleaned up. We hope eventually as KDE moves from DCOP to DBUS on KDE4 that more applications adopt a nice interface for integration. The next parameter, <emphasis>"setText(QString,QString)"</emphasis> is important because it <emphasis>prototypes</emphasis> the parameters allowed. Otherwise &kommander; could not validate the call. So without a definition of the DCOP call being used you will get an error. The remaining parameters are of course what is being passed. We recommend you look at applications with <command>kdcop</command> to see how this works and practice dcop calls from the shell to get your syntax right. +<screen>dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(TQString,TQString)", "StatusBar8", "Hello")</screen> +Let's look at this piece by piece. First of all we add <emphasis>parentPid</emphasis> to "kmdr-executor-" as we make no assumption a &kommander; window was the caller. You could use this with Quanta or KSpread or whatever. Next we are addressing <emphasis>KommanderIf</emphasis>, which is a <emphasis>nice</emphasis> interface for end users which has been cleaned up. We hope eventually as KDE moves from DCOP to DBUS on KDE4 that more applications adopt a nice interface for integration. The next parameter, <emphasis>"setText(TQString,TQString)"</emphasis> is important because it <emphasis>prototypes</emphasis> the parameters allowed. Otherwise &kommander; could not validate the call. So without a definition of the DCOP call being used you will get an error. The remaining parameters are of course what is being passed. We recommend you look at applications with <command>kdcop</command> to see how this works and practice dcop calls from the shell to get your syntax right. </para> </sect2> </sect1> @@ -557,7 +557,7 @@ file with given <emphasis>key</emphasis>; if there is no such value <emphasis>de for best control. </para></listitem> <listitem> -<para><command>connect(<parameter>sender</parameter>, <parameter>signal</parameter>, <parameter>receiver</parameter>, <parameter>slot</parameter>)</command> - connect a widget signal to a widget slot. See the connection dialog and select similar widgets for possibilities. If for instance a signal looks like looks like <command>execute(const QString&)</command> that is exactly what must be in quotes there. +<para><command>connect(<parameter>sender</parameter>, <parameter>signal</parameter>, <parameter>receiver</parameter>, <parameter>slot</parameter>)</command> - connect a widget signal to a widget slot. See the connection dialog and select similar widgets for possibilities. If for instance a signal looks like looks like <command>execute(const TQString&)</command> that is exactly what must be in quotes there. </para></listitem> <listitem> <para><command>disconnect(<parameter>sender</parameter>, <parameter>signal</parameter>, <parameter>receiver</parameter>, <parameter>slot</parameter>)</command> - undo the connection as listed above. Again, exact syntax is essential. diff --git a/doc/kommander/tutorials.docbook b/doc/kommander/tutorials.docbook index 6071c60c..a9ccafa8 100644 --- a/doc/kommander/tutorials.docbook +++ b/doc/kommander/tutorials.docbook @@ -83,7 +83,7 @@ One of the very useful features inherited from Qt Designer was signals and slots <para> To access the connection tool you can open it by right clicking anywhere on the dialog and selecting it. Click the menu and you will see a list of connections made at the bottom. Above that are two lists of signals and slots and above them the respective sender and receiver are selected. An easy way to make connections is visually. Look at the toolbar or the Tools menu. There are three items grouped there. A pointer, signals and slot connections and the tab order or widgets. Selecting this sets connection mode for the curios. Click on your widget to send the signal and drag it to your widget to receive it in a slot. As you do this you will see a line and drop indications on the widget under the mouse. The StatusBar on the Editor will tell you what is being connected. </para> -<note><para>In version 1.3 there is a &kommander; function connect() which allows you to connect signals and slots on the fly. This is useful if you just used createWidget. Obviously you can't use the dialog for something &kommander; doesn't yet know exists. Unfortunately there are too many combinations to list so you have to type out signals and slots. <emphasis>These must be typed verbatim or they will fail.</emphasis> This is where the connection tool is handy again. Open it and select two widgets like the two you want to connect and read the connection information. if it says <command>execute(const QString&)</command> that is exactly what you must type.</para></note> +<note><para>In version 1.3 there is a &kommander; function connect() which allows you to connect signals and slots on the fly. This is useful if you just used createWidget. Obviously you can't use the dialog for something &kommander; doesn't yet know exists. Unfortunately there are too many combinations to list so you have to type out signals and slots. <emphasis>These must be typed verbatim or they will fail.</emphasis> This is where the connection tool is handy again. Open it and select two widgets like the two you want to connect and read the connection information. if it says <command>execute(const TQString&)</command> that is exactly what you must type.</para></note> </sect2> <sect2 id="slot-functions"> diff --git a/doc/man/kimagemapeditor/CMakeLists.txt b/doc/man/kimagemapeditor/CMakeLists.txt index bf2486b8..4088e36f 100644 --- a/doc/man/kimagemapeditor/CMakeLists.txt +++ b/doc/man/kimagemapeditor/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kimagemapeditor.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/klinkstatus/CMakeLists.txt b/doc/man/klinkstatus/CMakeLists.txt index 555edb4f..e080e735 100644 --- a/doc/man/klinkstatus/CMakeLists.txt +++ b/doc/man/klinkstatus/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES klinkstatus.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kommander/CMakeLists.txt b/doc/man/kommander/CMakeLists.txt index 92110a2d..669b104c 100644 --- a/doc/man/kommander/CMakeLists.txt +++ b/doc/man/kommander/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kmdr2po.1 kmdr-executor.1 diff --git a/doc/man/kxsldbg/CMakeLists.txt b/doc/man/kxsldbg/CMakeLists.txt index bcba60ea..d701aad2 100644 --- a/doc/man/kxsldbg/CMakeLists.txt +++ b/doc/man/kxsldbg/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kxsldbg.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/quanta/CMakeLists.txt b/doc/man/quanta/CMakeLists.txt index de356ee8..7db459f7 100644 --- a/doc/man/quanta/CMakeLists.txt +++ b/doc/man/quanta/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES quanta.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/kimagemapeditor/arealistview.h b/kimagemapeditor/arealistview.h index 48f495f4..e3622edb 100644 --- a/kimagemapeditor/arealistview.h +++ b/kimagemapeditor/arealistview.h @@ -32,7 +32,7 @@ class Area; **/ class AreaListView : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kimagemapeditor/drawzone.cpp b/kimagemapeditor/drawzone.cpp index 51fdb2ac..f89b4e3d 100644 --- a/kimagemapeditor/drawzone.cpp +++ b/kimagemapeditor/drawzone.cpp @@ -262,7 +262,7 @@ void DrawZone::contentsMousePressEvent(TQMouseEvent* e) } if ( currentAction==None ) { - if (e->button()==Qt::RightButton) + if (e->button()==TQt::RightButton) { if ( (currentArea=imageMapEditor->onArea(drawStart)) ) { @@ -278,7 +278,7 @@ void DrawZone::contentsMousePressEvent(TQMouseEvent* e) } else - if (e->button()==Qt::MidButton) { + if (e->button()==TQt::MidButton) { contentsMouseDoubleClickEvent(e); } else // LeftClick on selectionpoint @@ -420,7 +420,7 @@ void DrawZone::contentsMouseReleaseEvent(TQMouseEvent *e) { // the right Button was pressed the Polygon is finished if ((currentArea->selectionPoints()->count()>2) && (currentArea->selectionPoints()->first()->contains(drawEnd) - || (e->button()==Qt::RightButton))) + || (e->button()==TQt::RightButton))) { currentArea->setFinished(true); currentAction=None; @@ -849,7 +849,7 @@ void DrawZone::drawContents(TQPainter* p,int clipx,int clipy,int clipw,int cliph { TQPen pen = TQPen(TQColor("white"),1); p2.setRasterOp(TQt::XorROP); - pen.setStyle(Qt::DotLine); + pen.setStyle(TQt::DotLine); p2.setPen(pen); TQRect r( drawStart.x(),drawStart.y(),drawCurrent.x()-drawStart.x(),drawCurrent.y()-drawStart.y()); diff --git a/kimagemapeditor/imageslistview.cpp b/kimagemapeditor/imageslistview.cpp index 15529a45..773fd9b4 100644 --- a/kimagemapeditor/imageslistview.cpp +++ b/kimagemapeditor/imageslistview.cpp @@ -60,8 +60,8 @@ ImagesListView::ImagesListView(TQWidget *parent, const char *name) setFullWidth(true); - connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*)), - this, TQT_SLOT( slotSelectionChanged(TQListViewItem*))); + connect( this, TQ_SIGNAL( selectionChanged(TQListViewItem*)), + this, TQ_SLOT( slotSelectionChanged(TQListViewItem*))); } diff --git a/kimagemapeditor/imageslistview.h b/kimagemapeditor/imageslistview.h index 24bac7a0..99f2dc64 100644 --- a/kimagemapeditor/imageslistview.h +++ b/kimagemapeditor/imageslistview.h @@ -46,7 +46,7 @@ class ImagesListViewItem : public TQListViewItem **/ class ImagesListView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kimagemapeditor/kimagemapeditor.cpp b/kimagemapeditor/kimagemapeditor.cpp index 1d9eeba7..8e92947d 100644 --- a/kimagemapeditor/kimagemapeditor.cpp +++ b/kimagemapeditor/kimagemapeditor.cpp @@ -118,7 +118,7 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *, mapsDock->manualDock( (KDockWidget*) areaDock, KDockWidget::DockCenter); imagesDock->manualDock( (KDockWidget*) mapsDock, KDockWidget::DockCenter); - connect( mainDock->manager(), TQT_SIGNAL(change()), this, TQT_SLOT(dockingStateChanged())); + connect( mainDock->manager(), TQ_SIGNAL(change()), this, TQ_SLOT(dockingStateChanged())); } else { @@ -137,25 +137,25 @@ KImageMapEditor::KImageMapEditor(TQWidget *parentWidget, const char *, } - connect( areaListView->listView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect( areaListView->listView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(showTagEditor(TQListViewItem*))); - connect( areaListView->listView, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, - TQT_SLOT(slotShowPopupMenu(TQListViewItem*,const TQPoint &))); + connect( areaListView->listView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); + connect( areaListView->listView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(showTagEditor(TQListViewItem*))); + connect( areaListView->listView, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, + TQ_SLOT(slotShowPopupMenu(TQListViewItem*,const TQPoint &))); - connect( mapsListView, TQT_SIGNAL( mapSelected(const TQString &)), - this, TQT_SLOT( setMap(const TQString &))); + connect( mapsListView, TQ_SIGNAL( mapSelected(const TQString &)), + this, TQ_SLOT( setMap(const TQString &))); - connect( mapsListView, TQT_SIGNAL( mapRenamed(const TQString &)), - this, TQT_SLOT( setMapName(const TQString &))); + connect( mapsListView, TQ_SIGNAL( mapRenamed(const TQString &)), + this, TQ_SLOT( setMapName(const TQString &))); - connect( mapsListView->listView(), TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, - TQT_SLOT(slotShowMapPopupMenu(TQListViewItem*,const TQPoint &))); + connect( mapsListView->listView(), TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, + TQ_SLOT(slotShowMapPopupMenu(TQListViewItem*,const TQPoint &))); - connect( imagesListView, TQT_SIGNAL( imageSelected(const KURL &)), - this, TQT_SLOT( setPicture(const KURL &))); + connect( imagesListView, TQ_SIGNAL( imageSelected(const KURL &)), + this, TQ_SLOT( setPicture(const KURL &))); - connect( imagesListView, TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, - TQT_SLOT(slotShowImagePopupMenu(TQListViewItem*,const TQPoint &))); + connect( imagesListView, TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &,int)), this, + TQ_SLOT(slotShowImagePopupMenu(TQListViewItem*,const TQPoint &))); // Shows the text: // "Drop an image or html file" @@ -431,46 +431,46 @@ void KImageMapEditor::saveLastURL(TDEConfig* config) { void KImageMapEditor::setupActions() { // File Open - TDEAction *temp=KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + TDEAction *temp=KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "openimage", SmallIcon("document-open") ); temp->setWhatsThis(i18n("<h3>Open File</h3>Click this to <em>open</em> a new picture or HTML file.")); temp->setToolTip(i18n("Open new picture or HTML file")); // File Open Recent - recentFilesAction = KStdAction::openRecent(this, TQT_SLOT(openURL(const KURL&)), + recentFilesAction = KStdAction::openRecent(this, TQ_SLOT(openURL(const KURL&)), actionCollection()); // File Save - temp =KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); + temp =KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "saveimage", SmallIcon("document-save") ); temp->setWhatsThis(i18n("<h3>Save File</h3>Click this to <em>save</em> the changes to the HTML file.")); temp->setToolTip(i18n("Save HTML file")); // File Save As - (void)KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); + (void)KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); // File Close - temp=KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection()); + temp=KStdAction::close(this, TQ_SLOT(fileClose()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "closeimage", SmallIcon("window-close") ); temp->setWhatsThis(i18n("<h3>Close File</h3>Click this to <em>close</em> the currently open HTML file.")); temp->setToolTip(i18n("Close HTML file")); // Edit Copy - copyAction=KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection()); + copyAction=KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "editcopyimage", SmallIcon("edit-copy") ); copyAction->setWhatsThis(i18n("<h3>Copy</h3>" "Click this to <em>copy</em> the selected area.")); copyAction->setEnabled(false); // Edit Cut - cutAction=KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection()); + cutAction=KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "editcutimage", SmallIcon("edit-cut") ); cutAction->setWhatsThis(i18n("<h3>Cut</h3>" "Click this to <em>cut</em> the selected area.")); cutAction->setEnabled(false); // Edit Paste - pasteAction=KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection()); + pasteAction=KStdAction::paste(this, TQ_SLOT(slotPaste()), actionCollection()); TQMimeSourceFactory::defaultFactory()->setPixmap( "editpasteimage", SmallIcon("edit-paste") ); pasteAction->setWhatsThis(i18n("<h3>Paste</h3>" "Click this to <em>paste</em> the copied area.")); @@ -479,7 +479,7 @@ void KImageMapEditor::setupActions() // Edit Delete deleteAction=new TDEAction(i18n("&Delete"), "edit-delete", - Key_Delete,this,TQT_SLOT (slotDelete()),actionCollection(), "edit_delete"); + Key_Delete,this,TQ_SLOT (slotDelete()),actionCollection(), "edit_delete"); TQMimeSourceFactory::defaultFactory()->setPixmap( "editdeleteimage", SmallIcon("edit-delete") ); deleteAction->setWhatsThis(i18n("<h3>Delete</h3>" "Click this to <em>delete</em> the selected area.")); @@ -489,17 +489,17 @@ void KImageMapEditor::setupActions() _commandHistory = new KCommandHistory( actionCollection(), true); // Edit Properties - areaPropertiesAction= new TDEAction(i18n("Pr&operties"),0,this,TQT_SLOT(showTagEditor()), + areaPropertiesAction= new TDEAction(i18n("Pr&operties"),0,this,TQ_SLOT(showTagEditor()), actionCollection(), "edit_properties"); areaPropertiesAction->setEnabled(false); // View Zoom In - zoomInAction=KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection()); + zoomInAction=KStdAction::zoomIn(this, TQ_SLOT(slotZoomIn()), actionCollection()); // View Zoom Out - zoomOutAction=KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection()); + zoomOutAction=KStdAction::zoomOut(this, TQ_SLOT(slotZoomOut()), actionCollection()); // View Zoom - zoomAction=new TDESelectAction(i18n("Zoom"), 0,this,TQT_SLOT (slotZoom()), + zoomAction=new TDESelectAction(i18n("Zoom"), 0,this,TQ_SLOT (slotZoom()), actionCollection(), "view_zoom"); zoomAction->setWhatsThis(i18n("<h3>Zoom</h3>" "Choose the desired zoom level.")); @@ -517,56 +517,56 @@ void KImageMapEditor::setupActions() zoomAction->setCurrentItem(2); - highlightAreasAction = new TDEToggleAction(i18n("Highlight Areas"),0, this, TQT_SLOT (slotHightlightAreas()), + highlightAreasAction = new TDEToggleAction(i18n("Highlight Areas"),0, this, TQ_SLOT (slotHightlightAreas()), actionCollection(), "view_highlightareas"); - showAltAction = new TDEToggleAction(i18n("Show Alt Tag"),0, this, TQT_SLOT (slotShowAltTag()), + showAltAction = new TDEToggleAction(i18n("Show Alt Tag"),0, this, TQ_SLOT (slotShowAltTag()), actionCollection(), "view_showalt"); #if KDE_IS_VERSION(3,2,90) showAltAction->setCheckedState(i18n("Hide Alt Tag")); #endif - mapNameAction= new TDEAction(i18n("Map &Name..."),0,this,TQT_SLOT(mapEditName()), + mapNameAction= new TDEAction(i18n("Map &Name..."),0,this,TQ_SLOT(mapEditName()), actionCollection(), "map_name"); - mapNewAction = new TDEAction(i18n("Ne&w Map..."),0,this,TQT_SLOT(mapNew()), + mapNewAction = new TDEAction(i18n("Ne&w Map..."),0,this,TQ_SLOT(mapNew()), actionCollection(), "map_new"); mapNewAction->setToolTip(i18n("Create a new map")); - mapDeleteAction = new TDEAction(i18n("D&elete Map"),0,this,TQT_SLOT(mapDelete()), + mapDeleteAction = new TDEAction(i18n("D&elete Map"),0,this,TQ_SLOT(mapDelete()), actionCollection(), "map_delete"); mapDeleteAction->setToolTip(i18n("Delete the current active map")); - mapDefaultAreaAction = new TDEAction(i18n("Edit &Default Area..."),0,this,TQT_SLOT(mapDefaultArea()), + mapDefaultAreaAction = new TDEAction(i18n("Edit &Default Area..."),0,this,TQ_SLOT(mapDefaultArea()), actionCollection(), "map_defaultarea"); mapDefaultAreaAction->setToolTip(i18n("Edit the default area of the current active map")); - temp = new TDEAction(i18n("&Preview"),0,this,TQT_SLOT(mapPreview()), + temp = new TDEAction(i18n("&Preview"),0,this,TQ_SLOT(mapPreview()), actionCollection(), "map_preview"); temp->setToolTip(i18n("Show a preview")); // IMAGE i18n("&Image"); - imageAddAction = new TDEAction(i18n("Add Image..."),0,this,TQT_SLOT(imageAdd()), + imageAddAction = new TDEAction(i18n("Add Image..."),0,this,TQ_SLOT(imageAdd()), actionCollection(), "image_add"); imageAddAction->setToolTip(i18n("Add a new image")); - imageRemoveAction = new TDEAction(i18n("Remove Image"),0,this,TQT_SLOT(imageRemove()), + imageRemoveAction = new TDEAction(i18n("Remove Image"),0,this,TQ_SLOT(imageRemove()), actionCollection(), "image_remove"); imageRemoveAction->setToolTip(i18n("Remove the current visible image")); - imageUsemapAction = new TDEAction(i18n("Edit Usemap..."),0,this,TQT_SLOT(imageUsemap()), + imageUsemapAction = new TDEAction(i18n("Edit Usemap..."),0,this,TQ_SLOT(imageUsemap()), actionCollection(), "image_usemap"); imageUsemapAction->setToolTip(i18n("Edit the usemap tag of the current visible image")); - temp= new TDEAction(i18n("Show &HTML"),0,this,TQT_SLOT(mapShowHTML()), + temp= new TDEAction(i18n("Show &HTML"),0,this,TQ_SLOT(mapShowHTML()), actionCollection(), "map_showhtml"); // Selection Tool arrowAction=new TDERadioAction(i18n("&Selection"), "arrow", - 0,this,TQT_SLOT (slotDrawArrow()), + 0,this,TQ_SLOT (slotDrawArrow()), actionCollection(), "tool_arrow"); TQMimeSourceFactory::defaultFactory()->setPixmap( "arrowimage", SmallIcon("arrow") ); arrowAction->setWhatsThis(i18n("<h3>Selection</h3>" @@ -576,7 +576,7 @@ void KImageMapEditor::setupActions() // Circle circleAction=new TDERadioAction(i18n("&Circle"), "circle", - 0,this,TQT_SLOT (slotDrawCircle()), + 0,this,TQ_SLOT (slotDrawCircle()), actionCollection(), "tool_circle"); TQMimeSourceFactory::defaultFactory()->setPixmap( "circleimage", SmallIcon("drawcircle") ); circleAction->setWhatsThis(i18n("<h3>Circle</h3>" @@ -585,7 +585,7 @@ void KImageMapEditor::setupActions() // Rectangle rectangleAction=new TDERadioAction(i18n("&Rectangle"), "rectangle", - 0,this,TQT_SLOT (slotDrawRectangle()), + 0,this,TQ_SLOT (slotDrawRectangle()), actionCollection(), "tool_rectangle"); TQMimeSourceFactory::defaultFactory()->setPixmap( "rectangleimage", SmallIcon("drawrectangle") ); rectangleAction->setWhatsThis(i18n("<h3>Rectangle</h3>" @@ -594,7 +594,7 @@ void KImageMapEditor::setupActions() // Polygon polygonAction=new TDERadioAction(i18n("&Polygon"), "polygon", - 0,this,TQT_SLOT (slotDrawPolygon()), + 0,this,TQ_SLOT (slotDrawPolygon()), actionCollection(), "tool_polygon"); TQMimeSourceFactory::defaultFactory()->setPixmap( "polygonimage", SmallIcon("drawpolygon") ); polygonAction->setWhatsThis(i18n("<h3>Polygon</h3>" @@ -603,7 +603,7 @@ void KImageMapEditor::setupActions() // Freehand freehandAction=new TDERadioAction(i18n("&Freehand Polygon"), "freehand", - 0,this,TQT_SLOT (slotDrawFreehand()), + 0,this,TQ_SLOT (slotDrawFreehand()), actionCollection(), "tool_freehand"); TQMimeSourceFactory::defaultFactory()->setPixmap( "freehandimage", SmallIcon("freehand") ); freehandAction->setWhatsThis(i18n("<h3>Freehandpolygon</h3>" @@ -612,7 +612,7 @@ void KImageMapEditor::setupActions() // Add Point addPointAction=new TDERadioAction(i18n("&Add Point"), "addpoint", - 0,this,TQT_SLOT (slotDrawAddPoint()), + 0,this,TQ_SLOT (slotDrawAddPoint()), actionCollection(), "tool_addpoint"); TQMimeSourceFactory::defaultFactory()->setPixmap( "addpointimage", SmallIcon("addpoint") ); addPointAction->setWhatsThis(i18n("<h3>Add Point</h3>" @@ -621,7 +621,7 @@ void KImageMapEditor::setupActions() // Remove Point removePointAction=new TDERadioAction(i18n("&Remove Point"), "removepoint", - 0,this,TQT_SLOT (slotDrawRemovePoint()), + 0,this,TQ_SLOT (slotDrawRemovePoint()), actionCollection(), "tool_removepoint"); TQMimeSourceFactory::defaultFactory()->setPixmap( "removepointimage", SmallIcon("removepoint") ); removePointAction->setWhatsThis(i18n("<h3>Remove Point</h3>" @@ -631,31 +631,31 @@ void KImageMapEditor::setupActions() #if TDE_VERSION < 300 TDEAction *cancelAction = #endif - new TDEAction(i18n("Cancel Drawing"), Key_Escape, this, TQT_SLOT( slotCancelDrawing() ), + new TDEAction(i18n("Cancel Drawing"), Key_Escape, this, TQ_SLOT( slotCancelDrawing() ), actionCollection(), "canceldrawing" ); - moveLeftAction = new TDEAction(i18n("Move Left"), Key_Left, this, TQT_SLOT( slotMoveLeft() ), + moveLeftAction = new TDEAction(i18n("Move Left"), Key_Left, this, TQ_SLOT( slotMoveLeft() ), actionCollection() , "moveleft" ); - moveRightAction = new TDEAction(i18n("Move Right"), Key_Right, this, TQT_SLOT( slotMoveRight() ), + moveRightAction = new TDEAction(i18n("Move Right"), Key_Right, this, TQ_SLOT( slotMoveRight() ), actionCollection() , "moveright" ); - moveUpAction = new TDEAction(i18n("Move Up"), Key_Up, this, TQT_SLOT( slotMoveUp() ), + moveUpAction = new TDEAction(i18n("Move Up"), Key_Up, this, TQ_SLOT( slotMoveUp() ), actionCollection() , "moveup" ); - moveDownAction = new TDEAction(i18n("Move Down"), Key_Down, this, TQT_SLOT( slotMoveDown() ), + moveDownAction = new TDEAction(i18n("Move Down"), Key_Down, this, TQ_SLOT( slotMoveDown() ), actionCollection() , "movedown" ); - increaseWidthAction = new TDEAction(i18n("Increase Width"), Key_Right + SHIFT, this, TQT_SLOT( slotIncreaseWidth() ), + increaseWidthAction = new TDEAction(i18n("Increase Width"), Key_Right + SHIFT, this, TQ_SLOT( slotIncreaseWidth() ), actionCollection() , "increasewidth" ); - decreaseWidthAction = new TDEAction(i18n("Decrease Width"), Key_Left + SHIFT, this, TQT_SLOT( slotDecreaseWidth() ), + decreaseWidthAction = new TDEAction(i18n("Decrease Width"), Key_Left + SHIFT, this, TQ_SLOT( slotDecreaseWidth() ), actionCollection() , "decreasewidth" ); - increaseHeightAction = new TDEAction(i18n("Increase Height"), Key_Up + SHIFT, this, TQT_SLOT( slotIncreaseHeight() ), + increaseHeightAction = new TDEAction(i18n("Increase Height"), Key_Up + SHIFT, this, TQ_SLOT( slotIncreaseHeight() ), actionCollection() , "increaseheight" ); - decreaseHeightAction = new TDEAction(i18n("Decrease Height"), Key_Down + SHIFT, this, TQT_SLOT( slotDecreaseHeight() ), + decreaseHeightAction = new TDEAction(i18n("Decrease Height"), Key_Down + SHIFT, this, TQ_SLOT( slotDecreaseHeight() ), actionCollection() , "decreaseheight" ); #if TDE_VERSION < 300 accel = new TDEAccel(widget()); @@ -670,38 +670,38 @@ void KImageMapEditor::setupActions() decreaseHeightAction->plugAccel(accel, true); #endif - toFrontAction = new TDEAction(i18n("Bring to Front"), 0 , this, TQT_SLOT( slotToFront() ), + toFrontAction = new TDEAction(i18n("Bring to Front"), 0 , this, TQ_SLOT( slotToFront() ), actionCollection() , "tofront" ); - toBackAction = new TDEAction(i18n("Send to Back"), 0 , this, TQT_SLOT( slotToBack() ), + toBackAction = new TDEAction(i18n("Send to Back"), 0 , this, TQ_SLOT( slotToBack() ), actionCollection() , "toback" ); - forwardOneAction = new TDEAction(i18n("Bring Forward One"), "raise" ,0, this, TQT_SLOT( slotForwardOne() ), + forwardOneAction = new TDEAction(i18n("Bring Forward One"), "raise" ,0, this, TQ_SLOT( slotForwardOne() ), actionCollection() , "forwardone" ); - backOneAction = new TDEAction(i18n("Send Back One"), "lower" ,0, this, TQT_SLOT( slotBackOne() ), + backOneAction = new TDEAction(i18n("Send Back One"), "lower" ,0, this, TQ_SLOT( slotBackOne() ), actionCollection() , "backone" ); forwardOneAction->plug(areaListView->upBtn); backOneAction->plug(areaListView->downBtn); - connect( areaListView->upBtn, TQT_SIGNAL(pressed()), forwardOneAction, TQT_SLOT(activate())); - connect( areaListView->downBtn, TQT_SIGNAL(pressed()), backOneAction, TQT_SLOT(activate())); + connect( areaListView->upBtn, TQ_SIGNAL(pressed()), forwardOneAction, TQ_SLOT(activate())); + connect( areaListView->downBtn, TQ_SIGNAL(pressed()), backOneAction, TQ_SLOT(activate())); new TDEAction( i18n("Configure KImageMapEditor..."), "configure", 0, - this, TQT_SLOT(slotShowPreferences()), + this, TQ_SLOT(slotShowPreferences()), actionCollection(), "configure_kimagemapeditor" ); if (areaDock) { configureShowAreaListAction = new TDEToggleAction( i18n("Show Area List"), 0L, 0, - this, TQT_SLOT(configureShowAreaList()), + this, TQ_SLOT(configureShowAreaList()), actionCollection(), "configure_show_arealist" ); configureShowMapListAction = new TDEToggleAction( i18n("Show Map List"), 0L, 0, - this, TQT_SLOT(configureShowMapList()), + this, TQ_SLOT(configureShowMapList()), actionCollection(), "configure_show_maplist" ); configureShowImageListAction = new TDEToggleAction( i18n("Show Image List"), 0L, 0, - this, TQT_SLOT(configureShowImageList()), + this, TQ_SLOT(configureShowImageList()), actionCollection(), "configure_show_imagelist" ); #if KDE_IS_VERSION(3,2,90) configureShowAreaListAction->setCheckedState(i18n("Hide Area List")); @@ -725,7 +725,7 @@ void KImageMapEditor::setupStatusBar() void KImageMapEditor::slotShowPreferences() { PreferencesDialog *dialog = new PreferencesDialog(widget(),config()); - connect(dialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotConfigChanged())); + connect(dialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotConfigChanged())); dialog->exec(); delete dialog; } @@ -1327,7 +1327,7 @@ int KImageMapEditor::showTagEditor(Area *a) { drawZone->repaintArea(*a); AreaDialog *dialog= new AreaDialog(this,a); - connect (dialog, TQT_SIGNAL(areaChanged(Area*)), this, TQT_SLOT(slotAreaChanged(Area*))); + connect (dialog, TQ_SIGNAL(areaChanged(Area*)), this, TQ_SLOT(slotAreaChanged(Area*))); int result = dialog->exec(); diff --git a/kimagemapeditor/kimagemapeditor.h b/kimagemapeditor/kimagemapeditor.h index d500c099..615f0498 100644 --- a/kimagemapeditor/kimagemapeditor.h +++ b/kimagemapeditor/kimagemapeditor.h @@ -129,7 +129,7 @@ class KDockMainWindow; #define STATUS_SELECTION 1001 class KImageMapEditor : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public : enum ToolType { Selection, Rectangle, Circle, Polygon, Freehand, AddPoint, RemovePoint }; diff --git a/kimagemapeditor/kimedialogs.cpp b/kimagemapeditor/kimedialogs.cpp index 2b7b92bb..fe389c1a 100644 --- a/kimagemapeditor/kimedialogs.cpp +++ b/kimagemapeditor/kimedialogs.cpp @@ -76,7 +76,7 @@ RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) topXSpin->setMinValue(0); topXSpin->setValue(a->rect().left()); layout->addWidget(topXSpin,0,1); - connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( topXSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); TQLabel *lbl= new TQLabel(i18n("Top &X:"),this); lbl->setBuddy(topXSpin); @@ -87,7 +87,7 @@ RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) topYSpin->setMinValue(0); topYSpin->setValue(a->rect().top()); layout->addWidget(topYSpin,1,1); - connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( topYSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Top &Y:"),this); lbl->setBuddy(topYSpin); @@ -98,7 +98,7 @@ RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) widthSpin->setMinValue(0); widthSpin->setValue(a->rect().width()); layout->addWidget(widthSpin,2,1); - connect( widthSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( widthSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("&Width:"),this); lbl->setBuddy(widthSpin); @@ -109,7 +109,7 @@ RectCoordsEdit::RectCoordsEdit(TQWidget *parent, Area* a) heightSpin->setMinValue(0); heightSpin->setValue(a->rect().height()); layout->addWidget(heightSpin,3,1); - connect( heightSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( heightSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Hei&ght:"),this); lbl->setBuddy(heightSpin); @@ -137,7 +137,7 @@ CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a) centerXSpin->setMinValue(0); centerXSpin->setValue(a->rect().center().x()); layout->addWidget(centerXSpin,0,1); - connect( centerXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( centerXSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); TQLabel *lbl= new TQLabel(i18n("Center &X:"),this); lbl->setBuddy(centerXSpin); @@ -148,7 +148,7 @@ CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a) centerYSpin->setMinValue(0); centerYSpin->setValue(a->rect().center().y()); layout->addWidget(centerYSpin,1,1); - connect( centerYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( centerYSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Center &Y:"),this); @@ -160,7 +160,7 @@ CircleCoordsEdit::CircleCoordsEdit(TQWidget *parent, Area* a) radiusSpin->setMinValue(0); radiusSpin->setValue(a->rect().width()/2); layout->addWidget(radiusSpin,2,1); - connect( radiusSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( radiusSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("&Radius:"),this); @@ -199,7 +199,7 @@ PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a) coordsTable->setText(i,1, TQString::number(area->coords()->point(i).y()) ); } - connect( coordsTable, TQT_SIGNAL(currentChanged(int,int)), this, TQT_SLOT(slotHighlightPoint(int))); + connect( coordsTable, TQ_SIGNAL(currentChanged(int,int)), this, TQ_SLOT(slotHighlightPoint(int))); // coordsTable->setMinimumHeight(50); // coordsTable->setMaximumHeight(400); @@ -209,9 +209,9 @@ PolyCoordsEdit::PolyCoordsEdit(TQWidget *parent, Area* a) layout->setStretchFactor(coordsTable,-1); TQHBox *hbox= new TQHBox(this); TQPushButton *addBtn=new TQPushButton(i18n("Add"),hbox); - connect( addBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotAddPoint())); + connect( addBtn, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotAddPoint())); TQPushButton *removeBtn=new TQPushButton(i18n("Remove"),hbox); - connect( removeBtn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotRemovePoint())); + connect( removeBtn, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotRemovePoint())); layout->addWidget(hbox); slotHighlightPoint(1); @@ -284,7 +284,7 @@ SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a) topXSpin->setMinValue(0); topXSpin->setValue(a->rect().left()); layout->addWidget(topXSpin,0,1); - connect( topXSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( topXSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); TQLabel *lbl= new TQLabel(i18n("Top &X"),this); lbl->setBuddy(topXSpin); @@ -295,7 +295,7 @@ SelectionCoordsEdit::SelectionCoordsEdit(TQWidget *parent, Area* a) topYSpin->setMinValue(0); topYSpin->setValue(a->rect().top()); layout->addWidget(topYSpin,1,1); - connect( topYSpin, TQT_SIGNAL(valueChanged(const TQString &)), this, TQT_SLOT(slotTriggerUpdate())); + connect( topYSpin, TQ_SIGNAL(valueChanged(const TQString &)), this, TQ_SLOT(slotTriggerUpdate())); lbl= new TQLabel(i18n("Top &Y"),this); lbl->setBuddy(topYSpin); @@ -329,7 +329,7 @@ TQWidget* AreaDialog::createGeneralPage() hrefEdit = new TQLineEdit(area->attribute("href"),hbox); TQPushButton *btn = new TQPushButton("",hbox); btn->setPixmap(SmallIcon("document-open")); - connect( btn, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotChooseHref())); + connect( btn, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotChooseHref())); hbox->setMinimumHeight(hbox->height()); layout->addWidget(hbox,0,2); @@ -363,7 +363,7 @@ TQWidget* AreaDialog::createCoordsPage() coordsEdit = createCoordsEdit(page,area); layout->addWidget(coordsEdit); - connect( coordsEdit, TQT_SIGNAL(update()), this, TQT_SLOT(slotUpdateArea())); + connect( coordsEdit, TQ_SIGNAL(update()), this, TQ_SLOT(slotUpdateArea())); return page; } @@ -395,9 +395,9 @@ TQWidget* AreaDialog::createButtonBar() TQPushButton *applyBtn = new KPushButton(KStdGuiItem::apply(),box); TQPushButton *cancelBtn = new KPushButton(KStdGuiItem::cancel(),box); - connect(okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOk())); - connect(applyBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotApply())); - connect(cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCancel())); + connect(okBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOk())); + connect(applyBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotApply())); + connect(cancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCancel())); box->setSpacing(5); box->setStretchFactor(spacer,10); @@ -635,7 +635,7 @@ ImageMapChooseDialog::ImageMapChooseDialog(TQWidget* parent,TQPtrList<MapTag> *_ for (MapTag *tag = maps->first(); tag!=0L; tag=maps->next()) { mapListBox->insertItem(tag->name); } - connect (mapListBox, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotMapChanged(int))); + connect (mapListBox, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotMapChanged(int))); } initImageListTable(page); @@ -696,7 +696,7 @@ void ImageMapChooseDialog::initImageListTable(TQWidget* parent) { imageListTable->setText(row,1,usemap); row++; } - connect (imageListTable, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotImageChanged())); + connect (imageListTable, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotImageChanged())); imageListTable->selectRow(0); slotImageChanged(); @@ -855,7 +855,7 @@ HTMLPreviewDialog::HTMLPreviewDialog(TQWidget* parent, KURL url, const TQString // dialog->adjustSize(); TQLabel* lbl = new TQLabel(page,"urllabel"); - connect( htmlPart, TQT_SIGNAL( onURL(const TQString&)), lbl, TQT_SLOT( setText(const TQString&))); + connect( htmlPart, TQ_SIGNAL( onURL(const TQString&)), lbl, TQ_SLOT( setText(const TQString&))); } HTMLPreviewDialog::~HTMLPreviewDialog() { diff --git a/kimagemapeditor/kimedialogs.h b/kimagemapeditor/kimedialogs.h index aa8cdebe..03bccbf0 100644 --- a/kimagemapeditor/kimedialogs.h +++ b/kimagemapeditor/kimedialogs.h @@ -32,7 +32,7 @@ class TQSpinBox; class CoordsEdit : public TQWidget { -Q_OBJECT +TQ_OBJECT public : CoordsEdit(TQWidget *parent, Area* a); @@ -70,7 +70,7 @@ class CircleCoordsEdit : public CoordsEdit { class TQTable; class PolyCoordsEdit : public CoordsEdit { - Q_OBJECT + TQ_OBJECT public: PolyCoordsEdit(TQWidget *parent, Area* a); @@ -86,7 +86,7 @@ class PolyCoordsEdit : public CoordsEdit { }; class SelectionCoordsEdit : public CoordsEdit { - Q_OBJECT + TQ_OBJECT public: SelectionCoordsEdit(TQWidget *parent, Area* a); @@ -102,7 +102,7 @@ class TQCheckBox; class TQGridLayout; class AreaDialog : public KDialog { - Q_OBJECT + TQ_OBJECT private: Area *area; @@ -152,7 +152,7 @@ class TQLabel; class ImageMapChooseDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT private: TQTable *imageListTable; @@ -178,7 +178,7 @@ class ImageMapChooseDialog : public KDialogBase { class TDEConfig; class PreferencesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: PreferencesDialog(TQWidget *parent,TDEConfig*); diff --git a/kimagemapeditor/kimeshell.cpp b/kimagemapeditor/kimeshell.cpp index b04ba886..2c69ab22 100644 --- a/kimagemapeditor/kimeshell.cpp +++ b/kimagemapeditor/kimeshell.cpp @@ -54,7 +54,7 @@ KimeShell::KimeShell(const char *name ) mainDock->setEnableDocking(KDockWidget::DockNone); setView( mainDock); // central widget in a KDE mainwindow setMainDockWidget( mainDock); // master dockwidget - m_part = new KImageMapEditor( w, "kimagemapeditor", TQT_TQOBJECT(this), "kimagemapeditor"); + m_part = new KImageMapEditor( w, "kimagemapeditor", this, "kimagemapeditor"); // setCentralWidget( part->widget() ); @@ -73,11 +73,11 @@ KimeShell::KimeShell(const char *name ) if (!initialGeometrySet()) resize( TQSize(725, 525).expandedTo(minimumSizeHint())); - connect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), - this, TQT_SLOT(slotSetStatusBarText ( const TQString & ))); + connect( m_part, TQ_SIGNAL(setStatusBarText(const TQString &)), + this, TQ_SLOT(slotSetStatusBarText ( const TQString & ))); - connect( m_part, TQT_SIGNAL(setWindowCaption(const TQString &)), - this, TQT_SLOT(setCaption( const TQString &))); + connect( m_part, TQ_SIGNAL(setWindowCaption(const TQString &)), + this, TQ_SLOT(setCaption( const TQString &))); setAutoSaveSettings( "General Options" ); @@ -109,16 +109,16 @@ bool KimeShell::queryExit() void KimeShell::setupActions() { - (void)KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); + (void)KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); // File Quit - (void)KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()),actionCollection()); + (void)KStdAction::quit(this, TQ_SLOT(close()),actionCollection()); - (void)KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection()); - (void)KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - (void)KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); - (void)KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); + (void)KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + (void)KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + (void)KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + (void)KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); } @@ -258,8 +258,8 @@ void KimeShell::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/kimagemapeditor/kimeshell.h b/kimagemapeditor/kimeshell.h index 154edb59..1d86138a 100644 --- a/kimagemapeditor/kimeshell.h +++ b/kimagemapeditor/kimeshell.h @@ -24,7 +24,7 @@ class KImageMapEditor; class KimeShell : public KParts::DockMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kimagemapeditor/mapslistview.cpp b/kimagemapeditor/mapslistview.cpp index 84a77bc2..38884cf6 100644 --- a/kimagemapeditor/mapslistview.cpp +++ b/kimagemapeditor/mapslistview.cpp @@ -31,11 +31,11 @@ MapsListView::MapsListView(TQWidget *parent, const char *name) _listView->setSelectionMode(TQListView::Single); _listView->setItemsRenameable(true); - connect( _listView, TQT_SIGNAL( selectionChanged(TQListViewItem*)), - this, TQT_SLOT( slotSelectionChanged(TQListViewItem*))); + connect( _listView, TQ_SIGNAL( selectionChanged(TQListViewItem*)), + this, TQ_SLOT( slotSelectionChanged(TQListViewItem*))); - connect( _listView, TQT_SIGNAL( itemRenamed(TQListViewItem*)), - this, TQT_SLOT( slotItemRenamed(TQListViewItem*))); + connect( _listView, TQ_SIGNAL( itemRenamed(TQListViewItem*)), + this, TQ_SLOT( slotItemRenamed(TQListViewItem*))); } diff --git a/kimagemapeditor/mapslistview.h b/kimagemapeditor/mapslistview.h index 858071ec..d3cea955 100644 --- a/kimagemapeditor/mapslistview.h +++ b/kimagemapeditor/mapslistview.h @@ -30,7 +30,7 @@ class TDEListView; **/ class MapsListView : public TQVBox { -Q_OBJECT +TQ_OBJECT public: MapsListView(TQWidget *parent, const char *name); diff --git a/kimagemapeditor/qextfileinfo.cpp b/kimagemapeditor/qextfileinfo.cpp index 031a34ab..8bb304b2 100644 --- a/kimagemapeditor/qextfileinfo.cpp +++ b/kimagemapeditor/qextfileinfo.cpp @@ -220,10 +220,10 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& bJobOK = true; TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true); - connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), - this, TQT_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), + this, TQ_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); // kdDebug(24000) << "Now listing: " << startURL.url() << endl; enter_loop(); @@ -247,11 +247,11 @@ bool QExtFileInfo::internalExists(const KURL& url) TDEIO::StatJob * job = TDEIO::stat( url, false); job->setDetails(0); job->setSide(false); //check the url for writing - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); //To avoid lock-ups, start a timer. - TQTimer::singleShot(10*1000, this,TQT_SLOT(slotTimeout())); + TQTimer::singleShot(10*1000, this,TQ_SLOT(slotTimeout())); // kdDebug(24000)<<"QExtFileInfo::internalExists:before enter_loop"<<endl; enter_loop(); // kdDebug(24000)<<"QExtFileInfo::internalExists:after enter_loop"<<endl; @@ -266,8 +266,8 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss TDEIO::Scheduler::checkSlaveOnHold(true); TDEIO::Job * job = TDEIO::file_copy( src, target, permissions, overwrite, resume ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; @@ -280,7 +280,7 @@ void tqt_leave_modal( TQWidget *widget ); void QExtFileInfo::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); // kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<<endl; tqApp->enter_loop(); diff --git a/kimagemapeditor/qextfileinfo.h b/kimagemapeditor/qextfileinfo.h index 86dd2923..7c838951 100644 --- a/kimagemapeditor/qextfileinfo.h +++ b/kimagemapeditor/qextfileinfo.h @@ -23,7 +23,7 @@ class QExtFileInfo:public TQObject { - Q_OBJECT + TQ_OBJECT public: QExtFileInfo() {}; diff --git a/klinkstatus/klinkstatus.tdevelop b/klinkstatus/klinkstatus.tdevelop index fe98acbc..dfa6da01 100644 --- a/klinkstatus/klinkstatus.tdevelop +++ b/klinkstatus/klinkstatus.tdevelop @@ -47,7 +47,7 @@ <ccompiler>tdevgccoptions</ccompiler> <cxxcompiler>tdevgppoptions</cxxcompiler> <f77compiler>tdevg77options</f77compiler> - <cxxflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT -DQT_FATAL_ASSERT</cxxflags> + <cxxflags>-DKDE_NO_COMPAT -DQT_FATAL_ASSERT</cxxflags> <topsourcedir>..</topsourcedir> <cppflags/> <ldflags/> diff --git a/klinkstatus/src/actionmanager.cpp b/klinkstatus/src/actionmanager.cpp index 6c8ef1a6..26a969df 100644 --- a/klinkstatus/src/actionmanager.cpp +++ b/klinkstatus/src/actionmanager.cpp @@ -89,34 +89,34 @@ void ActionManager::initPart(KLinkStatusPart* part) new TDEAction(i18n("New Link Check"), "document-new", 0, - d->part, TQT_SLOT(slotNewLinkCheck()), - TQT_TQOBJECT(d->actionCollection), "new_link_check"); + d->part, TQ_SLOT(slotNewLinkCheck()), + d->actionCollection, "new_link_check"); new TDEAction(i18n("Open URL..."), "document-open", 0, - d->part, TQT_SLOT(slotOpenLink()), - TQT_TQOBJECT(d->actionCollection), "open_link"); + d->part, TQ_SLOT(slotOpenLink()), + d->actionCollection, "open_link"); action = new TDEAction(i18n("Close Tab"), "window-close", 0, - d->part, TQT_SLOT(slotClose()), - TQT_TQOBJECT(d->actionCollection), "close_tab"); + d->part, TQ_SLOT(slotClose()), + d->actionCollection, "close_tab"); action->setEnabled(false); // *************** Settings menu ********************* (void) new TDEAction(i18n("Configure KLinkStatus..."), "configure", - 0, d->part, TQT_SLOT(slotConfigureKLinkStatus()), - TQT_TQOBJECT(d->actionCollection), "configure_klinkstatus"); + 0, d->part, TQ_SLOT(slotConfigureKLinkStatus()), + d->actionCollection, "configure_klinkstatus"); // *************** Help menu ********************* (void) new TDEAction(i18n("About KLinkStatus"), "klinkstatus", - 0, d->part, TQT_SLOT(slotAbout()), - TQT_TQOBJECT(d->actionCollection), "about_klinkstatus"); + 0, d->part, TQ_SLOT(slotAbout()), + d->actionCollection, "about_klinkstatus"); (void) new TDEAction(i18n("&Report Bug..."), 0, 0, d->part, - TQT_SLOT(slotReportBug()), TQT_TQOBJECT(d->actionCollection), "report_bug"); + TQ_SLOT(slotReportBug()), d->actionCollection, "report_bug"); // *************** View menu ********************* } @@ -133,8 +133,8 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession) // *************** File menu ********************* TDEAction* action = new TDEAction(i18n("E&xport Results as HTML..."), "document-save", 0, - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotExportAsHTML()), - TQT_TQOBJECT(d->actionCollection), "file_export_html"); + d->tabWidgetSession, TQ_SLOT(slotExportAsHTML()), + d->actionCollection, "file_export_html"); action->setEnabled(false); // *************** View menu ********************* @@ -142,39 +142,39 @@ void ActionManager::initTabWidget(TabWidgetSession* tabWidgetSession) // this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget TDEToggleAction* toggle_action = new TDEToggleAction(i18n("&Follow last Link checked"), "make_tdevelop", "Ctrl+f", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotFollowLastLinkChecked()), - TQT_TQOBJECT(d->actionCollection), "follow_last_link_checked"); + d->tabWidgetSession, TQ_SLOT(slotFollowLastLinkChecked()), + d->actionCollection, "follow_last_link_checked"); toggle_action->setChecked(KLSConfig::followLastLinkChecked()); // this action must be in the tabwidget because the slot can't be connected to a particular sessionWidget toggle_action = new TDEToggleAction(i18n("&Hide Search Panel"), "go-bottom", "Ctrl+h", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotHideSearchPanel()), - TQT_TQOBJECT(d->actionCollection), "hide_search_bar"); + d->tabWidgetSession, TQ_SLOT(slotHideSearchPanel()), + d->actionCollection, "hide_search_bar"); KGuiItem item(i18n("&Show Search Panel"), "go-top", "Show Search Panel"); toggle_action->setCheckedState(item); new TDEAction(i18n("&Reset Search Options"), "reload", "F5", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotResetSearchOptions()), - TQT_TQOBJECT(d->actionCollection), "reset_search_bar"); + d->tabWidgetSession, TQ_SLOT(slotResetSearchOptions()), + d->actionCollection, "reset_search_bar"); // *************** Search menu ********************* toggle_action = new TDEToggleAction(i18n("&Start Search"), "media-playback-start", "Ctrl+s", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStartSearch()), - TQT_TQOBJECT(d->actionCollection), "start_search"); + d->tabWidgetSession, TQ_SLOT(slotStartSearch()), + d->actionCollection, "start_search"); toggle_action->setEnabled(false); toggle_action = new TDEToggleAction(i18n("&Pause Search"), "media-playback-pause", "Ctrl+p", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotPauseSearch()), - TQT_TQOBJECT(d->actionCollection), "pause_search"); + d->tabWidgetSession, TQ_SLOT(slotPauseSearch()), + d->actionCollection, "pause_search"); toggle_action->setEnabled(false); action = new TDEAction(i18n("St&op Search"), "media-playback-stop", "Ctrl+c", - TQT_TQOBJECT(d->tabWidgetSession), TQT_SLOT(slotStopSearch()), - TQT_TQOBJECT(d->actionCollection), "stop_search"); + d->tabWidgetSession, TQ_SLOT(slotStopSearch()), + d->actionCollection, "stop_search"); action->setEnabled(false); } diff --git a/klinkstatus/src/actionmanager.h b/klinkstatus/src/actionmanager.h index 15584b0c..66303d57 100644 --- a/klinkstatus/src/actionmanager.h +++ b/klinkstatus/src/actionmanager.h @@ -36,7 +36,7 @@ class TabWidgetSession; */ class ActionManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: ActionManager(TQObject* parent=0, const char* name=0); diff --git a/klinkstatus/src/engine/linkchecker.cpp b/klinkstatus/src/engine/linkchecker.cpp index 82572997..1f36c485 100644 --- a/klinkstatus/src/engine/linkchecker.cpp +++ b/klinkstatus/src/engine/linkchecker.cpp @@ -97,16 +97,16 @@ void LinkChecker::check() t_job_->addMetaData("SendUserAgent", "false"); - TQObject::connect(t_job_, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - TQObject::connect(t_job_, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT(slotMimetype(TDEIO::Job *, const TQString &))); - TQObject::connect(t_job_, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotResult(TDEIO::Job *))); - TQObject::connect(t_job_, TQT_SIGNAL(redirection(TDEIO::Job *, const KURL &)), - this, TQT_SLOT(slotRedirection(TDEIO::Job *, const KURL &))); - - TQTimer::singleShot( time_out_ * 1000, this, TQT_SLOT(slotTimeOut()) ); + TQObject::connect(t_job_, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::connect(t_job_, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT(slotMimetype(TDEIO::Job *, const TQString &))); + TQObject::connect(t_job_, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotResult(TDEIO::Job *))); + TQObject::connect(t_job_, TQ_SIGNAL(redirection(TDEIO::Job *, const KURL &)), + this, TQ_SLOT(slotRedirection(TDEIO::Job *, const KURL &))); + + TQTimer::singleShot( time_out_ * 1000, this, TQ_SLOT(slotTimeOut()) ); t_job_->setInteractive(false); } diff --git a/klinkstatus/src/engine/linkchecker.h b/klinkstatus/src/engine/linkchecker.h index a29d6445..050eaf87 100644 --- a/klinkstatus/src/engine/linkchecker.h +++ b/klinkstatus/src/engine/linkchecker.h @@ -39,7 +39,7 @@ using namespace std; */ class LinkChecker : public TQObject { - Q_OBJECT + TQ_OBJECT public: LinkChecker(LinkStatus* linkstatus, int time_out = 50, diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp index 45fdc24b..e05087d1 100644 --- a/klinkstatus/src/engine/searchmanager.cpp +++ b/klinkstatus/src/engine/searchmanager.cpp @@ -191,11 +191,11 @@ void SearchManager::checkRoot() LinkChecker* checker = new LinkChecker(&root_, time_out_, this, "link_checker"); checker->setSearchManager(this); - connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); + connect(checker, TQ_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); /* - connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)), - this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *))); + connect(checker, TQ_SIGNAL(jobFinnished(LinkChecker *)), + this, TQ_SLOT(slotLinkCheckerFinnished(LinkChecker *))); */ checker->check(); } @@ -524,11 +524,11 @@ void SearchManager::checkLinksSimultaneously(vector<LinkStatus*> const& links) LinkChecker* checker = new LinkChecker(ls, time_out_, this, "link_checker"); checker->setSearchManager(this); - connect(checker, TQT_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); + connect(checker, TQ_SIGNAL(transactionFinished(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); /* - connect(checker, TQT_SIGNAL(jobFinnished(LinkChecker *)), - this, TQT_SLOT(slotLinkCheckerFinnished(LinkChecker *))); + connect(checker, TQ_SIGNAL(jobFinnished(LinkChecker *)), + this, TQ_SLOT(slotLinkCheckerFinnished(LinkChecker *))); */ checker->check(); } diff --git a/klinkstatus/src/engine/searchmanager.h b/klinkstatus/src/engine/searchmanager.h index c60281c7..943c94ed 100644 --- a/klinkstatus/src/engine/searchmanager.h +++ b/klinkstatus/src/engine/searchmanager.h @@ -43,7 +43,7 @@ typedef TQMap<TQString, TDEHTMLPart*> TDEHTMLPartMap; class SearchManager: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/klinkstatus/src/global.cpp b/klinkstatus/src/global.cpp index b5ac9619..6a24578f 100644 --- a/klinkstatus/src/global.cpp +++ b/klinkstatus/src/global.cpp @@ -149,12 +149,12 @@ void Global::execCommand(TQString const& command) self()->process_PS_ = new TDEProcess(); *(self()->process_PS_) << TQStringList::split(" ",command); - connect( self()->process_PS_, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - self(), TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); - connect( self()->process_PS_, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - self(), TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); - connect( self()->process_PS_, TQT_SIGNAL(processExited(TDEProcess*)), - self(), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect( self()->process_PS_, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + self(), TQ_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect( self()->process_PS_, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + self(), TQ_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect( self()->process_PS_, TQ_SIGNAL(processExited(TDEProcess*)), + self(), TQ_SLOT(slotProcessExited(TDEProcess*))); //if TDEProcess fails I think a message box is needed... I will fix it if (!self()->process_PS_->start(TDEProcess::NotifyOnExit,TDEProcess::All)) @@ -164,8 +164,8 @@ void Global::execCommand(TQString const& command) { //To avoid lock-ups, start a timer. TQTimer* timer = new TQTimer(self()); - connect(timer, TQT_SIGNAL(timeout()), - self(), TQT_SLOT(slotProcessTimeout())); + connect(timer, TQ_SIGNAL(timeout()), + self(), TQ_SLOT(slotProcessTimeout())); timer->start(120*1000, true); self()->loop_started_ = true; kapp->enter_loop(); diff --git a/klinkstatus/src/global.h b/klinkstatus/src/global.h index a91d3b6d..86b3cbd1 100644 --- a/klinkstatus/src/global.h +++ b/klinkstatus/src/global.h @@ -24,7 +24,7 @@ class TDEProcess; */ class Global : public TQObject { - Q_OBJECT + TQ_OBJECT public: static Global* self(); diff --git a/klinkstatus/src/klinkstatus.cpp b/klinkstatus/src/klinkstatus.cpp index f4154f3c..7a125bb5 100644 --- a/klinkstatus/src/klinkstatus.cpp +++ b/klinkstatus/src/klinkstatus.cpp @@ -54,7 +54,7 @@ KLinkStatus::KLinkStatus() { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this, "klinkstatus_part", "KParts::ReadOnlyPart" )); if (m_part) @@ -97,7 +97,7 @@ void KLinkStatus::load(const KURL& url) void KLinkStatus::setupActions() { - // KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + // KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); // The above causes a segfault when using File->Quit. // Here's Waldo's explanation: /* I had a look. The problem is due to the SessionWidget destructor calling @@ -113,13 +113,13 @@ void KLinkStatus::setupActions() administration. The easiest solution is to call close() on the mainwindow instead of TDEApplication::quit()*/ - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); - //m_toolbarAction = KStdAction::showToolbar(this, TQT_SLOT(optionsShowToolbar()), actionCollection()); - //m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection()); + //m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + //m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void KLinkStatus::setupPartActions() @@ -199,8 +199,8 @@ void KLinkStatus::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/klinkstatus/src/klinkstatus.h b/klinkstatus/src/klinkstatus.h index 8d4e82ab..1c471234 100644 --- a/klinkstatus/src/klinkstatus.h +++ b/klinkstatus/src/klinkstatus.h @@ -40,7 +40,7 @@ class TDEToggleAction; */ class KLinkStatus : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: KLinkStatus(); diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp index bf8e1db7..6b379387 100644 --- a/klinkstatus/src/klinkstatus_part.cpp +++ b/klinkstatus/src/klinkstatus_part.cpp @@ -153,7 +153,7 @@ void KLinkStatusPart::slotConfigureKLinkStatus() dialog->addPage(new ConfigIdentificationDialog(0), i18n("Identification"), "agent", i18n("Configure the way KLinkstatus reports itself")); dialog->show(); - connect(dialog, TQT_SIGNAL(settingsChanged()), tabwidget_, TQT_SLOT(slotLoadSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), tabwidget_, TQ_SLOT(slotLoadSettings())); } void KLinkStatusPart::slotAbout() diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h index 3d8a498e..de91318a 100644 --- a/klinkstatus/src/klinkstatus_part.h +++ b/klinkstatus/src/klinkstatus_part.h @@ -36,7 +36,7 @@ class TDEAction; class KLinkStatusPart: public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KLinkStatusPart(TQWidget *parentWidget, const char *widgetName, diff --git a/klinkstatus/src/ui/documentrootdialog.cpp b/klinkstatus/src/ui/documentrootdialog.cpp index 888526a3..1ae0c449 100644 --- a/klinkstatus/src/ui/documentrootdialog.cpp +++ b/klinkstatus/src/ui/documentrootdialog.cpp @@ -53,12 +53,12 @@ DocumentRootDialog::DocumentRootDialog(TQWidget *parent, TQString const& url) m_urlRequester->setMode(KFile::Directory); // enableButtonOK(false); - connect(m_urlRequester, TQT_SIGNAL(textChanged (const TQString &)), - this, TQT_SLOT(slotTextChanged (const TQString &))); - connect(m_urlRequester, TQT_SIGNAL(returnPressed (const TQString &)), - this, TQT_SLOT(slotReturnPressed (const TQString &))); - connect(m_urlRequester, TQT_SIGNAL(urlSelected (const TQString &)), - this, TQT_SLOT(slotTextChanged (const TQString &))); + connect(m_urlRequester, TQ_SIGNAL(textChanged (const TQString &)), + this, TQ_SLOT(slotTextChanged (const TQString &))); + connect(m_urlRequester, TQ_SIGNAL(returnPressed (const TQString &)), + this, TQ_SLOT(slotReturnPressed (const TQString &))); + connect(m_urlRequester, TQ_SIGNAL(urlSelected (const TQString &)), + this, TQ_SLOT(slotTextChanged (const TQString &))); } DocumentRootDialog::~DocumentRootDialog() diff --git a/klinkstatus/src/ui/documentrootdialog.h b/klinkstatus/src/ui/documentrootdialog.h index 0e7ef47d..cbbb6215 100644 --- a/klinkstatus/src/ui/documentrootdialog.h +++ b/klinkstatus/src/ui/documentrootdialog.h @@ -29,7 +29,7 @@ class KURLRequester; */ class DocumentRootDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: DocumentRootDialog(TQWidget *parent, TQString const& url); diff --git a/klinkstatus/src/ui/klshistorycombo.cpp b/klinkstatus/src/ui/klshistorycombo.cpp index 52d884c8..21de0de3 100644 --- a/klinkstatus/src/ui/klshistorycombo.cpp +++ b/klinkstatus/src/ui/klshistorycombo.cpp @@ -32,8 +32,8 @@ KLSHistoryCombo::KLSHistoryCombo(TQWidget *parent, const char *name) setDuplicatesEnabled(false); setAutoCompletion(false); - connect(this, TQT_SIGNAL(activated(const TQString& )), - this, TQT_SLOT(addToHistory(const TQString& ))); + connect(this, TQ_SIGNAL(activated(const TQString& )), + this, TQ_SLOT(addToHistory(const TQString& ))); } KLSHistoryCombo::~KLSHistoryCombo() @@ -79,12 +79,12 @@ bool KLSHistoryCombo::eventFilter( TQObject *o, TQEvent *ev ) // Handle Ctrl+Del/Backspace etc better than the TQt widget, which always // jumps to the next whitespace. TQLineEdit *edit = lineEdit(); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(edit) ) + if ( o == edit ) { int type = ev->type(); if ( type == TQEvent::KeyPress ) { - TQKeyEvent *e = TQT_TQKEYEVENT( ev ); + TQKeyEvent *e = static_cast<TQKeyEvent*>( ev ); if ( e->key() == Key_Return || e->key() == Key_Enter ) { diff --git a/klinkstatus/src/ui/klshistorycombo.h b/klinkstatus/src/ui/klshistorycombo.h index 2b153b82..ba7fb5d3 100644 --- a/klinkstatus/src/ui/klshistorycombo.h +++ b/klinkstatus/src/ui/klshistorycombo.h @@ -21,7 +21,7 @@ Based on KonqCombo */ class KLSHistoryCombo : public KHistoryCombo { - Q_OBJECT + TQ_OBJECT public: diff --git a/klinkstatus/src/ui/resultssearchbar.cpp b/klinkstatus/src/ui/resultssearchbar.cpp index 3b6e6603..adea6013 100644 --- a/klinkstatus/src/ui/resultssearchbar.cpp +++ b/klinkstatus/src/ui/resultssearchbar.cpp @@ -73,8 +73,8 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) d->layout->addWidget(searchLabel); d->searchLine = new KLineEdit(this, "searchline"); - connect(d->searchLine, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotSearchStringChanged(const TQString &))); + connect(d->searchLine, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotSearchStringChanged(const TQString &))); searchLabel->setBuddy(d->searchLine); d->layout->addWidget(d->searchLine); @@ -101,13 +101,13 @@ ResultsSearchBar::ResultsSearchBar(TQWidget* parent, const char* name) TQToolTip::add( d->searchLine, i18n("Enter the terms to filter the result link list")); TQToolTip::add( d->searchCombo, i18n("Choose what kind of link status to show in result list")); - connect(clearButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT(slotClearSearch()) ); + connect(clearButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT(slotClearSearch()) ); - connect(d->searchCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSearchComboChanged(int))); + connect(d->searchCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSearchComboChanged(int))); - connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotActivateSearch())); + connect(&(d->timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotActivateSearch())); } ResultsSearchBar::~ResultsSearchBar() diff --git a/klinkstatus/src/ui/resultssearchbar.h b/klinkstatus/src/ui/resultssearchbar.h index 1c5854c9..a9edceee 100644 --- a/klinkstatus/src/ui/resultssearchbar.h +++ b/klinkstatus/src/ui/resultssearchbar.h @@ -32,7 +32,7 @@ */ class ResultsSearchBar : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ResultsSearchBar(TQWidget *parent = 0, const char *name = 0); diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp index a3dc0e25..b1072add 100644 --- a/klinkstatus/src/ui/sessionwidget.cpp +++ b/klinkstatus/src/ui/sessionwidget.cpp @@ -81,13 +81,13 @@ SessionWidget::SessionWidget(int max_simultaneous_connections, int time_out, init(); slotLoadSettings(); - connect(combobox_url, TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT( slotEnableCheckButton( const TQString & ) ) ); + connect(combobox_url, TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT( slotEnableCheckButton( const TQString & ) ) ); - connect(tree_view, TQT_SIGNAL( clicked ( TQListViewItem * ) ), - this, TQT_SLOT( showBottomStatusLabel( TQListViewItem * ) ) ); + connect(tree_view, TQ_SIGNAL( clicked ( TQListViewItem * ) ), + this, TQ_SLOT( showBottomStatusLabel( TQListViewItem * ) ) ); - connect(&bottom_status_timer_, TQT_SIGNAL(timeout()), this, TQT_SLOT(clearBottomStatusLabel()) ); + connect(&bottom_status_timer_, TQ_SIGNAL(timeout()), this, TQ_SLOT(clearBottomStatusLabel()) ); } SessionWidget::~SessionWidget() @@ -107,14 +107,14 @@ void SessionWidget::init() pushbutton_url->setIconSet(TDEGlobal::iconLoader()->loadIconSet("document-open", TDEIcon::Small)); TQPixmap pixMap = TDEGlobal::iconLoader()->loadIcon("document-open", TDEIcon::Small); pushbutton_url->setFixedSize(pixMap.width() + 8, pixMap.height() + 8); - connect(pushbutton_url, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChooseUrlDialog())); + connect(pushbutton_url, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChooseUrlDialog())); resultsSearchBar->hide(); start_search_action_ = static_cast<TDEToggleAction*> (action_manager_->action("start_search")); - connect(resultsSearchBar, TQT_SIGNAL(signalSearch(LinkMatcher)), - this, TQT_SLOT(slotApplyFilter(LinkMatcher))); + connect(resultsSearchBar, TQ_SIGNAL(signalSearch(LinkMatcher)), + this, TQ_SLOT(slotApplyFilter(LinkMatcher))); } void SessionWidget::slotLoadSettings(bool modify_current_widget_settings) @@ -151,23 +151,23 @@ void SessionWidget::newSearchManager() search_manager_ = new SearchManager(KLSConfig::maxConnectionsNumber(), KLSConfig::timeOut(), - TQT_TQOBJECT(this), "search_manager"); + this, "search_manager"); Q_ASSERT(search_manager_); - connect(search_manager_, TQT_SIGNAL(signalRootChecked(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); - connect(search_manager_, TQT_SIGNAL(signalLinkChecked(const LinkStatus *, LinkChecker *)), - this, TQT_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); - connect(search_manager_, TQT_SIGNAL(signalSearchFinished()), - this, TQT_SLOT(slotSearchFinished())); - connect(search_manager_, TQT_SIGNAL(signalSearchPaused()), - this, TQT_SLOT(slotSearchPaused())); - connect(search_manager_, TQT_SIGNAL(signalAddingLevelTotalSteps(uint)), - this, TQT_SLOT(slotAddingLevelTotalSteps(uint))); - connect(search_manager_, TQT_SIGNAL(signalAddingLevelProgress()), - this, TQT_SLOT(slotAddingLevelProgress())); - connect(search_manager_, TQT_SIGNAL(signalLinksToCheckTotalSteps(uint)), - this, TQT_SLOT(slotLinksToCheckTotalSteps(uint))); + connect(search_manager_, TQ_SIGNAL(signalRootChecked(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotRootChecked(const LinkStatus *, LinkChecker *))); + connect(search_manager_, TQ_SIGNAL(signalLinkChecked(const LinkStatus *, LinkChecker *)), + this, TQ_SLOT(slotLinkChecked(const LinkStatus *, LinkChecker *))); + connect(search_manager_, TQ_SIGNAL(signalSearchFinished()), + this, TQ_SLOT(slotSearchFinished())); + connect(search_manager_, TQ_SIGNAL(signalSearchPaused()), + this, TQ_SLOT(slotSearchPaused())); + connect(search_manager_, TQ_SIGNAL(signalAddingLevelTotalSteps(uint)), + this, TQ_SLOT(slotAddingLevelTotalSteps(uint))); + connect(search_manager_, TQ_SIGNAL(signalAddingLevelProgress()), + this, TQ_SLOT(slotAddingLevelProgress())); + connect(search_manager_, TQ_SIGNAL(signalLinksToCheckTotalSteps(uint)), + this, TQ_SLOT(slotLinksToCheckTotalSteps(uint))); } void SessionWidget::setColumns(TQStringList const& colunas) diff --git a/klinkstatus/src/ui/sessionwidget.h b/klinkstatus/src/ui/sessionwidget.h index 057b2c6c..fece4492 100644 --- a/klinkstatus/src/ui/sessionwidget.h +++ b/klinkstatus/src/ui/sessionwidget.h @@ -44,7 +44,7 @@ using namespace std; class SessionWidget: public SessionWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui index 19f3679c..c5c2acaf 100644 --- a/klinkstatus/src/ui/sessionwidgetbase.ui +++ b/klinkstatus/src/ui/sessionwidgetbase.ui @@ -585,11 +585,11 @@ <tabstop>checkbox_subdirs_only</tabstop> <tabstop>checkbox_external_links</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot specifier="pure virtual">slotCheck()</slot> <slot specifier="pure virtual">slotCancel()</slot> <slot specifier="pure virtual">slotClearComboUrl()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klshistorycombo.h</include> diff --git a/klinkstatus/src/ui/settings/CMakeLists.txt b/klinkstatus/src/ui/settings/CMakeLists.txt index 78e036f1..932c0cdd 100644 --- a/klinkstatus/src/ui/settings/CMakeLists.txt +++ b/klinkstatus/src/ui/settings/CMakeLists.txt @@ -19,17 +19,17 @@ link_directories( ##### settings (static) -file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" ) - tde_add_library( settings STATIC_PIC AUTOMOC SOURCES + ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp configsearchdialog.ui configresultsdialog.ui configidentificationdialogui.ui - ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp configidentificationdialog.cpp - + DEPENDENCIES cfg-static ) + +configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.cpp b/klinkstatus/src/ui/settings/configidentificationdialog.cpp index 31906ace..b7d7800f 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.cpp +++ b/klinkstatus/src/ui/settings/configidentificationdialog.cpp @@ -37,7 +37,7 @@ ConfigIdentificationDialog::ConfigIdentificationDialog(TQWidget *parent, const c slotDefaultUA(); } - connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefaultUA())); + connect(buttonDefault, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefaultUA())); } diff --git a/klinkstatus/src/ui/settings/configidentificationdialog.h b/klinkstatus/src/ui/settings/configidentificationdialog.h index b9a40fd3..307187b4 100644 --- a/klinkstatus/src/ui/settings/configidentificationdialog.h +++ b/klinkstatus/src/ui/settings/configidentificationdialog.h @@ -28,7 +28,7 @@ */ class ConfigIdentificationDialog : public ConfigIdentificationDialogUi { -Q_OBJECT +TQ_OBJECT public: ConfigIdentificationDialog(TQWidget *parent = 0, const char *name = 0); diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp index 4a886e1d..28ac2aa0 100644 --- a/klinkstatus/src/ui/tablelinkstatus.cpp +++ b/klinkstatus/src/ui/tablelinkstatus.cpp @@ -67,8 +67,8 @@ TableLinkstatus::TableLinkstatus(TQWidget * parent, const char * name, sub_menu_ = new TQPopupMenu(this, "sub_menu_referrers"); - connect(this, TQT_SIGNAL( contextMenuRequested ( int, int, const TQPoint& )), - this, TQT_SLOT( slotPopupContextMenu( int, int, const TQPoint&)) ); + connect(this, TQ_SIGNAL( contextMenuRequested ( int, int, const TQPoint& )), + this, TQ_SLOT( slotPopupContextMenu( int, int, const TQPoint&)) ); } TableLinkstatus::~TableLinkstatus() @@ -274,14 +274,14 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector<KURL> const& referrers, if(!is_root) { - sub_menu_->insertItem(i18n("All"), this, TQT_SLOT(slotEditReferrersWithQuanta())); + sub_menu_->insertItem(i18n("All"), this, TQ_SLOT(slotEditReferrersWithQuanta())); sub_menu_->insertSeparator(); for(uint i = 0; i != referrers.size(); ++i) { sub_menu_->insertItem(referrers[i].prettyURL()); } - connect(sub_menu_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEditReferrerWithQuanta(int))); + connect(sub_menu_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEditReferrerWithQuanta(int))); context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Edit Referrer with Quanta"), sub_menu_); @@ -293,21 +293,21 @@ void TableLinkstatus::loadContextTableMenu(TQValueVector<KURL> const& referrers, } context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open URL"), - this, TQT_SLOT(slotViewUrlInBrowser())); + this, TQ_SLOT(slotViewUrlInBrowser())); context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open Referrer URL"), - this, TQT_SLOT(slotViewParentUrlInBrowser())); + this, TQ_SLOT(slotViewParentUrlInBrowser())); context_table_menu_.insertSeparator(); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy URL"), - this, TQT_SLOT(slotCopyUrlToClipboard())); + this, TQ_SLOT(slotCopyUrlToClipboard())); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy Referrer URL"), - this, TQT_SLOT(slotCopyParentUrlToClipboard())); + this, TQ_SLOT(slotCopyParentUrlToClipboard())); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy Cell Text"), - this, TQT_SLOT(slotCopyCellTextToClipboard())); + this, TQ_SLOT(slotCopyCellTextToClipboard())); } void TableLinkstatus::slotCopyUrlToClipboard() const diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h index ba7d9731..0d01da82 100644 --- a/klinkstatus/src/ui/tablelinkstatus.h +++ b/klinkstatus/src/ui/tablelinkstatus.h @@ -45,7 +45,7 @@ class TableItem; class TableLinkstatus: public TQTable, public ResultView { - Q_OBJECT + TQ_OBJECT public: diff --git a/klinkstatus/src/ui/tabwidgetsession.cpp b/klinkstatus/src/ui/tabwidgetsession.cpp index 9f27d344..e2f6a54f 100644 --- a/klinkstatus/src/ui/tabwidgetsession.cpp +++ b/klinkstatus/src/ui/tabwidgetsession.cpp @@ -45,7 +45,7 @@ TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) : KTabWidget(parent, name, f) // tabs_ is initialized with size 17 { - setFocusPolicy(TQ_NoFocus); + setFocusPolicy(TQWidget::NoFocus); setMargin(0); setTabReorderingEnabled(true); setHoverCloseButton(true); @@ -55,7 +55,7 @@ TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) TQToolButton* tabs_new = new TQToolButton(this); tabs_new->setAccel(TQKeySequence("Ctrl+N")); - connect(tabs_new, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewSession())); + connect(tabs_new, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewSession())); tabs_new->setIconSet(SmallIconSet("tab_new_raised")); tabs_new->adjustSize(); TQToolTip::add(tabs_new, i18n("Open new tab")); @@ -63,13 +63,13 @@ TabWidgetSession::TabWidgetSession(TQWidget* parent, const char* name, WFlags f) tabs_close_ = new TQToolButton(this); tabs_close_->setAccel(TQKeySequence("Ctrl+W")); - connect(tabs_close_, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeSession())); + connect(tabs_close_, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeSession())); tabs_close_->setIconSet(SmallIconSet("tab_remove")); tabs_close_->adjustSize(); TQToolTip::add(tabs_close_, i18n("Close the current tab")); setCornerWidget(tabs_close_, TopRight); - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotCurrentChanged(TQWidget*))); } TabWidgetSession::~TabWidgetSession() @@ -117,8 +117,8 @@ SessionWidget* TabWidgetSession::newSession() { // TODO: settings: number of connections, timeout SessionWidget* session_widget = newSessionWidget(); - connect(session_widget, TQT_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)), - this, TQT_SLOT(updateTabLabel(const LinkStatus *, SessionWidget*))); + connect(session_widget, TQ_SIGNAL(signalUpdateTabLabel(const LinkStatus *, SessionWidget*)), + this, TQ_SLOT(updateTabLabel(const LinkStatus *, SessionWidget*))); insertTab(session_widget, i18n("Session") + i18n(TQString::number(count() + 1).ascii())); diff --git a/klinkstatus/src/ui/tabwidgetsession.h b/klinkstatus/src/ui/tabwidgetsession.h index 22675a38..a58e413f 100644 --- a/klinkstatus/src/ui/tabwidgetsession.h +++ b/klinkstatus/src/ui/tabwidgetsession.h @@ -37,7 +37,7 @@ This class handles the creation and destruction of sessions, i.e, severals insta */ class TabWidgetSession : public KTabWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp index 52e7883b..c0cebe68 100644 --- a/klinkstatus/src/ui/treeview.cpp +++ b/klinkstatus/src/ui/treeview.cpp @@ -54,8 +54,8 @@ TreeView::TreeView(TQWidget *parent, const char *name) sub_menu_ = new TQPopupMenu(this, "sub_menu_referrers"); - connect(this, TQT_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( slotPopupContextMenu( TQListViewItem *, const TQPoint &, int )) ); + connect(this, TQ_SIGNAL( rightButtonClicked ( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT( slotPopupContextMenu( TQListViewItem *, const TQPoint &, int )) ); } @@ -345,14 +345,14 @@ void TreeView::loadContextTableMenu(TQValueVector<KURL> const& referrers, bool i if(!is_root) { - sub_menu_->insertItem(i18n("All"), this, TQT_SLOT(slotEditReferrersWithQuanta())); + sub_menu_->insertItem(i18n("All"), this, TQ_SLOT(slotEditReferrersWithQuanta())); sub_menu_->insertSeparator(); for(uint i = 0; i != referrers.size(); ++i) { sub_menu_->insertItem(referrers[i].prettyURL()); } - connect(sub_menu_, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotEditReferrerWithQuanta(int))); + connect(sub_menu_, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotEditReferrerWithQuanta(int))); context_table_menu_.insertItem(SmallIconSet("edit"), i18n("Edit Referrer with Quanta"), sub_menu_); @@ -365,21 +365,21 @@ void TreeView::loadContextTableMenu(TQValueVector<KURL> const& referrers, bool i } context_table_menu_.insertItem(SmallIconSet("document-open"), i18n("Open URL"), - this, TQT_SLOT(slotViewUrlInBrowser())); + this, TQ_SLOT(slotViewUrlInBrowser())); context_table_menu_.insertItem(/*SmallIconSet("document-open"), */i18n("Open Referrer URL"), - this, TQT_SLOT(slotViewParentUrlInBrowser())); + this, TQ_SLOT(slotViewParentUrlInBrowser())); context_table_menu_.insertSeparator(); context_table_menu_.insertItem(SmallIconSet("edit-copy"), i18n("Copy URL"), - this, TQT_SLOT(slotCopyUrlToClipboard())); + this, TQ_SLOT(slotCopyUrlToClipboard())); context_table_menu_.insertItem(/*SmallIconSet("edit-copy"), */i18n("Copy Referrer URL"), - this, TQT_SLOT(slotCopyParentUrlToClipboard())); + this, TQ_SLOT(slotCopyParentUrlToClipboard())); context_table_menu_.insertItem(/*SmallIconSet("edit-copy"), */i18n("Copy Cell Text"), - this, TQT_SLOT(slotCopyCellTextToClipboard())); + this, TQ_SLOT(slotCopyCellTextToClipboard())); } TreeViewItem* TreeView::myItem(TQListViewItem* item) const diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h index 3ce26039..b3d6b9ee 100644 --- a/klinkstatus/src/ui/treeview.h +++ b/klinkstatus/src/ui/treeview.h @@ -28,7 +28,7 @@ that a TQTable view isn't needed at all so some day I will clean this up. */ class TreeView : public TDEListView, public ResultView { - Q_OBJECT + TQ_OBJECT public: diff --git a/klinkstatus/src/utils/xsl.h b/klinkstatus/src/utils/xsl.h index 4e6d8476..e579968b 100644 --- a/klinkstatus/src/utils/xsl.h +++ b/klinkstatus/src/utils/xsl.h @@ -34,7 +34,7 @@ class XSLTPrivate; */ class XSLT : public TQObject { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( Flags flags READ flagsProperty WRITE setFlagsProperty ) diff --git a/kommander/Kommander-TODO.kno b/kommander/Kommander-TODO.kno index 4207a210..27ec95f3 100644 --- a/kommander/Kommander-TODO.kno +++ b/kommander/Kommander-TODO.kno @@ -72,8 +72,8 @@ \NewEntry 1 Other <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif"> <p><span style="font-weight:600">Other GUI-related issues</span></p> -<ul type="disc"><li>cleanup Q_SLOTS/Q_SIGNALS/connections interface</li> -<li>find out why Q_SLOTS are shown only for current tab<br /></li></ul> +<ul type="disc"><li>cleanup slots/signals/connections interface</li> +<li>find out why slots are shown only for current tab<br /></li></ul> <p><span style="font-weight:600">KDE4 ideas:<br /></span></p> <ul type="disc"><li>create a KDevelop plugin for the editor</li> <li>use KFormDesigner or the new Qt Designer</li></ul> @@ -160,8 +160,8 @@ \NewEntry 1 Signals <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Georgia"> -<p><span style="font-weight:600">New Q_SIGNALS for existing widgets</span></p> -<ul type="disc"><li>add Q_SIGNALS for D&D<br /><span style="font-style:italic">Requires dragContent and dragType, perhaps dragSource to be set.</span></li> +<p><span style="font-weight:600">New signals for existing widgets</span></p> +<ul type="disc"><li>add signals for D&D<br /><span style="font-style:italic">Requires dragContent and dragType, perhaps dragSource to be set.</span></li> <li></li></ul> </body></html> @@ -218,7 +218,7 @@ \NewEntry 1 Done <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:10pt;font-family:Sans Serif"> -<p>New widgets include the DatePicker, Popup Menu and Toolbox. New functions inlcude widget creation, hooking and unhooking Q_SIGNALS and Q_SLOTS and full slot access as well as passing and returning parameters in scripts. WooHoo! Take that do list!<br /></p> +<p>New widgets include the DatePicker, Popup Menu and Toolbox. New functions inlcude widget creation, hooking and unhooking signals and slots and full slot access as well as passing and returning parameters in scripts. WooHoo! Take that do list!<br /></p> <ul type="disc"><li>fixed dcop functions</li> <li>added indexed array functions</li> <li>made color slot work in TextEdit</li> diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp index 87a55c9f..bc3b2a21 100644 --- a/kommander/editor/actiondnd.cpp +++ b/kommander/editor/actiondnd.cpp @@ -68,23 +68,23 @@ void QDesignerAction::remove() { if ( !widgetToInsert ) return; - MainWindow::self->formWindow()->selectWidget( TQT_TQOBJECT(widgetToInsert), false ); + MainWindow::self->formWindow()->selectWidget( widgetToInsert, false ); widgetToInsert->reparent( 0, TQPoint( 0, 0 ), false ); } -QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *parent, +QDesignerToolBarSeparator::QDesignerToolBarSeparator(TQt::Orientation o , TQToolBar *parent, const char* name ) : TQWidget( parent, name ) { - connect( parent, TQT_SIGNAL(orientationChanged(Qt::Orientation)), - this, TQT_SLOT(setOrientation(Qt::Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(TQt::Orientation)), + this, TQ_SLOT(setOrientation(TQt::Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); } -void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o ) +void QDesignerToolBarSeparator::setOrientation( TQt::Orientation o ) { orient = o; } @@ -98,7 +98,7 @@ TQSize QDesignerToolBarSeparator::sizeHint() const { int extent = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent, this ); - if ( orient ==Qt::Horizontal ) + if ( orient ==TQt::Horizontal ) return TQSize( extent, 0 ); else return TQSize( 0, extent ); @@ -109,10 +109,10 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * ) TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; - if ( orientation() ==Qt::Horizontal ) + if ( orientation() ==TQt::Horizontal ) flags |= TQStyle::Style_Horizontal; - style().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), + style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(), colorGroup(), flags ); } @@ -163,7 +163,7 @@ QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw ) insertAnchor = 0; afterAnchor = true; setAcceptDrops( true ); - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); lastIndicatorPos = TQPoint( -1, -1 ); indicator = new QDesignerIndicatorWidget( this ); indicator->hide(); @@ -181,7 +181,7 @@ QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw, Dock dock ) setAcceptDrops( true ); indicator = new QDesignerIndicatorWidget( this ); indicator->hide(); - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); installEventFilter( this ); widgetInserting = false; findFormWindow(); @@ -201,7 +201,7 @@ void QDesignerToolBar::findFormWindow() void QDesignerToolBar::addAction( TQAction *a ) { actionList.append( a ); - connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); if ( a->inherits( "TQActionGroup" ) ) { ( (QDesignerActionGroup*)a )->widget()->installEventFilter( this ); actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a ); @@ -225,13 +225,13 @@ bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e ) if ( !o || !e || o->inherits( "TQDockWindowHandle" ) || o->inherits( "TQDockWindowTitleBar" ) ) return TQToolBar::eventFilter( o, e ); - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::MouseButtonPress && - ( ( TQMouseEvent*)e )->button() == Qt::LeftButton ) { + if ( o == this && e->type() == TQEvent::MouseButtonPress && + ( ( TQMouseEvent*)e )->button() == TQt::LeftButton ) { mousePressEvent( (TQMouseEvent*)e ); return true; } - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) + if ( o == this ) return TQToolBar::eventFilter( o, e ); if ( e->type() == TQEvent::MouseButtonPress ) { @@ -304,7 +304,7 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e ) void QDesignerToolBar::mousePressEvent( TQMouseEvent *e ) { widgetInserting = false; - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && MainWindow::self->currentTool() != POINTER_TOOL && MainWindow::self->currentTool() != ORDER_TOOL ) { @@ -391,10 +391,10 @@ void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * ) { widgetInserting = false; - if ( e->button() == Qt::MidButton ) + if ( e->button() == TQt::MidButton ) return; - if ( e->button() == Qt::LeftButton && + if ( e->button() == TQt::LeftButton && MainWindow::self->currentTool() != POINTER_TOOL && MainWindow::self->currentTool() != ORDER_TOOL ) { @@ -430,7 +430,7 @@ void QDesignerToolBar::removeWidget( TQWidget *w ) void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) { - if ( widgetInserting || ( e->state() & Qt::LeftButton ) == 0 ) + if ( widgetInserting || ( e->state() & TQt::LeftButton ) == 0 ) return; if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() ) return; @@ -458,7 +458,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o ) drag->setPixmap( a->iconSet().pixmap() ); if ( a->inherits( "QDesignerAction" ) ) { if ( formWindow->widgets()->find( ( (QDesignerAction*)a )->widget() ) ) - formWindow->selectWidget( TQT_TQOBJECT(( (QDesignerAction*)a )->widget()), false ); + formWindow->selectWidget( ( (QDesignerAction*)a )->widget(), false ); } if ( !drag->drag() ) { AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n("Add Action '%1' to Toolbar '%2'" ). @@ -583,7 +583,7 @@ void QDesignerToolBar::actionRemoved() TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos ) { - if ( orientation() ==Qt::Horizontal ) { + if ( orientation() ==TQt::Horizontal ) { TQPoint pnt( width() - 2, 0 ); insertAnchor = 0; afterAnchor = true; @@ -637,7 +637,7 @@ void QDesignerToolBar::drawIndicator( const TQPoint &pos ) if ( lastIndicatorPos == pos ) return; bool wasVsisible = indicator->isVisible(); - if ( orientation() ==Qt::Horizontal ) { + if ( orientation() ==TQt::Horizontal ) { indicator->resize( 3, height() ); if ( pos != TQPoint( -1, -1 ) ) indicator->move( pos.x() - 1, 0 ); @@ -704,7 +704,7 @@ QDesignerMenuBar::QDesignerMenuBar( TQWidget *mw ) { show(); setAcceptDrops( true ); - MetaDataBase::addEntry( TQT_TQOBJECT(this) ); + MetaDataBase::addEntry( this ); itemNum = 0; mousePressed = false; lastIndicatorPos = TQPoint( -1, -1 ); @@ -769,7 +769,7 @@ void QDesignerMenuBar::mousePressEvent( TQMouseEvent *e ) lastIndicatorPos = TQPoint( -1, -1 ); insertAt = -1; mousePressed = true; - if ( e->button() == Qt::MidButton || e->button() == Qt::RightButton ) + if ( e->button() == TQt::MidButton || e->button() == TQt::RightButton ) return; dragStartPos = e->pos(); @@ -778,7 +778,7 @@ void QDesignerMenuBar::mousePressEvent( TQMouseEvent *e ) void QDesignerMenuBar::mouseMoveEvent( TQMouseEvent *e ) { - if ( !mousePressed || e->state() == Qt::NoButton ) { + if ( !mousePressed || e->state() == TQt::NoButton ) { TQMenuBar::mouseMoveEvent( e ); return; } @@ -847,12 +847,12 @@ void QDesignerMenuBar::dragMoveEvent( TQDragMoveEvent *e ) e->provides( "application/x-designer-actiongroup" ) || e->provides( "application/x-designer-separator" ) ) { int item = itemAtPos( e->pos() ); - bool uieffect = TQApplication::isEffectEnabled( Qt::UI_AnimateMenu ); - TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, false ); + bool uieffect = TQApplication::isEffectEnabled( TQt::UI_AnimateMenu ); + TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, false ); if ( !tqApp->activePopupWidget() ) actItem = -1; activateItemAt( item ); - TQApplication::setEffectEnabled( Qt::UI_AnimateMenu, uieffect ); + TQApplication::setEffectEnabled( TQt::UI_AnimateMenu, uieffect ); if ( item == -1 ) hidePopups(); } else { @@ -977,7 +977,7 @@ void QDesignerPopupMenu::contextMenuEvent( TQContextMenuEvent *e ) { #if defined( TQ_WS_MAC ) //the mac needs us to use context menu rather than right click e->accept(); - TQMouseEvent me( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), Qt::RightButton, Qt::RightButton ); + TQMouseEvent me( TQEvent::MouseButtonPress, e->pos(), e->globalPos(), TQt::RightButton, TQt::RightButton ); mousePressEvent(&me); #else Q_UNUSED( e ); @@ -986,10 +986,10 @@ void QDesignerPopupMenu::contextMenuEvent( TQContextMenuEvent *e ) void QDesignerPopupMenu::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::MidButton ) + if ( e->button() == TQt::MidButton ) return; - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { // A popup for a popup, we only need one, so make sure that // we don't create multiple. The timer keeps the event loop sane. popupPos = e->globalPos(); @@ -998,7 +998,7 @@ void QDesignerPopupMenu::mousePressEvent( TQMouseEvent *e ) popupMenu->close(); } e->accept(); - TQTimer::singleShot( 0, this, TQT_SLOT(createPopupMenu()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(createPopupMenu()) ); return; } mousePressed = true; @@ -1054,7 +1054,7 @@ void QDesignerPopupMenu::createPopupMenu() void QDesignerPopupMenu::mouseMoveEvent( TQMouseEvent *e ) { - if ( !mousePressed || e->state() == Qt::NoButton ) { + if ( !mousePressed || e->state() == TQt::NoButton ) { TQPopupMenu::mouseMoveEvent( e ); return; } @@ -1217,7 +1217,7 @@ TQPoint QDesignerPopupMenu::calcIndicatorPos( const TQPoint &pos ) void QDesignerPopupMenu::addAction( TQAction *a ) { actionList.append( a ); - connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) ); + connect( a, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( actionRemoved() ) ); } void QDesignerPopupMenu::actionRemoved() diff --git a/kommander/editor/actiondnd.h b/kommander/editor/actiondnd.h index eeb255a2..2f4649a5 100644 --- a/kommander/editor/actiondnd.h +++ b/kommander/editor/actiondnd.h @@ -36,7 +36,7 @@ class FormWindow; class QDesignerActionGroup : public TQActionGroup { - Q_OBJECT + TQ_OBJECT public: @@ -67,7 +67,7 @@ private: class QDesignerAction : public TQAction { - Q_OBJECT + TQ_OBJECT public: @@ -102,7 +102,7 @@ private: class QDesignerToolBarSeparator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -122,7 +122,7 @@ private: class QSeparatorAction : public TQAction { - Q_OBJECT + TQ_OBJECT public: @@ -141,7 +141,7 @@ private: class QDesignerToolBar : public TQToolBar { - Q_OBJECT + TQ_OBJECT public: @@ -200,7 +200,7 @@ private: class QDesignerMenuBar : public TQMenuBar { - Q_OBJECT + TQ_OBJECT friend class QDesignerPopupMenu; @@ -249,7 +249,7 @@ private: class QDesignerPopupMenu : public TQPopupMenu { - Q_OBJECT + TQ_OBJECT public: @@ -298,7 +298,7 @@ private: class QDesignerIndicatorWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/actioneditorimpl.cpp b/kommander/editor/actioneditorimpl.cpp index 72f09daf..3b5df0e8 100644 --- a/kommander/editor/actioneditorimpl.cpp +++ b/kommander/editor/actioneditorimpl.cpp @@ -44,17 +44,17 @@ ActionEditor::ActionEditor( TQWidget* parent, const char* name, WFlags fl ) buttonConnect->setEnabled( false ); TQPopupMenu *popup = new TQPopupMenu( this ); - popup->insertItem( i18n("New &Action" ), this, TQT_SLOT( newAction() ) ); - popup->insertItem( i18n("New Action &Group" ), this, TQT_SLOT( newActionGroup() ) ); - popup->insertItem( i18n("New &Dropdown Action Group" ), this, TQT_SLOT( newDropDownActionGroup() ) ); + popup->insertItem( i18n("New &Action" ), this, TQ_SLOT( newAction() ) ); + popup->insertItem( i18n("New Action &Group" ), this, TQ_SLOT( newActionGroup() ) ); + popup->insertItem( i18n("New &Dropdown Action Group" ), this, TQ_SLOT( newDropDownActionGroup() ) ); buttonNewAction->setPopup( popup ); buttonNewAction->setPopupDelay( 0 ); - connect( listActions, TQT_SIGNAL( insertAction() ), this, TQT_SLOT( newAction() ) ); - connect( listActions, TQT_SIGNAL( insertActionGroup() ), this, TQT_SLOT( newActionGroup() ) ); - connect( listActions, TQT_SIGNAL( insertDropDownActionGroup() ), this, TQT_SLOT( newDropDownActionGroup() ) ); - connect( listActions, TQT_SIGNAL( deleteAction() ), this, TQT_SLOT( deleteAction() ) ); - connect( listActions, TQT_SIGNAL( connectAction() ), this, TQT_SLOT( connectionsClicked() ) ); + connect( listActions, TQ_SIGNAL( insertAction() ), this, TQ_SLOT( newAction() ) ); + connect( listActions, TQ_SIGNAL( insertActionGroup() ), this, TQ_SLOT( newActionGroup() ) ); + connect( listActions, TQ_SIGNAL( insertDropDownActionGroup() ), this, TQ_SLOT( newDropDownActionGroup() ) ); + connect( listActions, TQ_SIGNAL( deleteAction() ), this, TQ_SLOT( deleteAction() ) ); + connect( listActions, TQ_SIGNAL( connectAction() ), this, TQ_SLOT( connectionsClicked() ) ); } void ActionEditor::closeEvent( TQCloseEvent *e ) @@ -86,10 +86,10 @@ void ActionEditor::deleteAction() formWindow->actionList().removeRef( currentAction ); delete currentAction; TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(formWindow), currentAction ); + MetaDataBase::connections( formWindow, currentAction ); for ( TQValueList<MetaDataBase::Connection>::Iterator it2 = conns.begin(); it2 != conns.end(); ++it2 ) - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow), (*it2).sender, (*it2).signal, + MetaDataBase::removeConnection( formWindow, (*it2).sender, (*it2).signal, (*it2).receiver, (*it2).slot ); delete it.current(); break; @@ -97,10 +97,10 @@ void ActionEditor::deleteAction() formWindow->actionList().removeRef( currentAction ); delete currentAction; TQValueList<MetaDataBase::Connection> conns = - MetaDataBase::connections( TQT_TQOBJECT(formWindow), currentAction ); + MetaDataBase::connections( formWindow, currentAction ); for ( TQValueList<MetaDataBase::Connection>::Iterator it2 = conns.begin(); it2 != conns.end(); ++it2 ) - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow), (*it2).sender, (*it2).signal, + MetaDataBase::removeConnection( formWindow, (*it2).sender, (*it2).signal, (*it2).receiver, (*it2).slot ); delete it.current(); break; @@ -109,7 +109,7 @@ void ActionEditor::deleteAction() } if ( formWindow ) - formWindow->setActiveObject( TQT_TQOBJECT(formWindow->mainContainer()) ); + formWindow->setActiveObject( formWindow->mainContainer() ); } void ActionEditor::newAction() @@ -257,7 +257,7 @@ void ActionEditor::updateActionIcon( TQAction *a ) void ActionEditor::connectionsClicked() { - ConnectionEditor editor( formWindow->mainWindow(), TQT_TQOBJECT(currentAction), TQT_TQOBJECT(formWindow), formWindow ); + ConnectionEditor editor( formWindow->mainWindow(), currentAction, formWindow, formWindow ); editor.exec(); } #include "actioneditorimpl.moc" diff --git a/kommander/editor/actioneditorimpl.h b/kommander/editor/actioneditorimpl.h index ff6f001d..38b543f4 100644 --- a/kommander/editor/actioneditorimpl.h +++ b/kommander/editor/actioneditorimpl.h @@ -31,7 +31,7 @@ class ActionItem; class ActionEditor : public ActionEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/actionlistview.cpp b/kommander/editor/actionlistview.cpp index 78b883b0..ab7517f7 100644 --- a/kommander/editor/actionlistview.cpp +++ b/kommander/editor/actionlistview.cpp @@ -30,8 +30,8 @@ ActionListView::ActionListView( TQWidget *parent, const char *name ) header()->setStretchEnabled( true ); setRootIsDecorated( true ); setSorting( -1 ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbMenu( TQListViewItem *, const TQPoint & ) ) ); } ActionItem::ActionItem( TQListView *lv, TQAction *ac ) diff --git a/kommander/editor/actionlistview.h b/kommander/editor/actionlistview.h index c65e6658..fa13b2d2 100644 --- a/kommander/editor/actionlistview.h +++ b/kommander/editor/actionlistview.h @@ -52,7 +52,7 @@ private: class ActionListView : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/asciivalidator.h b/kommander/editor/asciivalidator.h index 676208eb..2faac155 100644 --- a/kommander/editor/asciivalidator.h +++ b/kommander/editor/asciivalidator.h @@ -27,7 +27,7 @@ class AsciiValidator: public TQValidator { - Q_OBJECT + TQ_OBJECT public: AsciiValidator( TQObject * parent, const char *name = 0 ); diff --git a/kommander/editor/assistproc.cpp b/kommander/editor/assistproc.cpp index 8fbf61f3..580b2b2d 100644 --- a/kommander/editor/assistproc.cpp +++ b/kommander/editor/assistproc.cpp @@ -23,14 +23,14 @@ AssistProc::AssistProc( TQObject *parent, const char *name, const TQString &path : TQProcess( parent, name ) { assistantPath = path; - connect( this, TQT_SIGNAL(readyReadStdout()), this, TQT_SLOT(processOutput()) ); - connect( this, TQT_SIGNAL(readyReadStderr()), this, TQT_SLOT(processErrOutput()) ); + connect( this, TQ_SIGNAL(readyReadStdout()), this, TQ_SLOT(processOutput()) ); + connect( this, TQ_SIGNAL(readyReadStderr()), this, TQ_SLOT(processErrOutput()) ); } AssistProc::~AssistProc() { tryTerminate(); - TQTimer::singleShot( 5000, this, TQT_SLOT(kill())); // If busy, kill in 5 sec... + TQTimer::singleShot( 5000, this, TQ_SLOT(kill())); // If busy, kill in 5 sec... } bool AssistProc::run( const TQString &path ) diff --git a/kommander/editor/assistproc.h b/kommander/editor/assistproc.h index 8e579bda..c7097787 100644 --- a/kommander/editor/assistproc.h +++ b/kommander/editor/assistproc.h @@ -27,7 +27,7 @@ class AssistProc : public TQProcess { - Q_OBJECT + TQ_OBJECT public: AssistProc( TQObject *parent=0, const char * name = 0, const TQString &path = TQString() ); diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui index b5f74086..a43e524b 100644 --- a/kommander/editor/assoctexteditor.ui +++ b/kommander/editor/assoctexteditor.ui @@ -215,9 +215,9 @@ <slot>AssocTextEditorBase_destroyed(TQObject*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>AssocTextEditorBase_destroyed(TQObject*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp index 1c1b7bbe..93e33b17 100644 --- a/kommander/editor/assoctexteditorimpl.cpp +++ b/kommander/editor/assoctexteditorimpl.cpp @@ -89,7 +89,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, break; } - doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(a_parent), "KTextEditor::Document"); + doc = KTextEditor::createDocument ("libkatepart", a_parent, "KTextEditor::Document"); TQGridLayout *layout = new TQGridLayout(editorFrame, 1, 1); view = doc->createView(editorFrame); layout->addWidget(view, 1,1); @@ -138,7 +138,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, readOnlyAction = view->actionCollection()->action("tools_toggle_write_lock"); popup->insertSeparator(); highlightPopup = new TDEPopupMenu(popup); - connect(highlightPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(slotHighlightingChanged(int))); + connect(highlightPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(slotHighlightingChanged(int))); popup->insertItem(i18n("&Highlighting"), highlightPopup); @@ -151,13 +151,13 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form, readOnlyAction->activate(); setWidget(a_widget); - connect(doc, TQT_SIGNAL(textChanged()), TQT_SLOT(textEditChanged())); - connect(widgetsComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(widgetChanged(int))); - connect(stateComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(stateChanged(int))); - connect(filePushButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertFile())); - connect(functionButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertFunction())); - connect(widgetComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(insertWidgetName(int))); - connect(treeWidgetButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectWidget())); + connect(doc, TQ_SIGNAL(textChanged()), TQ_SLOT(textEditChanged())); + connect(widgetsComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(widgetChanged(int))); + connect(stateComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(stateChanged(int))); + connect(filePushButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertFile())); + connect(functionButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertFunction())); + connect(widgetComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(insertWidgetName(int))); + connect(treeWidgetButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectWidget())); view->setFocus(); } @@ -270,21 +270,21 @@ void AssocTextEditor::save() const { TQString text = i18n("Set the \'text association\' of \'%1\'").arg(m_widget->name()); SetPropertyCommand *cmd = new SetPropertyCommand(text, m_formWindow, - TQT_TQOBJECT(m_widget), m_propertyEditor, "associations", atw->associatedText(), + m_widget, m_propertyEditor, "associations", atw->associatedText(), associatedText(), TQString(), TQString(), false); cmd->execute(); m_formWindow->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(m_widget), "associations", true); + MetaDataBase::setPropertyChanged(m_widget, "associations", true); } if (atw->populationText() != populationText()) { TQString text = i18n("Set the \'population text\' of \'%1\'").arg(m_widget->name()); - SetPropertyCommand *cmd = new SetPropertyCommand(text, m_formWindow, TQT_TQOBJECT(m_widget), + SetPropertyCommand *cmd = new SetPropertyCommand(text, m_formWindow, m_widget, m_propertyEditor, "populationText", atw->populationText(), populationText(), TQString(), TQString(), false); cmd->execute(); m_formWindow->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(m_widget), "populationText", true); + MetaDataBase::setPropertyChanged(m_widget, "populationText", true); } } @@ -305,7 +305,7 @@ TQString AssocTextEditor::populationText() const TQStringList AssocTextEditor::buildWidgetList() { TQStringList widgetList; - TQObject* thisObject = TQT_TQOBJECT(m_formWindow->mainContainer()); + TQObject* thisObject = m_formWindow->mainContainer(); TQObjectList *objectList = thisObject->queryList(); objectList->prepend(thisObject); diff --git a/kommander/editor/assoctexteditorimpl.h b/kommander/editor/assoctexteditorimpl.h index 2a63942e..2b12f766 100644 --- a/kommander/editor/assoctexteditorimpl.h +++ b/kommander/editor/assoctexteditorimpl.h @@ -48,7 +48,7 @@ class TDEPopupMenu; class AssocTextEditor : public AssocTextEditorBase { - Q_OBJECT + TQ_OBJECT public: AssocTextEditor(TQWidget*, FormWindow*, PropertyEditor*, KParts::PartManager *partManager, TQWidget*, const char* = 0, bool = true); diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui index b39a7e7b..210703ee 100644 --- a/kommander/editor/choosewidget.ui +++ b/kommander/editor/choosewidget.ui @@ -54,9 +54,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -71,9 +68,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kommander/editor/choosewidgetimpl.cpp b/kommander/editor/choosewidgetimpl.cpp index 62f545a0..f399b8b5 100644 --- a/kommander/editor/choosewidgetimpl.cpp +++ b/kommander/editor/choosewidgetimpl.cpp @@ -32,8 +32,8 @@ ChooseWidget::ChooseWidget(TQWidget* a_parent, const char* a_name, bool a_modal) : ChooseWidgetBase(a_parent, a_name, a_modal) { - connect( nameEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(textChanged(const TQString&)) ); - connect( widgetView, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(selectedItem(TQListViewItem*))); + connect( nameEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(textChanged(const TQString&)) ); + connect( widgetView, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(selectedItem(TQListViewItem*))); widgetView->setFullWidth(true); widgetView->addColumn(i18n("Widgets")); widgetView->setRootIsDecorated(true); diff --git a/kommander/editor/choosewidgetimpl.h b/kommander/editor/choosewidgetimpl.h index 5fd8a2b8..e3655e2b 100644 --- a/kommander/editor/choosewidgetimpl.h +++ b/kommander/editor/choosewidgetimpl.h @@ -21,7 +21,7 @@ class ChooseWidget : public ChooseWidgetBase { - Q_OBJECT + TQ_OBJECT public: ChooseWidget(TQWidget*, const char* = 0, bool=true); diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp index adc74084..8d15c885 100644 --- a/kommander/editor/command.cpp +++ b/kommander/editor/command.cpp @@ -235,7 +235,7 @@ void ResizeCommand::execute() { widget->setGeometry( newRect ); formWindow()->updateSelection( widget ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow()->emitUpdateProperties( widget ); if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout ) formWindow()->updateChildSelections( widget ); } @@ -244,7 +244,7 @@ void ResizeCommand::unexecute() { widget->setGeometry( oldRect ); formWindow()->updateSelection( widget ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow()->emitUpdateProperties( widget ); if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout ) formWindow()->updateChildSelections( widget ); } @@ -271,14 +271,14 @@ void InsertCommand::execute() widget->show(); formWindow()->widgets()->insert( widget, widget ); formWindow()->clearSelection( false ); - formWindow()->selectWidget( TQT_TQOBJECT(widget) ); + formWindow()->selectWidget( widget ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( widget ); } void InsertCommand::unexecute() { widget->hide(); - formWindow()->selectWidget( TQT_TQOBJECT(widget), false ); + formWindow()->selectWidget( widget, false ); formWindow()->widgets()->remove( widget ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( widget ); } @@ -318,7 +318,7 @@ void MoveCommand::execute() w->reparent( newParent, pos, true ); formWindow()->raiseSelection( w ); formWindow()->raiseChildSelections( w ); - formWindow()->widgetChanged( TQT_TQOBJECT(w) ); + formWindow()->widgetChanged( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -326,7 +326,7 @@ void MoveCommand::execute() } formWindow()->updateSelection( w ); formWindow()->updateChildSelections( w ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) ); + formWindow()->emitUpdateProperties( w ); } } @@ -339,7 +339,7 @@ void MoveCommand::unexecute() w->reparent( oldParent, pos, true ); formWindow()->raiseSelection( w ); formWindow()->raiseChildSelections( w ); - formWindow()->widgetChanged( TQT_TQOBJECT(w) ); + formWindow()->widgetChanged( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -347,7 +347,7 @@ void MoveCommand::unexecute() } formWindow()->updateSelection( w ); formWindow()->updateChildSelections( w ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) ); + formWindow()->emitUpdateProperties( w ); } } @@ -369,13 +369,13 @@ void DeleteCommand::execute() TQString s = w->name(); s.prepend( "qt_dead_widget_" ); w->setName( s.utf8() ); - formWindow()->selectWidget( TQT_TQOBJECT(w), false ); + formWindow()->selectWidget( w, false ); formWindow()->widgets()->remove( w ); - TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( TQT_TQOBJECT(formWindow()), TQT_TQOBJECT(w) ); + TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( formWindow(), w ); connections.insert( w, conns ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), (*it).sender, + MetaDataBase::removeConnection( formWindow(), (*it).sender, (*it).signal, (*it).receiver, (*it).slot ); } } @@ -395,11 +395,11 @@ void DeleteCommand::unexecute() s.remove( 0, TQString( "qt_dead_widget_" ).length() ); w->setName( s.utf8() ); formWindow()->widgets()->insert( w, w ); - formWindow()->selectWidget( TQT_TQOBJECT(w) ); + formWindow()->selectWidget( w ); TQValueList<MetaDataBase::Connection> conns = *connections.find( w ); TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin(); for ( ; it != conns.end(); ++it ) { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), (*it).sender, + MetaDataBase::addConnection( formWindow(), (*it).sender, (*it).signal, (*it).receiver, (*it).slot ); } } @@ -430,7 +430,7 @@ void SetPropertyCommand::execute() if ( isResetCommand ) { MetaDataBase::setPropertyChanged( widget, propName, false ); if ( WidgetFactory::resetProperty( widget, propName ) ) { - if ( !formWindow()->isWidgetSelected( widget ) && TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(formWindow()) ) + if ( !formWindow()->isWidgetSelected( widget ) && widget != formWindow() ) formWindow()->selectWidget( widget ); if ( editor->widget() != widget ) editor->setWidget( widget, formWindow() ); @@ -553,9 +553,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ align |= WordBreak; widget->setProperty( "alignment", TQVariant( align ) ); } else if ( propName == "layoutSpacing" ) { - MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( static_cast<TQWidget*>( editor->widget() ) ), v.toInt() ); } else if ( propName == "layoutMargin" ) { - MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( static_cast<TQWidget*>( editor->widget() ) ), v.toInt() ); } else if ( propName == "toolTip" || propName == "whatsThis" || propName == "database" || propName == "frameworkCode" ) { MetaDataBase::setFakeProperty( editor->widget(), propName, v ); } else if ( editor->widget()->inherits( "CustomWidget" ) ) { @@ -587,9 +587,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤ oldSerNum = v.toPixmap().serialNumber(); widget->setProperty( propName.latin1(), v ); if ( oldSerNum != -1 && oldSerNum != widget->property( propName.latin1() ).toPixmap().serialNumber() ) - MetaDataBase::setPixmapKey( TQT_TQOBJECT(formWindow()), + MetaDataBase::setPixmapKey( formWindow(), widget->property( propName.latin1() ).toPixmap().serialNumber(), - MetaDataBase::pixmapKey( TQT_TQOBJECT(formWindow()), oldSerNum ) ); + MetaDataBase::pixmapKey( formWindow(), oldSerNum ) ); if ( propName == "cursor" ) MetaDataBase::setCursor( (TQWidget*)widget, v.toCursor() ); if ( propName == "name" && widget->isWidgetType() ) { @@ -747,8 +747,8 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw, : Command( n, fw ), lb( layoutBase ), widgets( wl ) { WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase ); - spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) ); - margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) ); + spacing = MetaDataBase::spacing( layoutBase ); + margin = MetaDataBase::margin( layoutBase ); layout = 0; if ( lay == WidgetFactory::HBox ) layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( "TQSplitter" ) ); @@ -776,8 +776,8 @@ void BreakLayoutCommand::unexecute() formWindow()->clearSelection( false ); layout->doLayout(); formWindow()->mainWindow()->objectHierarchy()->rebuild(); - MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing ); - MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( lb ), spacing ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( lb ), margin ); } // ------------------------------------------------------------ @@ -809,7 +809,7 @@ AddTabPageCommand::AddTabPageCommand( const TQString &n, FormWindow *fw, tabPage = new QDesignerWidget( formWindow(), tabWidget, "tab" ); tabPage->hide(); index = -1; - MetaDataBase::addEntry( TQT_TQOBJECT(tabPage) ); + MetaDataBase::addEntry( tabPage ); } void AddTabPageCommand::execute() @@ -818,7 +818,7 @@ void AddTabPageCommand::execute() index = ( (QDesignerTabWidget*)tabWidget )->count(); tabWidget->insertTab( tabPage, tabLabel, index ); tabWidget->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -826,7 +826,7 @@ void AddTabPageCommand::unexecute() { tabWidget->removePage( tabPage ); tabPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -840,7 +840,7 @@ AddToolBoxPageCommand::AddToolBoxPageCommand( const TQString &n, FormWindow *fw, page = new QDesignerWidget( formWindow(), toolBox, "tab" ); page->hide(); index = -1; - MetaDataBase::addEntry( TQT_TQOBJECT(page) ); + MetaDataBase::addEntry( page ); } void AddToolBoxPageCommand::execute() @@ -849,7 +849,7 @@ void AddToolBoxPageCommand::execute() index = ( (EditorToolBox*)toolBox)->count(); toolBox->insertItem(index, page, label); toolBox->setCurrentItem( page ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox ); } @@ -857,7 +857,7 @@ void AddToolBoxPageCommand::unexecute() { toolBox->removeItem( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox ); } @@ -876,7 +876,7 @@ void MoveTabPageCommand::execute() ((QDesignerTabWidget*)tabWidget )->removePage( tabPage ); ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex ); ((QDesignerTabWidget*)tabWidget )->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -885,7 +885,7 @@ void MoveTabPageCommand::unexecute() ((QDesignerTabWidget*)tabWidget )->removePage( tabPage ); ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex ); ((QDesignerTabWidget*)tabWidget )->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -903,7 +903,7 @@ void DeleteTabPageCommand::execute() { tabWidget->removePage( tabPage ); tabPage->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -911,7 +911,7 @@ void DeleteTabPageCommand::unexecute() { tabWidget->insertTab( tabPage, tabLabel, index ); tabWidget->showPage( tabPage ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget ); } @@ -929,7 +929,7 @@ void DeleteToolBoxPageCommand::execute() { toolBox->removeItem( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox ); } @@ -937,7 +937,7 @@ void DeleteToolBoxPageCommand::unexecute() { toolBox->insertItem(index, page, label); toolBox->setCurrentItem( page ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox ); } @@ -951,7 +951,7 @@ AddWizardPageCommand::AddWizardPageCommand( const TQString &n, FormWindow *fw, page->hide(); index = i; show = s; - MetaDataBase::addEntry( TQT_TQOBJECT(page) ); + MetaDataBase::addEntry( page ); } void AddWizardPageCommand::execute() @@ -961,7 +961,7 @@ void AddWizardPageCommand::execute() wizard->insertPage( page, pageLabel, index ); if ( show ) ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -969,7 +969,7 @@ void AddWizardPageCommand::unexecute() { wizard->removePage( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -988,7 +988,7 @@ void DeleteWizardPageCommand::execute() pageLabel = wizard->title( page ); wizard->removePage( page ); page->hide(); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -997,7 +997,7 @@ void DeleteWizardPageCommand::unexecute() wizard->insertPage( page, pageLabel, index ); if ( show ) ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1017,7 +1017,7 @@ void RenameWizardPageCommand::execute() wizard->setTitle( page, label ); label = oldLabel; - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); } void RenameWizardPageCommand::unexecute() @@ -1042,7 +1042,7 @@ void SwapWizardPagesCommand::execute() wizard->removePage( page2 ); wizard->insertPage( page1, page1Label, index2 ); wizard->insertPage( page2, page2Label, index1 ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) ); + formWindow()->emitUpdateProperties( formWindow()->currentWidget() ); formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard ); } @@ -1061,7 +1061,7 @@ AddConnectionCommand::AddConnectionCommand( const TQString &name, FormWindow *fw void AddConnectionCommand::execute() { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::addConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); #ifndef KOMMANDER if ( connection.receiver == formWindow()->mainContainer() ) @@ -1074,7 +1074,7 @@ void AddConnectionCommand::execute() void AddConnectionCommand::unexecute() { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::removeConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); #ifndef KOMMANDER if ( connection.receiver == formWindow()->mainContainer() ) @@ -1095,7 +1095,7 @@ RemoveConnectionCommand::RemoveConnectionCommand( const TQString &name, FormWind void RemoveConnectionCommand::execute() { - MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::removeConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); #ifndef KOMMANDER if ( connection.receiver == formWindow()->mainContainer() ) @@ -1108,7 +1108,7 @@ void RemoveConnectionCommand::execute() void RemoveConnectionCommand::unexecute() { - MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender, + MetaDataBase::addConnection( formWindow(), connection.sender, connection.signal, connection.receiver, connection.slot ); #ifndef KOMMANDER if ( connection.receiver == formWindow()->mainContainer() ) @@ -1131,7 +1131,7 @@ AddSlotCommand::AddSlotCommand( const TQString &name, FormWindow *fw, const TQCS void AddSlotCommand::execute() { - MetaDataBase::addSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType ); + MetaDataBase::addSlot( formWindow(), slot, specifier, access, language, returnType ); #ifndef KOMMANDER formWindow()->mainWindow()->slotsChanged(); #endif @@ -1141,7 +1141,7 @@ void AddSlotCommand::execute() void AddSlotCommand::unexecute() { - MetaDataBase::removeSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType ); + MetaDataBase::removeSlot( formWindow(), slot, specifier, access, language, returnType ); #ifndef KOMMANDER formWindow()->mainWindow()->slotsChanged(); #endif @@ -1160,7 +1160,7 @@ RemoveSlotCommand::RemoveSlotCommand( const TQString &name, FormWindow *fw, cons void RemoveSlotCommand::execute() { - MetaDataBase::removeSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType ); + MetaDataBase::removeSlot( formWindow(), slot, specifier, access, language, returnType ); #ifndef KOMMANDER formWindow()->mainWindow()->slotsChanged(); #endif @@ -1170,7 +1170,7 @@ void RemoveSlotCommand::execute() void RemoveSlotCommand::unexecute() { - MetaDataBase::addSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType ); + MetaDataBase::addSlot( formWindow(), slot, specifier, access, language, returnType ); #ifndef KOMMANDER formWindow()->mainWindow()->slotsChanged(); #endif @@ -1238,7 +1238,7 @@ void PasteCommand::execute() { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->show(); - formWindow()->selectWidget( TQT_TQOBJECT(w) ); + formWindow()->selectWidget( w ); formWindow()->widgets()->insert( w, w ); formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w ); } @@ -1248,7 +1248,7 @@ void PasteCommand::unexecute() { for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { w->hide(); - formWindow()->selectWidget( TQT_TQOBJECT(w), false ); + formWindow()->selectWidget( w, false ); formWindow()->widgets()->remove( w ); formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w ); } @@ -1490,21 +1490,21 @@ PopulateMultiLineEditCommand::PopulateMultiLineEditCommand( const TQString &n, F : Command( n, fw ), newText( txt ), mlined( mle ) { oldText = mlined->text(); - wasChanged = MetaDataBase::isPropertyChanged( TQT_TQOBJECT(mlined), "text" ); + wasChanged = MetaDataBase::isPropertyChanged( mlined, "text" ); } void PopulateMultiLineEditCommand::execute() { mlined->setText( newText ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", true ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) ); + MetaDataBase::setPropertyChanged( mlined, "text", true ); + formWindow()->emitUpdateProperties( mlined ); } void PopulateMultiLineEditCommand::unexecute() { mlined->setText( oldText ); - MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", wasChanged ); - formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) ); + MetaDataBase::setPropertyChanged( mlined, "text", wasChanged ); + formWindow()->emitUpdateProperties( mlined ); } // ------------------------------------------------------------ @@ -1516,7 +1516,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T { #ifndef TQT_NO_TABLE int i = 0; - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table)); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table); for ( i = 0; i < table->horizontalHeader()->count(); ++i ) { PopulateTableCommand::Column col; col.text = table->horizontalHeader()->label( i ); @@ -1546,7 +1546,7 @@ void PopulateTableCommand::execute() if ( !(*cit).field.isEmpty() ) columnFields.insert( (*cit).text, (*cit).field ); } - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields ); + MetaDataBase::setColumnFields( table, columnFields ); table->setNumRows( newRows.count() ); i = 0; for ( TQValueList<Row>::Iterator rit = newRows.begin(); rit != newRows.end(); ++rit, ++i ) @@ -1565,7 +1565,7 @@ void PopulateTableCommand::unexecute() if ( !(*cit).field.isEmpty() ) columnFields.insert( (*cit).text, (*cit).field ); } - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields ); + MetaDataBase::setColumnFields( table, columnFields ); table->setNumRows( oldRows.count() ); i = 0; for ( TQValueList<Row>::Iterator rit = oldRows.begin(); rit != oldRows.end(); ++rit, ++i ) @@ -1611,7 +1611,7 @@ void AddActionToToolBarCommand::execute() else toolBar->insertAction( index, action ); toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } else { TQObjectList clo = action->childrenListObject(); if (!clo.isEmpty()) { @@ -1635,7 +1635,7 @@ void AddActionToToolBarCommand::execute() } } toolBar->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); } } @@ -1649,7 +1649,7 @@ void AddActionToToolBarCommand::unexecute() toolBar->removeAction( action ); action->removeFrom( toolBar ); - TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) ); + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), toolBar, TQ_SLOT( actionRemoved() ) ); if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( toolBar ); } else { @@ -1701,13 +1701,13 @@ void AddActionToPopupCommand::execute() } } popup->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); } else { if ( !action->inherits( "QDesignerAction" ) || ( (QDesignerAction*)action )->supportsMenu() ) { action->addTo( popup ); popup->insertAction( index, action ); popup->reInsert(); - TQObject::connect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); + TQObject::connect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); } } } @@ -1716,7 +1716,7 @@ void AddActionToPopupCommand::unexecute() { action->removeFrom( popup ); popup->removeAction( action ); - TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) ); + TQObject::disconnect( action, TQ_SIGNAL( destroyed() ), popup, TQ_SLOT( actionRemoved() ) ); if ( !action->inherits( "TQActionGroup" ) || ( (TQActionGroup*)action )->usesDropDown()) { action->removeEventFilter( popup ); } else { @@ -1749,7 +1749,7 @@ void AddMenuCommand::execute() if ( !popup ) { TQString n = "PopupMenu"; popup = new QDesignerPopupMenu( mainWindow ); - formWindow()->unify( TQT_TQOBJECT(popup), n, true ); + formWindow()->unify( popup, n, true ); popup->setName( n.utf8() ); } if ( !mainWindow->child( 0, "TQMenuBar" ) ) { @@ -1762,7 +1762,7 @@ void AddMenuCommand::execute() id = mainWindow->menuBar()->insertItem( name, popup ); else id = mainWindow->menuBar()->insertItem( name, popup, id, index ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } void AddMenuCommand::unexecute() @@ -1770,7 +1770,7 @@ void AddMenuCommand::unexecute() if ( !popup || !menuBar ) return; menuBar->removeItem( id ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } // ------------------------------------------------------------ @@ -1784,13 +1784,13 @@ RenameMenuCommand::RenameMenuCommand( const TQString &n, FormWindow *fw, QDesign void RenameMenuCommand::execute() { menuBar->changeItem( id, newName ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } void RenameMenuCommand::unexecute() { menuBar->changeItem( id, oldName ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } // ------------------------------------------------------------ @@ -1805,14 +1805,14 @@ void MoveMenuCommand::execute() { menuBar->removeItem( menuBar->idAt( fromIdx ) ); menuBar->insertItem( text, popup, -1, toIdx ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } void MoveMenuCommand::unexecute() { menuBar->removeItem( menuBar->idAt( toIdx ) ); menuBar->insertItem( text, popup, -1, fromIdx ); - formWindow()->killAccels( TQT_TQOBJECT(formWindow()) ); + formWindow()->killAccels( formWindow() ); } // ------------------------------------------------------------ @@ -1827,7 +1827,7 @@ void AddToolBarCommand::execute() if ( !toolBar ) { toolBar = new QDesignerToolBar( mainWindow ); TQString n = "Toolbar"; - formWindow()->unify( TQT_TQOBJECT(toolBar), n, true ); + formWindow()->unify( toolBar, n, true ); toolBar->setName( n.utf8() ); mainWindow->addToolBar( toolBar, n ); } else { diff --git a/kommander/editor/command.h b/kommander/editor/command.h index 0e9390be..c093b0af 100644 --- a/kommander/editor/command.h +++ b/kommander/editor/command.h @@ -122,7 +122,7 @@ private: class CommandHistory : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui index 0a20e4e6..0ff745f8 100644 --- a/kommander/editor/connectioneditor.ui +++ b/kommander/editor/connectioneditor.ui @@ -216,9 +216,6 @@ <property name="text"> <string>&Disconnect</string> </property> - <property name="accel"> - <string>Alt+D</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -253,9 +250,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string>Alt+O</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -273,9 +267,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string>Alt+C</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -345,9 +336,6 @@ <property name="text"> <string>Co&nnect</string> </property> - <property name="accel"> - <string>Alt+N</string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -390,7 +378,7 @@ <tabstop>okButton</tabstop> <tabstop>cancelButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot>addSlotClicked()</slot> @@ -402,7 +390,7 @@ <slot access="protected">signalChanged()</slot> <slot access="protected">Q_SLOTSChanged()</slot> <slot access="protected">cancelClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index aa1c9f61..e9ae6738 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -92,10 +92,10 @@ static const char *const ignore_signals[] = { ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* rcvr, FormWindow* fw) : ConnectionEditorBase(parent, 0, true), m_formWindow(fw) { - if (!rcvr || TQT_BASE_OBJECT(rcvr) == TQT_BASE_OBJECT(m_formWindow)) - rcvr = TQT_TQOBJECT(m_formWindow->mainContainer()); - if (!sndr || TQT_BASE_OBJECT(sndr) == TQT_BASE_OBJECT(m_formWindow)) - sndr = TQT_TQOBJECT(m_formWindow->mainContainer()); + if (!rcvr || rcvr == m_formWindow) + rcvr = m_formWindow->mainContainer(); + if (!sndr || sndr == m_formWindow) + sndr = m_formWindow->mainContainer(); m_sender = sndr; m_receiver = rcvr; @@ -108,7 +108,7 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r !it.current()->inherits("TQLayoutWidget") && !it.current()->inherits("Spacer") && qstrcmp(it.current()->name(), "central widget") && - !m_formWindow->isMainContainer(TQT_TQOBJECT(it.current())) && + !m_formWindow->isMainContainer(it.current()) && !lst.contains(it.current()->name())) lst << it.current()->name(); } @@ -128,16 +128,16 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r updateDisconnectButton(); // Connections - connect(comboSender, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(senderChanged(const TQString&))); - connect(comboReceiver, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(receiverChanged(const TQString&))); - connect(signalBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateConnectButton())); - connect(slotBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateConnectButton())); - connect(connectButton, TQT_SIGNAL(clicked()), TQT_SLOT(connectClicked())); - connect(disconnectButton, TQT_SIGNAL(clicked()), TQT_SLOT(disconnectClicked())); - connect(okButton, TQT_SIGNAL(clicked()), TQT_SLOT(okClicked())); - connect(cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(cancelClicked())); - connect(signalBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(connectClicked())); - connect(slotBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(connectClicked())); + connect(comboSender, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(senderChanged(const TQString&))); + connect(comboReceiver, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(receiverChanged(const TQString&))); + connect(signalBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateConnectButton())); + connect(slotBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateConnectButton())); + connect(connectButton, TQ_SIGNAL(clicked()), TQ_SLOT(connectClicked())); + connect(disconnectButton, TQ_SIGNAL(clicked()), TQ_SLOT(disconnectClicked())); + connect(okButton, TQ_SIGNAL(clicked()), TQ_SLOT(okClicked())); + connect(cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(cancelClicked())); + connect(signalBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(connectClicked())); + connect(slotBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(connectClicked())); } ConnectionEditor::~ConnectionEditor() @@ -154,19 +154,19 @@ bool ConnectionEditor::isSignalIgnored(const char *signal) const bool ConnectionEditor::isSlotIgnored(const TQMetaData* md) { - if (md->tqt_mo_access != TQMetaData::Public && (md->tqt_mo_access != TQMetaData::Protected || - !m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver)))) + if (md->access != TQMetaData::Public && (md->access != TQMetaData::Protected || + !m_formWindow->isMainContainer(m_receiver))) return true; for (int i = 0; ignore_slots[i]; i++) - if (!qstrcmp(md->tqt_mo_ci_name, ignore_slots[i])) + if (!qstrcmp(md->name, ignore_slots[i])) return true; - if (!m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver)) && !qstrcmp(md->tqt_mo_ci_name, "close()")) + if (!m_formWindow->isMainContainer(m_receiver) && !qstrcmp(md->name, "close()")) return true; - if (!qstrcmp(md->tqt_mo_ci_name, "setFocus()") && m_receiver->isWidgetType() && - ((TQWidget*)m_receiver)->focusPolicy() == TQ_NoFocus) + if (!qstrcmp(md->name, "setFocus()") && m_receiver->isWidgetType() && + ((TQWidget*)m_receiver)->focusPolicy() == TQWidget::NoFocus) return true; for (int i = 0; i<comboSender->count(); i++) - if (checkConnectArgs(MetaDataBase::normalizeSlot(signalBox->text(i)).latin1(), m_receiver, md->tqt_mo_ci_name)) + if (checkConnectArgs(MetaDataBase::normalizeSlot(signalBox->text(i)).latin1(), m_receiver, md->name)) return false; return true; } @@ -175,11 +175,11 @@ TQObject* ConnectionEditor::objectByName(const TQString& s) const { for (TQPtrDictIterator <TQWidget> it(*m_formWindow->widgets()); it.current(); ++it) if (TQString(it.current()->name()) == s) - return TQT_TQOBJECT(it.current()); + return it.current(); for (TQPtrListIterator<TQAction> it(m_formWindow->actionList()); it.current(); ++it) if (TQString(it.current()->name()) == s) - return TQT_TQOBJECT(it.current()); + return it.current(); return 0; } @@ -279,8 +279,8 @@ void ConnectionEditor::senderChanged(const TQString& s) for (TQStrListIterator it(p_sigs); it.current(); ++it) if (!isSignalIgnored(it.current()) && !signalBox->findItem(it.current(), TQt::ExactMatch)) signalBox->insertItem(it.current()); - if (TQT_BASE_OBJECT(m_sender) == TQT_BASE_OBJECT(m_formWindow->mainContainer())) - signalBox->insertStringList(MetaDataBase::signalList(TQT_TQOBJECT(m_formWindow))); + if (m_sender == m_formWindow->mainContainer()) + signalBox->insertStringList(MetaDataBase::signalList(m_formWindow)); signalBox->sort(); signalBox->setCurrentItem(signalBox->firstItem()); // Update slots - some may (not) have their signal equivalents now. @@ -298,8 +298,8 @@ void ConnectionEditor::receiverChanged(const TQString& s) for (int i = 0; i < n; ++i) { const TQMetaData* md = m_receiver->metaObject()->slot(i, true); - if (!isSlotIgnored(md) && !slotBox->findItem(md->tqt_mo_ci_name, TQt::ExactMatch)) - slotBox->insertItem(md->tqt_mo_ci_name); + if (!isSlotIgnored(md) && !slotBox->findItem(md->name, TQt::ExactMatch)) + slotBox->insertItem(md->name); } slotBox->sort(); slotBox->setCurrentItem(slotBox->firstItem()); @@ -336,14 +336,14 @@ void ConnectionEditor::fillConnectionsList() { connectionView->clear(); m_connections.clear(); - m_oldConnections = MetaDataBase::connections(TQT_TQOBJECT(m_formWindow)); + m_oldConnections = MetaDataBase::connections(m_formWindow); if (!m_oldConnections.isEmpty()) { TQValueList <MetaDataBase::Connection>::Iterator it = m_oldConnections.begin(); for (; it != m_oldConnections.end(); ++it) { - if (m_formWindow->isMainContainer(TQT_TQOBJECT((*it).receiver)) && - !MetaDataBase::hasSlot(TQT_TQOBJECT(m_formWindow), MetaDataBase::normalizeSlot((*it).slot).latin1())) + if (m_formWindow->isMainContainer((*it).receiver) && + !MetaDataBase::hasSlot(m_formWindow, MetaDataBase::normalizeSlot((*it).slot).latin1())) continue; MetaDataBase::Connection conn = *it; TDEListViewItem *i = new TDEListViewItem(connectionView, conn.sender->name(), conn.signal, diff --git a/kommander/editor/connectioneditorimpl.h b/kommander/editor/connectioneditorimpl.h index f130e590..8ac3fdd3 100644 --- a/kommander/editor/connectioneditorimpl.h +++ b/kommander/editor/connectioneditorimpl.h @@ -31,7 +31,7 @@ class FormWindow; class ConnectionEditor : public ConnectionEditorBase { - Q_OBJECT + TQ_OBJECT public: ConnectionEditor(TQWidget* parent, TQObject* sender, TQObject* receiver, FormWindow* fw); diff --git a/kommander/editor/filechooser.cpp b/kommander/editor/filechooser.cpp index ac0aad5a..347eacf5 100644 --- a/kommander/editor/filechooser.cpp +++ b/kommander/editor/filechooser.cpp @@ -13,15 +13,15 @@ FileChooser::FileChooser( TQWidget *parent, const char *name ) lineEdit = new TQLineEdit( this, "filechooser_lineedit" ); layout->addWidget( lineEdit ); - connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) ); + connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( fileNameChanged( const TQString & ) ) ); button = new TQPushButton( "...", this, "filechooser_button" ); button->setFixedWidth( button->fontMetrics().width( " ... " ) ); layout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( chooseFile() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( chooseFile() ) ); setFocusProxy( lineEdit ); } diff --git a/kommander/editor/filechooser.h b/kommander/editor/filechooser.h index e87ee91e..f3384d15 100644 --- a/kommander/editor/filechooser.h +++ b/kommander/editor/filechooser.h @@ -8,7 +8,7 @@ class TQPushButton; class FileChooser : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( Mode ) diff --git a/kommander/editor/formfile.cpp b/kommander/editor/formfile.cpp index c82e961d..874918d3 100644 --- a/kommander/editor/formfile.cpp +++ b/kommander/editor/formfile.cpp @@ -45,15 +45,15 @@ FormFile::FormFile(const TQString &fn, bool temp) : filename(fn), fileNameTemp(temp), fw(0) { - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } void FormFile::init() { - connect(this, TQT_SIGNAL(addedFormFile(FormFile *)), MainWindow::self->workspace(), - TQT_SLOT(formFileAdded(FormFile*))); - connect(this, TQT_SIGNAL(removedFormFile(FormFile *)), MainWindow::self->workspace(), - TQT_SLOT(formFileRemoved(FormFile*))); + connect(this, TQ_SIGNAL(addedFormFile(FormFile *)), MainWindow::self->workspace(), + TQ_SLOT(formFileAdded(FormFile*))); + connect(this, TQ_SIGNAL(removedFormFile(FormFile *)), MainWindow::self->workspace(), + TQ_SLOT(formFileRemoved(FormFile*))); emit addedFormFile(this); } diff --git a/kommander/editor/formfile.h b/kommander/editor/formfile.h index 35839427..51377e04 100644 --- a/kommander/editor/formfile.h +++ b/kommander/editor/formfile.h @@ -28,7 +28,7 @@ class FormWindow; class FormFile : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui index f0bad338..410d80b7 100644 --- a/kommander/editor/formsettings.ui +++ b/kommander/editor/formsettings.ui @@ -326,9 +326,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>okClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kommander/editor/formsettingsimpl.cpp b/kommander/editor/formsettingsimpl.cpp index ddfa8345..b65a9718 100644 --- a/kommander/editor/formsettingsimpl.cpp +++ b/kommander/editor/formsettingsimpl.cpp @@ -30,7 +30,7 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw ) : FormSettingsBase( parent, 0, true ), formwindow( fw ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(TQT_TQOBJECT(fw)); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(fw); editAuthor->setText(info.author); editVersion->setText(info.version); editLicense->setText(info.license); @@ -46,7 +46,7 @@ void FormSettings::okClicked() info.version = editVersion->text(); info.license = editLicense->text(); info.comment = editComment->text(); - MetaDataBase::setMetaInfo(TQT_TQOBJECT(formwindow), info); + MetaDataBase::setMetaInfo(formwindow, info); formwindow->commandHistory()->setModified(true); formwindow->setLayoutDefaultSpacing(spinSpacing->value()); diff --git a/kommander/editor/formsettingsimpl.h b/kommander/editor/formsettingsimpl.h index 1e1075d0..909999bb 100644 --- a/kommander/editor/formsettingsimpl.h +++ b/kommander/editor/formsettingsimpl.h @@ -27,7 +27,7 @@ class FormWindow; class FormSettings : public FormSettingsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp index 1c294adc..81489695 100644 --- a/kommander/editor/formwindow.cpp +++ b/kommander/editor/formwindow.cpp @@ -129,7 +129,7 @@ FormWindow::FormWindow(FormFile *f, TQWidget *parent, const char *name) void FormWindow::init() { - MetaDataBase::addEntry(TQT_TQOBJECT(this)); + MetaDataBase::addEntry(this); ff->setFormWindow(this); propertyWidget = 0; toolFixed = false; @@ -140,34 +140,34 @@ void FormWindow::init() unclippedPainter = 0; widgetPressed = false; drawRubber = false; - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); sizePreviewLabel = 0; checkSelectionsTimer = new TQTimer(this, "checkSelectionsTimer"); - connect(checkSelectionsTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(invalidCheckedSelections())); + connect(checkSelectionsTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(invalidCheckedSelections())); updatePropertiesTimer = new TQTimer(this); - connect(updatePropertiesTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(updatePropertiesTimerDone())); + connect(updatePropertiesTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(updatePropertiesTimerDone())); showPropertiesTimer = new TQTimer(this); - connect(showPropertiesTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(showPropertiesTimerDone())); + connect(showPropertiesTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(showPropertiesTimerDone())); selectionChangedTimer = new TQTimer(this); - connect(selectionChangedTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(selectionChangedTimerDone())); + connect(selectionChangedTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(selectionChangedTimerDone())); insertParent = 0; - connect(&commands, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), - this, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &))); + connect(&commands, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), + this, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &))); propShowBlocked = false; setIcon(PixmapChooser::loadPixmap("form.xpm", PixmapChooser::Mini)); - connect(&commands, TQT_SIGNAL(modificationChanged(bool)), - this, TQT_SLOT(modificationChanged(bool))); + connect(&commands, TQ_SIGNAL(modificationChanged(bool)), + this, TQ_SLOT(modificationChanged(bool))); buffer = 0; TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this); setMainContainer(w); - propertyWidget = TQT_TQOBJECT(w); + propertyWidget = w; targetContainer = 0; hadOwnPalette = false; @@ -178,7 +178,7 @@ void FormWindow::init() void FormWindow::setMainWindow(MainWindow *w) { mainwindow = w; - MetaDataBase::addEntry(TQT_TQOBJECT(this)); + MetaDataBase::addEntry(this); initSlots(); } @@ -190,7 +190,7 @@ FormWindow::~FormWindow() { if (MainWindow::self->objectHierarchy()->formWindow() == this) MainWindow::self->objectHierarchy()->setFormWindow(0, 0); - MetaDataBase::clear(TQT_TQOBJECT(this)); + MetaDataBase::clear(this); if (ff) ff->setFormWindow(0); } @@ -295,7 +295,7 @@ void FormWindow::insertWidget() return; bool useSizeHint = !oldRectValid || (currRect.width() < 2 && currRect.height() < 2); - Qt::Orientation orient =Qt::Horizontal; + TQt::Orientation orient =TQt::Horizontal; TQString n = WidgetDatabase::className(currTool); if (useSizeHint && (n == "Spacer" || n == "TQSlider" || n == "Line" || n == "TQScrollBar")) { TQPopupMenu m(mainWindow()); @@ -303,7 +303,7 @@ void FormWindow::insertWidget() int ver = m.insertItem(i18n("&Vertical")); int r = m.exec(TQCursor::pos()); if (r == ver) - orient =Qt::Vertical; + orient =TQt::Vertical; } TQWidget *w = WidgetFactory::create(currTool, insertParent, 0, true, &currRect, orient); @@ -312,7 +312,7 @@ void FormWindow::insertWidget() if (!savePixmapInline() && currTool == WidgetDatabase::idFromClassName("PixmapLabel")) ((TQLabel*)w)->setPixmap(PixmapChooser::loadPixmap("image.xpm")); - int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))); + int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)); if (WidgetDatabase::isCustomWidget(id)) { TQWhatsThis::add(w, i18n("<b>A %1 (custom widget)</b> " "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> " @@ -332,7 +332,7 @@ void FormWindow::insertWidget() } TQString s = w->name(); - unify(TQT_TQOBJECT(w), s, true); + unify(w, s, true); w->setName(s.utf8()); insertWidget(w); TQRect r(currRect); @@ -357,12 +357,12 @@ void FormWindow::insertWidget() const TQObjectList l = insertParent->childrenListObject(); TQObjectListIt it(l); TQWidgetList lst; - if (WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) + if (WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) for (; it.current();) { TQObject *o = it.current(); ++it; if (o->isWidgetType() && ((TQWidget*)o)->isVisibleTo(this) && - insertedWidgets.find((TQWidget*)o) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w)) + insertedWidgets.find((TQWidget*)o) && o != w) { TQRect r2(((TQWidget*)o)->pos(), ((TQWidget*)o)->size()); if (r.contains(r2)) @@ -414,12 +414,12 @@ void FormWindow::insertWidget(TQWidget *w, bool checkName) { if (checkName) { TQString s = w->name(); - unify(TQT_TQOBJECT(w), s, true); + unify(w, s, true); w->setName(s.utf8()); } - MetaDataBase::addEntry(TQT_TQOBJECT(w)); - int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))); + MetaDataBase::addEntry(w); + int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)); if (WidgetDatabase::isCustomWidget(id)) { TQWhatsThis::add(w, i18n("<b>A %1 (custom widget)</b> " @@ -446,7 +446,7 @@ void FormWindow::insertWidget(TQWidget *w, bool checkName) void FormWindow::removeWidget(TQWidget *w) { - MetaDataBase::removeEntry(TQT_TQOBJECT(w)); + MetaDataBase::removeEntry(w); widgets()->take(w); } @@ -454,10 +454,10 @@ void FormWindow::handleContextMenu(TQContextMenuEvent *e, TQWidget *w) { switch (currTool) { case POINTER_TOOL: - if (!isMainContainer(TQT_TQOBJECT(w)) && qstrcmp(w->name(), "central widget")) + if (!isMainContainer(w) && qstrcmp(w->name(), "central widget")) { // press on a child widget raiseChildSelections(w); // raise selections and select widget - selectWidget(TQT_TQOBJECT(w)); + selectWidget(w); // if widget is laid out, find the first non-laid out super-widget TQWidget *realWidget = w; // but store the original one while (w->parentWidget() && (WidgetFactory::layoutType(w->parentWidget()) != @@ -500,7 +500,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) switch (currTool) { case POINTER_TOOL: - if (!isMainContainer(TQT_TQOBJECT(w)) && qstrcmp(w->name(), "central widget") != 0) + if (!isMainContainer(w) && qstrcmp(w->name(), "central widget") != 0) { // press on a child widget // if the clicked widget is not in a layout, raise it if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout) @@ -513,7 +513,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) break; } - bool sel = isWidgetSelected(TQT_TQOBJECT(w)); + bool sel = isWidgetSelected(w); if (!((e->state() & ControlButton) || (e->state() & ShiftButton))) { // control not pressed... if (!sel) // ...and widget no selectted: unselect all @@ -531,7 +531,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) if (!o->isWidgetType()) continue; if (insertedWidgets.find((TQWidget*)o)) - selectWidget(TQT_TQOBJECT(o), false); + selectWidget(o, false); } setPropertyShowingBlocked(false); delete l; @@ -540,14 +540,14 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) tqApp->processEvents(); } if (((e->state() & ControlButton) || (e->state() & ShiftButton)) && - sel && e->button() == Qt::LeftButton) + sel && e->button() == TQt::LeftButton) { // control pressed and selected, unselect widget - selectWidget(TQT_TQOBJECT(w), false); + selectWidget(w, false); break; } raiseChildSelections(w); // raise selections and select widget - selectWidget(TQT_TQOBJECT(w)); + selectWidget(w); // if widget is laid out, find the first non-laid out super-widget while (w->parentWidget() && @@ -555,7 +555,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) || !insertedWidgets.find(w))) w = w->parentWidget(); - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { // left button: store original geometry and more as the widget might start moving widgetPressed = true; widgetGeom = TQRect(w->pos(), w->size()); @@ -563,8 +563,8 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) origPressPos = oldPressPos; checkedSelectionsForMove = false; moving.clear(); - if (w->parentWidget() && !isMainContainer(TQT_TQOBJECT(w->parentWidget())) && - !isCentralWidget(TQT_TQOBJECT(w->parentWidget()))) + if (w->parentWidget() && !isMainContainer(w->parentWidget()) && + !isCentralWidget(w->parentWidget())) { targetContainer = w->parentWidget(); hadOwnPalette = w->parentWidget()->ownPalette(); @@ -574,14 +574,14 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) } else { // press was on the formwindow - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { // left button: start rubber selection and show formwindow properties drawRubber = true; if (!((e->state() & ControlButton) || (e->state() & ShiftButton))) { clearSelection(false); TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget*)opw); } @@ -591,19 +591,19 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) } break; case CONNECT_TOOL: - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) break; saveBackground(); mainWindow()->statusBar()->message(i18n("Connect '%1' with...").arg(w->name())); connectStartPos = mapFromGlobal(e->globalPos()); currentConnectPos = mapFromGlobal(e->globalPos()); - connectSender = TQT_TQOBJECT(designerWidget(TQT_TQOBJECT(w))); - connectReceiver = connectableObject(TQT_TQOBJECT(designerWidget(TQT_TQOBJECT(w))), connectReceiver); + connectSender = designerWidget(w); + connectReceiver = connectableObject(designerWidget(w), connectReceiver); beginUnclippedPainter(false); drawConnectLine(); break; case ORDER_TOOL: - if (!isMainContainer(TQT_TQOBJECT(w))) + if (!isMainContainer(w)) { // press on a child widget orderedWidgets.removeRef(w); orderedWidgets.append(w); @@ -625,16 +625,16 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w) } break; default: // any insert widget tool - if (e->button() == Qt::LeftButton) + if (e->button() == TQt::LeftButton) { insertParent = WidgetFactory::containerOfWidget(mainContainer()); // default parent for new widget is the formwindow - if (!isMainContainer(TQT_TQOBJECT(w))) + if (!isMainContainer(w)) { // press was not on formwindow, check if we can find another parent TQWidget *wid = w; for (;;) { - int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(wid))); + int id = WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(wid)); if ((WidgetDatabase::isContainer(id) || wid == mainContainer()) && !wid->inherits("TQLayoutWidget") && !wid->inherits("TQSplitter")) { @@ -659,7 +659,7 @@ void FormWindow::handleMouseDblClick(TQMouseEvent *, TQWidget *w) { switch (currTool) { case ORDER_TOOL: - if (!isMainContainer(TQT_TQOBJECT(w))) + if (!isMainContainer(w)) { // press on a child widget orderedWidgets.clear(); orderedWidgets.append(w); @@ -685,7 +685,7 @@ void FormWindow::handleMouseDblClick(TQMouseEvent *, TQWidget *w) void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) { - if ((e->state() & Qt::LeftButton) != Qt::LeftButton) + if ((e->state() & TQt::LeftButton) != TQt::LeftButton) return; TQWidget *newReceiver = (TQWidget*)connectReceiver, *oldReceiver = (TQWidget*)connectReceiver, *wid; @@ -724,10 +724,10 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) { // if we actually have to move if (!checkedSelectionsForMove) { // if not checked yet, check if the correct widget are selected... - if (!isWidgetSelected(TQT_TQOBJECT(w))) + if (!isWidgetSelected(w)) { // and unselect others. Only siblings can be moved at the same time setPropertyShowingBlocked(true); - selectWidget(TQT_TQOBJECT(w)); + selectWidget(w); setPropertyShowingBlocked(false); } checkSelectionsForMove(w); @@ -736,7 +736,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) // highlight the possible new parent container TQMapConstIterator<ulong, TQPoint> it = moving.begin(); TQWidget* wa = containerAt(e->globalPos(), ((TQWidget*)it.key())); - if (wa && !isMainContainer(TQT_TQOBJECT(wa)) && !isCentralWidget(TQT_TQOBJECT(wa))) + if (wa && !isMainContainer(wa) && !isCentralWidget(wa)) { wa = WidgetFactory::containerOfWidget(wa); // ok, looks like we moved onto a container @@ -792,17 +792,17 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) restoreConnectionLine(); wid = tqApp->widgetAt(e->globalPos(), true); if (wid) - wid = designerWidget(TQT_TQOBJECT(wid)); - if (wid && (isMainContainer(TQT_TQOBJECT(wid)) || insertedWidgets.find(wid)) && wid->isVisibleTo(this)) + wid = designerWidget(wid); + if (wid && (isMainContainer(wid) || insertedWidgets.find(wid)) && wid->isVisibleTo(this)) newReceiver = wid; if (newReceiver && (newReceiver->inherits("TQLayoutWidget") || newReceiver->inherits("Spacer"))) newReceiver = (TQWidget*)connectReceiver; - drawRecRect = TQT_BASE_OBJECT(newReceiver) != TQT_BASE_OBJECT(connectReceiver); + drawRecRect = newReceiver != connectReceiver; currentConnectPos = mapFromGlobal(e->globalPos()); - if (newReceiver && (isMainContainer(TQT_TQOBJECT(newReceiver)) - || insertedWidgets.find(newReceiver)) && !isCentralWidget(TQT_TQOBJECT(newReceiver))) - connectReceiver = connectableObject(TQT_TQOBJECT(newReceiver), TQT_TQOBJECT(connectReceiver)); + if (newReceiver && (isMainContainer(newReceiver) + || insertedWidgets.find(newReceiver)) && !isCentralWidget(newReceiver)) + connectReceiver = connectableObject(newReceiver, connectReceiver); mainWindow()->statusBar()->message(i18n("Connect '%1' to '%2'").arg(connectSender->name()). arg(connectReceiver->name())); tqApp->processEvents(); @@ -822,7 +822,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w) void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) { - if (e->button() != Qt::LeftButton) + if (e->button() != TQt::LeftButton) return; switch (currTool) @@ -888,7 +888,7 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) emitSelChanged = true; if (!wa->inherits("TQButtonGroup")) { - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(i), "buttonGroupId", false); + MetaDataBase::setPropertyChanged(i, "buttonGroupId", false); if (i->parentWidget() && i->parentWidget()->inherits("TQButtonGroup")) ((TQButtonGroup *) i->parentWidget())->remove((TQButton *) i); } @@ -897,13 +897,13 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w) i->reparent(wa, pos, true); raiseSelection(i); raiseChildSelections(i); - widgetChanged(TQT_TQOBJECT(i)); + widgetChanged(i); mainWindow()->objectHierarchy()->widgetRemoved(i); mainWindow()->objectHierarchy()->widgetInserted(i); } if (emitSelChanged) { - emit showProperties(TQT_TQOBJECT(wa)); + emit showProperties(wa); emit showProperties(propertyWidget); } newParent = wa; @@ -1064,7 +1064,7 @@ void FormWindow::handleKeyPress(TQKeyEvent * e, TQWidget * w) TQObjectList *l = queryList("TQWidget"); if (!l) return; - if (l->find(TQT_TQOBJECT(w)) != -1) + if (l->find(w) != -1) e->accept(); delete l; } @@ -1086,10 +1086,10 @@ void FormWindow::selectWidget(TQObject * o, bool select) TQWidget *w = (TQWidget *) o; - if (isMainContainer(TQT_TQOBJECT(w))) + if (isMainContainer(w)) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); emitShowProperties(propertyWidget); @@ -1100,7 +1100,7 @@ void FormWindow::selectWidget(TQObject * o, bool select) w == ((TQMainWindow *) mainContainer())->centralWidget()) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); emitShowProperties(propertyWidget); @@ -1113,7 +1113,7 @@ void FormWindow::selectWidget(TQObject * o, bool select) if (select) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(w); + propertyWidget = w; if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); if (!isPropertyShowingBlocked()) @@ -1148,9 +1148,9 @@ void FormWindow::selectWidget(TQObject * o, bool select) s->setWidget(0); TQObject *opw = propertyWidget; if (!usedSelections.isEmpty()) - propertyWidget = TQT_TQOBJECT(TQPtrDictIterator < WidgetSelection > (usedSelections).current()->widget()); + propertyWidget = TQPtrDictIterator < WidgetSelection > (usedSelections).current()->widget(); else - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); if (!isPropertyShowingBlocked()) @@ -1170,7 +1170,7 @@ void FormWindow::updateSelection(TQWidget * w) { WidgetSelection *s = usedSelections.find(w); if (!w->isVisibleTo(this)) - selectWidget(TQT_TQOBJECT(w), false); + selectWidget(w, false); else if (s) s->updateGeometry(); } @@ -1199,7 +1199,7 @@ void FormWindow::clearSelection(bool changePropertyDisplay) if (changePropertyDisplay) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); emitShowProperties(propertyWidget); @@ -1292,7 +1292,7 @@ void FormWindow::selectWidgets() p = mapFromGlobal(p); TQRect r(p, ((TQWidget *) o)->size()); if (r.intersects(currRect) && !r.contains(currRect)) - selectWidget(TQT_TQOBJECT(o)); + selectWidget(o); } } delete l; @@ -1350,7 +1350,7 @@ void FormWindow::raiseChildSelections(TQWidget * w) TQPtrDictIterator < WidgetSelection > it(usedSelections); for (; it.current(); ++it) { - if (l->findRef(TQT_TQOBJECT(it.current()->widget())) != -1) + if (l->findRef(it.current()->widget()) != -1) it.current()->show(); } delete l; @@ -1385,7 +1385,7 @@ void FormWindow::checkSelectionsForMove(TQWidget * w) if (it.current()->widget() == mainContainer()) continue; ++it; - if (l->find(TQT_TQOBJECT(sel->widget())) == -1) + if (l->find(sel->widget()) == -1) { if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) sel->setWidget(0); @@ -1411,7 +1411,7 @@ void FormWindow::deleteWidgets() for (; it.current(); ++it) { TQWidget *tb = 0; - if (!(tb = mainWindow()->isAToolBarChild(TQT_TQOBJECT(it.current()->widget())))) + if (!(tb = mainWindow()->isAToolBarChild(it.current()->widget()))) widgets.append(it.current()->widget()); else ((QDesignerToolBar *) tb)->removeWidget(it.current()->widget()); @@ -1500,7 +1500,7 @@ void FormWindow::invalidCheckedSelections() void FormWindow::checkPreviewGeometry(TQRect & r) { - if (TQT_TQRECT_OBJECT(rect()).contains(r)) + if (rect().contains(r)) return; if (r.left() < rect().left()) r.moveTopLeft(TQPoint(0, r.top())); @@ -1527,7 +1527,7 @@ void FormWindow::focusOutEvent(TQFocusEvent *) if (propertyWidget && !isMainContainer(propertyWidget) && !isWidgetSelected(propertyWidget)) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mainContainer()); + propertyWidget = mainContainer(); if (opw->isWidgetType()) repaintSelection((TQWidget *) opw); } @@ -1552,7 +1552,7 @@ TQWidget *FormWindow::designerWidget(TQObject * o) const if (!o || !o->isWidgetType()) return 0; TQWidget *w = (TQWidget *) o; - while (w && !isMainContainer(TQT_TQOBJECT(w)) && !insertedWidgets[(void *) w] || isCentralWidget(TQT_TQOBJECT(w))) + while (w && !isMainContainer(w) && !insertedWidgets[(void *) w] || isCentralWidget(w)) w = (TQWidget *) w->parent(); return w; } @@ -1652,7 +1652,7 @@ void FormWindow::currentToolChanged() { case POINTER_TOOL: if (propertyWidget && !isMainContainer(propertyWidget) && !isWidgetSelected(propertyWidget)) - emitShowProperties(TQT_TQOBJECT(mainContainer())); + emitShowProperties(mainContainer()); restoreCursors(this, this); break; case ORDER_TOOL: @@ -1662,7 +1662,7 @@ void FormWindow::currentToolChanged() orderedWidgets.clear(); showOrderIndicators(); if (mainWindow()->formWindow() == this) - emitShowProperties(TQT_TQOBJECT(mainContainer())); + emitShowProperties(mainContainer()); setCursorToAll(ArrowCursor, this); } break; @@ -1670,14 +1670,14 @@ void FormWindow::currentToolChanged() mainWindow()->statusBar()->message(i18n("Drag a line to create a connection...")); setCursorToAll(CrossCursor, this); if (mainWindow()->formWindow() == this) - emitShowProperties(TQT_TQOBJECT(mainContainer())); + emitShowProperties(mainContainer()); break; default: mainWindow()->statusBar()->message(i18n("Click on the form to insert a %1..."). arg(WidgetDatabase::toolTip(currTool).lower())); setCursorToAll(CrossCursor, this); if (mainWindow()->formWindow() == this) - emitShowProperties(TQT_TQOBJECT(mainContainer())); + emitShowProperties(mainContainer()); break; } } @@ -1695,7 +1695,7 @@ void FormWindow::showOrderIndicators() { TQWidget *w = (TQWidget *) o; if (w->isVisibleTo(w->parentWidget()) && - insertedWidgets[(void *) w] && w->focusPolicy() != TQ_NoFocus) + insertedWidgets[(void *) w] && w->focusPolicy() != TQWidget::NoFocus) { OrderIndicator *ind = new OrderIndicator(order++, w, this); orderIndicators.append(ind); @@ -1743,7 +1743,7 @@ bool FormWindow::checkCustomWidgets() { if (it.current()->isA("CustomWidget")) { - TQString className = WidgetFactory::classNameOf(TQT_TQOBJECT(it.current())); + TQString className = WidgetFactory::classNameOf(it.current()); if (!MetaDataBase::hasCustomWidget(className)) missingCustomWidgets << className; } @@ -1849,7 +1849,7 @@ void FormWindow::checkAccels() { clearSelection(false); for (wid = (*it).first(); wid; wid = (*it).next()) - selectWidget(TQT_TQOBJECT(wid), true); + selectWidget(wid, true); } return; } @@ -1890,7 +1890,7 @@ void FormWindow::selectAll() { if (((TQWidget *) o)->isVisibleTo(this) && insertedWidgets[(void *) o]) { - selectWidget(TQT_TQOBJECT(o)); + selectWidget(o); } } delete l; @@ -2036,7 +2036,7 @@ void FormWindow::breakLayout(TQWidget * w) if (!w || w == this) break; if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout && - WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) + WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) { Command *cmd = breakLayoutCommand(w); if (cmd) @@ -2066,7 +2066,7 @@ BreakLayoutCommand *FormWindow::breakLayoutCommand(TQWidget * w) for (TQObject * o = l.first(); o; o = l.next()) { if (o->isWidgetType() && - !mainWindow()->isAToolBarChild(TQT_TQOBJECT(o)) && + !mainWindow()->isAToolBarChild(o) && ((TQWidget *) o)->isVisibleTo(this) && insertedWidgets.find((TQWidget *) o)) widgets.append((TQWidget *) o); } @@ -2116,7 +2116,7 @@ bool FormWindow::allowMove(TQWidget *w) w = w->parentWidget(); while (w) { - if ((isMainContainer(TQT_TQOBJECT(w)) || insertedWidgets.find(w)) && WidgetFactory::layoutType(w) == + if ((isMainContainer(w) || insertedWidgets.find(w)) && WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) return true; w = w->parentWidget(); @@ -2274,7 +2274,7 @@ bool FormWindow::unify(TQObject *w, TQString &s, bool changeIt) int num = 1; TQPtrDictIterator<TQWidget> it(insertedWidgets); for (; it.current();) - if (TQT_BASE_OBJECT(it.current()) != TQT_BASE_OBJECT(w) && !qstrcmp(it.current()->name(), s.latin1())) + if (it.current() != w && !qstrcmp(it.current()->name(), s.latin1())) { found = true; if (!changeIt) @@ -2351,7 +2351,7 @@ bool FormWindow::isCustomWidgetUsed(MetaDataBase::CustomWidget *w) { TQPtrDictIterator<TQWidget> it(insertedWidgets); for (; it.current(); ++it) - if (it.current()->isA("CustomWidget") && !qstrcmp(WidgetFactory::classNameOf(TQT_TQOBJECT(it.current())), + if (it.current()->isA("CustomWidget") && !qstrcmp(WidgetFactory::classNameOf(it.current()), w->className.utf8())) return true; return false; @@ -2388,7 +2388,7 @@ bool FormWindow::isDatabaseAware() const void FormWindow::visibilityChanged() { if (currTool != ORDER_TOOL) - emitUpdateProperties(TQT_TQOBJECT(currentWidget())); + emitUpdateProperties(currentWidget()); else { updateOrderIndicators(); @@ -2407,7 +2407,7 @@ TQPoint FormWindow::mapToForm(const TQWidget* w, const TQPoint& pos) const { TQPoint p = pos; const TQWidget* i = w; - while (i && !i->isTopLevel() && !isMainContainer(TQT_TQOBJECT(const_cast<TQWidget*>(i)))) + while (i && !i->isTopLevel() && !isMainContainer(const_cast<TQWidget*>(i))) { p = i->mapToParent(p); i = i->parentWidget(); @@ -2444,7 +2444,7 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) TQWidget *container = 0; int depth = -1; TQWidgetList selected = selectedWidgets(); - if (TQT_TQRECT_OBJECT(rect()).contains(mapFromGlobal(pos))) + if (rect().contains(mapFromGlobal(pos))) { container = mainContainer(); depth = widgetDepth(container); @@ -2460,14 +2460,14 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) if (selected.find(it.current()) != -1) continue; if (!WidgetDatabase::isContainer(WidgetDatabase::idFromClassName( - WidgetFactory::classNameOf(TQT_TQOBJECT(it.current())))) && it.current() != mainContainer()) + WidgetFactory::classNameOf(it.current()))) && it.current() != mainContainer()) continue; // the rectangles of all ancestors of the container must contain the insert position TQWidget *w = it.current(); while (w && !w->isTopLevel()) { - if (!TQT_TQRECT_OBJECT(w->rect()).contains((w->mapFromGlobal(pos)))) + if (!w->rect().contains((w->mapFromGlobal(pos)))) break; w = w->parentWidget(); } @@ -2475,8 +2475,8 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) int wd = widgetDepth(it.current()); if (wd == depth && container && (it.current()->parentWidget()-> - childrenListObject()).find(TQT_TQOBJECT(it.current())) > - (container->parentWidget()->childrenListObject()).find(TQT_TQOBJECT(container))) + childrenListObject()).find(it.current()) > + (container->parentWidget()->childrenListObject()).find(container)) wd++; if (wd > depth && !isChildOf(it.current(), notParentOf)) { depth = wd; @@ -2489,7 +2489,7 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf) bool FormWindow::isMainContainer(TQObject *w) const { - return w && w->isWidgetType() && (TQT_BASE_OBJECT(w) == this || TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(mainContainer())); + return w && w->isWidgetType() && (w == this || w == mainContainer()); } void FormWindow::setMainContainer(TQWidget *w) @@ -2497,7 +2497,7 @@ void FormWindow::setMainContainer(TQWidget *w) bool resetPropertyWidget = isMainContainer(propertyWidget); if (mContainer) insertedWidgets.remove(mContainer); - if (TQT_BASE_OBJECT(propertyWidget) == TQT_BASE_OBJECT(mContainer)) + if (propertyWidget == mContainer) propertyWidget = 0; delete mContainer; mContainer = w; @@ -2508,7 +2508,7 @@ void FormWindow::setMainContainer(TQWidget *w) if (resetPropertyWidget) { TQObject *opw = propertyWidget; - propertyWidget = TQT_TQOBJECT(mContainer); + propertyWidget = mContainer; if (opw && opw->isWidgetType()) repaintSelection((TQWidget*)opw); } @@ -2567,7 +2567,7 @@ bool FormWindow::isCentralWidget(TQObject *w) const { if (!mainContainer()->inherits("TQMainWindow")) return false; - return TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(((TQMainWindow*)mainContainer())->centralWidget()); + return w == ((TQMainWindow*)mainContainer())->centralWidget(); } TQObject *FormWindow::connectableObject(TQObject *w, TQObject *) @@ -2604,6 +2604,6 @@ void FormWindow::setFormFile(FormFile *f) { ff = f; if (ff) - connect(this, TQT_SIGNAL(modificationChanged(bool, const TQString&)), ff, TQT_SLOT(formWindowChangedSomehow())); + connect(this, TQ_SIGNAL(modificationChanged(bool, const TQString&)), ff, TQ_SLOT(formWindowChangedSomehow())); } #include "formwindow.moc" diff --git a/kommander/editor/formwindow.h b/kommander/editor/formwindow.h index cb9a5c1c..8f834b15 100644 --- a/kommander/editor/formwindow.h +++ b/kommander/editor/formwindow.h @@ -57,7 +57,7 @@ class OrderIndicator; class FormWindow : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName ) diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui index 86d1b74a..707e9921 100644 --- a/kommander/editor/functions.ui +++ b/kommander/editor/functions.ui @@ -544,9 +544,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -561,9 +558,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kommander/editor/functionsimpl.cpp b/kommander/editor/functionsimpl.cpp index c1c3f41d..88521a97 100644 --- a/kommander/editor/functionsimpl.cpp +++ b/kommander/editor/functionsimpl.cpp @@ -49,11 +49,11 @@ FunctionsDialog::FunctionsDialog(TQWidget* a_parent, const TQDict<TQWidget>& a_w copyButton->setPixmap(TDEGlobal::iconLoader()->loadIcon("1downarrow", TDEIcon::Toolbar)); groupComboBox->insertStringList(SpecialInformation::groups()); - connect(groupComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int))); - connect(widgetComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(groupChanged(int))); - connect(functionListBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(functionChanged(int))); - connect(copyButton, TQT_SIGNAL(clicked()), TQT_SLOT(copyText())); - connect(clearButton, TQT_SIGNAL(clicked()), insertedText, TQT_SLOT(clear())); + connect(groupComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(groupChanged(int))); + connect(widgetComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(groupChanged(int))); + connect(functionListBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(functionChanged(int))); + connect(copyButton, TQ_SIGNAL(clicked()), TQ_SLOT(copyText())); + connect(clearButton, TQ_SIGNAL(clicked()), insertedText, TQ_SLOT(clear())); // build widget name list for (TQDictIterator<TQWidget> It(m_widgetList); It.current(); ++It) diff --git a/kommander/editor/functionsimpl.h b/kommander/editor/functionsimpl.h index 525a5081..e59ec6c2 100644 --- a/kommander/editor/functionsimpl.h +++ b/kommander/editor/functionsimpl.h @@ -25,7 +25,7 @@ class FunctionsDialog : public FunctionsDialogBase { - Q_OBJECT + TQ_OBJECT public: FunctionsDialog(TQWidget*, const TQDict<TQWidget>&, bool m_useInternalParser, char* = 0, bool = true); diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp index 116b75a5..b6113d37 100644 --- a/kommander/editor/hierarchyview.cpp +++ b/kommander/editor/hierarchyview.cpp @@ -193,18 +193,18 @@ HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) ); (void)*selectedBack; // hack setPalette( p ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); if ( doConnects ) { - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( objectClicked( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), - this, TQT_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( objectClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ), + this, TQ_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) ); } deselect = true; setColumnWidthMode( 1, Manual ); @@ -250,7 +250,7 @@ void HierarchyList::objectClicked( TQListViewItem *i ) if ( formWindow == w ) { if ( deselect ) formWindow->clearSelection( false ); - formWindow->emitShowProperties( TQT_TQOBJECT(formWindow) ); + formWindow->emitShowProperties( formWindow ); return; } @@ -264,7 +264,7 @@ void HierarchyList::objectClicked( TQListViewItem *i ) else ( (QDesignerWizard*)w->parent()->parent() )->setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) ); w = (TQWidget*)w->parent()->parent(); - formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) ); + formWindow->emitUpdateProperties( formWindow->currentWidget() ); } else { return; } @@ -273,7 +273,7 @@ void HierarchyList::objectClicked( TQListViewItem *i ) if ( deselect ) formWindow->clearSelection( false ); if ( w->isVisibleTo( formWindow ) ) - formWindow->selectWidget( TQT_TQOBJECT(w), true ); + formWindow->selectWidget( w, true ); } TQWidget *HierarchyList::findWidget( TQListViewItem *i ) @@ -345,7 +345,7 @@ void HierarchyList::setup() } #endif if ( w ) - insertObject( TQT_TQOBJECT(w), 0 ); + insertObject( w, 0 ); } void HierarchyList::setOpen( TQListViewItem *i, bool b ) @@ -357,7 +357,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) { bool fakeMainWindow = false; if ( o && o->inherits( "TQMainWindow" ) ) { - TQObject *cw = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + TQObject *cw = ( (TQMainWindow*)o )->centralWidget(); if ( cw ) { o = cw; fakeMainWindow = true; @@ -397,7 +397,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) TQToolBox *tb; if ( o->parent() && o->parent()->parent() && - (tb = ::tqqt_cast<TQToolBox*>(o->parent()->parent()->parent())) ) + (tb = ::tqt_cast<TQToolBox*>(o->parent()->parent()->parent())) ) name = tb->itemLabel( tb->indexOf((TQWidget*)o) ); @@ -449,12 +449,12 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent ) insertObject( obj, item ); } delete l2; - } else if ( ::tqqt_cast<TQToolBox*>(it.current()->parent()) ) { - if ( !::tqqt_cast<TQScrollView*>(it.current()) ) + } else if ( ::tqt_cast<TQToolBox*>(it.current()->parent()) ) { + if ( !::tqt_cast<TQScrollView*>(it.current()) ) continue; TQToolBox *tb = (TQToolBox*)it.current()->parent(); for ( int i = tb->count() - 1; i >= 0; --i ) - insertObject( TQT_TQOBJECT(tb->item( i )), item ); + insertObject( tb->item( i ), item ); } continue; } @@ -502,8 +502,8 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p ) } else { if ( !tabWidgetMenu ) tabWidgetMenu = - formWindow->mainWindow()->setupTabWidgetHierarchyMenu( this, TQT_SLOT( addTabPage() ), - TQT_SLOT( removeTabPage() ) ); + formWindow->mainWindow()->setupTabWidgetHierarchyMenu( this, TQ_SLOT( addTabPage() ), + TQ_SLOT( removeTabPage() ) ); tabWidgetMenu->popup( p ); } } diff --git a/kommander/editor/hierarchyview.h b/kommander/editor/hierarchyview.h index 78fbe292..1ae2b866 100644 --- a/kommander/editor/hierarchyview.h +++ b/kommander/editor/hierarchyview.h @@ -79,7 +79,7 @@ private: class HierarchyList:public TQListView { - Q_OBJECT + TQ_OBJECT public: HierarchyList(TQWidget * parent, FormWindow * fw, bool doConnects = TRUE); @@ -123,7 +123,7 @@ protected: class HierarchyView : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/iconvieweditorimpl.cpp b/kommander/editor/iconvieweditorimpl.cpp index 2fe8eed4..97c7514a 100644 --- a/kommander/editor/iconvieweditorimpl.cpp +++ b/kommander/editor/iconvieweditorimpl.cpp @@ -34,7 +34,7 @@ IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : IconViewEditorBase( parent, 0, true ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); iconview = (TQIconView*)editWidget; itemText->setText( "" ); diff --git a/kommander/editor/iconvieweditorimpl.h b/kommander/editor/iconvieweditorimpl.h index b25c59cc..d1fc8ec9 100644 --- a/kommander/editor/iconvieweditorimpl.h +++ b/kommander/editor/iconvieweditorimpl.h @@ -27,7 +27,7 @@ class FormWindow; class IconViewEditor : public IconViewEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp index 026b39f4..84e4dabb 100644 --- a/kommander/editor/layout.cpp +++ b/kommander/editor/layout.cpp @@ -116,7 +116,7 @@ void Layout::setup() // we leave here. if ( !lastList || ( lastList->count() < 2 && ( !layoutBase || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) && + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ) ) ) ) { widgets.clear(); @@ -134,8 +134,8 @@ void Layout::setup() // widgets to get informed if one gets deleted to be able to // handle that and do not crash in this case for ( w = widgets.first(); w; w = widgets.next() ) { - connect( w, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ), TQMIN( startPoint.y(), w->y() ) ); geometries.insert( w, TQRect( w->pos(), w->size() ) ); @@ -187,7 +187,7 @@ void Layout::finishLayout( bool needMove, TQLayout *layout ) layoutBase->show(); layout->activate(); formWindow->insertWidget( layoutBase ); - formWindow->selectWidget( TQT_TQOBJECT(layoutBase) ); + formWindow->selectWidget( layoutBase ); TQString n = layoutBase->name(); if ( n.find( "qt_dead_widget_" ) != -1 ) { n.remove( 0, TQString( "qt_dead_widget_" ).length() ); @@ -206,7 +206,7 @@ void Layout::undoLayout() it.key()->reparent( WidgetFactory::containerOfWidget( parent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) ); it.key()->resize( ( *it ).size() ); } - formWindow->selectWidget( TQT_TQOBJECT(layoutBase), false ); + formWindow->selectWidget( layoutBase, false ); WidgetFactory::deleteLayout( layoutBase ); if ( parent != layoutBase && !layoutBase->inherits( "TQMainWindow" ) ) { layoutBase->hide(); @@ -217,9 +217,9 @@ void Layout::undoLayout() layoutBase->setGeometry( oldGeometry ); } if ( widgets.first() ) - formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); + formWindow->selectWidget( widgets.first() ); else - formWindow->selectWidget( TQT_TQOBJECT(formWindow) ); + formWindow->selectWidget( formWindow ); } void Layout::breakLayout() @@ -233,7 +233,7 @@ void Layout::breakLayout() WidgetFactory::deleteLayout( layoutBase ); bool needReparent = qstrcmp( layoutBase->className(), "TQLayoutWidget" ) == 0 || qstrcmp( layoutBase->className(), "TQSplitter" ) == 0 || - ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) && + ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) && layoutBase != formWindow->mainContainer() ); bool needResize = qstrcmp( layoutBase->className(), "TQSplitter" ) == 0; bool add = geometries.isEmpty(); @@ -259,9 +259,9 @@ void Layout::breakLayout() parent = layoutBase; } if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) ) - formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) ); + formWindow->selectWidget( widgets.first() ); else - formWindow->selectWidget( TQT_TQOBJECT(formWindow) ); + formWindow->selectWidget( formWindow ); } class HorizontalLayoutList : public TQWidgetList @@ -306,7 +306,7 @@ void HorizontalLayout::doLayout() TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && w->parent() != layoutBase ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) @@ -320,7 +320,7 @@ void HorizontalLayout::doLayout() } if ( layoutBase->inherits( "TQSplitter" ) ) - ( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal ); + ( (TQSplitter*)layoutBase )->setOrientation( TQt::Horizontal ); finishLayout( needMove, layout ); } @@ -370,7 +370,7 @@ void VerticalLayout::doLayout() TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox ); for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) { - if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && w->parent() != layoutBase ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( !useSplitter ) { if ( qstrcmp( w->className(), "Spacer" ) == 0 ) @@ -384,7 +384,7 @@ void VerticalLayout::doLayout() } if ( layoutBase->inherits( "TQSplitter" ) ) - ( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical ); + ( (TQSplitter*)layoutBase )->setOrientation( TQt::Vertical ); finishLayout( needMove, layout ); } @@ -742,7 +742,7 @@ void GridLayout::doLayout() int r, c, rs, cs; for ( w = widgets.first(); w; w = widgets.next() ) { if ( grid->locateWidget( w, r, c, rs, cs) ) { - if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) ) + if ( needReparent && w->parent() != layoutBase ) w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false ); if ( rs * cs == 1 ) { layout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->alignment() : 0 ); @@ -803,7 +803,7 @@ void GridLayout::buildGrid() Spacer::Spacer( TQWidget *parent, const char *name ) : TQWidget( parent, name, WMouseNoMask ), - orient(Qt::Vertical ), interactive(true), sh( TQSize(20,20) ) + orient(TQt::Vertical ), interactive(true), sh( TQSize(20,20) ) { setSizeType( Expanding ); setAutoMask( true ); @@ -814,7 +814,7 @@ void Spacer::paintEvent( TQPaintEvent * ) TQPainter p( this ); p.setPen( TQt::blue ); - if ( orient ==Qt::Horizontal ) { + if ( orient ==TQt::Horizontal ) { const int dist = 3; const int amplitude = TQMIN( 3, height() / 3 ); const int base = height() / 2; @@ -853,7 +853,7 @@ void Spacer::resizeEvent( TQResizeEvent* e) void Spacer::updateMask() { TQRegion r( rect() ); - if ( orient ==Qt::Horizontal ) { + if ( orient ==TQt::Horizontal ) { const int amplitude = TQMIN( 3, height() / 3 ); const int base = height() / 2; r = r.subtract( TQRect(1, 0, width() - 2, base - amplitude ) ); @@ -870,7 +870,7 @@ void Spacer::updateMask() void Spacer::setSizeType( SizeType t ) { TQSizePolicy sizeP; - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t ); else sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum ); @@ -880,14 +880,14 @@ void Spacer::setSizeType( SizeType t ) Spacer::SizeType Spacer::sizeType() const { - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) return (SizeType)sizePolicy().verData(); return (SizeType)sizePolicy().horData(); } int Spacer::alignment() const { - if ( orient ==Qt::Vertical ) + if ( orient ==TQt::Vertical ) return AlignHCenter; return AlignVCenter; } @@ -901,7 +901,7 @@ TQSize Spacer::sizeHint() const { TQSize s = sh.expandedTo( TQSize(0,0) ); if ( sizeType() == Expanding ) - if ( orient ==Qt::Horizontal ) + if ( orient ==TQt::Horizontal ) s.rheight() = 0; else s.rwidth() = 0; @@ -917,12 +917,12 @@ void Spacer::setSizeHint( const TQSize &s ) updateGeometry(); } -Qt::Orientation Spacer::orientation() const +TQt::Orientation Spacer::orientation() const { return orient; } -void Spacer::setOrientation( Qt::Orientation o ) +void Spacer::setOrientation( TQt::Orientation o ) { if ( orient == o ) return; diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h index ee266127..a630b601 100644 --- a/kommander/editor/layout.h +++ b/kommander/editor/layout.h @@ -33,7 +33,7 @@ class TQPaintEvent; class Layout : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -111,7 +111,7 @@ protected: class Spacer : public TQWidget { - Q_OBJECT + TQ_OBJECT TQ_OVERRIDE( TQCString name ) @@ -156,7 +156,7 @@ protected: class QDesignerGridLayout : public TQGridLayout { - Q_OBJECT + TQ_OBJECT public: QDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){}; diff --git a/kommander/editor/listboxeditorimpl.cpp b/kommander/editor/listboxeditorimpl.cpp index 047bc4f8..32c94d95 100644 --- a/kommander/editor/listboxeditorimpl.cpp +++ b/kommander/editor/listboxeditorimpl.cpp @@ -35,7 +35,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : ListBoxEditorBase( parent, 0, true ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); listbox = (TQListBox*)editWidget; itemText->setText( "" ); diff --git a/kommander/editor/listboxeditorimpl.h b/kommander/editor/listboxeditorimpl.h index ec2376c0..677165ad 100644 --- a/kommander/editor/listboxeditorimpl.h +++ b/kommander/editor/listboxeditorimpl.h @@ -28,7 +28,7 @@ class FormWindow; class ListBoxEditor : public ListBoxEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/listeditor.ui b/kommander/editor/listeditor.ui index fd37c1f8..636cfb86 100644 --- a/kommander/editor/listeditor.ui +++ b/kommander/editor/listeditor.ui @@ -133,7 +133,7 @@ <forwards> <forward>class TQStringList;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>setList( const TQStringList & l )</slot> <slot>addItem()</slot> @@ -141,7 +141,7 @@ <slot>removeItems()</slot> <slot returnType="TQStringList">items()</slot> <slot>renameItem()</slot> -</Q_SLOTS> +</slots> <pixmapinproject/> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/listvieweditorimpl.cpp b/kommander/editor/listvieweditorimpl.cpp index 83422997..8021d242 100644 --- a/kommander/editor/listvieweditorimpl.cpp +++ b/kommander/editor/listvieweditorimpl.cpp @@ -40,7 +40,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw ) : ListViewEditorBase( parent, 0, true ), listview( lv ), formwindow( fw ) { - connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); itemText->setEnabled( false ); itemChoosePixmap->setEnabled( false ); itemDeletePixmap->setEnabled( false ); diff --git a/kommander/editor/listvieweditorimpl.h b/kommander/editor/listvieweditorimpl.h index 15aecaf8..a64e7883 100644 --- a/kommander/editor/listvieweditorimpl.h +++ b/kommander/editor/listvieweditorimpl.h @@ -31,7 +31,7 @@ class FormWindow; class ListViewEditor : public ListViewEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp index 3fde775c..fd5059ec 100644 --- a/kommander/editor/mainwindow.cpp +++ b/kommander/editor/mainwindow.cpp @@ -129,7 +129,7 @@ MainWindow::MainWindow(bool asClient) docPath(TQTDOCDIR), client(asClient), databaseAutoEdit(false), previewing(false) { m_partManager = new KParts::PartManager(this); - //connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )), this, TQT_SLOT(slotActivePartChanged(KParts::Part * ))); + //connect(m_partManager, TQ_SIGNAL(activePartChanged(KParts::Part * )), this, TQ_SLOT(slotActivePartChanged(KParts::Part * ))); init_colors(); inDebugMode = true; //debugging kommander @@ -177,7 +177,7 @@ MainWindow::MainWindow(bool asClient) as -= TQSize(30, 30); resize(TQSize(1200, 1000).boundedTo(as)); - connect(kapp->clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); + connect(kapp->clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged())); clipboardChanged(); layoutChilds = false; layoutSelected = false; @@ -199,12 +199,12 @@ MainWindow::MainWindow(bool asClient) w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this, 0, false); delete w; - assistant = new AssistProc(TQT_TQOBJECT(this), "Internal Assistant", assistantPath()); + assistant = new AssistProc(this, "Internal Assistant", assistantPath()); statusBar()->setSizeGripEnabled(true); SpecialInformation::registerSpecials(); backupTimer = new TQTimer(this); - connect(backupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCreateBackups())); + connect(backupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCreateBackups())); backupTimer->start(1000*60*5); //fire it every five minutes //createGUI(0); @@ -235,8 +235,8 @@ void MainWindow::setupMDI() PixmapChooser::NoSize)); qworkspace->setPaletteBackgroundColor(TQColor(238, 238, 238)); qworkspace->setScrollBarsEnabled(true); - connect(qworkspace, TQT_SIGNAL(windowActivated(TQWidget *)), - this, TQT_SLOT(activeWindowChanged(TQWidget *))); + connect(qworkspace, TQ_SIGNAL(windowActivated(TQWidget *)), + this, TQ_SLOT(activeWindowChanged(TQWidget *))); lastActiveFormWindow = 0; qworkspace->setAcceptDrops(true); } @@ -294,7 +294,7 @@ void MainWindow::setupWorkspace() QCompletionEdit *edit = new QCompletionEdit(vbox); TQToolTip::add(edit, i18n("Start typing the buffer you want to switch to here (ALT+B)")); TQAccel *a = new TQAccel(this); - a->connectItem(a->insertItem(ALT + Key_B), edit, TQT_SLOT(setFocus())); + a->connectItem(a->insertItem(ALT + Key_B), edit, TQ_SLOT(setFocus())); wspace = new Workspace(vbox, this); wspace->setBufferEdit(edit); dw->setWidget(vbox); @@ -425,7 +425,7 @@ void MainWindow::runForm() while ((editor = it.current()) != 0L) { ++it; - static_cast<AssocTextEditor*>(TQT_TQWIDGET(editor))->save(); + static_cast<AssocTextEditor*>(editor)->save(); } delete editors; @@ -460,75 +460,11 @@ void MainWindow::runForm() TDEProcess* process = new TDEProcess; process->setUseShell(true); (*process) << "kmdr-executor" << TQString("\"%1\"").arg(form->formFile()->fileName()); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStdout(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(closeRunningForm(TDEProcess*))); - messageLog->clear(MessageLog::All); - previewing = process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); - } -} - - -void MainWindow::runForm4() -{ - if (previewing) - { - KMessageBox::information(this, i18n("There is a dialog already running."), i18n("Run")); - return; - } - FormWindow* form = activeForm(); - if (!form || !form->formFile()) - return; - - TQObjectList *editors = queryList("AssocTextEditor"); - TQObjectListIt it(*editors); - TQObject *editor; - - while ((editor = it.current()) != 0L) - { - ++it; - static_cast<AssocTextEditor*>(TQT_TQWIDGET(editor))->save(); - } - delete editors; - - if (form->formFile()->hasTempFileName()) - { - if (!form->formFile()->saveAs()) - return; - } - - m_fileName = form->formFile()->fileName(); - m_backupName = m_fileName + ".running"; - m_modified = form->formFile()->isModified(); - - bool readOnlyFile = !TQFileInfo(m_fileName).isWritable(); - struct stat statbuf; - ::stat(m_fileName.local8Bit(), &statbuf); - if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true)) - { - KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(m_backupName)); - return; - } - form->formFile()->setFileName(m_fileName); - if (!readOnlyFile || m_modified) - form->formFile()->setModified(true); - if (form->formFile()->save(false)) - { - if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true)) - { - KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup")); - } - ::chmod(m_fileName.local8Bit(), S_IRWXU); - TDEProcess* process = new TDEProcess; - process->setUseShell(true); - (*process) << "kommander" << TQString("\"%1\"").arg(form->formFile()->fileName()); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStdout(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog, - TQT_SLOT(receivedStderr(TDEProcess*, char*, int))); - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(closeRunningForm(TDEProcess*))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog, + TQ_SLOT(receivedStdout(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog, + TQ_SLOT(receivedStderr(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(closeRunningForm(TDEProcess*))); messageLog->clear(MessageLog::All); previewing = process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } @@ -562,9 +498,9 @@ void MainWindow::showProperties(TQObject *o) } TQWidget *w = (TQWidget*)o; setupHierarchyView(); - FormWindow *fw = (FormWindow*)isAFormWindowChild(TQT_TQOBJECT(w)); + FormWindow *fw = (FormWindow*)isAFormWindowChild(w); if (fw) { - propertyEditor->setWidget(TQT_TQOBJECT(w), fw); + propertyEditor->setWidget(w, fw); hierarchyView->setFormWindow(fw, w); } else { propertyEditor->setWidget(0, 0); @@ -625,7 +561,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) } break; case TQEvent::MouseButtonPress: - if (((TQMouseEvent*)e)->button() == Qt::MidButton && dynamic_cast<KommanderWidget *>(o)) + if (((TQMouseEvent*)e)->button() == TQt::MidButton && dynamic_cast<KommanderWidget *>(o)) { AssocTextEditor *editor = new AssocTextEditor((TQWidget*)o, formWindow(), propertyEditor, m_partManager, this, "AssocTextEditor", false); //deletes itself! @@ -646,7 +582,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) TQWidget *pw = w->parentWidget(); while (pw) { if (pw->inherits("FormWindow")) { - ((FormWindow*)pw)->emitShowProperties(TQT_TQOBJECT(w)); + ((FormWindow*)pw)->emitShowProperties(w); if (!o->inherits("QDesignerToolBar")) return !o->inherits("TQToolButton") && !o->inherits("TQMenuBar") && !o->inherits("TQComboBox") && !o->inherits("QDesignerToolBarSeparator"); @@ -677,7 +613,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) } lastPressWidget = (TQWidget*)o; if (passiveInteractor) - TQTimer::singleShot(0, formWindow(), TQT_SLOT(visibilityChanged())); + TQTimer::singleShot(0, formWindow(), TQ_SLOT(visibilityChanged())); if (currentTool() == CONNECT_TOOL) return true; return !passiveInteractor; @@ -693,7 +629,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) ((FormWindow*)w)->handleMouseRelease((TQMouseEvent*)e, ((FormWindow*)w)->designerWidget(o)); if (passiveInteractor) { selectionChanged(); - TQTimer::singleShot(0, formWindow(), TQT_SLOT(visibilityChanged())); + TQTimer::singleShot(0, formWindow(), TQ_SLOT(visibilityChanged())); } return !passiveInteractor; case TQEvent::MouseMove: @@ -748,8 +684,8 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Hide: if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) break; - if (((FormWindow*)w)->isWidgetSelected(TQT_TQOBJECT(o))) - ((FormWindow*)w)->selectWidget(TQT_TQOBJECT(o), false); + if (((FormWindow*)w)->isWidgetSelected(o)) + ((FormWindow*)w)->selectWidget(o, false); break; case TQEvent::Enter: case TQEvent::Leave: @@ -769,25 +705,25 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Close: break; case TQEvent::DragEnter: - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) { + if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) { workspace()->contentsDragEnterEvent((TQDragEnterEvent*)e); return true; } break; case TQEvent::DragMove: - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) { + if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) { workspace()->contentsDragMoveEvent((TQDragMoveEvent*)e); return true; } break; case TQEvent::Drop: - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) { + if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) { workspace()->contentsDropEvent((TQDropEvent*)e); return true; } break; case TQEvent::Show: - if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this)) + if (o != this) break; if (((TQShowEvent*)e)->spontaneous()) break; @@ -867,16 +803,16 @@ void MainWindow::insertFormWindow(FormWindow *fw) "<p>You can have several forms open, and all open forms are listed " "in the <b>Form List</b>.")); - connect(fw, TQT_SIGNAL(showProperties(TQObject *)), - this, TQT_SLOT(showProperties(TQObject *))); - connect(fw, TQT_SIGNAL(updateProperties(TQObject *)), - this, TQT_SLOT(updateProperties(TQObject *))); - connect(this, TQT_SIGNAL(currentToolChanged()), - fw, TQT_SLOT(currentToolChanged())); - connect(fw, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(selectionChanged())); - connect(fw, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), - this, TQT_SLOT(updateUndoRedo(bool, bool, const TQString &, const TQString &))); + connect(fw, TQ_SIGNAL(showProperties(TQObject *)), + this, TQ_SLOT(showProperties(TQObject *))); + connect(fw, TQ_SIGNAL(updateProperties(TQObject *)), + this, TQ_SLOT(updateProperties(TQObject *))); + connect(this, TQ_SIGNAL(currentToolChanged()), + fw, TQ_SLOT(currentToolChanged())); + connect(fw, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(selectionChanged())); + connect(fw, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)), + this, TQ_SLOT(updateUndoRedo(bool, bool, const TQString &, const TQString &))); fw->show(); fw->currentToolChanged(); @@ -885,7 +821,7 @@ void MainWindow::insertFormWindow(FormWindow *fw) fw->mainContainer()->setCaption(fw->caption()); WidgetFactory::saveDefaultProperties(fw->mainContainer(), WidgetDatabase:: - idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(fw->mainContainer())))); + idFromClassName(WidgetFactory::classNameOf(fw->mainContainer()))); activeWindowChanged(fw); emit formWindowsChanged(); } @@ -1096,7 +1032,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString, ids << (id = rmbWidgets->insertItem(i18n("Add Page"), -1, 0)); commands.insert("add", id); } - if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) + if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) { if (ids.isEmpty()) ids << rmbWidgets->insertSeparator(0); @@ -1162,48 +1098,48 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg } if (ok) { TQString pn(i18n("Set the 'text' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "text", w->property("text"), text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "text", true); + MetaDataBase::setPropertyChanged(w, "text", true); } } else if (id == props[ "title" ]) { bool ok = false; TQString title = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this); if (ok) { TQString pn(i18n("Set the 'title' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "title", w->property("title"), title, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "title", true); + MetaDataBase::setPropertyChanged(w, "title", true); } } else if (id == props[ "pagetitle" ]) { bool ok = false; TQString text = KInputDialog::getText(i18n("Page Title"), i18n("New page title:"), w->property("pageTitle").toString(), &ok, this); if (ok) { TQString pn(i18n("Set the 'pageTitle' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "pageTitle", w->property("pageTitle"), text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "pageTitle", true); + MetaDataBase::setPropertyChanged(w, "pageTitle", true); } } else if (id == props[ "pixmap" ]) { TQPixmap oldPix = TQVariant(w->property("pixmap")).toPixmap(); TQPixmap pix = qChoosePixmap(this, formWindow(), oldPix); if (!pix.isNull()) { TQString pn(i18n("Set the 'pixmap' of '%1'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "pixmap", w->property("pixmap"), pix, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "pixmap", true); + MetaDataBase::setPropertyChanged(w, "pixmap", true); } } } @@ -1255,9 +1191,9 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands } } } - if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) { + if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) { if (id == commands[ "edit" ]) - WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow()); + WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)), this, w, formWindow()); } } @@ -1382,7 +1318,7 @@ void MainWindow::selectionChanged() breakLayout = laidout > 0; } else if (selectedWidgets == 1) { TQWidget *w = widgets.first(); - bool isContainer = WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w)))) || + bool isContainer = WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w))) || w == formWindow()->mainContainer(); actionEditAdjustSize->setEnabled(!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout); @@ -1392,7 +1328,7 @@ void MainWindow::selectionChanged() actionEditVLayout->setEnabled(false); actionEditGridLayout->setEnabled(false); if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { - actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w))); + actionEditBreakLayout->setEnabled(!isAToolBarChild(w)); breakLayout = true; } else { actionEditBreakLayout->setEnabled(false); @@ -1412,14 +1348,14 @@ void MainWindow::selectionChanged() layoutChilds = true; } if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) { - actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w))); + actionEditBreakLayout->setEnabled(!isAToolBarChild(w)); breakLayout = true; } } else { actionEditHLayout->setEnabled(false); actionEditVLayout->setEnabled(false); actionEditGridLayout->setEnabled(false); - actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w))); + actionEditBreakLayout->setEnabled(!isAToolBarChild(w)); breakLayout = true; } } @@ -1628,9 +1564,9 @@ ActionEditor *MainWindow::actioneditor() const bool MainWindow::openEditor(TQWidget* w, FormWindow*) { - if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) { + if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) { statusBar()->message(i18n("Edit %1...").arg(w->className())); - WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow()); + WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)), this, w, formWindow()); statusBar()->clear(); return true; } @@ -1648,12 +1584,12 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) } if (ok) { TQString pn(i18n("Set the 'text' of '%2'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "text", w->property("text"), text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "text", true); + MetaDataBase::setPropertyChanged(w, "text", true); } return true; } @@ -1663,12 +1599,12 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*) text = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this); if (ok) { TQString pn(i18n("Set the 'title' of '%2'").arg(w->name())); - SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor, + SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor, "title", w->property("title"), text, TQString(), TQString()); cmd->execute(); formWindow()->commandHistory()->addCommand(cmd); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "title", true); + MetaDataBase::setPropertyChanged(w, "title", true); } return true; } diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h index 69f06c5f..1136faa2 100644 --- a/kommander/editor/mainwindow.h +++ b/kommander/editor/mainwindow.h @@ -67,7 +67,7 @@ namespace KParts { class MainWindow : public KParts::DockMainWindow { - Q_OBJECT + TQ_OBJECT public: @@ -192,7 +192,6 @@ public slots: void configureEditor(); void runForm(); - void runForm4(); private slots: void activeWindowChanged( TQWidget *w ); diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp index dd760f81..d10c0c2f 100644 --- a/kommander/editor/mainwindowactions.cpp +++ b/kommander/editor/mainwindowactions.cpp @@ -92,77 +92,77 @@ int forms = 0; void MainWindow::setupEditActions() { - actionEditUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(editUndo()), actionCollection()); + actionEditUndo = KStdAction::undo(this, TQ_SLOT(editUndo()), actionCollection()); actionEditUndo->setText(i18n("&Undo: Not Available")); actionEditUndo->setToolTip(i18n("Undoes the last action")); actionEditUndo->setWhatsThis(whatsThisFrom("Edit|Undo")); actionEditUndo->setEnabled(false); - actionEditRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(editRedo()), actionCollection()); + actionEditRedo = KStdAction::redo(this, TQ_SLOT(editRedo()), actionCollection()); actionEditRedo->setText(i18n("&Redo: Not Available")); actionEditRedo->setToolTip(i18n("Redoes the last undone operation")); actionEditRedo->setWhatsThis(whatsThisFrom("Edit|Redo")); actionEditRedo->setEnabled(false); - actionEditCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(editCut()), actionCollection()); + actionEditCut = KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection()); actionEditCut->setToolTip(i18n("Cuts the selected widgets and puts them on the clipboard")); actionEditCut->setWhatsThis(whatsThisFrom("Edit|Cut")); actionEditCut->setEnabled(false); - actionEditCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(editCopy()), actionCollection()); + actionEditCopy = KStdAction::copy(this, TQ_SLOT(editCopy()), actionCollection()); actionEditCopy->setToolTip(i18n("Copies the selected widgets to the clipboard")); actionEditCopy->setWhatsThis(whatsThisFrom("Edit|Copy")); actionEditCopy->setEnabled(false); - actionEditPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(editPaste()), actionCollection()); + actionEditPaste = KStdAction::paste(this, TQ_SLOT(editPaste()), actionCollection()); actionEditPaste->setToolTip(i18n("Pastes the clipboard's contents")); actionEditPaste->setWhatsThis(whatsThisFrom("Edit|Paste")); actionEditPaste->setEnabled(false); - actionEditDelete = new TDEAction(i18n("Delete"), Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(editDelete()), + actionEditDelete = new TDEAction(i18n("Delete"), Key_Delete, this, TQ_SLOT(editDelete()), actionCollection(), "edit_delete"); actionEditDelete->setToolTip(i18n("Deletes the selected widgets")); actionEditDelete->setWhatsThis(whatsThisFrom("Edit|Delete")); actionEditDelete->setEnabled(false); - actionEditSelectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(editSelectAll()), actionCollection()); + actionEditSelectAll = KStdAction::selectAll(this, TQ_SLOT(editSelectAll()), actionCollection()); actionEditSelectAll->setToolTip(i18n("Selects all widgets")); actionEditSelectAll->setWhatsThis(whatsThisFrom("Edit|Select All")); actionEditRaise = new TDEAction(i18n("Bring to Front"), createIconSet("editraise.xpm"), - TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editRaise()), actionCollection(), "edit_raise"); + TDEShortcut::null(), this, TQ_SLOT(editRaise()), actionCollection(), "edit_raise"); actionEditRaise->setToolTip(i18n("Raises the selected widgets")); actionEditRaise->setEnabled(false); actionEditLower = new TDEAction(i18n("Send to Back"), createIconSet("editlower.xpm"), - TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLower()), actionCollection(), "edit_lower"); + TDEShortcut::null(), this, TQ_SLOT(editLower()), actionCollection(), "edit_lower"); actionEditLower->setToolTip(i18n("Lowers the selected widgets")); actionEditLower->setWhatsThis(i18n("Lowers the selected widgets")); actionEditLower->setEnabled(false); - actionEditFindGlobal = new TDEAction(i18n("Find in Form..."), CTRL + ALT + Key_F, TQT_TQOBJECT(this), TQT_SLOT(editFindGlobal()), actionCollection(), "edit_find_global"); + actionEditFindGlobal = new TDEAction(i18n("Find in Form..."), CTRL + ALT + Key_F, this, TQ_SLOT(editFindGlobal()), actionCollection(), "edit_find_global"); actionEditFindGlobal->setToolTip(i18n("Search for a text in the whole form.")); actionEditFindGlobal->setWhatsThis(whatsThisFrom("Edit|Find in Form")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditFindGlobal, TQ_SLOT(setEnabled(bool))); - actionEditAccels = new TDEAction(i18n("Check Accelerators"), ALT + Key_R, TQT_TQOBJECT(this), TQT_SLOT(editAccels()), + actionEditAccels = new TDEAction(i18n("Check Accelerators"), ALT + Key_R, this, TQ_SLOT(editAccels()), actionCollection(), "edit_check_accel"); actionEditAccels->setToolTip(i18n("Checks if the accelerators used in the form are unique")); actionEditAccels->setWhatsThis(whatsThisFrom("Edit|Check Accelerator")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditAccels, TQ_SLOT(setEnabled(bool))); actionEditConnections = new TDEAction(i18n("Connections"), createIconSet("connecttool.xpm"), - TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editConnections()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editConnections()), actionCollection(), "edit_connections"); actionEditConnections->setToolTip(i18n("Opens a dialog for editing connections")); actionEditConnections->setWhatsThis(whatsThisFrom("Edit|Connections")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditConnections, TQ_SLOT(setEnabled(bool))); actionEditFormSettings = new TDEAction(i18n("Form Settings..."), TDEShortcut::null(), - TQT_TQOBJECT(this), TQT_SLOT(editFormSettings()), actionCollection(), "edit_form"); + this, TQ_SLOT(editFormSettings()), actionCollection(), "edit_form"); actionEditFormSettings->setToolTip(i18n("Opens a dialog to change the form's settings")); actionEditFormSettings->setWhatsThis(whatsThisFrom("Edit|Form Settings")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), actionEditFormSettings, TQ_SLOT(setEnabled(bool))); TDEToolBar *tb = new TDEToolBar(this, "Edit"); tb->setFullSize(false); @@ -198,50 +198,50 @@ void MainWindow::setupEditActions() void MainWindow::setupLayoutActions() { actionEditAdjustSize = new TDEAction(i18n("Adjust Size"), createIconSet("adjustsize.xpm"), - CTRL + Key_J, TQT_TQOBJECT(this), TQT_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size"); + CTRL + Key_J, this, TQ_SLOT(editAdjustSize()), actionCollection(), "edit_adjust_size"); actionEditAdjustSize->setToolTip(i18n("Adjusts the size of the selected widget")); actionEditAdjustSize->setWhatsThis(whatsThisFrom("Layout|Adjust Size")); actionEditAdjustSize->setEnabled(false); actionEditHLayout = new TDEAction(i18n("Lay Out Horizontally"), createIconSet("edithlayout.xpm"), - CTRL + Key_H, TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h"); + CTRL + Key_H, this, TQ_SLOT(editLayoutHorizontal()), actionCollection(), "edit_layout_h"); actionEditHLayout->setToolTip(i18n("Lays out the selected widgets horizontally")); actionEditHLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally")); actionEditHLayout->setEnabled(false); actionEditVLayout = new TDEAction(i18n("Lay Out Vertically"), createIconSet("editvlayout.xpm"), - CTRL + Key_L, TQT_TQOBJECT(this), TQT_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v"); + CTRL + Key_L, this, TQ_SLOT(editLayoutVertical()), actionCollection(), "edit_layout_v"); actionEditVLayout->setToolTip(i18n("Lays out the selected widgets vertically")); actionEditVLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically")); actionEditVLayout->setEnabled(false); actionEditGridLayout = new TDEAction(i18n("Lay Out in a Grid"), createIconSet("editgrid.xpm"), - CTRL + Key_G, TQT_TQOBJECT(this), TQT_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid"); + CTRL + Key_G, this, TQ_SLOT(editLayoutGrid()), actionCollection(), "edit_layout_grid"); actionEditGridLayout->setToolTip(i18n("Lays out the selected widgets in a grid")); actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid")); actionEditGridLayout->setEnabled(false); actionEditSplitHorizontal = new TDEAction(i18n("Lay Out Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"), - TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editLayoutHorizontalSplit()), actionCollection(), "edit_split_h"); actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter")); actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay Out Horizontally in Splitter")); actionEditSplitHorizontal->setEnabled(false); actionEditSplitVertical = new TDEAction(i18n("Lay Out Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"), - TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutVerticalSplit()), actionCollection(), + TDEShortcut::null(), this, TQ_SLOT(editLayoutVerticalSplit()), actionCollection(), "edit_split_v"); actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter")); actionEditSplitVertical->setWhatsThis(whatsThisFrom("Layout|Lay Out Vertically (in Splitter)")); actionEditSplitVertical->setEnabled(false); actionEditBreakLayout = new TDEAction(i18n("Break Layout"), createIconSet("editbreaklayout.xpm"), - CTRL + Key_B, TQT_TQOBJECT(this), TQT_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout"); + CTRL + Key_B, this, TQ_SLOT(editBreakLayout()), actionCollection(), "edit_break_layout"); actionEditBreakLayout->setToolTip(i18n("Breaks the selected layout")); actionEditBreakLayout->setWhatsThis(whatsThisFrom("Layout|Break Layout")); int id = WidgetDatabase::idFromClassName("Spacer"); - TDEToggleAction *a = new TDEToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), + TDEToggleAction *a = new TDEToggleAction(i18n("Spacer"), createIconSet("spacer.xpm"), TDEShortcut::null(), this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(id).latin1()); a->setExclusiveGroup("tool"); a->setText(i18n("Add ") + WidgetDatabase::className(id)); @@ -280,21 +280,21 @@ void MainWindow::setupLayoutActions() void MainWindow::setupToolActions() { actionPointerTool = new TDEToggleAction(i18n("Pointer"), "arrow", Key_F2, - TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(), + this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(POINTER_TOOL).latin1()); actionPointerTool->setToolTip(i18n("Selects the pointer tool")); actionPointerTool->setWhatsThis(whatsThisFrom("Tools|Pointer")); actionPointerTool->setExclusiveGroup("tool"); actionConnectTool = new TDEToggleAction(i18n("Connect Signal/Slots"), createIconSet("connecttool.xpm"), - Key_F3, TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(), + Key_F3, this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(CONNECT_TOOL).latin1()); actionConnectTool->setToolTip(i18n("Selects the connection tool")); actionConnectTool->setWhatsThis(whatsThisFrom("Tools|Connect Signals and Slots")); actionConnectTool->setExclusiveGroup("tool"); actionOrderTool = new TDEToggleAction(i18n("Tab Order"), createIconSet("ordertool.xpm"), - Key_F4, TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(), + Key_F4, this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(ORDER_TOOL).latin1()); actionOrderTool->setToolTip(i18n("Selects the tab order tool")); actionOrderTool->setWhatsThis(whatsThisFrom("Tools|Tab Order")); @@ -344,7 +344,7 @@ void MainWindow::setupToolActions() if (WidgetDatabase::group(i) != grp) continue; // only widgets, i.e. not forms and temp stuff TDEToggleAction *a = new TDEToggleAction(WidgetDatabase::className(i), TDEShortcut::null(), - TQT_TQOBJECT(this), TQT_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1()); + this, TQ_SLOT(toolSelected()), actionCollection(), TQString::number(i).latin1()); a->setExclusiveGroup("tool"); TQString atext = WidgetDatabase::className(i); if (atext[0] == 'Q') @@ -390,7 +390,7 @@ void MainWindow::setupToolActions() continue; TQString name = fi->baseName(); name = name.replace("_", " "); - editMenu->insertItem(name, TQT_TQOBJECT(this), TQT_SLOT(editExternalTool(int)), 0, m_editorTools.count()); + editMenu->insertItem(name, this, TQ_SLOT(editExternalTool(int)), 0, m_editorTools.count()); m_editorTools.append(fi->filePath()); } } @@ -410,54 +410,54 @@ void MainWindow::setupFileActions() fileMenu = new TQPopupMenu(this, "File"); menuBar()->insertItem(i18n("&File"), fileMenu); - TDEAction *a = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); + TDEAction *a = KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); a->setToolTip(i18n("Creates a new dialog")); a->setWhatsThis(whatsThisFrom("File|New")); a->plug(fileTb); a->plug(fileMenu); - a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + a = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); a->setToolTip(i18n("Opens an existing dialog")); a->setWhatsThis(whatsThisFrom("File|Open")); a->plug(fileTb); a->plug(fileMenu); - actionRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(fileOpenRecent(const KURL&)), actionCollection()); + actionRecent = KStdAction::openRecent(this, TQ_SLOT(fileOpenRecent(const KURL&)), actionCollection()); actionRecent->setToolTip(i18n("Opens recently open file")); actionRecent->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(fileClose()), actionCollection()); + a = KStdAction::close(this, TQ_SLOT(fileClose()), actionCollection()); a->setToolTip(i18n("Closes the current dialog")); a->setWhatsThis(whatsThisFrom("File|Close")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); + a = KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); a->setToolTip(i18n("Saves the current dialog")); a->setWhatsThis(whatsThisFrom("File|Save")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileTb); a->plug(fileMenu); - a = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); + a = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); a->setToolTip(i18n("Saves the current dialog with a new filename")); a->setWhatsThis(whatsThisFrom("File|Save As")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); - a = new TDEAction(i18n("Save All"), "save_all", TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(fileSaveAll()), + a = new TDEAction(i18n("Save All"), "save_all", TDEShortcut::null(), this, TQ_SLOT(fileSaveAll()), actionCollection(), "file_close_all"); a->setToolTip(i18n("Saves all open dialogs")); a->setWhatsThis(whatsThisFrom("File|Save All")); - connect(this, TQT_SIGNAL(hasActiveWindow(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveWindow(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileMenu); fileMenu->insertSeparator(); - a = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection()); + a = KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection()); a->setToolTip(i18n("Quits the application and prompts to save any changed dialogs")); a->setWhatsThis(whatsThisFrom("File|Exit")); a->plug(fileMenu); @@ -470,20 +470,12 @@ void MainWindow::setupRunActions() menuBar()->insertItem(i18n("&Run"), menu); TDEAction* a = new TDEAction(i18n("Run Dialog"), "system-run", CTRL + Key_R, - TQT_TQOBJECT(this), TQT_SLOT(runForm()), actionCollection(), "run"); + this, TQ_SLOT(runForm()), actionCollection(), "run"); a->setToolTip(i18n("Executes dialog")); a->setWhatsThis(whatsThisFrom("Run|Run dialog")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), a, TQT_SLOT(setEnabled(bool))); + connect(this, TQ_SIGNAL(hasActiveForm(bool)), a, TQ_SLOT(setEnabled(bool))); a->plug(fileTb); a->plug(menu); - // add KDE4 executor - - TDEAction* b = new TDEAction(i18n("Run Dialog K4"), "launch", CTRL + SHIFT + TQt::Key_R, - TQT_TQOBJECT(this), TQT_SLOT(runForm4()), actionCollection(), "run4"); - b->setToolTip(i18n("Executes dialog in KDE4")); - b->setWhatsThis(whatsThisFrom("Run|Run dialog")); - connect(this, TQT_SIGNAL(hasActiveForm(bool)), b, TQT_SLOT(setEnabled(bool))); - b->plug(menu); } void MainWindow::setupWindowActions() @@ -493,39 +485,39 @@ void MainWindow::setupWindowActions() { windowActionsSetup = true; - TDEAction* actionWindowTile = new TDEAction(i18n("Tile"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace), TQT_SLOT(tile()), + TDEAction* actionWindowTile = new TDEAction(i18n("Tile"), TDEShortcut::null(), qworkspace, TQ_SLOT(tile()), actionCollection(), "window_tile"); actionWindowTile->setToolTip(i18n("Tiles the windows so that they are all visible")); actionWindowTile->setWhatsThis(whatsThisFrom("Window|Tile")); - TDEAction* actionWindowCascade = new TDEAction(i18n("Cascade"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace), TQT_SLOT(cascade()), + TDEAction* actionWindowCascade = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQ_SLOT(cascade()), actionCollection(), "window_cascade"); actionWindowCascade->setToolTip(i18n("Cascades the windows so that all their title bars are visible")); actionWindowCascade->setWhatsThis(whatsThisFrom("Window|Cascade")); - TDEAction* actionWindowClose = new TDEAction(i18n("Cascade"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace), TQT_SLOT(closeActiveWindow()), + TDEAction* actionWindowClose = new TDEAction(i18n("Cascade"), TDEShortcut::null(), qworkspace, TQ_SLOT(closeActiveWindow()), actionCollection(), "window_close"); actionWindowClose->setToolTip(i18n("Closes the active window")); actionWindowClose->setWhatsThis(whatsThisFrom("Window|Close")); - TDEAction* actionWindowCloseAll = new TDEAction(i18n("Close All"), TDEShortcut::null(), TQT_TQOBJECT(qworkspace), - TQT_SLOT(closeAllWindows()), actionCollection(), "window_close_all"); + TDEAction* actionWindowCloseAll = new TDEAction(i18n("Close All"), TDEShortcut::null(), qworkspace, + TQ_SLOT(closeAllWindows()), actionCollection(), "window_close_all"); actionWindowCloseAll->setToolTip(i18n("Closes all form windows")); actionWindowCloseAll->setWhatsThis(whatsThisFrom("Window|Close All")); - TDEAction* actionWindowNext = new TDEAction(i18n("Next"), Key_F6, TQT_TQOBJECT(qworkspace), - TQT_SLOT(activateNextWindow()), actionCollection(), "window_next"); + TDEAction* actionWindowNext = new TDEAction(i18n("Next"), Key_F6, qworkspace, + TQ_SLOT(activateNextWindow()), actionCollection(), "window_next"); actionWindowNext->setToolTip(i18n("Activates the next window")); actionWindowNext->setWhatsThis(whatsThisFrom("Window|Next")); - TDEAction* actionWindowPrevious = new TDEAction(i18n("Previous"), CTRL + SHIFT + Key_F6, TQT_TQOBJECT(qworkspace), - TQT_SLOT(activatePreviousWindow()), actionCollection(), "window_prev"); + TDEAction* actionWindowPrevious = new TDEAction(i18n("Previous"), CTRL + SHIFT + Key_F6, qworkspace, + TQ_SLOT(activatePreviousWindow()), actionCollection(), "window_prev"); actionWindowPrevious->setToolTip(i18n("Activates the previous window")); actionWindowPrevious->setWhatsThis(whatsThisFrom("Window|Previous")); windowMenu = new TDEPopupMenu(this, "Window"); menuBar()->insertItem(i18n("&Window"), windowMenu); - connect(windowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(setupWindowActions())); + connect(windowMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(setupWindowActions())); actionWindowClose->plug(windowMenu); actionWindowCloseAll->plug(windowMenu); @@ -562,7 +554,7 @@ void MainWindow::setupWindowActions() else itemText += w->caption(); - int id = windowMenu->insertItem(itemText, TQT_TQOBJECT(this), TQT_SLOT(windowsMenuActivated(int))); + int id = windowMenu->insertItem(itemText, this, TQ_SLOT(windowsMenuActivated(int))); windowMenu->setItemParameter(id, i); windowMenu->setItemChecked(id, qworkspace->activeWindow() == windows.at(i)); } @@ -572,21 +564,21 @@ void MainWindow::setupWindowActions() void MainWindow::setupSettingsActions() { TDEPopupMenu *settings = new TDEPopupMenu(this, "Settings"); - TDEAction* a = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(editShortcuts()), actionCollection()); + TDEAction* a = KStdAction::keyBindings(this, TQ_SLOT(editShortcuts()), actionCollection()); a->setToolTip(i18n("Opens a dialog to change shortcuts")); a->plug(settings); - a = new TDEAction(i18n("Configure &Plugins..."), TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editPlugins()), + a = new TDEAction(i18n("Configure &Plugins..."), TDEShortcut::null(), this, TQ_SLOT(editPlugins()), actionCollection(), "configure_plugins"); a->setToolTip(i18n("Opens a dialog to configure plugins")); a->plug(settings); - a = new TDEAction(i18n("&Configure Editor..."), TDEShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(configureEditor()), + a = new TDEAction(i18n("&Configure Editor..."), TDEShortcut::null(), this, TQ_SLOT(configureEditor()), actionCollection(), "configure_editor"); a->setToolTip(i18n("Configure various aspects of this editor.")); a->plug(settings); - a = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(editPreferences()), actionCollection()); + a = KStdAction::preferences(this, TQ_SLOT(editPreferences()), actionCollection()); a->setToolTip(i18n("Opens a dialog to change preferences")); a->setWhatsThis(whatsThisFrom("Edit|Preferences")); a->plug(settings); @@ -788,13 +780,13 @@ void MainWindow::fileCreateTemplate() } dia.editName->setText(i18n("NewTemplate")); - connect(dia.buttonCreate, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(createNewTemplate())); + connect(dia.buttonCreate, TQ_SIGNAL(clicked()), this, TQ_SLOT(createNewTemplate())); dia.exec(); } void MainWindow::createNewTemplate() { - CreateTemplate *dia = (CreateTemplate *) TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->parent(); + CreateTemplate *dia = (CreateTemplate *) sender()->parent(); TQString fn = dia->editName->text(); TQString cn = dia->listClass->currentText(); if (fn.isEmpty() || cn.isEmpty()) @@ -891,7 +883,7 @@ void MainWindow::editPaste() w = l.first(); if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout || (!WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory:: - classNameOf(TQT_TQOBJECT(w)))) && w != formWindow()->mainContainer())) + classNameOf(w))) && w != formWindow()->mainContainer())) w = formWindow()->mainContainer(); } @@ -1098,7 +1090,7 @@ void MainWindow::editPreferences() statusBar()->message(i18n("Edit preferences...")); Preferences *dia = new Preferences(this, 0, true); prefDia = dia; - connect(dia->helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp())); + connect(dia->helpButton, TQ_SIGNAL(clicked()), MainWindow::self, TQ_SLOT(showDialogHelp())); dia->buttonColor->setEditor(StyledButton::ColorEditor); dia->buttonPixmap->setEditor(StyledButton::PixmapEditor); dia->checkBoxShowGrid->setChecked(sGrid); @@ -1119,7 +1111,7 @@ void MainWindow::editPreferences() dia->checkBoxSplash->setChecked(splashScreen); dia->editDocPath->setText(docPath); dia->checkAutoEdit->setChecked(!databaseAutoEdit); - connect(dia->buttonDocPath, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(chooseDocPath())); + connect(dia->buttonDocPath, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseDocPath())); if (dia->exec() == TQDialog::Accepted) { @@ -1173,8 +1165,8 @@ void MainWindow::editExternalTool(int id) { TDEProcess* process = new TDEProcess; (*process) << "kmdr-executor" << m_editorTools[id]; - connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(editToolExited(TDEProcess*))); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(editToolOutput(TDEProcess*, char*, int))); + connect(process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(editToolExited(TDEProcess*))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQ_SLOT(editToolOutput(TDEProcess*, char*, int))); m_toolOutput = '\0'; process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } diff --git a/kommander/editor/messagelog.cpp b/kommander/editor/messagelog.cpp index e6d13a21..cf8bdd25 100644 --- a/kommander/editor/messagelog.cpp +++ b/kommander/editor/messagelog.cpp @@ -31,19 +31,19 @@ MessageLog::MessageLog(TQWidget* parent, const char* name) : TQTabWidget(parent, name) { m_popupMenu = new TDEPopupMenu(this); - m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("Copy Current &Line"), this, TQT_SLOT(copyLine())); - m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("&Copy Content"), this, TQT_SLOT(copyContent())); - m_popupMenu->insertItem(SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveToFile())); + m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("Copy Current &Line"), this, TQ_SLOT(copyLine())); + m_popupMenu->insertItem(SmallIconSet("edit-copy"), i18n("&Copy Content"), this, TQ_SLOT(copyContent())); + m_popupMenu->insertItem(SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQ_SLOT(saveToFile())); m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clearContent())); + m_popupMenu->insertItem(SmallIconSet("edit-clear"), i18n("Clear"), this, TQ_SLOT(clearContent())); for (int i = 0; i < m_listCount; i++) { m_lists[i] = new TDEListBox(this); addTab(m_lists[i], m_listNames[i]); m_seenEOL[i] = false; - connect(m_lists[i], TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); + connect(m_lists[i], TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); } } diff --git a/kommander/editor/messagelog.h b/kommander/editor/messagelog.h index ea1c2aa0..b1d3e66c 100644 --- a/kommander/editor/messagelog.h +++ b/kommander/editor/messagelog.h @@ -28,7 +28,7 @@ class TQListBoxItem; class MessageLog : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: enum InfoType {Stdout, Stderr, All}; diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp index ca261721..5c2d6681 100644 --- a/kommander/editor/metadatabase.cpp +++ b/kommander/editor/metadatabase.cpp @@ -281,8 +281,8 @@ int MetaDataBase::spacing( TQObject *o ) return -1; setupDataBase(); if ( o->inherits( "TQMainWindow" ) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); - MetaDataBaseRecord *r = db->find( TQT_TQOBJECT(o) ); + o = ( (TQMainWindow*)o )->centralWidget(); + MetaDataBaseRecord *r = db->find( o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); @@ -319,7 +319,7 @@ int MetaDataBase::margin( TQObject *o ) return -1; setupDataBase(); if ( o->inherits( "TQMainWindow" ) ) - o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget()); + o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", @@ -652,7 +652,7 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom return true; if ( o->inherits( "FormWindow" ) ) { - o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer()); + o = ( (FormWindow*)o )->mainContainer(); slotList = o->metaObject()->slotNames( true ); if ( slotList.find( slot ) != -1 ) return true; diff --git a/kommander/editor/multilineeditorimpl.cpp b/kommander/editor/multilineeditorimpl.cpp index 2dab19a1..158f5d9e 100644 --- a/kommander/editor/multilineeditorimpl.cpp +++ b/kommander/editor/multilineeditorimpl.cpp @@ -31,7 +31,7 @@ MultiLineEditor::MultiLineEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw ) : MultiLineEditorBase( parent, 0, true ), formwindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); mlined = (TQMultiLineEdit*)editWidget; // #### complete list of properties here preview->setAlignment( mlined->alignment() ); diff --git a/kommander/editor/multilineeditorimpl.h b/kommander/editor/multilineeditorimpl.h index 3931cf90..c5c07366 100644 --- a/kommander/editor/multilineeditorimpl.h +++ b/kommander/editor/multilineeditorimpl.h @@ -28,7 +28,7 @@ class TQMultiLineEdit; class MultiLineEditor : public MultiLineEditorBase { - Q_OBJECT + TQ_OBJECT public: @@ -46,7 +46,7 @@ private: class TextEditor : public MultiLineEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/newform.ui b/kommander/editor/newform.ui index 7b5a0938..4c2d3fa9 100644 --- a/kommander/editor/newform.ui +++ b/kommander/editor/newform.ui @@ -202,9 +202,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">itemChanged( TQIconViewItem * )</slot> <slot access="protected">projectChanged( const TQString & )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp index 5aeafc5d..17e37001 100644 --- a/kommander/editor/newformimpl.cpp +++ b/kommander/editor/newformimpl.cpp @@ -57,7 +57,7 @@ void FormItem::insert() FormWindow *fw = 0; FormFile *ff = new FormFile(FormFile::createUnnamedFileName(), true); fw = new FormWindow(ff, MainWindow::self, MainWindow::self->qWorkspace(), n.utf8()); - MetaDataBase::addEntry(TQT_TQOBJECT(fw)); + MetaDataBase::addEntry(fw); TQWidget *w = 0L; if (fType == Dialog) { @@ -72,7 +72,7 @@ void FormItem::insert() if (w) { w->setProperty("useInternalParser", true); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "useInternalParser", true); + MetaDataBase::setPropertyChanged(w, "useInternalParser", true); } fw->setCaption(n); fw->resize(600, 480); @@ -81,7 +81,7 @@ void FormItem::insert() // the wizard might have changed a lot, lets update everything MainWindow::self->actioneditor()->setFormWindow(fw); MainWindow::self->objectHierarchy()->setFormWindow(fw, fw); - fw->killAccels(TQT_TQOBJECT(fw)); + fw->killAccels(fw); fw->setFocus(); } @@ -138,7 +138,7 @@ void CustomFormItem::insert() NewForm::NewForm(TQWidget *parent, const TQString &templatePath) : NewFormBase(parent, 0, true) { - connect(helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp())); + connect(helpButton, TQ_SIGNAL(clicked()), MainWindow::self, TQ_SLOT(showDialogHelp())); TQIconViewItem *cur = 0; FormItem *fi = new FormItem(templateView, i18n("Dialog")); diff --git a/kommander/editor/newformimpl.h b/kommander/editor/newformimpl.h index e875a858..ed8e19a0 100644 --- a/kommander/editor/newformimpl.h +++ b/kommander/editor/newformimpl.h @@ -60,7 +60,7 @@ private: class NewForm : public NewFormBase { - Q_OBJECT + TQ_OBJECT public: NewForm( TQWidget *parent, const TQString &templatePath ); diff --git a/kommander/editor/orderindicator.h b/kommander/editor/orderindicator.h index cb75151b..08281c9c 100644 --- a/kommander/editor/orderindicator.h +++ b/kommander/editor/orderindicator.h @@ -27,7 +27,7 @@ class FormWindow; class OrderIndicator : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui index cadcb3f5..a77c277b 100644 --- a/kommander/editor/paletteeditor.ui +++ b/kommander/editor/paletteeditor.ui @@ -501,18 +501,17 @@ <tabstop>paletteCombo</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">onTune()</slot> <slot access="protected">onChoose2ndMainColor()</slot> <slot access="protected">onChooseMainColor()</slot> <slot access="protected">paletteSelected(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>styledbutton.h</includehint> - <includehint>styledbutton.h</includehint> - <includehint>previewframe.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">previewframe.h</include> + <include location="global" impldecl="in implementation">styledbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/paletteeditoradvanced.ui b/kommander/editor/paletteeditoradvanced.ui index 78fcb222..02d5e4d2 100644 --- a/kommander/editor/paletteeditoradvanced.ui +++ b/kommander/editor/paletteeditoradvanced.ui @@ -743,7 +743,7 @@ <tabstop>buttonEffect</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">onToggleBuildDisabled(bool)</slot> @@ -756,11 +756,9 @@ <slot access="protected">onToggleBuildInactive(bool)</slot> <slot access="protected">paletteSelected(int)</slot> <slot>showHelp()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>styledbutton.h</includehint> - <includehint>styledbutton.h</includehint> - <includehint>styledbutton.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">styledbutton.h</include> +</includes> </UI> diff --git a/kommander/editor/paletteeditoradvancedimpl.cpp b/kommander/editor/paletteeditoradvancedimpl.cpp index e7880b19..eb93c28d 100644 --- a/kommander/editor/paletteeditoradvancedimpl.cpp +++ b/kommander/editor/paletteeditoradvancedimpl.cpp @@ -63,7 +63,7 @@ PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); buttonPixmap->setEditor( StyledButton::PixmapEditor ); diff --git a/kommander/editor/paletteeditoradvancedimpl.h b/kommander/editor/paletteeditoradvancedimpl.h index a4b591cd..65ef641a 100644 --- a/kommander/editor/paletteeditoradvancedimpl.h +++ b/kommander/editor/paletteeditoradvancedimpl.h @@ -27,7 +27,7 @@ class FormWindow; class PaletteEditorAdvanced : public PaletteEditorAdvancedBase { - Q_OBJECT + TQ_OBJECT public: PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0, diff --git a/kommander/editor/paletteeditorimpl.cpp b/kommander/editor/paletteeditorimpl.cpp index bf68fe16..dd12de19 100644 --- a/kommander/editor/paletteeditorimpl.cpp +++ b/kommander/editor/paletteeditorimpl.cpp @@ -33,7 +33,7 @@ PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f ) : PaletteEditorBase( parent, name, modal, f ), formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); editPalette = TQApplication::palette(); setPreviewPalette( editPalette ); diff --git a/kommander/editor/paletteeditorimpl.h b/kommander/editor/paletteeditorimpl.h index 8bc18bce..680c960c 100644 --- a/kommander/editor/paletteeditorimpl.h +++ b/kommander/editor/paletteeditorimpl.h @@ -27,7 +27,7 @@ class FormWindow; class PaletteEditor : public PaletteEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/pixmapchooser.cpp b/kommander/editor/pixmapchooser.cpp index 7a2bd85e..71fe357c 100644 --- a/kommander/editor/pixmapchooser.cpp +++ b/kommander/editor/pixmapchooser.cpp @@ -966,7 +966,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T TQPixmap pix( fd.selectedFile() ); if ( fn ) *fn = fd.selectedFile(); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), fd.selectedFile() ); + MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), fd.selectedFile() ); return pix; } } @@ -985,13 +985,13 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T #endif else { PixmapFunction dia( parent, 0, true ); - TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + TQObject::connect( dia.helpButton, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" ); - dia.editArguments->setText( MetaDataBase::pixmapArgument( TQT_TQOBJECT(fw), old.serialNumber() ) ); + dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) ); dia.editArguments->setFocus(); if ( dia.exec() == TQDialog::Accepted ) { TQPixmap pix( PixmapChooser::loadPixmap( "image.xpm" ) ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dia.editArguments->text() ); + MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), dia.editArguments->text() ); return pix; } } @@ -1004,7 +1004,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T } ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name ) - : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( PixmapChooser::loadPixmap( "image.xpm", PixmapChooser::Mini ) ) + : TQFileIconProvider( parent, name ), imagepm( PixmapChooser::loadPixmap( "image.xpm", PixmapChooser::Mini ) ) { fmts = TQImage::inputFormats(); } diff --git a/kommander/editor/pixmapchooser.h b/kommander/editor/pixmapchooser.h index 6d8e761a..bfdf476c 100644 --- a/kommander/editor/pixmapchooser.h +++ b/kommander/editor/pixmapchooser.h @@ -31,7 +31,7 @@ class FormWindow; class PixmapView : public TQScrollView, public TQFilePreview { - Q_OBJECT + TQ_OBJECT public: @@ -47,7 +47,7 @@ private: class ImageIconProvider : public TQFileIconProvider { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/previewframe.h b/kommander/editor/previewframe.h index eda444f5..ad89abe5 100644 --- a/kommander/editor/previewframe.h +++ b/kommander/editor/previewframe.h @@ -28,7 +28,7 @@ class PreviewWorkspace : public TQWorkspace { - Q_OBJECT + TQ_OBJECT public: PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 ) @@ -41,7 +41,7 @@ protected: class PreviewFrame : public TQVBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/previewwidgetimpl.cpp b/kommander/editor/previewwidgetimpl.cpp index 6ac39c22..2b08ee3a 100644 --- a/kommander/editor/previewwidgetimpl.cpp +++ b/kommander/editor/previewwidgetimpl.cpp @@ -31,7 +31,7 @@ PreviewWidget::PreviewWidget( TQWidget *parent, const char *name ) while ((obj = it.current()) != 0) { ++it; obj->installEventFilter(this); - ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus); + ((TQWidget*)obj)->setFocusPolicy(TQWidget::NoFocus); } } diff --git a/kommander/editor/previewwidgetimpl.h b/kommander/editor/previewwidgetimpl.h index 31e04253..92fbce42 100644 --- a/kommander/editor/previewwidgetimpl.h +++ b/kommander/editor/previewwidgetimpl.h @@ -25,7 +25,7 @@ class PreviewWidget : public PreviewWidgetBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp index 24ce0949..4b0c58e4 100644 --- a/kommander/editor/propertyeditor.cpp +++ b/kommander/editor/propertyeditor.cpp @@ -282,7 +282,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg, void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r ) { p->save(); - TQApplication::style().tqdrawPrimitive(TQStyle::PE_Panel, p, r, cg, + TQApplication::style().drawPrimitive(TQStyle::PE_Panel, p, r, cg, TQStyle::Style_Sunken, TQStyleOption(1,1) ); p->restore(); } @@ -401,8 +401,8 @@ void PropertyItem::createResetButton() hbox->layout()->setAlignment( TQt::AlignRight ); listview->addChild( hbox ); hbox->hide(); - TQObject::connect( resetButton, TQT_SIGNAL( clicked() ), - listview, TQT_SLOT( resetProperty() ) ); + TQObject::connect( resetButton, TQ_SIGNAL( clicked() ), + listview, TQ_SLOT( resetProperty() ) ); TQToolTip::add( resetButton, i18n("Reset the property to its default value" ) ); TQWhatsThis::add( resetButton, i18n("Click this button to reset the property to its default value" ) ); updateResetButtonState(); @@ -539,7 +539,7 @@ void PropertyItem::setFocus( TQWidget *w ) { if ( !tqApp->focusWidget() || listview->propertyEditor()->formWindow() && - ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) && + ( !MainWindow::self->isAFormWindowChild( tqApp->focusWidget() ) && !tqApp->focusWidget()->inherits( "Editor" ) ) ) w->setFocus(); } @@ -582,30 +582,30 @@ TQLineEdit *PropertyTextItem::lined() if ( asciiOnly ) { if ( PropertyItem::name() == "name" ) - lin->setValidator( new AsciiValidator( TQT_TQOBJECT(lin), "ascii_validator" ) ); + lin->setValidator( new AsciiValidator( lin, "ascii_validator" ) ); else lin->setValidator( new AsciiValidator( TQString("!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9" "\xaa\xab\xac\xad\xae\xaf\xb1\xb2\xb3" "\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc" - "\xbd\xbe\xbf"), TQT_TQOBJECT(lin), "ascii_validator" ) ); + "\xbd\xbe\xbf"), lin, "ascii_validator" ) ); } if ( !hasMultiLines ) { lin->hide(); } else { button = new TQPushButton( i18n("..."), box ); button->setFixedWidth( 20 ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getText() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getText() ) ); lin->setFrame( false ); } - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); if ( PropertyItem::name() == "name" || PropertyItem::name() == "itemName" ) - connect( lin, TQT_SIGNAL( returnPressed() ), + connect( lin, TQ_SIGNAL( returnPressed() ), listview->propertyEditor()->formWindow()->commandHistory(), - TQT_SLOT( checkCompressedCommand() ) ); + TQ_SLOT( checkCompressedCommand() ) ); lin->installEventFilter( listview ); return lin; } @@ -762,12 +762,12 @@ TQLineEdit *PropertyDoubleItem::lined() if ( lin ) return lin; lin = new TQLineEdit( listview->viewport() ); - lin->setValidator( new TQDoubleValidator( TQT_TQOBJECT(lin), "double_validator" ) ); + lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) ); - connect( lin, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setValue() ) ); - connect( lin, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( setValue() ) ); lin->installEventFilter( listview ); return lin; } @@ -846,8 +846,8 @@ TQDateEdit *PropertyDateItem::lined() for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); delete l; - connect( lin, TQT_SIGNAL( valueChanged( const TQDate & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDate & ) ), + this, TQ_SLOT( setValue() ) ); return lin; } @@ -891,13 +891,13 @@ void PropertyDateItem::setValue( const TQVariant &v ) lined()->setDate( v.toDate() ); lined()->blockSignals( false ); } - setText( 1, v.toDate().toString( ::Qt::ISODate ) ); + setText( 1, v.toDate().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyDateItem::setValue() { - setText( 1, lined()->date().toString( ::Qt::ISODate ) ); + setText( 1, lined()->date().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->date(); PropertyItem::setValue( v ); @@ -917,8 +917,8 @@ TQTimeEdit *PropertyTimeItem::lined() if ( lin ) return lin; lin = new TQTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -966,13 +966,13 @@ void PropertyTimeItem::setValue( const TQVariant &v ) lined()->setTime( v.toTime() ); lined()->blockSignals( false ); } - setText( 1, v.toTime().toString( ::Qt::ISODate ) ); + setText( 1, v.toTime().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyTimeItem::setValue() { - setText( 1, lined()->time().toString( ::Qt::ISODate ) ); + setText( 1, lined()->time().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->time(); PropertyItem::setValue( v ); @@ -992,8 +992,8 @@ TQDateTimeEdit *PropertyDateTimeItem::lined() if ( lin ) return lin; lin = new TQDateTimeEdit( listview->viewport() ); - connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ), - this, TQT_SLOT( setValue() ) ); + connect( lin, TQ_SIGNAL( valueChanged( const TQDateTime & ) ), + this, TQ_SLOT( setValue() ) ); TQObjectList *l = lin->queryList( "TQLineEdit" ); for ( TQObject *o = l->first(); o; o = l->next() ) o->installEventFilter( listview ); @@ -1041,13 +1041,13 @@ void PropertyDateTimeItem::setValue( const TQVariant &v ) lined()->setDateTime( v.toDateTime() ); lined()->blockSignals( false ); } - setText( 1, v.toDateTime().toString( ::Qt::ISODate ) ); + setText( 1, v.toDateTime().toString( ::TQt::ISODate ) ); PropertyItem::setValue( v ); } void PropertyDateTimeItem::setValue() { - setText( 1, lined()->dateTime().toString( ::Qt::ISODate ) ); + setText( 1, lined()->dateTime().toString( ::TQt::ISODate ) ); TQVariant v; v = lined()->dateTime(); PropertyItem::setValue( v ); @@ -1070,8 +1070,8 @@ TQComboBox *PropertyBoolItem::combo() comb->hide(); comb->insertItem( i18n("False" ) ); comb->insertItem( i18n("True" ) ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -1167,8 +1167,8 @@ TQSpinBox *PropertyIntItem::spinBox() if ( ol && ol->first() ) ol->first()->installEventFilter( listview ); delete ol; - connect( spinBx, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( spinBx, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( setValue() ) ); return spinBx; } @@ -1252,8 +1252,8 @@ TQComboBox *PropertyListItem::combo() return comb; comb = new TQComboBox( editable, listview->viewport() ); comb->hide(); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); if ( editable ) { TQObjectList *ol = comb->queryList( "TQLineEdit" ); @@ -1548,8 +1548,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr box->setLineWidth( 2 ); pixPrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPixmap() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPixmap() ) ); } PropertyPixmapItem::~PropertyPixmapItem() { @@ -1637,8 +1637,8 @@ PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, Prop pal.setDisabled( cg ); colorPrev->setPalette( pal ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getColor() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getColor() ) ); } void PropertyColorItem::createChildren() @@ -1758,8 +1758,8 @@ PropertyFontItem::PropertyFontItem( PropertyList *l, PropertyItem *after, Proper box->installEventFilter( listview ); lined->installEventFilter( listview ); button->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getFont() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getFont() ) ); } void PropertyFontItem::createChildren() @@ -2156,8 +2156,8 @@ PropertyPaletteItem::PropertyPaletteItem( PropertyList *l, PropertyItem *after, box->setLineWidth( 2 ); palettePrev->setFrameStyle( TQFrame::NoFrame ); box->installEventFilter( listview ); - connect( button, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( getPalette() ) ); + connect( button, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( getPalette() ) ); } PropertyPaletteItem::~PropertyPaletteItem() { @@ -2197,11 +2197,7 @@ void PropertyPaletteItem::getPalette() if ( w->inherits( "TQScrollView" ) ) w = ( (TQScrollView*)w )->viewport(); TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(), -#if defined(TQT_NON_COMMERCIAL) - w->backgroundMode(), listview->topLevelWidget(), -#else w->backgroundMode(), listview, -#endif "choose_palette", listview->propertyEditor()->formWindow() ); if ( !ok ) return; @@ -2309,8 +2305,8 @@ TQComboBox *PropertyCursorItem::combo() cur.setMask( cur ); comb->insertItem( cur, i18n("Forbidden"), TQObject::ForbiddenCursor ); - connect( comb, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setValue() ) ); + connect( comb, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setValue() ) ); comb->installEventFilter( listview ); return comb; } @@ -2401,16 +2397,16 @@ PropertyList::PropertyList( PropertyEditor *e ) viewport()->installEventFilter( this ); addColumn( i18n("Property" ) ); addColumn( i18n("Value" ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( updateEditorSize() ) ); - disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( changeSortColumn( int ) ) ); - connect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( toggleSort() ) ); - connect( this, TQT_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( toggleOpen( TQListViewItem * ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( updateEditorSize() ) ); + disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( changeSortColumn( int ) ) ); + connect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( toggleSort() ) ); + connect( this, TQ_SIGNAL( pressed( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemPressed( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( toggleOpen( TQListViewItem * ) ) ); setSorting( -1 ); setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); @@ -2529,7 +2525,7 @@ void PropertyList::setupProperties() TQStringList valueSet; bool parentHasLayout = w->isWidgetType() && - !editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)w) ) && ( (TQWidget*)w )->parentWidget() && + !editor->formWindow()->isMainContainer( (TQWidget*)w ) && ( (TQWidget*)w )->parentWidget() && WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) { const TQMetaProperty* p = @@ -2559,7 +2555,7 @@ void PropertyList::setupProperties() } unique.insert( TQString::fromLatin1( it.current() ), true ); if ( editor->widget()->isWidgetType() && - editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)editor->widget()) ) ) { + editor->formWindow()->isMainContainer( (TQWidget*)editor->widget() ) ) { if ( qstrcmp( p->name(), "geometry" ) == 0 ) continue; } else { // hide some toplevel-only stuff @@ -2785,7 +2781,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name, case TQVariant::CString: item = new PropertyTextItem( this, item, 0, name, name == "name" && - TQT_BASE_OBJECT(editor->widget()) == TQT_BASE_OBJECT(editor->formWindow()->mainContainer()), + editor->widget() == editor->formWindow()->mainContainer(), false, true ); break; case TQVariant::Bool: @@ -2921,10 +2917,10 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) return true; PropertyItem *i = (PropertyItem*)currentItem(); - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) &&e->type() == TQEvent::KeyPress ) { + if ( o != this &&e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; if ( ( ke->key() == Key_Up || ke->key() == Key_Down ) && - ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(viewport()) ) && + ( o != this || o != viewport() ) && !( ke->state() & ControlButton ) ) { TQApplication::sendEvent( this, (TQKeyEvent*)e ); return true; @@ -2945,8 +2941,8 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) return true; } } else if ( e->type() == TQEvent::FocusOut && o->inherits( "TQLineEdit" ) && editor->formWindow() ) { - TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) ); - } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) { + TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQ_SLOT( checkCompressedCommand() ) ); + } else if ( o == viewport() ) { TQMouseEvent *me; PropertyListItem* i; switch ( e->type() ) { @@ -2961,7 +2957,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) break; case TQEvent::MouseMove: me = (TQMouseEvent*)e; - if ( me && me->state() & Qt::LeftButton && mousePressed) { + if ( me && me->state() & TQt::LeftButton && mousePressed) { i = (PropertyListItem*) itemAt( me->pos() ); if( i && i == pressItem ) { @@ -2996,7 +2992,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e ) default: break; } - } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) ) { + } else if ( o == header() ) { if ( e->type() == TQEvent::ContextMenu ) { ((TQContextMenuEvent *)e)->accept(); TQPopupMenu menu( 0 ); @@ -3085,9 +3081,9 @@ void PropertyList::setPropertyValue( PropertyItem *i ) else i->setValue( TQVariant( false) ); } else if ( i->name() == "layoutSpacing" ) { - ( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) ); + ( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) ); } else if ( i->name() == "layoutMargin" ) { - ( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) ); + ( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) ); } else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) { i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) ); } else if ( editor->widget()->inherits( "CustomWidget" ) ) { @@ -3284,8 +3280,8 @@ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e ) header()->hide(); removeColumn( 1 ); setRootIsDecorated( true ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), - this, TQT_SLOT( renamed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem *, int, const TQString & ) ), + this, TQ_SLOT( renamed( TQListViewItem * ) ) ); } void EventList::setup() diff --git a/kommander/editor/propertyeditor.h b/kommander/editor/propertyeditor.h index 00718088..a63b8406 100644 --- a/kommander/editor/propertyeditor.h +++ b/kommander/editor/propertyeditor.h @@ -127,7 +127,7 @@ private: class PropertyTextItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -164,7 +164,7 @@ private: class PropertyBoolItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -189,7 +189,7 @@ private: class PropertyIntItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -215,7 +215,7 @@ private: class PropertyDoubleItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -239,7 +239,7 @@ private: class PropertyListItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -275,7 +275,7 @@ private: class PropertyFontItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -305,7 +305,7 @@ private: class PropertyCoordItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -335,7 +335,7 @@ private: class PropertyColorItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -370,7 +370,7 @@ private: class PropertyPixmapItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -401,7 +401,7 @@ private: class PropertySizePolicyItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -428,7 +428,7 @@ private: class PropertyPaletteItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -457,7 +457,7 @@ private: class PropertyCursorItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -483,7 +483,7 @@ private: class PropertyDatabaseItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -510,7 +510,7 @@ private: class PropertyList : public TQListView { - Q_OBJECT + TQ_OBJECT public: @@ -566,7 +566,7 @@ private: class PropertyEditor : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: @@ -616,7 +616,7 @@ private: class PropertyDateItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -640,7 +640,7 @@ private: class PropertyTimeItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: @@ -664,7 +664,7 @@ private: class PropertyDateTimeItem : public TQObject, public PropertyItem { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/qcompletionedit.cpp b/kommander/editor/qcompletionedit.cpp index 6a7cb2a9..76c3e00a 100644 --- a/kommander/editor/qcompletionedit.cpp +++ b/kommander/editor/qcompletionedit.cpp @@ -19,8 +19,8 @@ QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name ) listbox->setHScrollBarMode( TQScrollView::AlwaysOn ); listbox->setVScrollBarMode( TQScrollView::AlwaysOn ); listbox->setCornerWidget( new TQSizeGrip( listbox, "completion sizegrip" ) ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( textDidChange( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( textDidChange( const TQString & ) ) ); popup->setFocusProxy( listbox ); installEventFilter( this ); } @@ -90,7 +90,7 @@ void QCompletionEdit::updateListBox() bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(popup) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox->viewport()) ) { + if ( o == popup || o == listbox || o == listbox->viewport() ) { if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; if ( ke->key() == Key_Enter || ke->key() == Key_Return || ke->key() == Key_Tab ) { @@ -133,7 +133,7 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e ) emit chosen( text() ); return true; } - } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { + } else if ( o == this ) { if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; if ( ke->key() == Key_Up || diff --git a/kommander/editor/qcompletionedit.h b/kommander/editor/qcompletionedit.h index 6390bd13..b96de3a9 100644 --- a/kommander/editor/qcompletionedit.h +++ b/kommander/editor/qcompletionedit.h @@ -9,7 +9,7 @@ class TQVBox; class QCompletionEdit : public TQLineEdit { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd ) TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive ) diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp index bcf15811..32b70e9d 100644 --- a/kommander/editor/resource.cpp +++ b/kommander/editor/resource.cpp @@ -166,7 +166,7 @@ bool Resource::load( FormFile *ff ) TQFile f( ff->absFileName() ); f.open( IO_ReadOnly ); - bool b = load( ff, TQT_TQIODEVICE(&f) ); + bool b = load( ff, &f ); f.close(); return b; @@ -195,7 +195,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) formwindow->setProject( MainWindow::self->currProject() ); #endif formwindow->setMainWindow( mainwindow ); - MetaDataBase::addEntry( TQT_TQOBJECT(formwindow) ); + MetaDataBase::addEntry( formwindow ); #ifndef KOMMANDER if (!langIface) { @@ -303,17 +303,8 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) if ( !customWidgets.isNull() ) loadCustomWidgets( customWidgets, this ); -#if defined (TQT_NON_COMMERCIAL) - bool previewMode = MainWindow::self->isPreviewing(); - TQWidget *w = (TQWidget*)createObject( widget, !previewMode ? (TQWidget*)formwindow : MainWindow::self); - if ( !w ) - return false; - if ( previewMode ) - w->reparent( MainWindow::self, TQt::WType_TopLevel, w->pos(), true ); -#else if ( !createObject( widget, formwindow) ) return false; -#endif if ( !forwards.isNull() ) { for ( TQDomElement n = forwards.firstChild().toElement(); !n.isNull(); n = n.nextSibling().toElement() ) @@ -364,11 +355,11 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) if ( slot.returnType.isEmpty() ) slot.returnType = "void"; slot.slot = n.firstChild().toText().data().utf8(); - if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) ) - MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier, + if ( !MetaDataBase::hasSlot( formwindow, slot.slot, true ) ) + MetaDataBase::addSlot( formwindow, slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); else - MetaDataBase::changeSlotAttributes( TQT_TQOBJECT(formwindow), slot.slot, + MetaDataBase::changeSlotAttributes( formwindow, slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); } @@ -386,11 +377,11 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) loadTabOrder( tabOrder ); if ( formwindow ) { - MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), metaIncludes ); - MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), metaForwards ); - MetaDataBase::setSignalList( TQT_TQOBJECT(formwindow), metaSignals ); - MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), metaInfo ); - MetaDataBase::setExportMacro( TQT_TQOBJECT(formwindow->mainContainer()), exportMacro ); + MetaDataBase::setIncludes( formwindow, metaIncludes ); + MetaDataBase::setForwards( formwindow, metaForwards ); + MetaDataBase::setSignalList( formwindow, metaSignals ); + MetaDataBase::setMetaInfo( formwindow, metaInfo ); + MetaDataBase::setExportMacro( formwindow->mainContainer(), exportMacro ); } @@ -400,7 +391,7 @@ bool Resource::load( FormFile *ff, TQIODevice* dev ) } if ( formwindow ) { - formwindow->killAccels( TQT_TQOBJECT(formwindow) ); + formwindow->killAccels( formwindow ); if ( formwindow->layout() ) formwindow->layout()->activate(); if ( hadGeometry ) @@ -422,7 +413,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly ) TQFile f( filename ); if ( !f.open( IO_WriteOnly | IO_Translate ) ) return false; - bool b = save( TQT_TQIODEVICE(&f) ); + bool b = save( &f ); f.close(); return b; } @@ -439,7 +430,7 @@ bool Resource::save( TQIODevice* dev ) ts << formwindow->mainContainer()->property("shebang").toString() << endl; ts << "<!DOCTYPE UI><UI version=\"3.0\" stdsetdef=\"1\">" << endl; saveMetaInfoBefore( ts, 0 ); - saveObject( TQT_TQOBJECT(formwindow->mainContainer()), 0, ts, 0 ); + saveObject( formwindow->mainContainer(), 0, ts, 0 ); if ( formwindow->mainContainer()->inherits( "TQMainWindow" ) ) { saveMenuBar( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); saveToolBars( (TQMainWindow*)formwindow->mainContainer(), ts, 0 ); @@ -450,7 +441,7 @@ bool Resource::save( TQIODevice* dev ) saveActions( formwindow->actionList(), ts, 0 ); if ( !images.isEmpty() ) saveImageCollection( ts, 0 ); - if ( !MetaDataBase::connections( TQT_TQOBJECT(formwindow) ).isEmpty() || !MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ).isEmpty() ) + if ( !MetaDataBase::connections( formwindow ).isEmpty() || !MetaDataBase::slotList( formwindow ).isEmpty() ) saveConnections( ts, 0 ); saveTabOrder( ts, 0 ); saveMetaInfoAfter( ts, 0 ); @@ -483,7 +474,7 @@ TQString Resource::copy() p = p->parentWidget(); } if ( save ) - saveObject( TQT_TQOBJECT(w), 0, ts, 0 ); + saveObject( w, 0, ts, 0 ); } if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() ) saveCustomWidgets( ts, 0 ); @@ -545,9 +536,9 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); - formwindow->selectWidget( TQT_TQOBJECT(w) ); + formwindow->selectWidget( w ); } else if ( firstWidget.tagName() == "spacer" ) { - TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal ); + TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? TQt::Vertical : TQt::Horizontal ); if ( !w ) continue; widgets.append( w ); @@ -559,7 +550,7 @@ void Resource::paste( const TQString &cb, TQWidget *parent ) y = TQMAX( 0, parent->height() - w->height() ); if ( x != w->x() || y != w->y() ) w->move( x, y ); - formwindow->selectWidget( TQT_TQOBJECT(w) ); + formwindow->selectWidget( w ); } firstWidget = firstWidget.nextSibling().toElement(); } @@ -580,7 +571,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea const char* className = WidgetFactory::classNameOf( obj ); if ( obj->isA( "CustomWidget" ) ) usedCustomWidgets << TQString( className ); - if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->find( (TQWidget*)obj ) ) + if ( obj != formwindow && !formwindow->widgets()->find( (TQWidget*)obj ) ) return; // we don't know anything about this thing TQString attributes; @@ -627,7 +618,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQWidget *w = ws->widget( t->identifier() ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) == -1 ) + if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -642,19 +633,19 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( t->text() ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } delete tmpl; } else - if ( ::tqqt_cast<TQToolBox*>(obj) ) { + if ( ::tqt_cast<TQToolBox*>(obj) ) { TQToolBox* tb = (TQToolBox*)obj; for ( int i = 0; i < tb->count(); ++i ) { TQWidget *w = tb->item( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 ) + if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -665,7 +656,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "</property>" << endl; ts << makeIndent( indent ) << "<property name=\"backgroundMode\">" << endl; indent++; - saveEnumProperty( TQT_TQOBJECT(w), "backgroundMode", TQVariant::Invalid, ts, indent ); + saveEnumProperty( w, "backgroundMode", TQVariant::Invalid, ts, indent ); indent--; ts << makeIndent( indent ) << "</property>" << endl; ts << makeIndent( indent ) << "<attribute name=\"label\">" << endl; @@ -673,7 +664,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( tb->itemLabel( tb->indexOf(w) ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } @@ -683,7 +674,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea TQWidget *w = wiz->page( i ); if ( !w ) continue; - if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) == -1 ) + if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) == -1 ) continue; // we don't know this widget ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl; ++indent; @@ -698,12 +689,12 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea ts << makeIndent( indent ) << "<string>" << entitize( wiz->title( w ) ) << "</string>" << endl; indent--; ts << makeIndent( indent ) << "</attribute>" << endl; - saveChildrenOf( TQT_TQOBJECT(w), ts, indent ); + saveChildrenOf( w, ts, indent ); --indent; ts << makeIndent( indent ) << "</widget>" << endl; } } else if ( obj->inherits( "TQMainWindow" ) ) { - saveChildrenOf( TQT_TQOBJECT(( (TQMainWindow*)obj )->centralWidget()), ts, indent ); + saveChildrenOf( ( (TQMainWindow*)obj )->centralWidget(), ts, indent ); } else { saveChildrenOf( obj, ts, indent ); } @@ -782,7 +773,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent ) else if ( obj->inherits( "TQTable" ) ) { TQTable *table = (TQTable*)obj; int i; - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table ); bool isDataTable = table->inherits( "TQDataTable" ); for ( i = 0; i < table->horizontalHeader()->count(); ++i ) { if ( !table->horizontalHeader()->label( i ).isNull() && @@ -865,11 +856,11 @@ void Resource::savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, cons ts << makeIndent( indent ) << "<" + tagname + ">" << saveInCollection( p ) << "</" + tagname + ">" << endl; #ifndef KOMMANDER else if ( formwindow && formwindow->savePixmapInProject() ) - ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapKey( TQT_TQOBJECT(formwindow), p.serialNumber() ) + ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapKey( formwindow, p.serialNumber() ) << "</" + tagname + ">" << endl; #endif else - ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapArgument( TQT_TQOBJECT(formwindow), p.serialNumber() ) + ts << makeIndent( indent ) << "<" + tagname + ">" << MetaDataBase::pixmapArgument( formwindow, p.serialNumber() ) << "</" + tagname + ">" << endl; } @@ -881,7 +872,7 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* TQImage img = loadFromCollection( arg ); TQPixmap pix; pix.convertFromImage( img ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); return pix; } #ifndef KOMMANDER @@ -895,11 +886,11 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* { TQPixmap pix; pix = PixmapChooser::loadPixmap( "image.xpm" ); - MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapKey( formwindow, pix.serialNumber(), arg ); return pix; } TQPixmap pix = PixmapChooser::loadPixmap( "image.xpm" ); - MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); + MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg ); return pix; } @@ -965,7 +956,7 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent ) // save properties of layout if ( lay != WidgetFactory::NoLayout ) - saveObjectProperties( TQT_TQOBJECT(layout), ts, indent ); + saveObjectProperties( layout, ts, indent ); } @@ -993,7 +984,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) changed << "margin" << "spacing"; } - if ( TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) { + if ( w == formwindow->mainContainer() ) { if ( changed.findIndex( "geometry" ) == -1 ) changed << "geometry"; if ( changed.findIndex( "caption" ) == -1 ) @@ -1003,7 +994,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent ) if ( changed.isEmpty() ) return; - bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() && + bool inLayout = w != formwindow->mainContainer() && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() && WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout; TQStrList lst = w->metaObject()->propertyNames( !w->inherits( "Spacer" ) ); @@ -1108,9 +1099,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant num = value.toInt(); if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); + num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ); else if ( name == "margin" ) - num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) ); + num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ); } ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl; break; @@ -1126,9 +1117,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant unum = value.toUInt(); if ( w && w->inherits( "TQLayout" ) ) { if ( name == "spacing" ) - num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); + num = MetaDataBase::spacing( WidgetFactory::layoutParent( (TQLayout*)w ) ); else if ( name == "margin" ) - num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) ); + num = MetaDataBase::margin( WidgetFactory::layoutParent( (TQLayout*)w ) ); } ts << makeIndent( indent ) << "<number>" << TQString::number( unum ) << "</number>" << endl; break; @@ -1335,7 +1326,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay TQString className = e.attribute( "class", "TQWidget" ); if ( !className.isNull() ) { - obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, false )); + obj = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, false ); if ( !obj ) return 0; if ( !mainContainerSet ) { @@ -1371,7 +1362,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay if ( !parent || ( !parent->inherits( "TQToolBox" ) && !parent->inherits( "TQTabWidget" ) && !parent->inherits( "TQWizard" ) ) ) formwindow->insertWidget( w, pasting ); else if ( parent && ( parent->inherits( "TQToolBox" ) || parent->inherits( "TQTabWidget" ) || parent->inherits( "TQWizard" ) ) ) - MetaDataBase::addEntry( TQT_TQOBJECT(w) ); + MetaDataBase::addEntry( w ); if (w->inherits("Dialog")) dynamic_cast<Dialog*>(w)->setUseInternalParser(false); } @@ -1379,22 +1370,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay while ( !n.isNull() ) { if ( n.tagName() == "spacer" ) { - createSpacer( n, w, layout, Qt::Horizontal ); + createSpacer( n, w, layout, TQt::Horizontal ); } else if ( n.tagName() == "widget" ) { createObject( n, w, layout ); } else if ( n.tagName() == "hbox" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "grid" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "vbox" ) { layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); continue; } else if ( n.tagName() == "property" && obj ) { @@ -1428,7 +1419,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay n = n.nextSibling().toElement(); } - return TQT_TQOBJECT(w); + return w; } void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) @@ -1483,7 +1474,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) bool hasPixmap = false; TQString txt; TQString field; - TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( TQT_TQOBJECT(table) ); + TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( table ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) { TQString attrib = n.attribute( "name" ); @@ -1508,7 +1499,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget ) h->setLabel( i, txt ); if ( !isRow && !field.isEmpty() ) fieldMap.insert( txt, field ); - MetaDataBase::setColumnFields( TQT_TQOBJECT(table), fieldMap ); + MetaDataBase::setColumnFields( table, fieldMap ); } #endif } @@ -1534,7 +1525,7 @@ void Resource::loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bo void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i ) { - if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ) + if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) ) return; if ( widget->inherits( "TQListBox" ) || widget->inherits( "TQComboBox" ) ) { @@ -1605,7 +1596,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt } } -TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o ) +TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, TQt::Orientation o ) { TQDomElement n = e.firstChild().toElement(); int row = e.attribute( "row" ).toInt(); @@ -1623,7 +1614,7 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay spacer->setInteraciveMode( false ); while ( !n.isNull() ) { if ( n.tagName() == "property" ) - setObjectProperty( TQT_TQOBJECT(spacer), n.attribute( "name" ), n.firstChild().toElement() ); + setObjectProperty( spacer, n.attribute( "name" ), n.firstChild().toElement() ); n = n.nextSibling().toElement(); } spacer->setInteraciveMode( true ); @@ -1688,7 +1679,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( !p ) { MetaDataBase::setFakeProperty( obj, prop, v ); if ( obj->isWidgetType() ) { - if ( prop == "database" && TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(toplevel) ) { + if ( prop == "database" && obj != toplevel ) { TQStringList lst = MetaDataBase::fakeProperty( obj, "database" ).toStringList(); if ( lst.count() > 2 ) dbControls.insert( obj->name(), lst[ 2 ] ); @@ -1743,11 +1734,11 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD } if ( prop == "geometry" ) { - if ( TQT_BASE_OBJECT(obj) == toplevel ) { + if ( obj == toplevel ) { hadGeometry = true; toplevel->resize( v.toRect().size() ); return; - } else if ( TQT_BASE_OBJECT(obj) == formwindow->mainContainer() ) { + } else if ( obj == formwindow->mainContainer() ) { hadGeometry = true; formwindow->resize( v.toRect().size() ); return; @@ -1756,11 +1747,11 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( obj->inherits( "TQLayout" ) ) { if ( prop == "spacing" ) { - MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) )), v.toInt() ); + MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() ); return; } if ( prop == "margin" ) { - MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) )), v.toInt() ); + MetaDataBase::setMargin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() ); return; } } @@ -1768,10 +1759,10 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD if ( prop == "name" ) { if ( pasting ) { TQString s = v.toString(); - formwindow->unify( TQT_TQOBJECT(obj), s, true ); + formwindow->unify( obj, s, true ); obj->setName( s.utf8() ); return; - } else if ( formwindow && TQT_BASE_OBJECT(obj) == formwindow->mainContainer() ) { + } else if ( formwindow && obj == formwindow->mainContainer() ) { formwindow->setName( v.toCString() ); } } @@ -1916,7 +1907,7 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) { ts << makeIndent( indent ) << "<connections>" << endl; indent++; - TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( formwindow ); TQValueList<MetaDataBase::Connection>::Iterator it = connections.begin(); for ( ; it != connections.end(); ++it ) { MetaDataBase::Connection conn = *it; @@ -1925,8 +1916,8 @@ void Resource::saveConnections( TQTextStream &ts, int indent ) ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 && qstrcmp( conn.receiver->name(), "this" ) != 0 ) ) continue; - if ( formwindow->isMainContainer( TQT_TQOBJECT((*it).receiver) ) && - !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), MetaDataBase::normalizeSlot( (*it).slot ).latin1() ) ) + if ( formwindow->isMainContainer( (*it).receiver ) && + !MetaDataBase::hasSlot( formwindow, MetaDataBase::normalizeSlot( (*it).slot ).latin1() ) ) continue; if ( conn.sender->inherits( "CustomWidget" ) ) { @@ -1995,7 +1986,7 @@ void Resource::loadConnections( const TQDomElement &e ) conn.sender = 0; TQString name = n2.firstChild().toText().data(); if ( name == "this" || toplevel->name() == name ) { - conn.sender = TQT_TQOBJECT(toplevel); + conn.sender = toplevel; } else { if ( name == "this" ) name = toplevel->name(); @@ -2013,7 +2004,7 @@ void Resource::loadConnections( const TQDomElement &e ) } else if ( n2.tagName() == "receiver" ) { TQString name = n2.firstChild().toText().data(); if ( name == "this" || toplevel->name() == name ) { - conn.receiver = TQT_TQOBJECT(toplevel); + conn.receiver = toplevel; } else { TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { @@ -2028,10 +2019,10 @@ void Resource::loadConnections( const TQDomElement &e ) n2 = n2.nextSibling().toElement(); } if ( formwindow ) { - if ( TQT_BASE_OBJECT(conn.sender) == TQT_BASE_OBJECT(formwindow) ) - conn.sender = TQT_TQOBJECT(formwindow->mainContainer()); - if ( TQT_BASE_OBJECT(conn.receiver) == TQT_BASE_OBJECT(formwindow) ) - conn.receiver = TQT_TQOBJECT(formwindow->mainContainer()); + if ( conn.sender == formwindow ) + conn.sender = formwindow->mainContainer(); + if ( conn.receiver == formwindow ) + conn.receiver = formwindow->mainContainer(); } if ( conn.sender && conn.receiver ) { #ifndef KOMMANDER @@ -2044,7 +2035,7 @@ void Resource::loadConnections( const TQDomElement &e ) TQStringList::split( ',', conn.slot ), false ); } #else - MetaDataBase::addConnection( formwindow ? TQT_TQOBJECT(formwindow) : TQT_TQOBJECT(toplevel), + MetaDataBase::addConnection( formwindow ? formwindow : toplevel, conn.sender, conn.signal, conn.receiver, conn.slot ); #endif } @@ -2061,11 +2052,11 @@ void Resource::loadConnections( const TQDomElement &e ) if ( slot.returnType.isEmpty() ) slot.returnType = "void"; slot.slot = n.firstChild().toText().data().utf8(); - if ( !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), slot.slot, true ) ) - MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), slot.slot, slot.specifier, + if ( !MetaDataBase::hasSlot( formwindow, slot.slot, true ) ) + MetaDataBase::addSlot( formwindow, slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); else - MetaDataBase::changeSlotAttributes( TQT_TQOBJECT(formwindow), slot.slot, + MetaDataBase::changeSlotAttributes( formwindow, slot.slot, slot.specifier, slot.access, slot.language, slot.returnType ); } @@ -2254,7 +2245,7 @@ void Resource::loadTabOrder( const TQDomElement &e ) void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(TQT_TQOBJECT(formwindow)); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo(formwindow); TQString cn = formwindow->name(); ts << makeIndent(indent) << "<class>" << entitize(cn) << "</class>" << endl; if (!info.comment.isEmpty()) @@ -2269,8 +2260,8 @@ void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent ) void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) { - MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) ); - TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formwindow) ); + MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow ); + TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formwindow ); TQString extensionInclude; bool needExtensionInclude = false; if ( !includes.isEmpty() || needExtensionInclude ) { @@ -2291,7 +2282,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ts << makeIndent( indent ) << "</includes>" << endl; } - TQStringList forwards = MetaDataBase::forwards( TQT_TQOBJECT(formwindow) ); + TQStringList forwards = MetaDataBase::forwards( formwindow ); if ( !forwards.isEmpty() ) { ts << makeIndent( indent ) << "<forwards>" << endl; indent++; @@ -2300,7 +2291,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</forwards>" << endl; } - TQStringList sigs = MetaDataBase::signalList( TQT_TQOBJECT(formwindow) ); + TQStringList sigs = MetaDataBase::signalList( formwindow ); if ( !sigs.isEmpty() ) { ts << makeIndent( indent ) << "<signals>" << endl; indent++; @@ -2309,7 +2300,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) indent--; ts << makeIndent( indent ) << "</signals>" << endl; - TQValueList<MetaDataBase::Slot> slotList = MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ); + TQValueList<MetaDataBase::Slot> slotList = MetaDataBase::slotList( formwindow ); if ( !slotList.isEmpty() ) { ts << makeIndent( indent ) << "<slots>" << endl; indent++; @@ -2339,7 +2330,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent ) ; else ts << makeIndent( indent ) << "<pixmapfunction>" << formwindow->pixmapLoaderFunction() << "</pixmapfunction>" << endl; - if ( !( exportMacro = MetaDataBase::exportMacro( TQT_TQOBJECT(formwindow->mainContainer()) ) ).isEmpty() ) + if ( !( exportMacro = MetaDataBase::exportMacro( formwindow->mainContainer() ) ).isEmpty() ) ts << makeIndent( indent ) << "<exportmacro>" << exportMacro << "</exportmacro>" << endl; if ( formwindow ) ts << makeIndent( indent ) << "<layoutdefaults spacing=\"" << formwindow->layoutDefaultSpacing() @@ -2482,9 +2473,9 @@ void Resource::loadActions( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { - loadChildAction( TQT_TQOBJECT(formwindow), n ); + loadChildAction( formwindow, n ); } else if ( n.tagName() == "actiongroup" ) { - loadChildAction( TQT_TQOBJECT(formwindow), n ); + loadChildAction( formwindow, n ); } n = n.nextSibling().toElement(); } @@ -2505,7 +2496,7 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) continue; ts << makeIndent( indent ) << "<toolbar dock=\"" << i << "\">" << endl; indent++; - saveObjectProperties( TQT_TQOBJECT(tb), ts, indent ); + saveObjectProperties( tb, ts, indent ); TQPtrList<TQAction> actionList = ( (QDesignerToolBar*)tb )->insertedActions(); for ( TQAction *a = actionList.first(); a; a = actionList.next() ) { if ( a->inherits( "QSeparatorAction" ) ) { @@ -2514,14 +2505,14 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent ) if ( a->inherits( "QDesignerAction" ) && !( (QDesignerAction*)a )->supportsMenu() ) { TQWidget *w = ( (QDesignerAction*)a )->widget(); ts << makeIndent( indent ) << "<widget class=\"" - << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) << "\">" << endl; + << WidgetFactory::classNameOf( w ) << "\">" << endl; indent++; - saveObjectProperties( TQT_TQOBJECT(w), ts, indent ); - const char *className = WidgetFactory::classNameOf( TQT_TQOBJECT(w) ); + saveObjectProperties( w, ts, indent ); + const char *className = WidgetFactory::classNameOf( w ); if ( w->isA( "CustomWidget" ) ) usedCustomWidgets << TQString( className ); - if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) - saveItems( TQT_TQOBJECT(w), ts, indent ); + if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) + saveItems( w, ts, indent ); indent--; ts << makeIndent( indent ) << "</widget>" << endl; } else { @@ -2543,7 +2534,7 @@ void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent ) return; ts << makeIndent( indent ) << "<menubar>" << endl; indent++; - saveObjectProperties( TQT_TQOBJECT(mw->menuBar()), ts, indent ); + saveObjectProperties( mw->menuBar(), ts, indent ); for ( int i = 0; i < (int)mw->menuBar()->count(); ++i ) { ts << makeIndent( indent ) << "<item text=\"" << entitize( mw->menuBar()->text( mw->menuBar()->idAt( i ) ) ) @@ -2589,12 +2580,12 @@ void Resource::loadToolBars( const TQDomElement &e ) tb->addAction( a ); } else if ( n2.tagName() == "widget" ) { TQWidget *w = (TQWidget*)createObject( n2, tb ); - QDesignerAction *a = new QDesignerAction( w, TQT_TQOBJECT(tb) ); + QDesignerAction *a = new QDesignerAction( w, tb ); a->addTo( tb ); tb->addAction( a ); tb->installEventFilters( w ); } else if ( n2.tagName() == "property" ) { - setObjectProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); + setObjectProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); } @@ -2629,7 +2620,7 @@ void Resource::loadMenuBar( const TQDomElement &e ) } mb->insertItem( n.attribute( "text" ), popup ); } else if ( n.tagName() == "property" ) { - setObjectProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() ); + setObjectProperty( mb, n.attribute( "name" ), n.firstChild().toElement() ); } n = n.nextSibling().toElement(); } @@ -2672,7 +2663,7 @@ void Resource::saveFormCode() LanguageInterface::Function func; func.name = slot.slot; func.body = *it; - func.comments = MetaDataBase::functionComments( TQT_TQOBJECT(formwindow), func.name ); + func.comments = MetaDataBase::functionComments( formwindow, func.name ); func.returnType = slot.returnType; funcs.append( func ); } @@ -2725,7 +2716,7 @@ void Resource::loadFunctions( const TQDomElement &e ) } n = n.nextSibling().toElement(); } - MetaDataBase::setFunctionBodies( TQT_TQOBJECT(formwindow), bodies, TQString(), TQString() ); + MetaDataBase::setFunctionBodies( formwindow, bodies, TQString(), TQString() ); if ( !bodies.isEmpty() ) { LanguageInterface *iface = langIface; if ( !iface ) @@ -2740,7 +2731,7 @@ void Resource::loadFunctions( const TQDomElement &e ) #endif continue; TQString sl( (*it).slot ); - TQString comments = MetaDataBase::functionComments( TQT_TQOBJECT(formwindow), sl ); + TQString comments = MetaDataBase::functionComments( formwindow, sl ); if ( !comments.isEmpty() ) code += comments + "\n"; code += iface->createFunctionStart( formwindow->name(), make_function_pretty( sl ), @@ -2821,25 +2812,25 @@ void Resource::loadExtraSource() for ( TQValueList<LanguageInterface::Function>::Iterator fit = functions.begin(); fit != functions.end(); ++fit ) { - if ( MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1() ) ) - MetaDataBase::changeSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1(), (*fit).name.latin1() ); + if ( MetaDataBase::hasSlot( formwindow, (*fit).name.latin1() ) ) + MetaDataBase::changeSlot( formwindow, (*fit).name.latin1(), (*fit).name.latin1() ); else - MetaDataBase::addSlot( TQT_TQOBJECT(formwindow), (*fit).name.latin1(), "virtual", "public", lang, (*fit).returnType ); - MetaDataBase::setFunctionComments( TQT_TQOBJECT(formwindow), (*fit).name, (*fit).comments ); + MetaDataBase::addSlot( formwindow, (*fit).name.latin1(), "virtual", "public", lang, (*fit).returnType ); + MetaDataBase::setFunctionComments( formwindow, (*fit).name, (*fit).comments ); bodies.insert( MetaDataBase::normalizeSlot( (*fit).name ), (*fit).body ); } - MetaDataBase::setFunctionBodies( TQT_TQOBJECT(formwindow), bodies, TQString(), TQString() ); + MetaDataBase::setFunctionBodies( formwindow, bodies, TQString(), TQString() ); TQStringList v = MetaDataBase::variables( formwindow ); TQStringList::Iterator vit; for ( vit = vars.begin(); vit != vars.end(); ++vit ) v << *vit; - MetaDataBase::setVariables( TQT_TQOBJECT(formwindow), v ); + MetaDataBase::setVariables( formwindow, v ); TQStringList f = MetaDataBase::forwards( formwindow ); for ( vit = forwards.begin(); vit != forwards.end(); ++vit ) f << *vit; - MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), f ); + MetaDataBase::setForwards( formwindow, f ); TQValueList<MetaDataBase::Include> incls = MetaDataBase::includes( formwindow ); for ( vit = includesImpl.begin(); vit != includesImpl.end(); ++vit ) { @@ -2854,6 +2845,6 @@ void Resource::loadExtraSource() inc.location = "in declaration"; incls << inc; } - MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), incls ); + MetaDataBase::setIncludes( formwindow, incls ); } #endif diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp index 8aa6fdc7..4f6773dc 100644 --- a/kommander/editor/sizehandle.cpp +++ b/kommander/editor/sizehandle.cpp @@ -102,7 +102,7 @@ void SizeHandle::paintEvent( TQPaintEvent * ) void SizeHandle::mousePressEvent( TQMouseEvent *e ) { - if ( !widget || e->button() != Qt::LeftButton || !active ) + if ( !widget || e->button() != TQt::LeftButton || !active ) return; oldPressPos = e->pos(); geom = origGeom = TQRect( widget->pos(), widget->size() ); @@ -110,7 +110,7 @@ void SizeHandle::mousePressEvent( TQMouseEvent *e ) void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) { - if ( !widget || ( e->state() & Qt::LeftButton ) != Qt::LeftButton || !active ) + if ( !widget || ( e->state() & TQt::LeftButton ) != TQt::LeftButton || !active ) return; TQPoint rp = mapFromGlobal( e->globalPos() ); TQPoint d = oldPressPos - rp; @@ -222,7 +222,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e ) void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() != Qt::LeftButton || !active ) + if ( e->button() != TQt::LeftButton || !active ) return; formWindow->sizePreview()->hide(); @@ -231,7 +231,7 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e ) formWindow, widget, origGeom, widget->geometry() ) ); - formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) ); + formWindow->emitUpdateProperties( widget ); } void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height ) diff --git a/kommander/editor/sizehandle.h b/kommander/editor/sizehandle.h index 28d18063..394788ed 100644 --- a/kommander/editor/sizehandle.h +++ b/kommander/editor/sizehandle.h @@ -32,7 +32,7 @@ class TQPaintEvent; class SizeHandle : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp index 55c8945f..c35ce642 100644 --- a/kommander/editor/styledbutton.cpp +++ b/kommander/editor/styledbutton.cpp @@ -38,7 +38,7 @@ StyledButton::StyledButton(TQWidget* parent, const char* name) setMinimumSize( minimumSizeHint() ); setAcceptDrops( true ); - connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor())); + connect( this, TQ_SIGNAL(clicked()), TQ_SLOT(onEditor())); setEditor( ColorEditor ); } @@ -145,12 +145,12 @@ void StyledButton::resizeEvent( TQResizeEvent* e ) void StyledButton::drawButton( TQPainter *paint ) { - style().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(), + style().drawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(), isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised); drawButtonLabel(paint); if (hasFocus()) - style().tqdrawPrimitive(TQStyle::PE_FocusRect, paint, + style().drawPrimitive(TQStyle::PE_FocusRect, paint, style().subRect(TQStyle::SR_PushButtonFocusRect, this), colorGroup(), TQStyle::Style_Default); } diff --git a/kommander/editor/styledbutton.h b/kommander/editor/styledbutton.h index a090b8b5..1c46472c 100644 --- a/kommander/editor/styledbutton.h +++ b/kommander/editor/styledbutton.h @@ -30,7 +30,7 @@ class FormWindow; class StyledButton : public TQButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQColor color READ color WRITE setColor ) diff --git a/kommander/editor/tableeditorimpl.cpp b/kommander/editor/tableeditorimpl.cpp index cb07cd7c..137934d9 100644 --- a/kommander/editor/tableeditorimpl.cpp +++ b/kommander/editor/tableeditorimpl.cpp @@ -28,7 +28,7 @@ TableEditor::TableEditor( TQWidget* parent, TQWidget *editWidget, FormWindow *f #endif formWindow( fw ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); #ifndef TQT_NO_TABLE labelColumnPixmap->setText( "" ); labelRowPixmap->setText( "" ); @@ -381,7 +381,7 @@ void TableEditor::readFromTable() #ifndef TQT_NO_TABLE TQHeader *cols = editTable->horizontalHeader(); table->setNumCols( cols->count() ); - TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(editTable) ); + TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( editTable ); for ( int i = 0; i < cols->count(); ++i ) { if ( editTable->horizontalHeader()->iconSet( i ) ) { table->horizontalHeader()->setLabel( i, *editTable->horizontalHeader()->iconSet( i ), diff --git a/kommander/editor/tableeditorimpl.h b/kommander/editor/tableeditorimpl.h index 0342ed60..70b61763 100644 --- a/kommander/editor/tableeditorimpl.h +++ b/kommander/editor/tableeditorimpl.h @@ -10,7 +10,7 @@ class FormWindow; class TableEditor : public TableEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/timestamp.cpp b/kommander/editor/timestamp.cpp index 850e7eb2..7782fff3 100644 --- a/kommander/editor/timestamp.cpp +++ b/kommander/editor/timestamp.cpp @@ -28,7 +28,7 @@ TimeStamp::TimeStamp( TQObject *parent, const TQString &f ) : TQObject( parent ), filename( f ), autoCheck( false ) { timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( autoCheckTimeStamp() ) ); update(); } diff --git a/kommander/editor/timestamp.h b/kommander/editor/timestamp.h index cc867ad8..bbf11cff 100644 --- a/kommander/editor/timestamp.h +++ b/kommander/editor/timestamp.h @@ -27,7 +27,7 @@ class TimeStamp : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp index 3effc4e3..f4b7eaac 100644 --- a/kommander/editor/widgetfactory.cpp +++ b/kommander/editor/widgetfactory.cpp @@ -188,7 +188,7 @@ int QDesignerTabWidget::count() const bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(tabBar()) ) return false; + if ( o != tabBar() ) return false; switch ( e->type() ) { case TQEvent::MouseButtonPress: { @@ -417,7 +417,7 @@ void WidgetFactory::saveDefaultProperties( TQWidget *w, int id ) static void saveChangedProperties( TQWidget *w, int id ) { - TQStringList l = MetaDataBase::changedProperties( TQT_TQOBJECT(w) ); + TQStringList l = MetaDataBase::changedProperties( w ); changedProperties->insert( id, l ); } @@ -468,7 +468,7 @@ int EditorTabWidget::count() const bool EditorTabWidget::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(tabBar()) ) return false; + if ( o != tabBar() ) return false; switch ( e->type() ) { case TQEvent::MouseButtonPress: { @@ -640,7 +640,7 @@ int EditorToolBox::count() const created. */ -TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient ) +TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, TQt::Orientation orient ) { TQString n = WidgetDatabase::className(id); //tqDebug("Trying to create '%s'", n.latin1()); @@ -662,7 +662,7 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo w = createCustomWidget(parent, name ? name : s, MetaDataBase::customWidget(id)); if (!w) return 0; - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(w); if (!defaultProperties->contains(id)) saveDefaultProperties(w, id); @@ -682,7 +682,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou int margin = 0; if ( widget && !widget->inherits( "TQLayoutWidget" ) && - ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) || + ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) || widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) ) margin = MainWindow::self->currentLayoutDefaultMargin(); @@ -701,35 +701,35 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou if ( !layout && widget && widget->inherits( "TQWidgetStack" ) ) widget = ((TQWidgetStack*)widget)->visibleWidget(); - MetaDataBase::addEntry( TQT_TQOBJECT(widget) ); + MetaDataBase::addEntry( widget ); if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { TQGroupBox *gb = (TQGroupBox*)widget; - gb->setColumnLayout( 0, Qt::Vertical ); + gb->setColumnLayout( 0, TQt::Vertical ); gb->layout()->setMargin( 0 ); gb->layout()->setSpacing( 0 ); TQLayout *l; switch ( type ) { case HBox: l = new TQHBoxLayout( gb->layout() ); - MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); + MetaDataBase::setMargin( gb, margin ); + MetaDataBase::setSpacing( gb, spacing ); l->setAlignment( AlignTop ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case VBox: l = new TQVBoxLayout( gb->layout(), spacing ); - MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); + MetaDataBase::setMargin( gb, margin ); + MetaDataBase::setSpacing( gb, spacing ); l->setAlignment( AlignTop ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case Grid: l = new QDesignerGridLayout( gb->layout() ); - MetaDataBase::setMargin( TQT_TQOBJECT(gb), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(gb), spacing ); + MetaDataBase::setMargin( gb, margin ); + MetaDataBase::setSpacing( gb, spacing ); l->setAlignment( AlignTop ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; default: return 0; @@ -740,24 +740,24 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou switch ( type ) { case HBox: l = new TQHBoxLayout( layout ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); l->setSpacing( spacing ); l->setMargin( margin ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case VBox: l = new TQVBoxLayout( layout ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); l->setSpacing( spacing ); l->setMargin( margin ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case Grid: { l = new QDesignerGridLayout( layout ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); l->setSpacing( spacing ); l->setMargin( margin ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; } default: @@ -768,39 +768,39 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou switch ( type ) { case HBox: l = new TQHBoxLayout( widget ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); if ( widget ) { - MetaDataBase::setMargin( TQT_TQOBJECT(widget), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(widget), spacing ); + MetaDataBase::setMargin( widget, margin ); + MetaDataBase::setSpacing( widget, spacing ); } else { l->setMargin( margin ); l->setSpacing( margin ); } - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case VBox: l = new TQVBoxLayout( widget ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); if ( widget ) { - MetaDataBase::setMargin( TQT_TQOBJECT(widget), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(widget), spacing ); + MetaDataBase::setMargin( widget, margin ); + MetaDataBase::setSpacing( widget, spacing ); } else { l->setMargin( margin ); l->setSpacing( margin ); } - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; case Grid: { l = new QDesignerGridLayout( widget ); - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); if ( widget ) { - MetaDataBase::setMargin( TQT_TQOBJECT(widget), margin ); - MetaDataBase::setSpacing( TQT_TQOBJECT(widget), spacing ); + MetaDataBase::setMargin( widget, margin ); + MetaDataBase::setSpacing( widget, spacing ); } else { l->setMargin( margin ); l->setSpacing( margin ); } - MetaDataBase::addEntry( TQT_TQOBJECT(l) ); + MetaDataBase::addEntry( l ); return l; } default: @@ -834,7 +834,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget ) */ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init, - const TQRect *r, Qt::Orientation orient ) + const TQRect *r, TQt::Orientation orient ) { if (className == "TQPushButton") { @@ -955,8 +955,8 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (init) { l->setText(TQString::fromLatin1(name)); - MetaDataBase::addEntry(TQT_TQOBJECT(l)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "text", true); + MetaDataBase::addEntry(l); + MetaDataBase::setPropertyChanged(l, "text", true); } return l; } else if (className == "TQLayoutWidget") @@ -969,11 +969,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare FormWindow *fw = find_formwindow(parent); TQWidget *w = fw ? new QDesignerWidget(fw, tw, "tab") : new TQWidget(tw, "tab"); tw->addTab(w, i18n("Tab 1")); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(w); w = fw ? new QDesignerWidget(fw, tw, "tab") : new TQWidget(tw, "tab"); tw->addTab(w, i18n("Tab 2")); - MetaDataBase::addEntry(TQT_TQOBJECT(tw)); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(tw); + MetaDataBase::addEntry(w); } return tw; } else if (className == "TQComboBox") @@ -989,7 +989,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (fw) { QDesignerWidget *dw = new QDesignerWidget(fw, parent, name); - MetaDataBase::addEntry(TQT_TQOBJECT(dw)); + MetaDataBase::addEntry(dw); return dw; } } @@ -1014,25 +1014,25 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (init && parent && parent->inherits("FormWindow")) { QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page"); - MetaDataBase::addEntry(TQT_TQOBJECT(dw)); + MetaDataBase::addEntry(dw); wiz->addPage(dw, i18n("Page")); - TQTimer::singleShot(0, wiz, TQT_SLOT(next())); + TQTimer::singleShot(0, wiz, TQ_SLOT(next())); } return wiz; } else if (className == "Spacer") { Spacer *s = new Spacer(parent, name); - MetaDataBase::addEntry(TQT_TQOBJECT(s)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "sizeType", true); + MetaDataBase::addEntry(s); + MetaDataBase::setPropertyChanged(s, "orientation", true); + MetaDataBase::setPropertyChanged(s, "sizeType", true); if (!r) return s; if (!r->isValid() || r->width() < 2 && r->height() < 2) s->setOrientation(orient); else if (r->width() < r->height()) - s->setOrientation(Qt::Vertical); + s->setOrientation(TQt::Vertical); else - s->setOrientation(Qt::Horizontal); + s->setOrientation(TQt::Horizontal); return s; } else if (className == "TQLCDNumber") return new TQLCDNumber(parent, name); @@ -1052,9 +1052,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (!r->isValid() || r->width() < 2 && r->height() < 2) s->setOrientation(orient); else if (r->width() > r->height()) - s->setOrientation(Qt::Horizontal); - MetaDataBase::addEntry(TQT_TQOBJECT(s)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); + s->setOrientation(TQt::Horizontal); + MetaDataBase::addEntry(s); + MetaDataBase::setPropertyChanged(s, "orientation", true); return s; } else if (className == "TQScrollBar") { @@ -1064,9 +1064,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (!r->isValid() || r->width() < 2 && r->height() < 2) s->setOrientation(orient); else if (r->width() > r->height()) - s->setOrientation(Qt::Horizontal); - MetaDataBase::addEntry(TQT_TQOBJECT(s)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); + s->setOrientation(TQt::Horizontal); + MetaDataBase::addEntry(s); + MetaDataBase::setPropertyChanged(s, "orientation", true); return s; } else if (className == "TQFrame") { @@ -1078,16 +1078,16 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare } else if (className == "Line") { Line *l = new Line(parent, name); - MetaDataBase::addEntry(TQT_TQOBJECT(l)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "orientation", true); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "frameShadow", true); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(l), "frameShape", true); + MetaDataBase::addEntry(l); + MetaDataBase::setPropertyChanged(l, "orientation", true); + MetaDataBase::setPropertyChanged(l, "frameShadow", true); + MetaDataBase::setPropertyChanged(l, "frameShape", true); if (!r) return l; if (!r->isValid() || r->width() < 2 && r->height() < 2) l->setOrientation(orient); else if (r->width() < r->height()) - l->setOrientation(Qt::Vertical); + l->setOrientation(TQt::Vertical); return l; } else if (className == "TQMainWindow") { @@ -1095,7 +1095,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare mw->setDockEnabled(TQt::DockMinimized, false); QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, mw, "central widget"); mw->setDockMenuEnabled(false); - MetaDataBase::addEntry(TQT_TQOBJECT(dw)); + MetaDataBase::addEntry(dw); mw->setCentralWidget(dw); (void) mw->statusBar(); dw->show(); @@ -1156,10 +1156,10 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (init && parent && parent->inherits("FormWindow")) { QDesignerWidget *dw = new QDesignerWidget((FormWindow *) parent, wiz, "page"); - MetaDataBase::addEntry(TQT_TQOBJECT(dw)); + MetaDataBase::addEntry(dw); wiz->addPage(dw, i18n("Page 1")); wiz->addPage(dw, i18n("Page 2")); - TQTimer::singleShot(0, wiz, TQT_SLOT(next())); + TQTimer::singleShot(0, wiz, TQ_SLOT(next())); } return wiz; } @@ -1171,11 +1171,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare FormWindow *fw = find_formwindow(parent); TQWidget *w = fw ? new QDesignerWidget(fw, tw, "tab") : new TQWidget(tw, "tab"); tw->addTab(w, i18n("Tab 1")); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(w); w = fw ? new QDesignerWidget(fw, tw, "tab") : new TQWidget(tw, "tab"); tw->addTab(w, i18n("Tab 2")); - MetaDataBase::addEntry(TQT_TQOBJECT(tw)); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(tw); + MetaDataBase::addEntry(w); } return tw; } else if (className == "ToolBox") @@ -1186,11 +1186,11 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare FormWindow *fw = find_formwindow(parent); TQWidget *w = fw ? new QDesignerWidget(fw, tw, "toolbox") : new TQWidget(tw, "toolbox"); tw->addItem(w, i18n("Page 1")); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(w); w = fw ? new QDesignerWidget(fw, tw, "toolbox") : new TQWidget(tw, "toolbox"); tw->addItem(w, i18n("Page 2")); - MetaDataBase::addEntry(TQT_TQOBJECT(tw)); - MetaDataBase::addEntry(TQT_TQOBJECT(w)); + MetaDataBase::addEntry(tw); + MetaDataBase::addEntry(w); } return tw; } @@ -1248,9 +1248,9 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare if (!r->isValid() || r->width() < 2 && r->height() < 2) s->setOrientation(orient); else if (r->width() > r->height()) - s->setOrientation(Qt::Horizontal); - MetaDataBase::addEntry(TQT_TQOBJECT(s)); - MetaDataBase::setPropertyChanged(TQT_TQOBJECT(s), "orientation", true); + s->setOrientation(TQt::Horizontal); + MetaDataBase::addEntry(s); + MetaDataBase::setPropertyChanged(s, "orientation", true); return s; } #endif @@ -1282,14 +1282,14 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay w = ((TQWidgetStack*)w)->visibleWidget(); if ( w && w->inherits( "TQSplitter" ) ) - return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox; + return ( (TQSplitter*)w )->orientation() ==TQt::Horizontal ? HBox : VBox; if ( !w || !w->layout() ) return NoLayout; TQLayout *lay = w->layout(); if ( w->inherits( "TQGroupBox" ) ) { - TQObjectList *l = TQT_TQOBJECT(lay)->queryList( "TQLayout" ); + TQObjectList *l = lay->queryList( "TQLayout" ); if ( l && l->first() ) lay = (TQLayout*)l->first(); delete l; @@ -1331,7 +1331,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w ) TQWidget *WidgetFactory::layoutParent( TQLayout *layout ) { - TQObject *o = TQT_TQOBJECT(layout); + TQObject *o = layout; while ( o ) { if ( o->isWidgetType() ) return (TQWidget*)o; @@ -1379,7 +1379,7 @@ TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w ) if ( w->parentWidget() && w->parentWidget()->inherits( "TQWidgetStack" ) ) w = w->parentWidget(); while ( w ) { - if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) || + if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) || w && w->parentWidget() && w->parentWidget()->inherits( "FormWindow" ) ) return w; w = w->parentWidget(); @@ -1395,7 +1395,7 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o ) if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things return true; - if ( o->inherits( "TQTabBar" ) || ::tqqt_cast<TQToolBox*>(o->parent()) ) + if ( o->inherits( "TQTabBar" ) || ::tqt_cast<TQToolBox*>(o->parent()) ) return true; else if ( o->inherits( "TQSizeGrip" ) ) return true; @@ -1475,7 +1475,7 @@ void WidgetFactory::initChangedProperties( TQObject *o ) if ( o->inherits( "TQPushButton" ) || o->inherits("TQRadioButton") || o->inherits( "TQCheckBox" ) || o->inherits( "TQToolButton" ) ) MetaDataBase::setPropertyChanged( o, "text", true ); - else if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { + else if (::tqt_cast<TQToolButton*>(o) && ::tqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) { MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "textLabel", TRUE ); MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE ); @@ -1498,7 +1498,7 @@ void WidgetFactory::initChangedProperties( TQObject *o ) t->verticalHeader()->setLabel( i, TQString::number( i + 1 ) ); } #endif - } else if ( ::tqqt_cast<TQToolBox*>(o) ) { + } else if ( ::tqt_cast<TQToolBox*>(o) ) { MetaDataBase::setPropertyChanged( o, "currentIndex", true ); MetaDataBase::setPropertyChanged( o, "itemName", true ); MetaDataBase::setPropertyChanged( o, "itemLabel", true ); @@ -1904,17 +1904,10 @@ void TQLayoutWidget::updateSizePolicy() vt |= TQSizePolicy::Maximum; } } -#ifdef USE_QT4 if ( layout()->expanding() & TQSizePolicy::Horizontally ) ht = TQSizePolicy::Expanding; if ( layout()->expanding() & TQSizePolicy::Vertically ) vt = TQSizePolicy::Expanding; -#else // USE_QT4 - if ( layout()->expanding() & TQSizePolicy::Horizontally ) - ht = TQSizePolicy::Expanding; - if ( layout()->expanding() & TQSizePolicy::Vertically ) - vt = TQSizePolicy::Expanding; -#endif // USE_QT4 layout()->invalidate(); } diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h index ff0d9c60..7b45da8c 100644 --- a/kommander/editor/widgetfactory.h +++ b/kommander/editor/widgetfactory.h @@ -110,7 +110,7 @@ private: class QDesignerTabWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) @@ -140,7 +140,7 @@ private: class EditorTabWidget : public TabWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) @@ -170,7 +170,7 @@ private: class KDE_EXPORT EditorToolBox : public ToolBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) @@ -190,7 +190,7 @@ public: class QDesignerWizard : public TQWizard { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true ) TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true ) @@ -226,7 +226,7 @@ private: class TQLayoutWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -245,7 +245,7 @@ protected: class CustomWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -278,7 +278,7 @@ protected: class Line : public TQFrame { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) @@ -305,7 +305,7 @@ public: class QDesignerLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget ) @@ -338,7 +338,7 @@ private: class QDesignerWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -355,7 +355,7 @@ private: class QDesignerDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: @@ -372,7 +372,7 @@ private: class QDesignerToolButton : public TQToolButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -396,7 +396,7 @@ public: class QDesignerRadioButton : public TQRadioButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -421,7 +421,7 @@ public: class QDesignerPushButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -446,7 +446,7 @@ public: class QDesignerCheckBox : public TQCheckBox { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId ) @@ -471,7 +471,7 @@ public: class EditorDialog : public Dialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/widgetinterface.h b/kommander/editor/widgetinterface.h index 3eed33d7..2958b10c 100644 --- a/kommander/editor/widgetinterface.h +++ b/kommander/editor/widgetinterface.h @@ -24,6 +24,6 @@ #include <tqwidgetinterface_p.h> #define WidgetInterface TQWidgetFactoryInterface -#define IID_Widget IID_TQWidgetFactory +#define IID_Widget IID_QWidgetFactory #endif diff --git a/kommander/editor/wizardeditor.ui b/kommander/editor/wizardeditor.ui index 2f5c16e4..ec183bf2 100644 --- a/kommander/editor/wizardeditor.ui +++ b/kommander/editor/wizardeditor.ui @@ -302,7 +302,7 @@ <slot>cancelClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">init()</slot> <slot access="protected">destroy()</slot> <slot access="protected">addClicked()</slot> @@ -315,6 +315,6 @@ <slot access="protected">okClicked()</slot> <slot access="protected">removeClicked()</slot> <slot access="protected">upClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kommander/editor/wizardeditorimpl.cpp b/kommander/editor/wizardeditorimpl.cpp index 3dbdec9b..f362a360 100644 --- a/kommander/editor/wizardeditorimpl.cpp +++ b/kommander/editor/wizardeditorimpl.cpp @@ -34,7 +34,7 @@ WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw ) : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ) { - connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); + connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) ); fillListBox(); } diff --git a/kommander/editor/wizardeditorimpl.h b/kommander/editor/wizardeditorimpl.h index b3d7e896..c6bb84ed 100644 --- a/kommander/editor/wizardeditorimpl.h +++ b/kommander/editor/wizardeditorimpl.h @@ -31,7 +31,7 @@ class FormWindow; class WizardEditor : public WizardEditorBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/editor/workspace.cpp b/kommander/editor/workspace.cpp index a14eac60..59ed882c 100644 --- a/kommander/editor/workspace.cpp +++ b/kommander/editor/workspace.cpp @@ -136,7 +136,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, *formPixmap ); - TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); #ifndef KOMMANDER if ( formFile->supportsCodeFile() ) (void) new WorkspaceItem( this, formFile, FormSourceType ); @@ -154,7 +154,7 @@ WorkspaceItem::WorkspaceItem( TQListView *parent, FormFile* ff, Type type ) t = type; if ( type == FormFileType ) { setPixmap( 0, *formPixmap ); - TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); + TQObject::connect( ff, TQ_SIGNAL( somethingChanged(FormFile*) ), listView(), TQ_SLOT( update(FormFile*) ) ); #ifndef KOMMANDER if ( formFile->supportsCodeFile() ) (void) new WorkspaceItem( this, formFile, FormSourceType ); @@ -355,12 +355,12 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw ) setPalette( p ); addColumn( i18n("Files" ) ); setAllColumnsShowFocus( true ); - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), - connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( itemClicked( int, TQListViewItem *, const TQPoint& ) ) ), + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( itemDoubleClicked( TQListViewItem * ) ) ), + connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( rmbClicked( TQListViewItem *, const TQPoint& ) ) ), setHScrollBarMode( AlwaysOff ); setVScrollBarMode( AlwaysOn ); viewport()->setAcceptDrops( true ); @@ -395,19 +395,19 @@ void Workspace::setCurrentProject( Project *pro ) if ( project == pro ) return; if ( project ) { - disconnect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - disconnect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + disconnect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + disconnect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); } project = pro; - connect( project, TQT_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQT_SLOT( sourceFileAdded(SourceFile*) ) ); - connect( project, TQT_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQT_SLOT( sourceFileRemoved(SourceFile*) ) ); - connect( project, TQT_SIGNAL( formFileAdded(FormFile*) ), this, TQT_SLOT( formFileAdded(FormFile*) ) ); - connect( project, TQT_SIGNAL( formFileRemoved(FormFile*) ), this, TQT_SLOT( formFileRemoved(FormFile*) ) ); - connect( project, TQT_SIGNAL( destroyed(TQObject*) ), this, TQT_SLOT( projectDestroyed(TQObject*) ) ); - connect( project, TQT_SIGNAL( projectModified() ), this, TQT_SLOT( update() ) ); + connect( project, TQ_SIGNAL( sourceFileAdded(SourceFile*) ), this, TQ_SLOT( sourceFileAdded(SourceFile*) ) ); + connect( project, TQ_SIGNAL( sourceFileRemoved(SourceFile*) ), this, TQ_SLOT( sourceFileRemoved(SourceFile*) ) ); + connect( project, TQ_SIGNAL( formFileAdded(FormFile*) ), this, TQ_SLOT( formFileAdded(FormFile*) ) ); + connect( project, TQ_SIGNAL( formFileRemoved(FormFile*) ), this, TQ_SLOT( formFileRemoved(FormFile*) ) ); + connect( project, TQ_SIGNAL( destroyed(TQObject*) ), this, TQ_SLOT( projectDestroyed(TQObject*) ) ); + connect( project, TQ_SIGNAL( projectModified() ), this, TQ_SLOT( update() ) ); clear(); if ( bufferEdit ) @@ -583,7 +583,7 @@ void Workspace::itemDoubleClicked( TQListViewItem *i ) void Workspace::itemClicked( int button, TQListViewItem *i, const TQPoint& ) { - if ( !i || button != Qt::LeftButton ) + if ( !i || button != TQt::LeftButton ) return; closeAutoOpenItems(); @@ -699,7 +699,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) break; #endif case OPEN_SOURCE: - itemClicked( Qt::LeftButton, i, pos ); + itemClicked( TQt::LeftButton, i, pos ); break; #ifndef KOMMANDER case REMOVE_FORM: // FIXME @@ -707,10 +707,10 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) break; #endif case OPEN_FORM: - itemClicked( Qt::LeftButton, i, pos ); + itemClicked( TQt::LeftButton, i, pos ); break; case OPEN_FORM_SOURCE: - itemClicked( Qt::LeftButton, i, pos ); + itemClicked( TQt::LeftButton, i, pos ); break; default: break; @@ -720,7 +720,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) bool Workspace::eventFilter( TQObject *o, TQEvent * e ) { // Reggie, on what type of events do we have to execute updateBufferEdit() - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(bufferEdit) && e->type() != TQEvent::ChildRemoved ) + if ( o == bufferEdit && e->type() != TQEvent::ChildRemoved ) updateBufferEdit(); return TQListView::eventFilter( o, e ); } @@ -728,8 +728,8 @@ bool Workspace::eventFilter( TQObject *o, TQEvent * e ) void Workspace::setBufferEdit( QCompletionEdit *edit ) { bufferEdit = edit; - connect( bufferEdit, TQT_SIGNAL( chosen( const TQString & ) ), - this, TQT_SLOT( bufferChosen( const TQString & ) ) ); + connect( bufferEdit, TQ_SIGNAL( chosen( const TQString & ) ), + this, TQ_SLOT( bufferChosen( const TQString & ) ) ); bufferEdit->installEventFilter( this ); } @@ -764,7 +764,7 @@ void Workspace::bufferChosen( const TQString &buffer ) TQListViewItemIterator it( this ); while ( it.current() ) { if ( ( (WorkspaceItem*)it.current())->checkCompletion( buffer ) ) { - itemClicked( Qt::LeftButton, it.current(), TQPoint() ); + itemClicked( TQt::LeftButton, it.current(), TQPoint() ); break; } ++it; diff --git a/kommander/editor/workspace.h b/kommander/editor/workspace.h index 330fd444..4ba4b2a3 100644 --- a/kommander/editor/workspace.h +++ b/kommander/editor/workspace.h @@ -93,7 +93,7 @@ private: class Workspace : public TQListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/examples/current/b1.kmdr b/kommander/examples/current/b1.kmdr index 09725243..4dd7ee30 100644 --- a/kommander/examples/current/b1.kmdr +++ b/kommander/examples/current/b1.kmdr @@ -121,7 +121,7 @@ endif <property name="associations" stdset="0"> <stringlist> <string>//message_info("parentPid = "+parentPid+"\npid = "+pid) -dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(QString,QString)", "StatusBar8", "Hello") +dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(TQString,TQString)", "StatusBar8", "Hello") </string> </stringlist> </property> diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr index 2cc912c4..676fde24 100644 --- a/kommander/examples/current/editor-poc.kmdr +++ b/kommander/examples/current/editor-poc.kmdr @@ -303,9 +303,9 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1)) <stringlist> <string></string> <string>@Array.setValue(help, "Proof of concept", "&lt;center&gt;&lt;h2&gt;Kommander MainWindow frames!&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;As Kommander took on functionality an attempt was made to make a MainWindow Kommander widget. Sadly it was a huge time loss for two developers who both gave up after days of trying. The problem was with the editor. However you can use a Qt Designer generated UI file renamed to a *.kmdr file. Into this frame you can place your widgets and make a working application where nearly everything works.&lt;/p&gt;") -@Array.setValue(help, "Known limitations", "&lt;center&gt;&lt;h2&gt;Known limitations&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are Q_SIGNALS for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and TDEActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &lt;/p&gt;") +@Array.setValue(help, "Known limitations", "&lt;center&gt;&lt;h2&gt;Known limitations&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are signals for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and TDEActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &lt;/p&gt;") @Array.setValue(help, "Rolling your own", "&lt;center&gt;&lt;h2&gt;Rolling your own&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;It is our intention to have a template in the 1.3 release of a MainWindow, but if you have Qt Designer for Qt 3x you can easily start a window design, save it, rename to *.kmdr and open in Kommander. Remember not to add widgets in Designer as Kommander will not recognize them.&lt;/p&gt;") -@Array.setValue(help, "Using Actions", "&lt;center&gt;&lt;h2&gt;Using Actions&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;If you want to get the goodies, menus, toolbars and accelerator keys, you need to use actions. Kommander has an Action editor on the window menu under Views. There you can add actions and there is a shortcut to connecting them with Q_SIGNALS and Q_SLOTS. To get everything working select an Action and look in the properties menu for settings like name, text and icon. For menus and toolbars try right clicking on them for context menus. Now from the Action View drag an Action to the menu or toolbar. See the visual feedback? Just connect your Action to a script and you have three different ways to call it.&lt;/p&gt; +@Array.setValue(help, "Using Actions", "&lt;center&gt;&lt;h2&gt;Using Actions&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;If you want to get the goodies, menus, toolbars and accelerator keys, you need to use actions. Kommander has an Action editor on the window menu under Views. There you can add actions and there is a shortcut to connecting them with signals and slots. To get everything working select an Action and look in the properties menu for settings like name, text and icon. For menus and toolbars try right clicking on them for context menus. Now from the Action View drag an Action to the menu or toolbar. See the visual feedback? Just connect your Action to a script and you have three different ways to call it.&lt;/p&gt; ") @Array.setValue(help, "Link examples", "&lt;center&gt;&lt;h2&gt;Link examples&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;This demo shows examples of linking. Links will show in the TextEdit widget, but they don't do anything. In the TextBrowser they open web pages and email links, but of course you can't edit in the TextBrowser. If you don't mind writing some script you can set up your own link handling, which I've done here. Note that it will follow links anywhere in the editor. If the link is a widget name it assumes it to be a script and calls it. If not it looks to see if it is a web link and calls that&lt;/p&gt;&lt;p&gt;It would be easy to extend this script to accept link parameters and process emails. You could also make a reference to other text objects, tab widget tabs, pretty much anything you can think of.&lt;/p&gt;") @Array.setValue(help, "How this help works", "&lt;center&gt;&lt;h2&gt;How this help works&lt;/h2&gt;&lt;/center&gt;&lt;p&gt;Do you wonder where this help came from? It is possible to use KDE help if you write DocBook, make it and install it. This quick help is fast and can contain &lt;i&gt;rich text&lt;/i&gt;. To look at the dialog copy the text in the hidden TextEdit (set to text mode so as not to muck things up with rich text interperting XML) and paste it to a text editor like KWrite. Save it as a Kommander file and open it in the Kommander Editor.&lt;/p&gt;") @@ -586,9 +586,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&New</string> </property> - <property name="accel"> - <number>272629838</number> - </property> </action> <action> <property name="name"> @@ -603,9 +600,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Open...</string> </property> - <property name="accel"> - <number>272629839</number> - </property> </action> <action> <property name="name"> @@ -620,9 +614,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Save</string> </property> - <property name="accel"> - <number>272629843</number> - </property> </action> <action> <property name="name"> @@ -634,9 +625,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -651,9 +639,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Print...</string> </property> - <property name="accel"> - <number>272629840</number> - </property> </action> <action> <property name="name"> @@ -665,9 +650,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -682,9 +664,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Undo</string> </property> - <property name="accel"> - <number>272629850</number> - </property> </action> <action> <property name="name"> @@ -699,9 +678,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Redo</string> </property> - <property name="accel"> - <number>272629849</number> - </property> </action> <action> <property name="name"> @@ -716,9 +692,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Cu&t</string> </property> - <property name="accel"> - <number>272629848</number> - </property> </action> <action> <property name="name"> @@ -733,9 +706,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Copy</string> </property> - <property name="accel"> - <number>272629827</number> - </property> </action> <action> <property name="name"> @@ -750,9 +720,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Paste</string> </property> - <property name="accel"> - <number>272629846</number> - </property> </action> <action> <property name="name"> @@ -767,9 +734,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Find...</string> </property> - <property name="accel"> - <number>272629830</number> - </property> </action> <action> <property name="name"> @@ -781,9 +745,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -795,9 +756,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -809,9 +767,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -840,9 +795,6 @@ TextEdit5.setColor(color)</string> <property name="menuText"> <string>Bold</string> </property> - <property name="accel"> - <number>272629826</number> - </property> </action> <actiongroup> <property name="name"> @@ -871,9 +823,6 @@ TextEdit5.setColor(color)</string> <property name="text"> <string>Italic</string> </property> - <property name="accel"> - <number>272629833</number> - </property> </action> <action> <property name="name"> diff --git a/kommander/examples/current/kpartmwframe.kmdr b/kommander/examples/current/kpartmwframe.kmdr index 7211785b..d723f0e2 100644 --- a/kommander/examples/current/kpartmwframe.kmdr +++ b/kommander/examples/current/kpartmwframe.kmdr @@ -218,9 +218,6 @@ endif</string> <property name="menuText"> <string>&New</string> </property> - <property name="accel"> - <number>272629838</number> - </property> </action> <action> <property name="name"> @@ -235,9 +232,6 @@ endif</string> <property name="menuText"> <string>&Open...</string> </property> - <property name="accel"> - <number>272629839</number> - </property> </action> <action> <property name="name"> @@ -252,9 +246,6 @@ endif</string> <property name="menuText"> <string>&Save</string> </property> - <property name="accel"> - <number>272629843</number> - </property> </action> <action> <property name="name"> @@ -266,9 +257,6 @@ endif</string> <property name="menuText"> <string>Save &As...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -283,9 +271,6 @@ endif</string> <property name="menuText"> <string>&Print...</string> </property> - <property name="accel"> - <number>272629840</number> - </property> </action> <action> <property name="name"> @@ -297,9 +282,6 @@ endif</string> <property name="menuText"> <string>E&xit</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -314,9 +296,6 @@ endif</string> <property name="menuText"> <string>&Undo</string> </property> - <property name="accel"> - <number>272629850</number> - </property> </action> <action> <property name="name"> @@ -331,9 +310,6 @@ endif</string> <property name="menuText"> <string>&Redo</string> </property> - <property name="accel"> - <number>272629849</number> - </property> </action> <action> <property name="name"> @@ -348,9 +324,6 @@ endif</string> <property name="menuText"> <string>Cu&t</string> </property> - <property name="accel"> - <number>272629848</number> - </property> </action> <action> <property name="name"> @@ -365,9 +338,6 @@ endif</string> <property name="menuText"> <string>&Copy</string> </property> - <property name="accel"> - <number>272629827</number> - </property> </action> <action> <property name="name"> @@ -382,9 +352,6 @@ endif</string> <property name="menuText"> <string>&Paste</string> </property> - <property name="accel"> - <number>272629846</number> - </property> </action> <action> <property name="name"> @@ -399,9 +366,6 @@ endif</string> <property name="menuText"> <string>&Find...</string> </property> - <property name="accel"> - <number>272629830</number> - </property> </action> <action> <property name="name"> @@ -413,9 +377,6 @@ endif</string> <property name="menuText"> <string>&Contents...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -427,9 +388,6 @@ endif</string> <property name="menuText"> <string>&Index...</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -441,9 +399,6 @@ endif</string> <property name="menuText"> <string>&About</string> </property> - <property name="accel"> - <number>0</number> - </property> </action> <action> <property name="name"> @@ -472,9 +427,6 @@ endif</string> <property name="menuText"> <string>Bold</string> </property> - <property name="accel"> - <number>272629826</number> - </property> </action> <actiongroup> <property name="name"> @@ -503,9 +455,6 @@ endif</string> <property name="text"> <string>Italic</string> </property> - <property name="accel"> - <number>272629833</number> - </property> </action> <action> <property name="name"> diff --git a/kommander/examples/old/form4.kmdr b/kommander/examples/old/form4.kmdr index db66649e..3bb039e2 100644 --- a/kommander/examples/old/form4.kmdr +++ b/kommander/examples/old/form4.kmdr @@ -79,9 +79,9 @@ <connections> <connection> <sender>TextEdit1</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>LineEdit1</receiver> - <slot>setWidgetText(const QString&)</slot> + <slot>setWidgetText(const TQString&)</slot> </connection> </connections> <layoutdefaults spacing="6" margin="11"/> diff --git a/kommander/examples/old/form5.kmdr b/kommander/examples/old/form5.kmdr index ef7127c2..1f244567 100644 --- a/kommander/examples/old/form5.kmdr +++ b/kommander/examples/old/form5.kmdr @@ -331,15 +331,15 @@ Ha ha. We got it all with Kommander!</string> <connections> <connection> <sender>ExecButton9</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>usetext</receiver> - <slot>setWidgetText(const QString&)</slot> + <slot>setWidgetText(const TQString&)</slot> </connection> <connection> <sender>ExecButton9_2</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>usetext</receiver> - <slot>setText(const QString&)</slot> + <slot>setText(const TQString&)</slot> </connection> </connections> <layoutdefaults spacing="6" margin="11"/> diff --git a/kommander/examples/old/settings.kmdr b/kommander/examples/old/settings.kmdr index 988dc3f9..df796460 100644 --- a/kommander/examples/old/settings.kmdr +++ b/kommander/examples/old/settings.kmdr @@ -249,9 +249,9 @@ Items") </connection> <connection> <sender>ExecButton1</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>listBox</receiver> - <slot>setWidgetText(const QString&)</slot> + <slot>setWidgetText(const TQString&)</slot> </connection> <connection> <sender>settingsDialog</sender> diff --git a/kommander/examples/old/tidy.kmdr b/kommander/examples/old/tidy.kmdr index e8641450..acc47721 100644 --- a/kommander/examples/old/tidy.kmdr +++ b/kommander/examples/old/tidy.kmdr @@ -1150,9 +1150,9 @@ fi </connection> <connection> <sender>ExecButton2</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>GtidyPath</receiver> - <slot>setWidgetText(const QString&)</slot> + <slot>setWidgetText(const TQString&)</slot> </connection> </connections> <layoutdefaults spacing="6" margin="11"/> diff --git a/kommander/examples/old/widgetgenerator.kmdr b/kommander/examples/old/widgetgenerator.kmdr index d4ebfc78..46f166e3 100644 --- a/kommander/examples/old/widgetgenerator.kmdr +++ b/kommander/examples/old/widgetgenerator.kmdr @@ -100,37 +100,37 @@ headerContent="/**************************************************************** /* OTHER INCLUDES */ #include <kommanderwidget.h> -class QWidget; +class TQWidget; class QShowEvent; class @className : public @inheritClassName, public KommanderWidget { - Q_OBJECT + TQ_OBJECT - TQ_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - @className(QWidget *a_parent, const char *a_name); + @className(TQWidget *a_parent, const char *a_name); ~@className(); - virtual QString widgetText() const; + virtual TQString widgetText() const; virtual bool isKommanderWidget() const; virtual void setAssociatedText(QStringList); virtual QStringList associatedText() const; - virtual QString currentState() const; + virtual TQString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(QString); + virtual TQString populationText() const; + virtual void setPopulationText(TQString); -public Q_SLOTS: - virtual void setWidgetText(const QString &); +public slots: + virtual void setWidgetText(const TQString &); virtual void populate(); -Q_SIGNALS: +signals: void widgetOpened(); - void widgetTextChanged(const QString &); + void widgetTextChanged(const TQString &); protected: void showEvent( QShowEvent *e ); private: @@ -169,7 +169,7 @@ cppContent="/******************************************************************* #include <kommanderwidget.h> #include \"$classNameLower.h\" -@className::@className(QWidget *a_parent, const char *a_name) +@className::@className(TQWidget *a_parent, const char *a_name) : @inheritClassName(a_parent, a_name), KommanderWidget(this) { QStringList states; @@ -182,9 +182,9 @@ cppContent="/******************************************************************* { } -QString @className::currentState() const +TQString @className::currentState() const { - return QString(\"default\"); + return TQString(\"default\"); } bool @className::isKommanderWidget() const @@ -204,30 +204,30 @@ void @className::setAssociatedText(QStringList a_at) void @className::populate() { - QString txt = KommanderWidget::evalAssociatedText( populationText() ); + TQString txt = KommanderWidget::evalAssociatedText( populationText() ); setWidgetText( txt ); } -QString @className::populationText() const +TQString @className::populationText() const { return KommanderWidget::populationText(); } -void @className::setPopulationText(QString a_text) +void @className::setPopulationText(TQString a_text) { KommanderWidget::setPopulationText(a_text); } -void @className::setWidgetText(const QString &a_text) +void @className::setWidgetText(const TQString &a_text) { //set the widget text of your widget here emit widgetTextChanged(a_text); } -QString @className::widgetText() const +TQString @className::widgetText() const { // implement your widget text here - return QString::null; + return TQString::null; } void @className::showEvent( QShowEvent *e ) diff --git a/kommander/examples/old/wizard.kmdr b/kommander/examples/old/wizard.kmdr index 352aaef3..d7f57170 100644 --- a/kommander/examples/old/wizard.kmdr +++ b/kommander/examples/old/wizard.kmdr @@ -39,7 +39,7 @@ </property> <property name="associations" stdset="0"> <stringlist> - <string>@dcop(@dcopid, KommanderIf, enableWidget(QString,bool), next, @CheckBox1.checked) + <string>@dcop(@dcopid, KommanderIf, enableWidget(TQString,bool), next, @CheckBox1.checked) </string> </stringlist> @@ -156,7 +156,7 @@ </property> <property name="associations" stdset="0"> <stringlist> - <string>@dcop(@dcopid, KommanderIf, enableWidget(QString,bool), next, @CheckBox1_2.checked) + <string>@dcop(@dcopid, KommanderIf, enableWidget(TQString,bool), next, @CheckBox1_2.checked) </string> </stringlist> @@ -213,7 +213,7 @@ </property> <property name="associations" stdset="0"> <stringlist> - <string>@dcop(@dcopid, KommanderIf, enableWidget(QString,bool), finish, @CheckBox2.checked) + <string>@dcop(@dcopid, KommanderIf, enableWidget(TQString,bool), finish, @CheckBox2.checked) </string> </stringlist> @@ -262,15 +262,15 @@ </connection> <connection> <sender>Wizard1</sender> - <signal>selected(const QString&)</signal> + <signal>selected(const TQString&)</signal> <receiver>ScriptObject1_2</receiver> <slot>execute()</slot> </connection> <connection> <sender>Wizard1</sender> - <signal>selected(const QString&)</signal> + <signal>selected(const TQString&)</signal> <receiver>LineEdit6</receiver> - <slot>setText(const QString&)</slot> + <slot>setText(const TQString&)</slot> </connection> <connection> <sender>CheckBox2</sender> diff --git a/kommander/examples/tutorial/picview.kmdr b/kommander/examples/tutorial/picview.kmdr index 1617b53d..4fdca299 100644 --- a/kommander/examples/tutorial/picview.kmdr +++ b/kommander/examples/tutorial/picview.kmdr @@ -133,7 +133,7 @@ <connections> <connection> <sender>FileSelector1</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>ListBox1</receiver> <slot>populate()</slot> </connection> diff --git a/kommander/examples/tutorial/slots.kmdr b/kommander/examples/tutorial/slots.kmdr index d4f2b524..ae0fec91 100644 --- a/kommander/examples/tutorial/slots.kmdr +++ b/kommander/examples/tutorial/slots.kmdr @@ -185,7 +185,7 @@ fi <connections> <connection> <sender>FileSelector</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>FileListBox</receiver> <slot>populate()</slot> </connection> diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index 6dbb1a10..b746ec97 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -106,7 +106,7 @@ bool Instance::build(const KURL& fname) { TQFile inputFile; inputFile.open(IO_ReadOnly, stdin); - m_instance = KommanderFactory::create(TQT_TQIODEVICE(&inputFile)); + m_instance = KommanderFactory::create(&inputFile); } // check if build was successful @@ -121,7 +121,7 @@ bool Instance::build(const KURL& fname) window->setFileName(fname.path().local8Bit()); // FIXME : Should verify that all of the widgets in the dialog derive from KommanderWidget - m_textInstance = kommanderWidget(TQT_TQOBJECT(m_instance)); + m_textInstance = kommanderWidget(m_instance); if (!m_textInstance) // Main dialog/window is not a Kommander widget - look for one { @@ -437,7 +437,7 @@ TQStringList Instance::children(const TQString& parent, bool recursive) TQObject* child = stringToWidget(parent); TQObjectList* widgets; if (!child) - child = TQT_TQOBJECT(m_instance); + child = m_instance; if (child->inherits("TQWidget")) { widgets = child->queryList("TQWidget", 0, false, recursive); diff --git a/kommander/executor/instance.h b/kommander/executor/instance.h index f7af3103..f93c90de 100644 --- a/kommander/executor/instance.h +++ b/kommander/executor/instance.h @@ -42,7 +42,7 @@ class KommanderWidget; class Instance : public TQObject, virtual public DCOPKommanderIf { - Q_OBJECT + TQ_OBJECT public: diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp index ecd9bfac..f27ab90f 100644 --- a/kommander/executor/main.cpp +++ b/kommander/executor/main.cpp @@ -81,7 +81,7 @@ int main(int argc, char *argv[]) TDELocale::setMainCatalogue("kommander"); TDEApplication app; - TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); if (!args->count()) { KMessageBox::sorry(0, i18n("Error: no dialog given. Use --stdin option to read dialog from standard input.\n")); diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 57737fb7..f3cbb0e1 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -131,7 +131,7 @@ TQWidget *KommanderFactory::create( const TQString &uiFile, TQObject *connector, if (!qwf_currFileName) qwf_currFileName = new TQString(); *qwf_currFileName = uiFile; - TQWidget *w = KommanderFactory::create( TQT_TQIODEVICE(&f), connector, parent, name ); + TQWidget *w = KommanderFactory::create( &f, connector, parent, name ); if ( !qwf_forms ) qwf_forms = new TQMap<TQWidget*, TQString>; qwf_forms->insert( w, uiFile ); @@ -517,7 +517,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge // hide layout widgets w = parent; } else { - obj = TQT_TQOBJECT(KommanderFactory::createWidget( className, parent, 0 )); + obj = KommanderFactory::createWidget( className, parent, 0 ); if ( !obj ) { return 0; @@ -563,7 +563,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge layout = createLayout( 0, 0, KommanderFactory::HBox ); else layout = createLayout( w, layout, KommanderFactory::HBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); @@ -574,7 +574,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge layout = createLayout( 0, 0, KommanderFactory::Grid ); else layout = createLayout( w, layout, KommanderFactory::Grid ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); @@ -585,7 +585,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge layout = createLayout( 0, 0, KommanderFactory::VBox ); else layout = createLayout( w, layout, KommanderFactory::VBox ); - obj = TQT_TQOBJECT(layout); + obj = layout; n = n.firstChild().toElement(); if ( parentLayout && parentLayout->inherits( "TQGridLayout" ) ) ( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row, row + rowspan - 1, col, col + colspan - 1 ); @@ -636,7 +636,7 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* layout, L if ( !layout && widget && widget->inherits( "TQGroupBox" ) ) { TQGroupBox *gb = (TQGroupBox*)widget; - gb->setColumnLayout( 0, Qt::Vertical ); + gb->setColumnLayout( 0, TQt::Vertical ); gb->layout()->setMargin( 0 ); gb->layout()->setSpacing( 0 ); TQLayout *l; @@ -827,7 +827,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T } if ( prop == "geometry" ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) { + if ( obj == toplevel ) { toplevel->resize( v.toRect().size() ); return; } @@ -844,7 +844,7 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) int rowspan = e.attribute( "rowspan" ).toInt(); int colspan = e.attribute( "colspan" ).toInt(); - Qt::Orientation orient = Qt::Horizontal; + TQt::Orientation orient = TQt::Horizontal; int w = 0, h = 0; TQSizePolicy::SizeType sizeType = TQSizePolicy::Preferred; while ( !n.isNull() ) { @@ -852,9 +852,9 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) TQString prop = n.attribute( "name" ); if ( prop == "orientation" ) { if ( n.firstChild().firstChild().toText().data() == "Horizontal" ) - orient = Qt::Horizontal; + orient = TQt::Horizontal; else - orient = Qt::Vertical; + orient = TQt::Vertical; } else if ( prop == "sizeType" ) { if ( n.firstChild().firstChild().toText().data() == "Fixed" ) sizeType = TQSizePolicy::Fixed; @@ -880,14 +880,14 @@ void KommanderFactory::createSpacer( const TQDomElement &e, TQLayout *layout ) rowspan = 1; if ( colspan < 1 ) colspan = 1; - TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum, - orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum ); + TQSpacerItem *item = new TQSpacerItem( w, h, orient == TQt::Horizontal ? sizeType : TQSizePolicy::Minimum, + orient == TQt::Vertical ? sizeType : TQSizePolicy::Minimum ); if ( layout ) { if ( layout->inherits( "TQBoxLayout" ) ) ( (TQBoxLayout*)layout )->addItem( item ); else ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1, - orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter ); + orient == TQt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter ); } } @@ -1022,7 +1022,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect if ( n2.tagName() == "sender" ) { TQString name = n2.firstChild().toText().data(); if ( name == "this" || name == toplevel->name() ) { - conn.sender = TQT_TQOBJECT(toplevel); + conn.sender = toplevel; } else { if ( name == "this" ) name = toplevel->name(); @@ -1040,7 +1040,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect } else if ( n2.tagName() == "receiver" ) { TQString name = n2.firstChild().toText().data(); if ( name == "this" || name == toplevel->name() ) { - conn.receiver = TQT_TQOBJECT(toplevel); + conn.receiver = toplevel; } else { TQObjectList *l = toplevel->queryList( 0, name.utf8(), false ); if ( l ) { @@ -1061,7 +1061,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect TQObject *sender = 0, *receiver = 0; TQObjectList *l = toplevel->queryList( 0, conn.sender->name(), false ); if ( qstrcmp( conn.sender->name(), toplevel->name() ) == 0 ) { - sender = TQT_TQOBJECT(toplevel); + sender = toplevel; } else { if ( !l || !l->first() ) { delete l; @@ -1075,7 +1075,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect sender = findAction( conn.sender->name() ); if ( qstrcmp( conn.receiver->name(), toplevel->name() ) == 0 ) { - receiver = TQT_TQOBJECT(toplevel); + receiver = toplevel; } else { l = toplevel->queryList( 0, conn.receiver->name(), false ); if ( !l || !l->first() ) { @@ -1097,7 +1097,7 @@ void KommanderFactory::loadConnections( const TQDomElement &e, TQObject *connect TQStrList slotList = receiver->metaObject()->slotNames( true ); // if this is a connection to a custom slot and we have a connector, try this as receiver - if ( slotList.find( conn.slot ) == -1 && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel) && connector ) { + if ( slotList.find( conn.slot ) == -1 && receiver == toplevel && connector ) { slotList = connector->metaObject()->slotNames( true ); receiver = connector; } @@ -1386,9 +1386,9 @@ void KommanderFactory::loadActions( const TQDomElement &e ) TQDomElement n = e.firstChild().toElement(); while ( !n.isNull() ) { if ( n.tagName() == "action" ) { - loadChildAction( TQT_TQOBJECT(toplevel), n ); + loadChildAction( toplevel, n ); } else if ( n.tagName() == "actiongroup" ) { - loadChildAction( TQT_TQOBJECT(toplevel), n ); + loadChildAction( toplevel, n ); } n = n.nextSibling().toElement(); } @@ -1416,7 +1416,7 @@ void KommanderFactory::loadToolBars( const TQDomElement &e ) } else if ( n2.tagName() == "widget" ) { (void)createWidgetInternal( n2, tb, 0, n2.attribute( "class", "TQWidget" ) ); } else if ( n2.tagName() == "property" ) { - setProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() ); + setProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() ); } n2 = n2.nextSibling().toElement(); } @@ -1447,7 +1447,7 @@ void KommanderFactory::loadMenuBar( const TQDomElement &e ) } mb->insertItem( translate( n.attribute( "text" ) ), popup ); } else if ( n.tagName() == "property" ) { - setProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() ); + setProperty( mb, n.attribute( "name" ), n.firstChild().toElement() ); } n = n.nextSibling().toElement(); } diff --git a/kommander/kmdrtools/dcoptool-oldparser.kmdr b/kommander/kmdrtools/dcoptool-oldparser.kmdr index 6a21755a..d3a00bc7 100644 --- a/kommander/kmdrtools/dcoptool-oldparser.kmdr +++ b/kommander/kmdrtools/dcoptool-oldparser.kmdr @@ -30,98 +30,98 @@ @TextParam4.setVisible(false) @param4.setVisible(false) -@setGlobal(Array,"values(QString) -keys(QString) -clear(QString) -count(QString) -count(QString) -remove(QString,QString) -remove(QString,QString) -fromString(QString,QString) -toString(QString) -toString(QString) -toString(QString) -toString(QString) -toString(QString)") +@setGlobal(Array,"values(TQString) +keys(TQString) +clear(TQString) +count(TQString) +count(TQString) +remove(TQString,TQString) +remove(TQString,TQString) +fromString(TQString,TQString) +toString(TQString) +toString(TQString) +toString(TQString) +toString(TQString) +toString(TQString)") -@setGlobal(File,"read(QString) -write(QString,QString) -append(QString,QString)") +@setGlobal(File,"read(TQString) +write(TQString,TQString) +append(TQString,TQString)") -@setGlobal(Input,"text(QString,QString,QString) -password(QString,QString) -value(QString,QString,int,int,int,int) -double(QString,QString,double,double,double,double) -openfile(QString,QString,QString) -savefile(QString,QString,QString) -directory(QString,QString,QString) -openfiles(QString,QString,QString)") +@setGlobal(Input,"text(TQString,TQString,TQString) +password(TQString,TQString) +value(TQString,TQString,int,int,int,int) +double(TQString,TQString,double,double,double,double) +openfile(TQString,TQString,TQString) +savefile(TQString,TQString,TQString) +directory(TQString,TQString,TQString) +openfiles(TQString,TQString,TQString)") -@setGlobal(DCOP,"addUniqueItem(QString,QString) -associatedText(QString) -cellText(QString,int,int) -checked(QString) -children(QString,bool) -clear(QString) -count(QString) -currentColumn(QString) -currentItem(QString) -currentRow(QString) -execute(QString) -findItem(QString,QString) -insertColumn(QString,int,int) -insertItem(QString,QString,int) -insertItems(QString,QStringList,int) -insertRow(QString,int,int) -item(QString,int) -itemDepth(QString,int) -itemPath(QString,int) -removeColumn(QString,int,int) -removeItem(QString,int) -removeRow(QString,int,int) -selection(QString) -setAssociatedText(QString,QString) -setEnabled(QString,bool) -setCellText(QString,int,int,QString) -setCellWidget(QString,int,int,QString) -cellWidget(QString,int,int) -setChecked(QString,bool) -setColumnCaption(QString,int,QString) -setCurrentItem(QString,int) -insertTab(QString,QString,int) -setMaximum(QString,int) -setPixmap(QString,QString,int) -setRowCaption(QString,int,QString) -setSelection(QString,QString) -setText(QString,QString) -setVisible(QString,bool) -type(QString) -setEditable(QString,bool)") +@setGlobal(DCOP,"addUniqueItem(TQString,TQString) +associatedText(TQString) +cellText(TQString,int,int) +checked(TQString) +children(TQString,bool) +clear(TQString) +count(TQString) +currentColumn(TQString) +currentItem(TQString) +currentRow(TQString) +execute(TQString) +findItem(TQString,TQString) +insertColumn(TQString,int,int) +insertItem(TQString,TQString,int) +insertItems(TQString,QStringList,int) +insertRow(TQString,int,int) +item(TQString,int) +itemDepth(TQString,int) +itemPath(TQString,int) +removeColumn(TQString,int,int) +removeItem(TQString,int) +removeRow(TQString,int,int) +selection(TQString) +setAssociatedText(TQString,TQString) +setEnabled(TQString,bool) +setCellText(TQString,int,int,TQString) +setCellWidget(TQString,int,int,TQString) +cellWidget(TQString,int,int) +setChecked(TQString,bool) +setColumnCaption(TQString,int,TQString) +setCurrentItem(TQString,int) +insertTab(TQString,TQString,int) +setMaximum(TQString,int) +setPixmap(TQString,TQString,int) +setRowCaption(TQString,int,TQString) +setSelection(TQString,TQString) +setText(TQString,TQString) +setVisible(TQString,bool) +type(TQString) +setEditable(TQString,bool)") -@setGlobal(File,"read(QString) -write(QString,QString) -append(QString,QString)") +@setGlobal(File,"read(TQString) +write(TQString,TQString) +append(TQString,TQString)") @setGlobal(KommanderMessage,"") -@setGlobal(String,"length(QString) -contains(QString,QString) -find(QString,QString,int) -findRev(QString,QString,int) -left(QString,int) -right(QString,int) -mid(QString,int,int) -remove(QString,QString) -replace(QString,QString,QString) -upper(QString) -lower(QString) -compare(QString,QString) -isEmpty(QString) -isNumber(QString) -section(QString,QString,int) -args(QString,QString,QString,QString) -args(QString,QString,QString,QString) -args(QString,QString,QString,QString)") +@setGlobal(String,"length(TQString) +contains(TQString,TQString) +find(TQString,TQString,int) +findRev(TQString,TQString,int) +left(TQString,int) +right(TQString,int) +mid(TQString,int,int) +remove(TQString,TQString) +replace(TQString,TQString,TQString) +upper(TQString) +lower(TQString) +compare(TQString,TQString) +isEmpty(TQString) +isNumber(TQString) +section(TQString,TQString,int) +args(TQString,TQString,TQString,TQString) +args(TQString,TQString,TQString,TQString) +args(TQString,TQString,TQString,TQString)") @functiongroup.setCurrentItem(1) @@ -647,10 +647,10 @@ fi @#@exec(kdialog --msgbox "@global(_KDDIR)\n") @# dcop kmdr-executor-32730 KommanderIf children kmdr-executor-32730 1 @wname.clear -@setGlobal(items,@dcop(@global(pdlg), KommanderIf, "children(QString,bool)", @global(pdlg), 1 )) +@setGlobal(items,@dcop(@global(pdlg), KommanderIf, "children(TQString,bool)", @global(pdlg), 1 )) @setGlobal(iwd,"") @forEach(i, @global(items)) - @setGlobal(iwd, "@global(iwd)@i (@dcop(@global(pdlg), KommanderIf, "type(QString)", @i))\n") + @setGlobal(iwd, "@global(iwd)@i (@dcop(@global(pdlg), KommanderIf, "type(TQString)", @i))\n") @end @wname.insertItems(@global(iwd),0)</string> </stringlist> @@ -757,7 +757,7 @@ fi <string>@##### put the following in @setfunction ######### @# set up dialog based on function @switch(@functiongroup.selection::@proto.selection) -@case(DCOP::addUniqueItem(QString,QString)) +@case(DCOP::addUniqueItem(TQString,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"item") @setGlobal(PARM2,"") @@ -765,7 +765,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,addUniqueItem) @setGlobal(DESC,"Inserts the item if it will not create a duplicate.") -@case(DCOP::associatedText(QString)) +@case(DCOP::associatedText(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -773,7 +773,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,associatedText) @setGlobal(DESC,"Returns scripts associated with widget. This is an advanced feature that would not be commonly used.") -@case(DCOP::cellText(QString,int,int)) +@case(DCOP::cellText(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"column") @@ -781,7 +781,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,cellText) @setGlobal(DESC,"Returns text of a cell in a table.") -@case(DCOP::checked(QString)) +@case(DCOP::checked(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -789,7 +789,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,checked) @setGlobal(DESC,"Returns 1 for checked boxes, 0 for unchecked.") -@case(DCOP::children(QString,bool)) +@case(DCOP::children(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"recursive") @setGlobal(PARM2,"") @@ -797,7 +797,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,children) @setGlobal(DESC,"Returns the list of child widgets contained in the parent widget. Set the <i>recursive</i> parameter to <i>true</i> to include widgets contained by child widgets.") -@case(DCOP::clear(QString)) +@case(DCOP::clear(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -805,7 +805,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,clear) @setGlobal(DESC,"Removes all content from the widget.") -@case(DCOP::count(QString)) +@case(DCOP::count(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -813,7 +813,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,count) @setGlobal(DESC,"Returns number of items in a widget such as combobox or listbox.") -@case(DCOP::currentColumn(QString)) +@case(DCOP::currentColumn(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -821,7 +821,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,currentColumn) @setGlobal(DESC,"Returns index of current column.") -@case(DCOP::currentItem(QString)) +@case(DCOP::currentItem(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -829,7 +829,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,currentItem) @setGlobal(DESC,"Returns index of current item.") -@case(DCOP::currentRow(QString)) +@case(DCOP::currentRow(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -837,7 +837,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,currentRow) @setGlobal(DESC,"Returns index of current row.") -@case(DCOP::execute(QString)) +@case(DCOP::execute(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -845,7 +845,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,execute) @setGlobal(DESC,"Executes the script associated with the widget. With the new parser the execute method can take one or more arguments.") -@case(DCOP::findItem(QString,QString)) +@case(DCOP::findItem(TQString,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"item") @setGlobal(PARM2,"") @@ -853,7 +853,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,findItem) @setGlobal(DESC,"Returns the index of an item with the given text.") -@case(DCOP::insertColumn(QString,int,int)) +@case(DCOP::insertColumn(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"column") @setGlobal(PARM2,"count") @@ -861,7 +861,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,insertColumn) @setGlobal(DESC,"Inserts new column &#040;or <i>count</i> columns&#041; at <i>column</i> position.") -@case(DCOP::insertItem(QString,QString,int)) +@case(DCOP::insertItem(TQString,TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"item") @setGlobal(PARM2,"index") @@ -869,7 +869,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,insertItem) @setGlobal(DESC,"Inserts item at <i>index</i> position.") -@case(DCOP::insertItems(QString,QStringList,int)) +@case(DCOP::insertItems(TQString,QStringList,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"items") @setGlobal(PARM2,"index") @@ -877,7 +877,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,insertItems) @setGlobal(DESC,"Inserts multiple items &#040;EOL-separated&#041; at <i>index</i> position.") -@case(DCOP::insertRow(QString,int,int)) +@case(DCOP::insertRow(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"count") @@ -885,7 +885,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,insertRow) @setGlobal(DESC,"Inserts new row &#040;or <i>count</i> rows&#041; at <i>row</i> position.") -@case(DCOP::item(QString,int)) +@case(DCOP::item(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"index") @setGlobal(PARM2,"") @@ -893,7 +893,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,item) @setGlobal(DESC,"Returns the text of the item at the given index.") -@case(DCOP::itemDepth(QString,int)) +@case(DCOP::itemDepth(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"index") @setGlobal(PARM2,"") @@ -901,7 +901,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,itemDepth) @setGlobal(DESC,"Returns the depth of the current item in the tree. Root items have depth 0.") -@case(DCOP::itemPath(QString,int)) +@case(DCOP::itemPath(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"index") @setGlobal(PARM2,"") @@ -909,7 +909,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,itemPath) @setGlobal(DESC,"Returns the slash-separated path to the given item in the tree.") -@case(DCOP::removeColumn(QString,int,int)) +@case(DCOP::removeColumn(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"column") @setGlobal(PARM2,"count") @@ -917,7 +917,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,removeColumn) @setGlobal(DESC,"Removes the column &#040;or <i>count</i> consecutive columns&#041; with the given index.") -@case(DCOP::removeItem(QString,int)) +@case(DCOP::removeItem(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"index") @setGlobal(PARM2,"") @@ -925,7 +925,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,removeItem) @setGlobal(DESC,"Removes the item with the given index.") -@case(DCOP::removeRow(QString,int,int)) +@case(DCOP::removeRow(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"count") @@ -933,7 +933,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,removeRow) @setGlobal(DESC,"Removes the row &#040;or <i>count</i> consecutive rows&#041; with the given index.") -@case(DCOP::selection(QString)) +@case(DCOP::selection(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -941,7 +941,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,selection) @setGlobal(DESC,"Returns selected text or text of current item.\nIn case of Table widgets, returns the selection coordinates, separated by commas in TopRow,LeftColumn,BottomRow,RightColumn form. ") -@case(DCOP::setAssociatedText(QString,QString)) +@case(DCOP::setAssociatedText(TQString,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -949,7 +949,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setAssociatedText) @setGlobal(DESC,"Sets scripts associated with widget. This is an advanced feature that would not be commonly used.") -@case(DCOP::setEnabled(QString,bool)) +@case(DCOP::setEnabled(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"enabled") @setGlobal(PARM2,"") @@ -957,7 +957,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setEnabled) @setGlobal(DESC,"Enables or disables widget.") -@case(DCOP::setCellText(QString,int,int,QString)) +@case(DCOP::setCellText(TQString,int,int,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"col") @@ -965,7 +965,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setCellText) @setGlobal(DESC,"Sets text of a cell in a table.") -@case(DCOP::setCellWidget(QString,int,int,QString)) +@case(DCOP::setCellWidget(TQString,int,int,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"col") @@ -973,7 +973,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setCellWidget) @setGlobal(DESC,"Inserts a widget into a cell of a table.") -@case(DCOP::cellWidget(QString,int,int)) +@case(DCOP::cellWidget(TQString,int,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"col") @@ -981,7 +981,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,cellWidget) @setGlobal(DESC,"Returns the name of a widget inserted into a cell, or an empty string if the cell contains no widget or an unknown widget type.") -@case(DCOP::setChecked(QString,bool)) +@case(DCOP::setChecked(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"checked") @setGlobal(PARM2,"") @@ -989,7 +989,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setChecked) @setGlobal(DESC,"Sets/unsets checkbox.") -@case(DCOP::setColumnCaption(QString,int,QString)) +@case(DCOP::setColumnCaption(TQString,int,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"column") @setGlobal(PARM2,"text") @@ -997,7 +997,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setColumnCaption) @setGlobal(DESC,"Sets caption of the column <i>column</i>.") -@case(DCOP::setCurrentItem(QString,int)) +@case(DCOP::setCurrentItem(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"index") @setGlobal(PARM2,"") @@ -1005,7 +1005,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setCurrentItem) @setGlobal(DESC,"Selects the item at the specified index. Indexes are zero based.") -@case(DCOP::insertTab(QString,QString,int)) +@case(DCOP::insertTab(TQString,TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"label") @setGlobal(PARM2,"index") @@ -1013,7 +1013,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,insertTab) @setGlobal(DESC,"Inserts a tab to the tabwidget with the specified label at the given index. Indexes are zero based.") -@case(DCOP::setMaximum(QString,int)) +@case(DCOP::setMaximum(TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"value") @setGlobal(PARM2,"") @@ -1021,7 +1021,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setMaximum) @setGlobal(DESC,"Sets maximum numeric value") -@case(DCOP::setPixmap(QString,QString,int)) +@case(DCOP::setPixmap(TQString,TQString,int)) @setGlobal(enWidget,1) @setGlobal(PARM1,"iconName") @setGlobal(PARM2,"index") @@ -1029,7 +1029,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setPixmap) @setGlobal(DESC,"Sets pixmap at the given index to the specified icon. Use <i>index = -1</i> to set the pixmap for all items.") -@case(DCOP::setRowCaption(QString,int,QString)) +@case(DCOP::setRowCaption(TQString,int,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"row") @setGlobal(PARM2,"text") @@ -1037,7 +1037,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setRowCaption) @setGlobal(DESC,"Sets caption of the row <i>row</i>.") -@case(DCOP::setSelection(QString,QString)) +@case(DCOP::setSelection(TQString,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -1045,7 +1045,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setSelection) @setGlobal(DESC,"Selects given text or select item containing given text.") -@case(DCOP::setText(QString,QString)) +@case(DCOP::setText(TQString,TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -1053,7 +1053,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setText) @setGlobal(DESC,"Sets widget's content.") -@case(DCOP::setVisible(QString,bool)) +@case(DCOP::setVisible(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"visible") @setGlobal(PARM2,"") @@ -1061,7 +1061,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setVisible) @setGlobal(DESC,"Shows/hides widget.") -@case(DCOP::type(QString)) +@case(DCOP::type(TQString)) @setGlobal(enWidget,1) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -1069,7 +1069,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,type) @setGlobal(DESC,"Returns type&#040;class&#041; of widget.") -@case(DCOP::setEditable(QString,bool)) +@case(DCOP::setEditable(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1077,7 +1077,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setEditable) @setGlobal(DESC,"Makes the widget editable or read only, depending on the editable argument.") -@case(Kommander::setEditable(QString,bool)) +@case(Kommander::setEditable(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1085,7 +1085,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setEditable) @setGlobal(DESC,"Returns current widget's content. This was required inside widget A to return widget A content when requested by widget B. The new method is to use &#064;A.text inside B instead of just &#064;A if you just want the unaltered text.") -@case(Kommander::setEditable(QString,bool)) +@case(Kommander::setEditable(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1093,7 +1093,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setEditable) @setGlobal(DESC,"Returns selected text or text of current item. This is deprecated for <i>&#064;mywidget.selected</i>.") -@case(Kommander::setEditable(QString,bool)) +@case(Kommander::setEditable(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1101,7 +1101,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setEditable) @setGlobal(DESC,"Does nothing. This is useful if you request a CheckBox or RadioButton to return a value where a state, typically the unchecked state, has no value. The &#064;null prevents an error indicating it is empty.") -@case(Kommander::pid(QString,bool)) +@case(Kommander::pid(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1109,7 +1109,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,pid) @setGlobal(DESC,"Returns the pid &#040;process ID&#041; of the current process.") -@case(Kommander::dcopid(QString,bool)) +@case(Kommander::dcopid(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1117,7 +1117,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,dcopid) @setGlobal(DESC,"Returns DCOP identifier of current process. This is shorthand for <i>kmdr-executor-&#064;pid</i>.") -@case(Kommander::parentPid(QString,bool)) +@case(Kommander::parentPid(TQString,bool)) @setGlobal(enWidget,1) @setGlobal(PARM1,"editable") @setGlobal(PARM2,"") @@ -1125,7 +1125,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,parentPid) @setGlobal(DESC,"Returns the pid of the parent Kommander window.") -@case(Kommander::debug(QString)) +@case(Kommander::debug(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -1133,7 +1133,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,debug) @setGlobal(DESC,"Writes <i>text</i> on stderr.") -@case(Kommander::echo(QString)) +@case(Kommander::echo(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -1141,7 +1141,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,echo) @setGlobal(DESC,"Writes <i>text</i> on standard output.") -@case(Kommander::echo(QString)) +@case(Kommander::echo(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"") @@ -1149,7 +1149,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,echo) @setGlobal(DESC,"Executes a script block. Bash is used if no shell is given. It is primarily for use in non-button widgets where script actions are not expected. Full path is not required for the shell which may be useful for portability. <p><i>If this is used inside a button it allows alternate script languages to be used and will return a value to the main script, which may be unexpected.</i>") -@case(Kommander::env(QString)) +@case(Kommander::env(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"") @@ -1157,7 +1157,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,env) @setGlobal(DESC,"Returns value of an environment &#040;shell&#041; variable. Do not use <i>$</i> in the name. For example, <i>&#064;env&#040;PATH&#041;</i>.") -@case(Kommander::exec(QString)) +@case(Kommander::exec(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"command") @setGlobal(PARM2,"") @@ -1165,7 +1165,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,exec) @setGlobal(DESC,"Executes an external shell command.") -@case(Kommander::exec(QString)) +@case(Kommander::exec(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"command") @setGlobal(PARM2,"") @@ -1173,7 +1173,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,exec) @setGlobal(DESC,"Parses an expression and returns computed value.") -@case(Kommander::forEach(QString,QString)) +@case(Kommander::forEach(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"items") @@ -1181,7 +1181,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,forEach) @setGlobal(DESC,"Executes loop: values from <i>items</i> list &#040;passed as EOL-separated string&#041; are assigned to the variable. <br><b>Old</b><br> <i>&#064;forEach&#040;i,A\\nB\\nC\\n&#041;<br> &#064;# &#064;i=A<br>&#064;end</i><br><b>New</b><br><i>foreach i in MyArray do<br> //i = key, MyArray[i] = val<br>end ") -@case(Kommander::for(QString,int,int,int)) +@case(Kommander::for(TQString,int,int,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"start") @@ -1189,7 +1189,7 @@ fi @setGlobal(PARM4,"step") @setGlobal(short,for) @setGlobal(DESC,"Executes loop: variable is set to <i>start</i> and is increased by <i>step</i> each time loop is executed. Execution stops when variable becomes larger then <i>end</i>. <br><b>Old</b><br><i>&#064;for&#040;i,1,10,1&#041;<br> &#064;# &#064;i=1<br>&#064;endif</i><br><b>New</b><br><i>for i=0 to 20 step 5 do<br> debug&#040;i&#041;<br>end</i>.") -@case(Kommander::for(QString,int,int,int)) +@case(Kommander::for(TQString,int,int,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"start") @@ -1197,7 +1197,7 @@ fi @setGlobal(PARM4,"step") @setGlobal(short,for) @setGlobal(DESC,"Returns the value of a global variable.") -@case(Kommander::i18n(QString)) +@case(Kommander::i18n(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"") @@ -1205,7 +1205,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,i18n) @setGlobal(DESC,"Translates the string into the current language. Texts in GUI would be automatically extracted for translation.") -@case(Kommander::if(QString)) +@case(Kommander::if(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"expression") @setGlobal(PARM2,"") @@ -1213,7 +1213,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,if) @setGlobal(DESC,"Executes block if expression is true &#040;non-zero number or non-empty string.&#041; <p><b>Old</b>Close with <b>&#064;endif</b></p><p><b>New</b><br>if val == true then<br>// do op<br>elseif cond<br>// second chance<br>else<br>// cond failed<br>endif</p>") -@case(Kommander::dialog(QString,QString)) +@case(Kommander::dialog(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"file") @setGlobal(PARM2,"args") @@ -1221,7 +1221,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,dialog) @setGlobal(DESC,"Executes another Kommander dialog. Current dialog directory is used if no path is given. Arguments may be given as named arguments which will become global variables in the new dialog. For instance: <i>var=val</i>") -@case(Kommander::readSetting(QString,QString)) +@case(Kommander::readSetting(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"key") @setGlobal(PARM2,"default") @@ -1229,7 +1229,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,readSetting) @setGlobal(DESC,"Reads setting from configration file for this dialog.") -@case(Kommander::setGlobal(QString,QString)) +@case(Kommander::setGlobal(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"variable") @setGlobal(PARM2,"value") @@ -1237,7 +1237,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,setGlobal) @setGlobal(DESC,"Sets the value of a global variable. Global variables exist for the life of the Kommander window.") -@case(Kommander::writeSetting(QString,QString)) +@case(Kommander::writeSetting(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"key") @setGlobal(PARM2,"value") @@ -1245,7 +1245,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,writeSetting) @setGlobal(DESC,"Stores setting in configuration file for this dialog.") -@case(Kommander::writeSetting(QString,QString)) +@case(Kommander::writeSetting(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"key") @setGlobal(PARM2,"value") @@ -1253,7 +1253,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,writeSetting) @setGlobal(DESC,"Begin of <b>switch</b> block. Following <b>case</b> values are compared to <i>expression</i>.<p>&#064;switch&#040;&#041;<br>&#064;case&#040;&#041;<br>&#064;end") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1261,7 +1261,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Executes an external DCOP call.") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1269,7 +1269,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Adds a comment to EOL that Kommander will not parse") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1277,7 +1277,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Creates a new widget with the specified type and as the child of parent.") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1285,7 +1285,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Returns true if there is a widget with the passed name, false otherwise.") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1293,7 +1293,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Connects the signal of sender with the slot of the receiver") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1301,7 +1301,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Disconnects the signal of sender from the slot of the receiver") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1309,7 +1309,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Exits script execution and returns") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1317,7 +1317,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Exits the current block of a while, for or foreach loop") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1325,7 +1325,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Exit a step and return to the beginning of a loop") -@case(Kommander::dcop(QString,QString,QString,QString)) +@case(Kommander::dcop(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"id") @setGlobal(PARM2,"interface") @@ -1333,7 +1333,7 @@ fi @setGlobal(PARM4,"args") @setGlobal(short,dcop) @setGlobal(DESC,"Return from a script, optionaly with a value from the script to the caller") -@case(Array::values(QString)) +@case(Array::values(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1341,7 +1341,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,values) @setGlobal(DESC,"Returns an EOL-separated list of all values in the array.") -@case(Array::keys(QString)) +@case(Array::keys(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1349,7 +1349,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,keys) @setGlobal(DESC,"Returns an EOL-separated list of all keys in the array.") -@case(Array::clear(QString)) +@case(Array::clear(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1357,7 +1357,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,clear) @setGlobal(DESC,"Removes all elements from the array.") -@case(Array::count(QString)) +@case(Array::count(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1365,7 +1365,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,count) @setGlobal(DESC,"Returns the number of elements in the array.") -@case(Array::count(QString)) +@case(Array::count(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1373,7 +1373,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,count) @setGlobal(DESC,"Returns the value associated with the given key.") -@case(Array::remove(QString,QString)) +@case(Array::remove(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"key") @@ -1381,7 +1381,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,remove) @setGlobal(DESC,"Removes element with the given key from the array.") -@case(Array::remove(QString,QString)) +@case(Array::remove(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"key") @@ -1389,7 +1389,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,remove) @setGlobal(DESC,"Adds element with the given key and value to the array") -@case(Array::fromString(QString,QString)) +@case(Array::fromString(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"string") @@ -1397,7 +1397,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,fromString) @setGlobal(DESC,"Adds all elements in the string to the array. ") -@case(Array::toString(QString)) +@case(Array::toString(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1405,7 +1405,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,toString) @setGlobal(DESC,"Returns all elements in the array in <pre>key\\tvalue\\n</pre> format.") -@case(Array::toString(QString)) +@case(Array::toString(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1413,7 +1413,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,toString) @setGlobal(DESC,"") -@case(Array::toString(QString)) +@case(Array::toString(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1421,7 +1421,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,toString) @setGlobal(DESC,"") -@case(Array::toString(QString)) +@case(Array::toString(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1429,7 +1429,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,toString) @setGlobal(DESC,"") -@case(Array::toString(QString)) +@case(Array::toString(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"array") @setGlobal(PARM2,"") @@ -1437,7 +1437,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,toString) @setGlobal(DESC,"") -@case(String::length(QString)) +@case(String::length(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"") @@ -1445,7 +1445,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,length) @setGlobal(DESC,"Returns number of chars in the string.") -@case(String::contains(QString,QString)) +@case(String::contains(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"substring") @@ -1453,7 +1453,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,contains) @setGlobal(DESC,"Checks if the the string contains the given substring.") -@case(String::find(QString,QString,int)) +@case(String::find(TQString,TQString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"sought") @@ -1461,7 +1461,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,find) @setGlobal(DESC,"Returns the position of a substring in the string, or -1 if it is not found.") -@case(String::findRev(QString,QString,int)) +@case(String::findRev(TQString,TQString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"sought") @@ -1469,7 +1469,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,findRev) @setGlobal(DESC,"Returns the position of a substring in the string, or -1 if it is not found. String is searched backwards") -@case(String::left(QString,int)) +@case(String::left(TQString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"n") @@ -1477,7 +1477,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,left) @setGlobal(DESC,"Returns the first <i>n</i> chars of the string.") -@case(String::right(QString,int)) +@case(String::right(TQString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"n") @@ -1485,7 +1485,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,right) @setGlobal(DESC,"Returns the last <i>n</i> chars of the string.") -@case(String::mid(QString,int,int)) +@case(String::mid(TQString,int,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"start") @@ -1493,7 +1493,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,mid) @setGlobal(DESC,"Returns <i>n</i> chars of the string, starting from <i>start</i>.") -@case(String::remove(QString,QString)) +@case(String::remove(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"substring") @@ -1501,7 +1501,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,remove) @setGlobal(DESC,"Removes all occurrences of given substring.") -@case(String::replace(QString,QString,QString)) +@case(String::replace(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"substring") @@ -1509,7 +1509,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,replace) @setGlobal(DESC,"Replaces all occurrences of the given substring with the given replacement.") -@case(String::upper(QString)) +@case(String::upper(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"") @@ -1517,7 +1517,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,upper) @setGlobal(DESC,"Converts the string to uppercase.") -@case(String::lower(QString)) +@case(String::lower(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"") @@ -1525,7 +1525,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,lower) @setGlobal(DESC,"Converts the string to lowercase.") -@case(String::compare(QString,QString)) +@case(String::compare(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string1") @setGlobal(PARM2,"string2") @@ -1533,7 +1533,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,compare) @setGlobal(DESC,"Compares two strings. Returns 0 if they are equal, ") -@case(String::isEmpty(QString)) +@case(String::isEmpty(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"") @@ -1541,7 +1541,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,isEmpty) @setGlobal(DESC,"Checks if the string is empty.") -@case(String::isNumber(QString)) +@case(String::isNumber(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"") @@ -1549,7 +1549,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,isNumber) @setGlobal(DESC,"Checks if the string is a valid number.") -@case(String::section(QString,QString,int)) +@case(String::section(TQString,TQString,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"separator") @@ -1557,7 +1557,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,section) @setGlobal(DESC,"Returns given section of a string.") -@case(String::args(QString,QString,QString,QString)) +@case(String::args(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"arg1") @@ -1565,7 +1565,7 @@ fi @setGlobal(PARM4,"arg3") @setGlobal(short,args) @setGlobal(DESC,"Returns the given string with %1, %2, %3 replaced with <i>arg1</i>, <i>arg2</i>, <i>arg3</i> accordingly.") -@case(String::args(QString,QString,QString,QString)) +@case(String::args(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"arg1") @@ -1573,7 +1573,7 @@ fi @setGlobal(PARM4,"arg3") @setGlobal(short,args) @setGlobal(DESC,"Convert a string to an integer. If not possible use the default value") -@case(String::args(QString,QString,QString,QString)) +@case(String::args(TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"string") @setGlobal(PARM2,"arg1") @@ -1581,7 +1581,7 @@ fi @setGlobal(PARM4,"arg3") @setGlobal(short,args) @setGlobal(DESC,"Convert a string to a double precision floating point value. If not possible use the default value") -@case(File::read(QString)) +@case(File::read(TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"") @setGlobal(PARM2,"") @@ -1589,7 +1589,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,read) @setGlobal(DESC,"Returns content of given file.") -@case(File::write(QString,QString)) +@case(File::write(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"file") @setGlobal(PARM2,"string") @@ -1597,7 +1597,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,write) @setGlobal(DESC,"Writes given string to a file.") -@case(File::append(QString,QString)) +@case(File::append(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"file") @setGlobal(PARM2,"string") @@ -1605,7 +1605,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,append) @setGlobal(DESC,"Appends given string to the end of a file.") -@case(Input::text(QString,QString,QString)) +@case(Input::text(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"caption") @setGlobal(PARM2,"label") @@ -1613,7 +1613,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,text) @setGlobal(DESC,"Shows text selection dialog. Returns entered text.") -@case(Input::password(QString,QString)) +@case(Input::password(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"caption") @setGlobal(PARM2,"password") @@ -1621,7 +1621,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,password) @setGlobal(DESC,"Shows a dialog asking user for password and returns it.") -@case(Input::value(QString,QString,int,int,int,int)) +@case(Input::value(TQString,TQString,int,int,int,int)) @setGlobal(enWidget,0) @setGlobal(PARM1,"caption") @setGlobal(PARM2,"label") @@ -1629,7 +1629,7 @@ fi @setGlobal(PARM4,"min") @setGlobal(short,value) @setGlobal(DESC,"Shows value selection dialog. Returns entered value.") -@case(Input::double(QString,QString,double,double,double,double)) +@case(Input::double(TQString,TQString,double,double,double,double)) @setGlobal(enWidget,0) @setGlobal(PARM1,"caption") @setGlobal(PARM2,"label") @@ -1637,7 +1637,7 @@ fi @setGlobal(PARM4,"min") @setGlobal(short,double) @setGlobal(DESC,"Shows float value selection dialog. Returns entered value.") -@case(Input::openfile(QString,QString,QString)) +@case(Input::openfile(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"startdir") @setGlobal(PARM2,"filter") @@ -1645,7 +1645,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,openfile) @setGlobal(DESC,"Shows existing file selection dialog. Returns selected file.") -@case(Input::savefile(QString,QString,QString)) +@case(Input::savefile(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"startdir") @setGlobal(PARM2,"filter") @@ -1653,7 +1653,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,savefile) @setGlobal(DESC,"Shows save file selection dialog. Returns selected file.") -@case(Input::directory(QString,QString,QString)) +@case(Input::directory(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"startdir") @setGlobal(PARM2,"filter") @@ -1661,7 +1661,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,directory) @setGlobal(DESC,"Shows directory selection dialog. Returns selected directory.") -@case(Input::openfiles(QString,QString,QString)) +@case(Input::openfiles(TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"startdir") @setGlobal(PARM2,"filter") @@ -1669,7 +1669,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,openfiles) @setGlobal(DESC,"Shows multiple files selection dialog. Returns EOL-separated list of selected files.") -@case(Message::info(QString,QString)) +@case(Message::info(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"caption") @@ -1677,7 +1677,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,info) @setGlobal(DESC,"Shows an information dialog.") -@case(Message::error(QString,QString)) +@case(Message::error(TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"caption") @@ -1685,7 +1685,7 @@ fi @setGlobal(PARM4,"") @setGlobal(short,error) @setGlobal(DESC,"Shows an error dialog.") -@case(Message::warning(QString,QString,QString,QString,QString)) +@case(Message::warning(TQString,TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"caption") @@ -1693,7 +1693,7 @@ fi @setGlobal(PARM4,"button2") @setGlobal(short,warning) @setGlobal(DESC,"Shows a warning dialog with up to three buttons. Returns number of selected button.") -@case(Message::question(QString,QString,QString,QString,QString)) +@case(Message::question(TQString,TQString,TQString,TQString,TQString)) @setGlobal(enWidget,0) @setGlobal(PARM1,"text") @setGlobal(PARM2,"caption") @@ -1816,46 +1816,46 @@ fi <property name="associations" stdset="0"> <stringlist> <string>@##### put the following in the @filteroff script ######### -@setGlobal(DCOP,"addUniqueItem(QString,QString) -associatedText(QString) -cellText(QString,int,int) -checked(QString) -children(QString,bool) -clear(QString) -count(QString) -currentColumn(QString) -currentItem(QString) -currentRow(QString) -execute(QString) -findItem(QString,QString) -insertColumn(QString,int,int) -insertItem(QString,QString,int) -insertItems(QString,QStringList,int) -insertRow(QString,int,int) -item(QString,int) -itemDepth(QString,int) -itemPath(QString,int) -removeColumn(QString,int,int) -removeItem(QString,int) -removeRow(QString,int,int) -selection(QString) -setAssociatedText(QString,QString) -setEnabled(QString,bool) -setCellText(QString,int,int,QString) -setCellWidget(QString,int,int,QString) -cellWidget(QString,int,int) -setChecked(QString,bool) -setColumnCaption(QString,int,QString) -setCurrentItem(QString,int) -insertTab(QString,QString,int) -setMaximum(QString,int) -setPixmap(QString,QString,int) -setRowCaption(QString,int,QString) -setSelection(QString,QString) -setText(QString,QString) -setVisible(QString,bool) -type(QString) -setEditable(QString,bool)") +@setGlobal(DCOP,"addUniqueItem(TQString,TQString) +associatedText(TQString) +cellText(TQString,int,int) +checked(TQString) +children(TQString,bool) +clear(TQString) +count(TQString) +currentColumn(TQString) +currentItem(TQString) +currentRow(TQString) +execute(TQString) +findItem(TQString,TQString) +insertColumn(TQString,int,int) +insertItem(TQString,TQString,int) +insertItems(TQString,QStringList,int) +insertRow(TQString,int,int) +item(TQString,int) +itemDepth(TQString,int) +itemPath(TQString,int) +removeColumn(TQString,int,int) +removeItem(TQString,int) +removeRow(TQString,int,int) +selection(TQString) +setAssociatedText(TQString,TQString) +setEnabled(TQString,bool) +setCellText(TQString,int,int,TQString) +setCellWidget(TQString,int,int,TQString) +cellWidget(TQString,int,int) +setChecked(TQString,bool) +setColumnCaption(TQString,int,TQString) +setCurrentItem(TQString,int) +insertTab(TQString,TQString,int) +setMaximum(TQString,int) +setPixmap(TQString,TQString,int) +setRowCaption(TQString,int,TQString) +setSelection(TQString,TQString) +setText(TQString,TQString) +setVisible(TQString,bool) +type(TQString) +setEditable(TQString,bool)") @proto.clear @proto.insertItems(@global(DCOP), 0) @@ -1888,195 +1888,195 @@ setEditable(QString,bool)") @##### put the following in the @filteron script ######### @case(aboutdialog) - @setGlobal(DCOP,"execute(QString)") + @setGlobal(DCOP,"execute(TQString)") @case(buttongroup) - @setGlobal(DCOP,"checked(QString) -setChecked(QString,bool)") + @setGlobal(DCOP,"checked(TQString) +setChecked(TQString,bool)") @case(checkbox) - @setGlobal(DCOP,"setText(QString,QString) -checked(QString) -setChecked(QString,bool)") + @setGlobal(DCOP,"setText(TQString,TQString) +checked(TQString) +setChecked(TQString,bool)") @case(closebutton) - @setGlobal(DCOP,"setText(QString,QString)") + @setGlobal(DCOP,"setText(TQString,TQString)") @case(combobox) - @setGlobal(DCOP,"selection(QString) -setSelection(QString,QString) -currentItem(QString) -setCurrentItem(QString,int) -item(QString,int) -removeItem(QString,int) -insertItem(QString,QString,int) -insertItems(QString,QStringList,int) -addUniqueItem(QString,QString) -clear(QString) -count(QString) -setEditable(QString,bool)") + @setGlobal(DCOP,"selection(TQString) +setSelection(TQString,TQString) +currentItem(TQString) +setCurrentItem(TQString,int) +item(TQString,int) +removeItem(TQString,int) +insertItem(TQString,TQString,int) +insertItems(TQString,QStringList,int) +addUniqueItem(TQString,TQString) +clear(TQString) +count(TQString) +setEditable(TQString,bool)") @case(datepicker) - @setGlobal(DCOP,"setText(QString,QString)") + @setGlobal(DCOP,"setText(TQString,TQString)") @case(dialog) - @setGlobal(DCOP,"setText(QString,QString)") + @setGlobal(DCOP,"setText(TQString,TQString)") @case(execbutton) - @setGlobal(DCOP,"setText(QString,QString) -execute(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +execute(TQString)") @case(fileselector) - @setGlobal(DCOP,"setText(QString,QString) -selection(QString) -setSelection(QString,QString) -clear(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +selection(TQString) +setSelection(TQString,TQString) +clear(TQString)") @case(fontdialog) - @setGlobal(DCOP,"execute(QString)") + @setGlobal(DCOP,"execute(TQString)") @case(groupbox) - @setGlobal(DCOP,"setText(QString,QString)") + @setGlobal(DCOP,"setText(TQString,TQString)") @case(konsole) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString) -execute(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString) +execute(TQString)") @case(label) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString)") @case(lineedit) - @setGlobal(DCOP,"setText(QString,QString) -selection(QString) -setSelection(QString,QString) -clear(QString) -setEditable(QString,bool)") + @setGlobal(DCOP,"setText(TQString,TQString) +selection(TQString) +setSelection(TQString,TQString) +clear(TQString) +setEditable(TQString,bool)") @case(listbox) - @setGlobal(DCOP,"setText(QString,QString) -selection(QString) -setSelection(QString,QString) -insertItems(QString,QStringList,int) -insertItem(QString,QString,int) -removeItem(QString,int) -clear(QString) -currentItem(QString) -setCurrentItem(QString,int) -item(QString,int) -addUniqueItem(QString,QString) -findItem(QString,QString) -setPixmap(QString,QString,int) -count(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +selection(TQString) +setSelection(TQString,TQString) +insertItems(TQString,QStringList,int) +insertItem(TQString,TQString,int) +removeItem(TQString,int) +clear(TQString) +currentItem(TQString) +setCurrentItem(TQString,int) +item(TQString,int) +addUniqueItem(TQString,TQString) +findItem(TQString,TQString) +setPixmap(TQString,TQString,int) +count(TQString)") @case(pixmaplabel) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString)") @case(popupmenu) - @setGlobal(DCOP,"clear(QString) -execute(QString) -item(QString,int) -count(QString)") + @setGlobal(DCOP,"clear(TQString) +execute(TQString) +item(TQString,int) +count(TQString)") @case(progressbar) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString) -setMaximum(QString,int)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString) +setMaximum(TQString,int)") @case(radiobutton) - @setGlobal(DCOP,"setText(QString,QString) -setChecked(QString,bool) -checked(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +setChecked(TQString,bool) +checked(TQString)") @case(richtexteditor) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString) -selection(QString) -setEditable(QString,bool)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString) +selection(TQString) +setEditable(TQString,bool)") @case(scriptobject) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString) -execute(QString) -item(QString,int) -count(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString) +execute(TQString) +item(TQString,int) +count(TQString)") @case(slider) - @setGlobal(DCOP,"setText(QString,QString) -clear(QString) -setMaximum(QString,int)") + @setGlobal(DCOP,"setText(TQString,TQString) +clear(TQString) +setMaximum(TQString,int)") @case(spinboxint) - @setGlobal(DCOP,"setText(QString,QString) -setMaximum(QString,int)") + @setGlobal(DCOP,"setText(TQString,TQString) +setMaximum(TQString,int)") @case(statusbar) - @setGlobal(DCOP,"setText(QString,QString) -insertItem(QString,QString,int) -removeItem(QString,int) -clear(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +insertItem(TQString,TQString,int) +removeItem(TQString,int) +clear(TQString)") @case(table) - @setGlobal(DCOP,"currentColumn(QString) -currentRow(QString) -insertColumn(QString,int,int) -insertRow(QString,int,int) -cellText(QString,int,int) -setCellText(QString,int,int,QString) -setCellWidget(QString,int,int,QString) -cellWidget(QString,int,int) -removeRow(QString,int,int) -removeColumn(QString,int,int) -setColumnCaption(QString,int,QString) -setRowCaption(QString,int,QString) -setText(QString,QString) -selection(QString)") + @setGlobal(DCOP,"currentColumn(TQString) +currentRow(TQString) +insertColumn(TQString,int,int) +insertRow(TQString,int,int) +cellText(TQString,int,int) +setCellText(TQString,int,int,TQString) +setCellWidget(TQString,int,int,TQString) +cellWidget(TQString,int,int) +removeRow(TQString,int,int) +removeColumn(TQString,int,int) +setColumnCaption(TQString,int,TQString) +setRowCaption(TQString,int,TQString) +setText(TQString,TQString) +selection(TQString)") @case(tabwidget) - @setGlobal(DCOP,"currentItem(QString) -setCurrentItem(QString,int) -insertTab(QString,QString,int)") + @setGlobal(DCOP,"currentItem(TQString) +setCurrentItem(TQString,int) +insertTab(TQString,TQString,int)") @case(textbrowser) - @setGlobal(DCOP,"setText(QString,QString) -selection(QString) -clear(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +selection(TQString) +clear(TQString)") @case(textedit) - @setGlobal(DCOP,"setText(QString,QString) -selection(QString) -setSelection(QString,QString) -clear(QString) -setEditable(QString,bool)") + @setGlobal(DCOP,"setText(TQString,TQString) +selection(TQString) +setSelection(TQString,TQString) +clear(TQString) +setEditable(TQString,bool)") @case(timer) - @setGlobal(DCOP,"setText(QString,QString) -execute(QString)") + @setGlobal(DCOP,"setText(TQString,TQString) +execute(TQString)") @case(timewidget) - @setGlobal(DCOP,"setText(QString,QString)") + @setGlobal(DCOP,"setText(TQString,TQString)") @case(toolbox) - @setGlobal(DCOP,"count(QString)") + @setGlobal(DCOP,"count(TQString)") @case(treewidget) - @setGlobal(DCOP,"insertItem(QString,QString,int) -setText(QString,QString) -insertItems(QString,QStringList,int) -selection(QString) -setSelection(QString,QString) -clear(QString) -removeItem(QString,int) -currentItem(QString) -setCurrentItem(QString,int) -findItem(QString,QString) -item(QString,int) -itemPath(QString,int) -itemDepth(QString,int) -setPixmap(QString,QString,int) -setColumnCaption(QString,int,QString)") + @setGlobal(DCOP,"insertItem(TQString,TQString,int) +setText(TQString,TQString) +insertItems(TQString,QStringList,int) +selection(TQString) +setSelection(TQString,TQString) +clear(TQString) +removeItem(TQString,int) +currentItem(TQString) +setCurrentItem(TQString,int) +findItem(TQString,TQString) +item(TQString,int) +itemPath(TQString,int) +itemDepth(TQString,int) +setPixmap(TQString,TQString,int) +setColumnCaption(TQString,int,TQString)") @end @proto.clear @@ -2095,13 +2095,13 @@ setColumnCaption(QString,int,QString)") <connections> <connection> <sender>wname</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>filterscript</receiver> <slot>execute()</slot> </connection> <connection> <sender>functiongroup</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>proto</receiver> <slot>populate()</slot> </connection> diff --git a/kommander/part/kommander_part.cpp b/kommander/part/kommander_part.cpp index 1d4fb709..66649ab3 100644 --- a/kommander/part/kommander_part.cpp +++ b/kommander/part/kommander_part.cpp @@ -66,7 +66,7 @@ bool KommanderPart::openFile() delete m_instance; m_instance = new Instance(0L); m_instance->build(m_url); - TQTimer::singleShot(0, this, TQT_SLOT(slotRun())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRun())); emit setStatusBarText( m_url.prettyURL() ); return true; diff --git a/kommander/part/kommander_part.h b/kommander/part/kommander_part.h index aca36b89..91c10fdb 100644 --- a/kommander/part/kommander_part.h +++ b/kommander/part/kommander_part.h @@ -23,7 +23,7 @@ class TQGridLayout; class KommanderPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KommanderPart(TQWidget *parentWidget, const char *widgetName, diff --git a/kommander/plugin/kommanderplugin.h b/kommander/plugin/kommanderplugin.h index 509ee9da..0699774e 100644 --- a/kommander/plugin/kommanderplugin.h +++ b/kommander/plugin/kommanderplugin.h @@ -44,7 +44,7 @@ class TQIconSet; class KOMMANDER_EXPORT KommanderPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: KommanderPlugin(); diff --git a/kommander/pluginmanager/mainwindow.cpp b/kommander/pluginmanager/mainwindow.cpp index dd196043..2f34f712 100644 --- a/kommander/pluginmanager/mainwindow.cpp +++ b/kommander/pluginmanager/mainwindow.cpp @@ -35,7 +35,7 @@ MainWindow::MainWindow( TQWidget* parent, const char *name, WFlags f ) toolBar->insertButton("document-open", Add, true, i18n("Add") ); toolBar->insertButton("no", Remove, true, i18n("Remove") ); toolBar->insertButton("reload", Refresh, true, i18n("Refresh") ); - connect( toolBar, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(toolButton(int)) ); + connect( toolBar, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(toolButton(int)) ); m_list = new TDEListBox( this ); setCentralWidget(m_list); diff --git a/kommander/pluginmanager/mainwindow.h b/kommander/pluginmanager/mainwindow.h index b49c4e21..09e536b4 100644 --- a/kommander/pluginmanager/mainwindow.h +++ b/kommander/pluginmanager/mainwindow.h @@ -25,7 +25,7 @@ class PluginManager; class MainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: MainWindow( TQWidget* parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose ); diff --git a/kommander/widget/functionlib.cpp b/kommander/widget/functionlib.cpp index bf08888a..47db3bd0 100644 --- a/kommander/widget/functionlib.cpp +++ b/kommander/widget/functionlib.cpp @@ -429,9 +429,9 @@ static ParseNode f_widgetExists(Parser* p, const ParameterList& params) static ParseNode f_connect(Parser* p, const ParameterList& params) { TQString sender = params[0].toString(); - TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString(); + TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString(); TQString receiver = params[2].toString(); - TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString(); + TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString(); KommanderWidget *senderW = p->currentWidget()->widgetByName(sender); if (!senderW) return ParseNode::error("unknown widget"); @@ -445,9 +445,9 @@ static ParseNode f_connect(Parser* p, const ParameterList& params) static ParseNode f_disconnect(Parser* p, const ParameterList& params) { TQString sender = params[0].toString(); - TQString signal = TQString::number(TQSIGNAL_CODE) + params[1].toString(); + TQString signal = TQString::number(TQ_SIGNAL_CODE) + params[1].toString(); TQString receiver = params[2].toString(); - TQString slot = TQString::number(TQSLOT_CODE) + params[3].toString(); + TQString slot = TQString::number(TQ_SLOT_CODE) + params[3].toString(); KommanderWidget *senderW = p->currentWidget()->widgetByName(sender); if (!senderW) return ParseNode::error("unknown widget"); diff --git a/kommander/widget/invokeclass.cpp b/kommander/widget/invokeclass.cpp index ec360d69..033ea770 100644 --- a/kommander/widget/invokeclass.cpp +++ b/kommander/widget/invokeclass.cpp @@ -24,8 +24,8 @@ void InvokeClass::invokeSlot(TQObject *object, const TQString& slot, TQStringLis { TQString invokeName = slot; invokeName = invokeName.mid(invokeName.find('(')); - invokeName.prepend(TQString::number(TQSIGNAL_CODE) + "invoke"); - TQString slotName = TQString::number(TQSLOT_CODE) + slot; + invokeName.prepend(TQString::number(TQ_SIGNAL_CODE) + "invoke"); + TQString slotName = TQString::number(TQ_SLOT_CODE) + slot; connect(this, invokeName.ascii(), object, slotName.ascii()); if (args.count() == 0) diff --git a/kommander/widget/invokeclass.h b/kommander/widget/invokeclass.h index 341aa78f..ac6ce32f 100644 --- a/kommander/widget/invokeclass.h +++ b/kommander/widget/invokeclass.h @@ -17,7 +17,7 @@ #include <tqstringlist.h> class InvokeClass : public TQObject { -Q_OBJECT +TQ_OBJECT public: InvokeClass(TQObject *parent); diff --git a/kommander/widget/kmdrmainwindow.cpp b/kommander/widget/kmdrmainwindow.cpp index 845cc905..c44ea4a6 100644 --- a/kommander/widget/kmdrmainwindow.cpp +++ b/kommander/widget/kmdrmainwindow.cpp @@ -21,7 +21,7 @@ KmdrMainWindow::KmdrMainWindow(TQWidget *parent, const char *name, WFlags f) : TDEMainWindow(parent, name, f) { - TQTimer::singleShot(10, this, TQT_SIGNAL(initialize())); + TQTimer::singleShot(10, this, TQ_SIGNAL(initialize())); } diff --git a/kommander/widget/kmdrmainwindow.h b/kommander/widget/kmdrmainwindow.h index cc1b57d3..96c4aabd 100644 --- a/kommander/widget/kmdrmainwindow.h +++ b/kommander/widget/kmdrmainwindow.h @@ -19,7 +19,7 @@ */ class KDE_EXPORT KmdrMainWindow : public TDEMainWindow { -Q_OBJECT +TQ_OBJECT public: KmdrMainWindow(TQWidget *parent = 0, const char *name = 0, WFlags f = WType_TopLevel | WDestructiveClose); diff --git a/kommander/widget/myprocess.cpp b/kommander/widget/myprocess.cpp index 45e64790..943589c7 100644 --- a/kommander/widget/myprocess.cpp +++ b/kommander/widget/myprocess.cpp @@ -85,9 +85,9 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell) mProcess = new TDEProcess; (*mProcess) << shellName.latin1(); - connect(mProcess, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(mProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(mProcess, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(mProcess, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); if(!mProcess->start(TDEProcess::NotifyOnExit, TDEProcess::All)) { @@ -102,7 +102,7 @@ TQString MyProcess::run(const TQString& a_command, const TQString& a_shell) else { TQWidget dummy(0, 0, WType_Dialog | WShowModal); - dummy.setFocusPolicy(TQ_NoFocus); + dummy.setFocusPolicy(TQWidget::NoFocus); m_loopStarted = true; tqt_enter_modal(&dummy); tqApp->enter_loop(); diff --git a/kommander/widget/myprocess.h b/kommander/widget/myprocess.h index 039db894..aed080d9 100644 --- a/kommander/widget/myprocess.h +++ b/kommander/widget/myprocess.h @@ -28,7 +28,7 @@ class KommanderWidget; class KOMMANDER_EXPORT MyProcess : public TQObject { - Q_OBJECT + TQ_OBJECT public: MyProcess(const KommanderWidget *); diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp index 05be2dfe..1ed4888e 100644 --- a/kommander/widgets/aboutdialog.cpp +++ b/kommander/widgets/aboutdialog.cpp @@ -42,7 +42,7 @@ enum Functions { }; AboutDialog::AboutDialog(TQWidget *parent, const char *name) - : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h index 37dedec4..e15743c6 100644 --- a/kommander/widgets/aboutdialog.h +++ b/kommander/widgets/aboutdialog.h @@ -23,7 +23,7 @@ class TDEAboutData; */ class KDE_EXPORT AboutDialog : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(bool KommanderWidget READ isKommanderWidget) TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp index 3d17b042..d598d64c 100644 --- a/kommander/widgets/buttongroup.cpp +++ b/kommander/widgets/buttongroup.cpp @@ -39,7 +39,7 @@ enum Functions { }; ButtonGroup::ButtonGroup(TQWidget *a_parent, const char *a_name) - : TQButtonGroup(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQButtonGroup(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "checked"; diff --git a/kommander/widgets/buttongroup.h b/kommander/widgets/buttongroup.h index cf2aa882..d9f79a86 100644 --- a/kommander/widgets/buttongroup.h +++ b/kommander/widgets/buttongroup.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ButtonGroup : public TQButtonGroup, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/checkbox.cpp b/kommander/widgets/checkbox.cpp index 61ab0aff..f7fe20be 100644 --- a/kommander/widgets/checkbox.cpp +++ b/kommander/widgets/checkbox.cpp @@ -29,7 +29,7 @@ #include "checkbox.h" CheckBox::CheckBox(TQWidget *a_parent, const char *a_name) - : TQCheckBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQCheckBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "unchecked"; diff --git a/kommander/widgets/checkbox.h b/kommander/widgets/checkbox.h index 6a740246..24713e9f 100644 --- a/kommander/widgets/checkbox.h +++ b/kommander/widgets/checkbox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT CheckBox : public TQCheckBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp index 30426eb8..07fb7ed8 100644 --- a/kommander/widgets/closebutton.cpp +++ b/kommander/widgets/closebutton.cpp @@ -31,7 +31,7 @@ #include "closebutton.h" CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) - : KPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KPushButton(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -39,16 +39,16 @@ CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) setDisplayStates(states); setWriteStdout(true); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(startProcess())); - TQObject *parent = TQT_TQOBJECT(this); + TQObject *parent = this; while (parent->parent() != 0) { parent = parent->parent(); if (parent->inherits("TQDialog")) break; } - connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject())); + connect(this, TQ_SIGNAL(clicked()), parent, TQ_SLOT(reject())); } CloseButton::~CloseButton() @@ -105,10 +105,10 @@ void CloseButton::startProcess() KShellProcess *process = new KShellProcess("/bin/sh"); *process << at; - connect(process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(endProcess(TDEProcess *))); - connect(process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *, + connect(process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(endProcess(TDEProcess *))); + connect(process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(appendOutput(TDEProcess *, char *, int))); - connect(process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(appendOutput(TDEProcess *, + connect(process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(appendOutput(TDEProcess *, char *, int))); if (!process->start(TDEProcess::Block, TDEProcess::Stdout)) diff --git a/kommander/widgets/closebutton.h b/kommander/widgets/closebutton.h index 975a3f46..96a5689a 100644 --- a/kommander/widgets/closebutton.h +++ b/kommander/widgets/closebutton.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT CloseButton : public KPushButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp index 6ebb9c17..1bb99c2b 100644 --- a/kommander/widgets/combobox.cpp +++ b/kommander/widgets/combobox.cpp @@ -37,14 +37,14 @@ enum Functions { ComboBox::ComboBox(TQWidget *a_parent, const char *a_name) - : KComboBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KComboBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(emitWidgetTextChanged(int))); + connect(this, TQ_SIGNAL(activated(int)), this, TQ_SLOT(emitWidgetTextChanged(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(popupList, "popupList(TQString widget)", i18n("Make the ComboBox expose it's list without mousing around."), 1); diff --git a/kommander/widgets/combobox.h b/kommander/widgets/combobox.h index 70a4c2d7..c964667d 100644 --- a/kommander/widgets/combobox.h +++ b/kommander/widgets/combobox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ComboBox : public KComboBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/datepicker.cpp b/kommander/widgets/datepicker.cpp index 64a064d3..6114f7f7 100644 --- a/kommander/widgets/datepicker.cpp +++ b/kommander/widgets/datepicker.cpp @@ -27,7 +27,7 @@ #include "datepicker.h" DatePicker::DatePicker(TQWidget *a_parent, const char *a_name) - : KDatePicker(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KDatePicker(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -76,13 +76,13 @@ void DatePicker::populate() void DatePicker::setWidgetText(const TQString& a_text) { - setDate(TQDate::fromString(a_text, Qt::ISODate)); + setDate(TQDate::fromString(a_text, TQt::ISODate)); emit widgetTextChanged(a_text); } TQString DatePicker::widgetText() const { - return date().toString(Qt::ISODate); + return date().toString(TQt::ISODate); } @@ -108,9 +108,9 @@ TQString DatePicker::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: - return date().toString(Qt::ISODate); + return date().toString(TQt::ISODate); case DCOP::setText: - setDate(TQDate::fromString(args[0], Qt::ISODate)); + setDate(TQDate::fromString(args[0], TQt::ISODate)); break; case DCOP::geometry: { diff --git a/kommander/widgets/datepicker.h b/kommander/widgets/datepicker.h index aa9e81e9..ddfa3be9 100644 --- a/kommander/widgets/datepicker.h +++ b/kommander/widgets/datepicker.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT DatePicker : public KDatePicker, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp index 242d4ba4..3c6ed20f 100644 --- a/kommander/widgets/dialog.cpp +++ b/kommander/widgets/dialog.cpp @@ -50,7 +50,7 @@ enum Functions { }; Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags) - : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(TQT_TQOBJECT(this)) + : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/dialog.h b/kommander/widgets/dialog.h index 9f34dd94..1859ed79 100644 --- a/kommander/widgets/dialog.h +++ b/kommander/widgets/dialog.h @@ -28,7 +28,7 @@ class TQShowEvent; class KOMMANDER_EXPORT Dialog : public TQDialog, public KommanderWindow { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp index d4969444..9ab99d1f 100644 --- a/kommander/widgets/execbutton.cpp +++ b/kommander/widgets/execbutton.cpp @@ -48,7 +48,7 @@ enum Functions { }; ExecButton::ExecButton(TQWidget* a_parent, const char* a_name) - : KPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KPushButton(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -56,7 +56,7 @@ ExecButton::ExecButton(TQWidget* a_parent, const char* a_name) setDisplayStates(states); setWriteStdout(true); setBlockGUI(Button); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(startProcess())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(EB_isOn, "isOn(TQString widget)", i18n("For use only when button is togle type."), 1); @@ -120,7 +120,7 @@ void ExecButton::startProcess() TDEApplication::setOverrideCursor(TQCursor(TQt::WaitCursor)); MyProcess* process = new MyProcess(this); process->setBlocking(m_blockGUI == GUI); - connect(process, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); + connect(process, TQ_SIGNAL(processExited(MyProcess*)), TQ_SLOT(processExited(MyProcess*))); m_output = process->run(at); if (m_blockGUI == GUI) { diff --git a/kommander/widgets/execbutton.h b/kommander/widgets/execbutton.h index 58fb7ef5..f866f8b2 100644 --- a/kommander/widgets/execbutton.h +++ b/kommander/widgets/execbutton.h @@ -35,7 +35,7 @@ class MyProcess; class TQShowEvent; class KOMMANDER_EXPORT ExecButton : public KPushButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_ENUMS(Blocking) diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp index 9d6869a7..f562662c 100644 --- a/kommander/widgets/fileselector.cpp +++ b/kommander/widgets/fileselector.cpp @@ -35,7 +35,7 @@ #include "fileselector.h" FileSelector::FileSelector(TQWidget * a_parent, const char *a_name) - : TQWidget(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQWidget(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -54,7 +54,7 @@ FileSelector::FileSelector(TQWidget * a_parent, const char *a_name) m_lineEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); m_selectButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(makeSelection())); + connect(m_selectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(makeSelection())); setSelectionType(Open); setSelectionOpenMultiple(false); diff --git a/kommander/widgets/fileselector.h b/kommander/widgets/fileselector.h index ecdbf402..2f69c872 100644 --- a/kommander/widgets/fileselector.h +++ b/kommander/widgets/fileselector.h @@ -35,7 +35,7 @@ class KLineEdit; class TQShowEvent; class KOMMANDER_EXPORT FileSelector : public TQWidget, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp index 59a1e372..95c4fe82 100644 --- a/kommander/widgets/fontdialog.cpp +++ b/kommander/widgets/fontdialog.cpp @@ -34,7 +34,7 @@ enum Functions { }; FontDialog::FontDialog(TQWidget *parent, const char *name) - : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h index 375e6cea..dc9d7f7d 100644 --- a/kommander/widgets/fontdialog.h +++ b/kommander/widgets/fontdialog.h @@ -22,7 +22,7 @@ */ class KDE_EXPORT FontDialog : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/groupbox.cpp b/kommander/widgets/groupbox.cpp index a90f447e..027168d8 100644 --- a/kommander/widgets/groupbox.cpp +++ b/kommander/widgets/groupbox.cpp @@ -32,7 +32,7 @@ GroupBox::GroupBox(TQWidget *a_parent, const char *a_name) - : TQGroupBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQGroupBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -84,13 +84,13 @@ void GroupBox::populate() void GroupBox::insertChild(TQObject *a_child) { m_childList.append(a_child); - TQT_TQOBJECT(this)->TQObject::insertChild(a_child); + this->TQObject::insertChild(a_child); } void GroupBox::removeChild(TQObject *a_child) { m_childList.remove(a_child); - TQT_TQOBJECT(this)->TQObject::removeChild(a_child); + this->TQObject::removeChild(a_child); } void GroupBox::showEvent( TQShowEvent *e ) diff --git a/kommander/widgets/groupbox.h b/kommander/widgets/groupbox.h index aac0d9ce..33472edc 100644 --- a/kommander/widgets/groupbox.h +++ b/kommander/widgets/groupbox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT GroupBox : public TQGroupBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/konsole.cpp b/kommander/widgets/konsole.cpp index bbfc5309..dd4a955d 100644 --- a/kommander/widgets/konsole.cpp +++ b/kommander/widgets/konsole.cpp @@ -26,7 +26,7 @@ #include <myprocess.h> Konsole::Konsole(TQWidget* a_parent, const char* a_name) - : KTextEdit(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)), mSeenEOL(false), mProcess(0) + : KTextEdit(a_parent, a_name), KommanderWidget(this), mSeenEOL(false), mProcess(0) { TQStringList states; states << "default"; @@ -87,8 +87,8 @@ void Konsole::execute() mSeenEOL = false; mProcess = new MyProcess(this); mProcess->setBlocking(false); - connect(mProcess, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); - connect(mProcess, TQT_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQT_SLOT(processReceivedStdout(MyProcess*, char*, int))); + connect(mProcess, TQ_SIGNAL(processExited(MyProcess*)), TQ_SLOT(processExited(MyProcess*))); + connect(mProcess, TQ_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQ_SLOT(processReceivedStdout(MyProcess*, char*, int))); setCursor(TQCursor(TQt::WaitCursor)); mProcess->run(at); } diff --git a/kommander/widgets/konsole.h b/kommander/widgets/konsole.h index 9ab83525..5c2722e5 100644 --- a/kommander/widgets/konsole.h +++ b/kommander/widgets/konsole.h @@ -31,7 +31,7 @@ class MyProcess; class KOMMANDER_EXPORT Konsole : public KTextEdit, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/label.cpp b/kommander/widgets/label.cpp index 31d0adac..ee422325 100644 --- a/kommander/widgets/label.cpp +++ b/kommander/widgets/label.cpp @@ -26,7 +26,7 @@ #include "label.h" Label::Label(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/label.h b/kommander/widgets/label.h index 8c0b2ed3..cd49dadd 100644 --- a/kommander/widgets/label.h +++ b/kommander/widgets/label.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT Label : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp index 7a01ae4e..f75526d9 100644 --- a/kommander/widgets/lineedit.cpp +++ b/kommander/widgets/lineedit.cpp @@ -31,15 +31,15 @@ enum functions { }; LineEdit::LineEdit(TQWidget *a_parent, const char *a_name) - : KLineEdit(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KLineEdit(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(textChanged(const TQString &)), this, - TQT_SIGNAL(widgetTextChanged(const TQString &))); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), this, + TQ_SIGNAL(widgetTextChanged(const TQString &))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(LE_clearModified, "clearModified(TQString widget)", i18n("Clear widget modified status."), 1); diff --git a/kommander/widgets/lineedit.h b/kommander/widgets/lineedit.h index d56b3e30..581fa4cc 100644 --- a/kommander/widgets/lineedit.h +++ b/kommander/widgets/lineedit.h @@ -33,7 +33,7 @@ class TQShowEvent; class KOMMANDER_EXPORT LineEdit : public KLineEdit, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp index 5d067f9c..b1d465c6 100644 --- a/kommander/widgets/listbox.cpp +++ b/kommander/widgets/listbox.cpp @@ -30,7 +30,7 @@ #include "listbox.h" ListBox::ListBox(TQWidget *a_parent, const char *a_name) - : TDEListBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TDEListBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/listbox.h b/kommander/widgets/listbox.h index 61932c64..9ced5462 100644 --- a/kommander/widgets/listbox.h +++ b/kommander/widgets/listbox.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ListBox : public TDEListBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp index a9298530..3d71ab1e 100644 --- a/kommander/widgets/pixmaplabel.cpp +++ b/kommander/widgets/pixmaplabel.cpp @@ -31,7 +31,7 @@ #include "pixmaplabel.h" PixmapLabel::PixmapLabel(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/pixmaplabel.h b/kommander/widgets/pixmaplabel.h index 35538be1..3fbf08fe 100644 --- a/kommander/widgets/pixmaplabel.h +++ b/kommander/widgets/pixmaplabel.h @@ -33,7 +33,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT PixmapLabel : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index 7a570dd3..b24e5956 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -38,7 +38,7 @@ #define LAST_FUNCTION INSERTSUBMENU PopupMenu::PopupMenu(TQWidget *parent, const char *name) - : TQLabel(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -55,7 +55,7 @@ PopupMenu::PopupMenu(TQWidget *parent, const char *name) setHidden(true); m_menu = new TDEPopupMenu(this); - connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuItemActivated(int))); + connect(m_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuItemActivated(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(INSERTMENUITEM, "insertMenuItem(TQString widget, TQString text, TQString executeWidget, int index, TQString icon)", i18n("Insert an item into the popup menu. The executeWidget's execute method will be run when this item is selected. Returns the id of the inserted item. Use -1 for index to insert to the end. The icon is optional."), 4, 5); diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h index 4bf073b8..4f1b08d4 100644 --- a/kommander/widgets/popupmenu.h +++ b/kommander/widgets/popupmenu.h @@ -24,7 +24,7 @@ class TDEPopupMenu; */ class KDE_EXPORT PopupMenu : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp index 111ffe9f..88e253e9 100644 --- a/kommander/widgets/progressbar.cpp +++ b/kommander/widgets/progressbar.cpp @@ -36,7 +36,7 @@ enum Functions { }; ProgressBar::ProgressBar(TQWidget *a_parent, const char *a_name) - : KProgress(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KProgress(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/progressbar.h b/kommander/widgets/progressbar.h index 7570b681..9532e139 100644 --- a/kommander/widgets/progressbar.h +++ b/kommander/widgets/progressbar.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT ProgressBar: public KProgress, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/radiobutton.cpp b/kommander/widgets/radiobutton.cpp index d6306c80..ba46248d 100644 --- a/kommander/widgets/radiobutton.cpp +++ b/kommander/widgets/radiobutton.cpp @@ -28,7 +28,7 @@ #include "radiobutton.h" RadioButton::RadioButton(TQWidget *a_parent, const char *a_name) - : TQRadioButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQRadioButton(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "unchecked"; diff --git a/kommander/widgets/radiobutton.h b/kommander/widgets/radiobutton.h index 2870a230..15f18a78 100644 --- a/kommander/widgets/radiobutton.h +++ b/kommander/widgets/radiobutton.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT RadioButton : public TQRadioButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp index 3233ea8f..33127372 100644 --- a/kommander/widgets/richtexteditor.cpp +++ b/kommander/widgets/richtexteditor.cpp @@ -43,7 +43,7 @@ #include "pixmaps/textright.xpm" RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) - : TQWidget(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQWidget(a_parent, a_name), KommanderWidget(this) { TQStringList states; @@ -84,15 +84,15 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) m_buttonTextBold = new TQToolButton(m_formatGroup, "textBold"); m_buttonTextBold->setPixmap(TQPixmap((const char **)bold_xpm)); m_buttonTextBold->setToggleButton(true); - connect(m_buttonTextBold, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textBold(bool))); + connect(m_buttonTextBold, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textBold(bool))); m_buttonTextItalic = new TQToolButton(m_formatGroup, "textItalic"); m_buttonTextItalic->setPixmap(TQPixmap((const char **)italic_xpm)); m_buttonTextItalic->setToggleButton(true); - connect(m_buttonTextItalic, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textItalic(bool))); + connect(m_buttonTextItalic, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textItalic(bool))); m_buttonTextUnder = new TQToolButton(m_formatGroup, "textUnder"); m_buttonTextUnder->setPixmap(TQPixmap((const char **)under_xpm)); m_buttonTextUnder->setToggleButton(true); - connect(m_buttonTextUnder, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textUnder(bool))); + connect(m_buttonTextUnder, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(textUnder(bool))); m_buttonTextLeft = new TQToolButton(m_alignGroup, "textLeft"); m_buttonTextLeft->setPixmap(TQPixmap((const char **)left_xpm)); @@ -104,11 +104,11 @@ RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) m_buttonTextRight->setPixmap(TQPixmap((const char **)right_xpm)); m_buttonTextRight->setToggleButton(true); - connect(m_alignGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(textAlign(int))); - connect(m_textedit, TQT_SIGNAL(currentFontChanged(const TQFont &)), this, TQT_SLOT(fontChanged(const TQFont &))); - connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(alignmentChanged(int))); + connect(m_alignGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(textAlign(int))); + connect(m_textedit, TQ_SIGNAL(currentFontChanged(const TQFont &)), this, TQ_SLOT(fontChanged(const TQFont &))); + connect(m_textedit, TQ_SIGNAL(currentAlignmentChanged(int)), this, TQ_SLOT(alignmentChanged(int))); - connect(m_textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); + connect(m_textedit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setTextChanged())); } diff --git a/kommander/widgets/richtexteditor.h b/kommander/widgets/richtexteditor.h index b7fd1540..79119f94 100644 --- a/kommander/widgets/richtexteditor.h +++ b/kommander/widgets/richtexteditor.h @@ -36,7 +36,7 @@ class TQHButtonGroup; class TQShowEvent; class KOMMANDER_EXPORT RichTextEditor : public TQWidget, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp index 514c4ae5..2b444471 100644 --- a/kommander/widgets/scriptobject.cpp +++ b/kommander/widgets/scriptobject.cpp @@ -30,7 +30,7 @@ #include <specials.h> ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/scriptobject.h b/kommander/widgets/scriptobject.h index 2a954f2d..9d427351 100644 --- a/kommander/widgets/scriptobject.h +++ b/kommander/widgets/scriptobject.h @@ -28,7 +28,7 @@ class KOMMANDER_EXPORT ScriptObject : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/slider.cpp b/kommander/widgets/slider.cpp index b8068ede..8c7d06bf 100644 --- a/kommander/widgets/slider.cpp +++ b/kommander/widgets/slider.cpp @@ -23,7 +23,7 @@ #include "slider.h" Slider::Slider(TQWidget * a_parent, const char *a_name) - : TQSlider(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQSlider(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/slider.h b/kommander/widgets/slider.h index 517f00e9..4bb1f1e3 100644 --- a/kommander/widgets/slider.h +++ b/kommander/widgets/slider.h @@ -29,7 +29,7 @@ class TQShowEvent; class KOMMANDER_EXPORT Slider: public TQSlider, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/spinboxint.cpp b/kommander/widgets/spinboxint.cpp index 72991376..a2b9af6a 100644 --- a/kommander/widgets/spinboxint.cpp +++ b/kommander/widgets/spinboxint.cpp @@ -28,7 +28,7 @@ #include "spinboxint.h" SpinBoxInt::SpinBoxInt(TQWidget *a_parent, const char *a_name) - : TQSpinBox(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQSpinBox(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/spinboxint.h b/kommander/widgets/spinboxint.h index 777ee291..93b75813 100644 --- a/kommander/widgets/spinboxint.h +++ b/kommander/widgets/spinboxint.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT SpinBoxInt : public TQSpinBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/statusbar.cpp b/kommander/widgets/statusbar.cpp index 3c5e76f5..0a3a249f 100644 --- a/kommander/widgets/statusbar.cpp +++ b/kommander/widgets/statusbar.cpp @@ -27,7 +27,7 @@ #include "statusbar.h" StatusBar::StatusBar(TQWidget *a_parent, const char *a_name) - : KStatusBar(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KStatusBar(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/statusbar.h b/kommander/widgets/statusbar.h index f7e8f139..91fbe0b6 100644 --- a/kommander/widgets/statusbar.h +++ b/kommander/widgets/statusbar.h @@ -32,7 +32,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT StatusBar : public KStatusBar, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/subdialog.cpp b/kommander/widgets/subdialog.cpp index 47e4ec69..66c8770b 100644 --- a/kommander/widgets/subdialog.cpp +++ b/kommander/widgets/subdialog.cpp @@ -32,14 +32,14 @@ #include "subdialog.h" SubDialog::SubDialog(TQWidget *a_parent, const char *a_name) - : TQPushButton(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)), m_dialog(0) + : TQPushButton(a_parent, a_name), KommanderWidget(this), m_dialog(0) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(showDialog())); + connect(this, TQ_SIGNAL(clicked()), this, TQ_SLOT(showDialog())); } @@ -103,7 +103,7 @@ void SubDialog::showDialog() if(!m_dialog) { kdWarning() << "Creation of sub dialog failed .." << endl; - connect(m_dialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFinished())); + connect(m_dialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotFinished())); m_dialog->exec(); } diff --git a/kommander/widgets/subdialog.h b/kommander/widgets/subdialog.h index bbf07e21..7f742c51 100644 --- a/kommander/widgets/subdialog.h +++ b/kommander/widgets/subdialog.h @@ -33,7 +33,7 @@ class TQDialog; class TQShowEvent; class KOMMANDER_EXPORT SubDialog : public TQPushButton, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp index 49ea5c19..6a8abc4b 100644 --- a/kommander/widgets/table.cpp +++ b/kommander/widgets/table.cpp @@ -48,7 +48,7 @@ enum Functions { Table::Table(TQWidget *a_parent, const char *a_name) - : TQTable(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQTable(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -57,11 +57,11 @@ Table::Table(TQWidget *a_parent, const char *a_name) KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(TBL_sortColumnExtra, "sortColumnExtra(TQString widget, int col, bool ascending, bool wholeRows)", i18n("Sets a column to sort ascending or descending. Optionally can sort with rows intact for database use."), 2, 4); KommanderPlugin::registerFunction(TBL_keepCellVisible, "keepCellVisible(TQString widget, int row, int col)", i18n("Scrolls the table so the cell indicated is visible."), 3); - KommanderPlugin::registerFunction(TBL_selectCells, "selectCells(TQString widget, int row, int col, int row, int col)", i18n("Select cells using the upper left and lower right cell addresses<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 5); + KommanderPlugin::registerFunction(TBL_selectCells, "selectCells(TQString widget, int row, int col, int row, int col)", i18n("Select cells using the upper left and lower right cell addresses"), 5); KommanderPlugin::registerFunction(TBL_selectRow, "selectRow(TQString widget, int row)", i18n("Select the row with the zero based index."), 2); - KommanderPlugin::registerFunction(TBL_selectColumn, "selectColumn(TQString widget, int col)", i18n("Select the column with the zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 2); - KommanderPlugin::registerFunction(TBL_setColumnReadOnly, "setColumnReadOnly(TQString widget, int col, bool Readonly)", i18n("Set the column read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); - KommanderPlugin::registerFunction(TBL_setRowReadOnly, "setRowReadOnly(TQString widget, int row, bool Readonly)", i18n("Set the row read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); + KommanderPlugin::registerFunction(TBL_selectColumn, "selectColumn(TQString widget, int col)", i18n("Select the column with the zero based index."), 2); + KommanderPlugin::registerFunction(TBL_setColumnReadOnly, "setColumnReadOnly(TQString widget, int col, bool Readonly)", i18n("Set the column read only using zero based index."), 3); + KommanderPlugin::registerFunction(TBL_setRowReadOnly, "setRowReadOnly(TQString widget, int row, bool Readonly)", i18n("Set the row read only using zero based index."), 3); KommanderPlugin::registerFunction(TBL_rowCount, "rowCount(TQString widget)", i18n("Returns the number of rows of the table"), 1); KommanderPlugin::registerFunction(TBL_colHeader, "columnHeader(TQString widget, int Column)", i18n("Returns the text of the header for the column index"), 2); KommanderPlugin::registerFunction(TBL_rowHeader, "rowHeader(TQString widget, int Row)", i18n("Returns the text of the header for the row index"), 2); @@ -131,7 +131,7 @@ void Table::setCellWidget(int row, int col, const TQString & _widgetName) KommanderWidget *w = widgetByName(_widgetName); if (w) { - TQWidget *widget = TQT_TQWIDGET(w->object()); + TQWidget *widget = static_cast<TQWidget*>(w->object()); if (TQTable::cellWidget(row, col) != widget) { setCurrentCell(-1, -1); //hack to not delete the cellwidget after clicking away to another cell. diff --git a/kommander/widgets/table.h b/kommander/widgets/table.h index 3a95b483..21f3dc58 100644 --- a/kommander/widgets/table.h +++ b/kommander/widgets/table.h @@ -30,7 +30,7 @@ class TQWidget; class KOMMANDER_EXPORT Table : public TQTable, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp index 7180a7d0..b4116fe3 100644 --- a/kommander/widgets/tabwidget.cpp +++ b/kommander/widgets/tabwidget.cpp @@ -44,7 +44,7 @@ enum Functions { }; TabWidget::TabWidget(TQWidget *a_parent, const char *a_name, int a_flags) - : TQTabWidget(a_parent, a_name, a_flags), KommanderWidget(TQT_TQOBJECT(this)) + : TQTabWidget(a_parent, a_name, a_flags), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/tabwidget.h b/kommander/widgets/tabwidget.h index 818879ec..6eb0747a 100644 --- a/kommander/widgets/tabwidget.h +++ b/kommander/widgets/tabwidget.h @@ -27,7 +27,7 @@ class TQShowEvent; class KOMMANDER_EXPORT TabWidget : public TQTabWidget, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/textbrowser.cpp b/kommander/widgets/textbrowser.cpp index 4abaa706..5a6e1576 100644 --- a/kommander/widgets/textbrowser.cpp +++ b/kommander/widgets/textbrowser.cpp @@ -35,7 +35,7 @@ enum Functions { }; TextBrowser::TextBrowser(TQWidget * a_parent, const char *a_name) - : KTextBrowser(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : KTextBrowser(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/textbrowser.h b/kommander/widgets/textbrowser.h index 18c99712..f134891a 100644 --- a/kommander/widgets/textbrowser.h +++ b/kommander/widgets/textbrowser.h @@ -29,7 +29,7 @@ class TQShowEvent; class KOMMANDER_EXPORT TextBrowser: public KTextBrowser, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp index aa2b7c9d..ad5f06d9 100644 --- a/kommander/widgets/textedit.cpp +++ b/kommander/widgets/textedit.cpp @@ -43,14 +43,14 @@ enum Functions { }; TextEdit::TextEdit(TQWidget * a_parent, const char *a_name):KTextEdit(a_parent, a_name), -KommanderWidget(TQT_TQOBJECT(this)) +KommanderWidget(this) { TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); + connect(this, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setTextChanged())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(TE_setModified, "setModified(TQString widget, bool Modified)", i18n("Set widget modified status."), 1); diff --git a/kommander/widgets/textedit.h b/kommander/widgets/textedit.h index a1713fd9..d445d563 100644 --- a/kommander/widgets/textedit.h +++ b/kommander/widgets/textedit.h @@ -31,7 +31,7 @@ class TQShowEvent; class KOMMANDER_EXPORT TextEdit: public KTextEdit, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp index b91d0eb5..ea39706c 100644 --- a/kommander/widgets/timer.cpp +++ b/kommander/widgets/timer.cpp @@ -38,7 +38,7 @@ enum Functions { }; Timer::Timer(TQWidget *a_parent, const char *a_name) - : TQLabel(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TQLabel(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; @@ -57,7 +57,7 @@ Timer::Timer(TQWidget *a_parent, const char *a_name) mTimer = new TQTimer(this); setInterval(5000); setSingleShot(false); - connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); KommanderPlugin::setDefaultGroup(Group::DCOP); KommanderPlugin::registerFunction(SetInterval, "setInterval(TQString widget, int interval)", i18n("Set the timer timeout interval in ms."), 2); @@ -148,7 +148,7 @@ void Timer::timeout() void Timer::execute() { if (mSingleShot) - TQTimer::singleShot(mInterval, this, TQT_SLOT(timeout())); + TQTimer::singleShot(mInterval, this, TQ_SLOT(timeout())); else mTimer->start(mInterval); } diff --git a/kommander/widgets/timer.h b/kommander/widgets/timer.h index fa3523ad..d53550a9 100644 --- a/kommander/widgets/timer.h +++ b/kommander/widgets/timer.h @@ -26,7 +26,7 @@ class TQTimer; class KOMMANDER_EXPORT Timer : public TQLabel, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp index 4df6b78e..0bebe1bb 100644 --- a/kommander/widgets/toolbox.cpp +++ b/kommander/widgets/toolbox.cpp @@ -33,7 +33,7 @@ #define LAST_FUNCTION INDEXOF ToolBox::ToolBox(TQWidget *parent, const char *name) - : TQToolBox(parent, name), KommanderWidget(TQT_TQOBJECT(this)) + : TQToolBox(parent, name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h index b1563c13..a80b8d9f 100644 --- a/kommander/widgets/toolbox.h +++ b/kommander/widgets/toolbox.h @@ -21,7 +21,7 @@ class KDE_EXPORT ToolBox : public TQToolBox, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) TQ_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp index 15949534..c2d6f87a 100644 --- a/kommander/widgets/treewidget.cpp +++ b/kommander/widgets/treewidget.cpp @@ -55,7 +55,7 @@ enum Functions { }; TreeWidget::TreeWidget(TQWidget *a_parent, const char *a_name) - : TDEListView(a_parent, a_name), KommanderWidget(TQT_TQOBJECT(this)) + : TDEListView(a_parent, a_name), KommanderWidget(this) { TQStringList states; states << "default"; diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h index 291a254e..e3bb7f4f 100644 --- a/kommander/widgets/treewidget.h +++ b/kommander/widgets/treewidget.h @@ -34,7 +34,7 @@ class TQWidget; class TQShowEvent; class KOMMANDER_EXPORT TreeWidget : public TDEListView, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/widgets/wizard.cpp b/kommander/widgets/wizard.cpp index 797ed009..0ae537de 100644 --- a/kommander/widgets/wizard.cpp +++ b/kommander/widgets/wizard.cpp @@ -32,7 +32,7 @@ Wizard::Wizard(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags) - : TQWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(TQT_TQOBJECT(this)) + : TQWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(this) { TQStringList states; states << "default"; @@ -41,7 +41,7 @@ Wizard::Wizard(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags setStates(states); setDisplayStates(states); - connect(this, TQT_SIGNAL(helpClicked()), TQT_SLOT(runHelp())); + connect(this, TQ_SIGNAL(helpClicked()), TQ_SLOT(runHelp())); } Wizard::~Wizard() diff --git a/kommander/widgets/wizard.h b/kommander/widgets/wizard.h index d8bbab45..7b3b6fdf 100644 --- a/kommander/widgets/wizard.h +++ b/kommander/widgets/wizard.h @@ -29,7 +29,7 @@ class TQShowEvent; class KOMMANDER_EXPORT Wizard : public TQWizard, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kommander/working/plugintemplate/widget.h b/kommander/working/plugintemplate/widget.h index c07c78cf..328ebe3b 100644 --- a/kommander/working/plugintemplate/widget.h +++ b/kommander/working/plugintemplate/widget.h @@ -14,7 +14,7 @@ class TQStringList; //replace TQWidget with the widget you want to derive from class %{APPNAME}: public TQWidget, public KommanderWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp index f4de889b..aaeca1fd 100644 --- a/kxsldbg/kxsldbg.cpp +++ b/kxsldbg/kxsldbg.cpp @@ -42,7 +42,7 @@ KXsldbg::KXsldbg() { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this, "kxsldbg_part", "KParts::ReadOnlyPart" )); if (m_part) @@ -64,8 +64,8 @@ KXsldbg::KXsldbg() (menuBar()->findItem(mbar->idAt(mbar->count()-1))->popup()); if (help_menu) { - help_menu->insertItem(SmallIconSet("contents"), i18n("&XSLDbg Handbook"), TQT_TQOBJECT(this), - TQT_SLOT(showXSLDbgHelp()), 0, -1, 1); + help_menu->insertItem(SmallIconSet("contents"), i18n("&XSLDbg Handbook"), this, + TQ_SLOT(showXSLDbgHelp()), 0, -1, 1); } } } @@ -102,14 +102,14 @@ bool KXsldbg::closeURL() void KXsldbg::setupActions() { - TDEAction *act = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); - connect(act, TQT_SIGNAL(activated()), this, TQT_SLOT(quit())); + TDEAction *act = KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); + connect(act, TQ_SIGNAL(activated()), this, TQ_SLOT(quit())); - m_toolbarAction = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); + m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void KXsldbg::saveProperties(TDEConfig* /*config*/) @@ -159,8 +159,8 @@ void KXsldbg::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/kxsldbg/kxsldbg.h b/kxsldbg/kxsldbg.h index 1d3420ad..b025918c 100644 --- a/kxsldbg/kxsldbg.h +++ b/kxsldbg/kxsldbg.h @@ -23,7 +23,7 @@ class TDEToggleAction; */ class KXsldbg : public KParts::MainWindow, public KXsldbgIf { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp index d1dee273..d83b6be4 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp @@ -94,7 +94,7 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, newEvaluate = new TQLineEdit(h); evaluateBtn = new TQPushButton(i18n("Evaluate"), h); - TQSplitter *splitter = new TQSplitter(Qt::Vertical, frame); + TQSplitter *splitter = new TQSplitter(TQt::Vertical, frame); mainView = new TQWidgetStack(splitter); mainView->setMinimumHeight(400); //## TODO don't use a magic number outputview = new XsldbgOutputView(splitter); @@ -102,149 +102,149 @@ KXsldbgPart::KXsldbgPart( TQWidget *parentWidget, const char * /*widgetName*/, docDictionary.setAutoDelete(true); // create our actions - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); // set our XML-UI resource file setXMLFile("kxsldbg_part.rc"); (void) new TDEAction( i18n("Configure Editor..."), "configure", 0, - this, TQT_SLOT(configureEditorCmd_activated()), + this, TQ_SLOT(configureEditorCmd_activated()), actionCollection(), "configureEditorCmd" ); (void) new TDEAction( i18n("Configure..."), "configure", Key_C, - this, TQT_SLOT(configureCmd_activated()), + this, TQ_SLOT(configureCmd_activated()), actionCollection(), "configureCmd" ); (void) new TDEAction( i18n("Inspect..."), "edit-find", Key_I, - this, TQT_SLOT(inspectorCmd_activated()), + this, TQ_SLOT(inspectorCmd_activated()), actionCollection(), "inspectCmd" ); // Motions commands (void) new TDEAction( i18n("Run"), "system-run", Key_F5, - this, TQT_SLOT(runCmd_activated()), + this, TQ_SLOT(runCmd_activated()), actionCollection(), "runCmd" ); (void) new TDEAction( i18n("Continue"), "1downarrow", Key_F4, - this, TQT_SLOT(continueCmd_activated()), + this, TQ_SLOT(continueCmd_activated()), actionCollection(), "continueCmd" ); (void) new TDEAction( i18n("Step"), "step", Key_F8, - this, TQT_SLOT(stepCmd_activated()), + this, TQ_SLOT(stepCmd_activated()), actionCollection(), "stepCmd" ); (void) new TDEAction( i18n("Next"), "next", Key_F10, - this, TQT_SLOT(nextCmd_activated()), + this, TQ_SLOT(nextCmd_activated()), actionCollection(), "nextCmd" ); (void) new TDEAction( i18n("Step Up"), "xsldbg_stepup", Key_F6, - this, TQT_SLOT(stepupCmd_activated()), + this, TQ_SLOT(stepupCmd_activated()), actionCollection(), "stepupCmd" ); (void) new TDEAction( i18n("Step Down"), "xsldbg_stepdown", Key_F7, - this, TQT_SLOT(stepCmd_activated()), + this, TQ_SLOT(stepCmd_activated()), actionCollection(), "stepdownCmd" ); // Breakpoint commands (void) new TDEAction( i18n("Break"), "xsldbg_break", Key_F2, - this, TQT_SLOT(breakCmd_activated()), + this, TQ_SLOT(breakCmd_activated()), actionCollection(), "breakCmd" ); (void) new TDEAction( i18n("Enable/Disable"), "xsldbg_enable", Key_F3, - this, TQT_SLOT(enableCmd_activated()), + this, TQ_SLOT(enableCmd_activated()), actionCollection(), "enableCmd" ); (void) new TDEAction( i18n("Delete"), "xsldbg_delete", Key_Delete, - this, TQT_SLOT(deleteCmd_activated()), + this, TQ_SLOT(deleteCmd_activated()), actionCollection(), "deleteCmd" ); (void) new TDEAction( i18n("&Source"), "xsldbg_source", Key_S, - this, TQT_SLOT(sourceCmd_activated()), + this, TQ_SLOT(sourceCmd_activated()), actionCollection(), "sourceCmd" ); (void) new TDEAction( i18n("&Data"), "xsldbg_data", Key_D, - this, TQT_SLOT(dataCmd_activated()), + this, TQ_SLOT(dataCmd_activated()), actionCollection(), "dataCmd" ); (void) new TDEAction( i18n("&Output"), "xsldbg_output", Key_O, - this, TQT_SLOT(outputCmd_activated()), + this, TQ_SLOT(outputCmd_activated()), actionCollection(), "outputCmd" ); (void) new TDEAction( i18n("Reload Current File From Disk"), "xsldbg_refresh", CTRL + Key_F5, - this, TQT_SLOT(refreshCmd_activated()), + this, TQ_SLOT(refreshCmd_activated()), actionCollection(), "refreshCmd" ); /* tracing and walking */ (void) new TDEAction( i18n("Walk Through Stylesheet..."), Key_W, - this, TQT_SLOT(walkCmd_activated()), + this, TQ_SLOT(walkCmd_activated()), actionCollection(), "walkCmd" ); (void) new TDEAction( i18n("Stop Wal&king Through Stylesheet"), Key_K, - this, TQT_SLOT(walkStopCmd_activated()), + this, TQ_SLOT(walkStopCmd_activated()), actionCollection(), "walkStopCmd" ); (void) new TDEAction( i18n("Tr&ace Execution of Stylesheet"), Key_A, - this, TQT_SLOT(traceCmd_activated()), + this, TQ_SLOT(traceCmd_activated()), actionCollection(), "traceCmd" ); (void) new TDEAction( i18n("Stop Tracing of Stylesheet"), Key_K, - this, TQT_SLOT(traceStopCmd_activated()), + this, TQ_SLOT(traceStopCmd_activated()), actionCollection(), "traceStopCmd" ); (void) new TDEAction( i18n("&Evaluate Expression..."), Key_E, - this, TQT_SLOT(evaluateCmd_activated()), + this, TQ_SLOT(evaluateCmd_activated()), actionCollection(), "evaluateCmd" ); (void) new TDEAction( i18n("Goto &XPath..."), Key_X, - this, TQT_SLOT(gotoXPathCmd_activated()), + this, TQ_SLOT(gotoXPathCmd_activated()), actionCollection(), "gotoXPathCmd" ); (void) new TDEAction( i18n("Lookup SystemID..."), 0, - this, TQT_SLOT(slotLookupSystemID()), + this, TQ_SLOT(slotLookupSystemID()), actionCollection(), "lookupSystemID" ); (void) new TDEAction( i18n("Lookup PublicID..."), 0, - this, TQT_SLOT(slotLookupPublicID()), + this, TQ_SLOT(slotLookupPublicID()), actionCollection(), "lookupPublicID" ); (void) new TDEAction( i18n("Quit"), 0, CTRL + Key_Q, - this, TQT_SLOT(quit()), + this, TQ_SLOT(quit()), actionCollection(), "file_quit" ); /* (void) new TDEAction( i18n("Exit KXsldbg"), "xsldbg_output", CTRL + Key_Q, - this, TQT_SLOT(exitCmd_activated()), + this, TQ_SLOT(exitCmd_activated()), actionCollection(), "exitCmd" ); */ - connect( xPathBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotGotoXPath() ) ); - connect( evaluateBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotEvaluate() ) ); + connect( xPathBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotGotoXPath() ) ); + connect( evaluateBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotEvaluate() ) ); /* - connect( searchBtn, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSearch() ) ); + connect( searchBtn, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSearch() ) ); */ /* We must have a valid debugger and inspector */ createInspector(); @@ -312,7 +312,7 @@ bool KXsldbgPart::fetchURL(const KURL &url) if (docPtr->kateView()){ mainView->addWidget(docPtr->kateView()); Kate::View *v = Kate::view((docPtr->kateView())); - connect(v, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(cursorPositionChanged())); + connect(v, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(cursorPositionChanged())); } } @@ -470,13 +470,13 @@ void KXsldbgPart::createInspector() debugger = new XsldbgDebugger(); TQ_CHECK_PTR( debugger ); if ( debugger != 0L ) { - connect(debugger, TQT_SIGNAL( debuggerReady()), - this, TQT_SLOT(debuggerStarted())); + connect(debugger, TQ_SIGNAL( debuggerReady()), + this, TQ_SLOT(debuggerStarted())); if (outputview){ connect(debugger, - TQT_SIGNAL( showMessage(TQString /* msg*/)), + TQ_SIGNAL( showMessage(TQString /* msg*/)), outputview, - TQT_SLOT(slotProcShowMessage(TQString /* msg*/))); + TQ_SLOT(slotProcShowMessage(TQString /* msg*/))); } inspector = new XsldbgInspector( debugger ); TQ_CHECK_PTR( inspector ); @@ -484,31 +484,31 @@ void KXsldbgPart::createInspector() if (inspector != 0L){ /*process line number and/or file name changed */ connect(debugger, - TQT_SIGNAL(lineNoChanged + TQ_SIGNAL(lineNoChanged (TQString /* fileName */ , int /* lineNumber */ , bool /* breakpoint */ ) ), this, - TQT_SLOT(lineNoChanged + TQ_SLOT(lineNoChanged ( TQString /* fileName */ , int /* lineNumber */ , bool /* breakpoint */ ) ) ); connect(debugger, - TQT_SIGNAL(breakpointItem(TQString /* fileName*/, + TQ_SIGNAL(breakpointItem(TQString /* fileName*/, int /* lineNumber */, TQString /*templateName*/, TQString /* modeName */, bool /* enabled */, int /* id */)), this, - TQT_SLOT( breakpointItem(TQString /* fileName*/, + TQ_SLOT( breakpointItem(TQString /* fileName*/, int /* lineNumber */, TQString /*templateName*/, TQString /* modeName */, bool /* enabled */, int /* id */))); - connect(debugger, TQT_SIGNAL(resolveItem(TQString /*URI*/)), - this, TQT_SLOT(slotProcResolveItem(TQString /*URI*/))); + connect(debugger, TQ_SIGNAL(resolveItem(TQString /*URI*/)), + this, TQ_SLOT(slotProcResolveItem(TQString /*URI*/))); } } } diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h index 173d22cf..35328993 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.h +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h @@ -47,7 +47,7 @@ typedef TQDict<QXsldbgDoc> XsldbgDocDict; */ class KXsldbgPart : public KParts::ReadOnlyPart, public KXsldbgPartIf { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.h b/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.h index 78dcbf3c..b82dbac7 100644 --- a/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.h +++ b/kxsldbg/kxsldbgpart/libtqtnotfier/xsldbgdebuggerbase.h @@ -44,7 +44,7 @@ class TQStringList; */ class XsldbgDebuggerBase : public TQObject { - Q_OBJECT + TQ_OBJECT friend class XsldbgEvent; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp index 73d3713b..00540e6d 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/files.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/files.cpp @@ -34,9 +34,12 @@ #include "xsldbgthread.h" #ifdef WIN32 #include <direct.h> +#else +#include <unistd.h> #endif #endif /* BUILD_DOCS */ +#include <cstdlib> /* top xml document */ @@ -743,9 +746,6 @@ filesInit(void) tempDocument = NULL; topStylesheet = NULL; entityNameList = arrayListNew(4, (freeItemFunc) filesFreeEntityInfo); -#if defined(HAVE_INCLUDE_FIX) && (LIBXML_VERSION < 20508) - xmlSetEntityReferenceFunc(filesEntityRef); -#endif /* setup the encoding */ encodeInBuff = xmlBufferCreate(); diff --git a/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp index 5c1bcbff..992b0149 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/files_unix.cpp @@ -21,6 +21,7 @@ #include "files.h" #include "utils.h" #include "options.h" +#include <cstdlib> static char *tempNames[2] = { NULL, NULL }; diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp index 196f2ba9..cb916f51 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp @@ -27,6 +27,7 @@ #include <kstandarddirs.h> #include <tqfileinfo.h> #include <tqstringlist.h> +#include <cstdlib> /* keep track of our integer/boolean options */ diff --git a/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp b/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp index dac5bb0f..8c5e26e8 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/os_cmds.cpp @@ -19,6 +19,7 @@ #include "xsldbg.h" #include "debugXSL.h" #include "files.h" +#include <cstdlib> /* ----------------------------------------- diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp index 08de69d7..d05281f5 100644 --- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp +++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp @@ -39,6 +39,7 @@ #include "files.h" #include "breakpoint.h" #include "debugXSL.h" +#include <cstdlib> #include <libxml/xmlerror.h> #include "xsldbgmsg.h" @@ -82,9 +83,6 @@ #include <libxml/xmlerror.h> #include <libxml/HTMLtree.h> #include <libxml/xmlIO.h> -#ifdef LIBXML_DOCB_ENABLED -#include <libxml/DOCBparser.h> -#endif #ifdef LIBXML_XINCLUDE_ENABLED #include <libxml/xinclude.h> #endif @@ -975,22 +973,11 @@ xsldbgLoadXmlData(void) #endif #ifdef LIBXML_DOCB_ENABLED if (optionsGetIntOption(OPTIONS_DOCBOOK)) -# if LIBXML_VERSION >= 20600 doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME)); -# else - doc = docbParseFile((char *) - optionsGetStringOption(OPTIONS_DATA_FILE_NAME), - NULL); -# endif else #endif - -#if LIBXML_VERSION >= 20600 doc = xmlSAXParseFile(&mySAXHandler, (char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME), 0); -#else - doc = xmlParseFile((char *) optionsGetStringOption(OPTIONS_DATA_FILE_NAME)); -#endif if (doc == NULL) { xsldbgGenericErrorFunc(i18n("Error: Unable to parse file %1.\n").arg(xsldbgUrl(optionsGetStringOption(OPTIONS_DATA_FILE_NAME)))); if (!optionsGetIntOption(OPTIONS_SHELL)) { @@ -1031,11 +1018,7 @@ xsldbgLoadXmlTemporary(const xmlChar * path) #endif #ifdef LIBXML_DOCB_ENABLED if (optionsGetIntOption(OPTIONS_DOCBOOK)) -# if LIBXML_VERSION >= 20600 doc = xmlParseFile((char *) path); -# else - doc = docbParseFile((char *) path, NULL); -# endif else #endif doc = xmlSAXParseFile(&mySAXhdlr, (char *) path, 0); @@ -1100,7 +1083,7 @@ handler_routine(DWORD dwCtrlType) #endif -#if LIBXML_VERSION >= 2006000 +#if 0 /* libxml/ handlers */ void xsldbgStructErrorHandler(void * userData, xmlErrorPtr error) { @@ -1230,16 +1213,11 @@ xsldbgInit() /* set up the parser */ xmlInitParser(); #if 0 -#if LIBXML_VERSION >= 20600 xmlSetGenericErrorFunc(NULL, NULL); xmlSetStructuredErrorFunc(NULL , (xmlStructuredErrorFunc)xsldbgStructErrorHandler); #else xmlSetGenericErrorFunc(0, xsldbgGenericErrorFunc); xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc); -#endif -#else - xmlSetGenericErrorFunc(0, xsldbgGenericErrorFunc); - xsltSetGenericErrorFunc(0, xsldbgGenericErrorFunc); #endif /* diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp index e4fafe5d..1b7580ca 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.cpp @@ -18,8 +18,8 @@ QXsldbgDoc::QXsldbgDoc(TQWidget *parent, KURL url) : TQObject(0L, "QXsldbgDoc"), kDoc(0L),kView(0L), locked(false) { kDoc = KTextEditor::createDocument("libkatepart", 0L,"KTextEditor::Document"); - connect(kDoc, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(lockDoc())); - connect(kDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(unlockDoc())); + connect(kDoc, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(lockDoc())); + connect(kDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(unlockDoc())); if (kDoc){ kView = kDoc->createView(parent, "QXsldbgDocView"); KURL cleanUrl; diff --git a/kxsldbg/kxsldbgpart/qxsldbgdoc.h b/kxsldbg/kxsldbgpart/qxsldbgdoc.h index c7c50174..8ddd8e3d 100644 --- a/kxsldbg/kxsldbgpart/qxsldbgdoc.h +++ b/kxsldbg/kxsldbgpart/qxsldbgdoc.h @@ -18,7 +18,7 @@ class QXsldbgDoc : public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui index b367d6a5..eadfbb05 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpoints.ui @@ -568,7 +568,7 @@ <tabstop>deleteButton</tabstop> <tabstop>enableButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotClear()</slot> <slot>refresh()</slot> <slot>selectionChanged(TQListViewItem*)</slot> @@ -577,6 +577,6 @@ <slot>slotEnableBreakpoint()</slot> <slot>slotAddAllTemplateBreakpoints()</slot> <slot>slotDeleteAllBreakpoints()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp index 453b4f60..e7716a0b 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp @@ -30,16 +30,16 @@ XsldbgBreakpointsImpl::XsldbgBreakpointsImpl(XsldbgDebugger *debugger, : XsldbgBreakpoints(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(breakpointItem(TQString /* file*/, + connect(debugger, TQ_SIGNAL(breakpointItem(TQString /* file*/, int /*line number */, TQString /*templateName*/, TQString /* modeName*/, bool /* enabled */, int /* id */)), - this, TQT_SLOT(slotProcBreakpointItem(TQString /* file*/, + this, TQ_SLOT(slotProcBreakpointItem(TQString /* file*/, int /*line number */, TQString /*templateName*/, TQString /* modeName */, bool /* enabled */, int /* id */))); - connect( breakpointListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect( breakpointListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); refresh(); } diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h index 4a567f6a..58f442c0 100644 --- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.h @@ -29,7 +29,7 @@ class XsldbgDebugger; class XsldbgBreakpointsImpl : public XsldbgBreakpoints, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui index d1fdba5c..f5739f1d 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstack.ui +++ b/kxsldbg/kxsldbgpart/xsldbgcallstack.ui @@ -149,9 +149,9 @@ <slot>refresh()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>refresh()</slot> <slot>selectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp index 9a500b6c..85a2b012 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.cpp @@ -27,10 +27,10 @@ XsldbgCallStackImpl::XsldbgCallStackImpl(XsldbgDebugger *debugger, { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(callStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */)), - this, TQT_SLOT(slotProcCallStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */))); - connect( callStackListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(debugger, TQ_SIGNAL(callStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */)), + this, TQ_SLOT(slotProcCallStackItem(TQString /* templateName*/, TQString /* fileName */, int /* lineNumber */))); + connect( callStackListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h index 66ebd983..ee7b9e4c 100644 --- a/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgcallstackimpl.h @@ -28,7 +28,7 @@ class XsldbgDebugger; class XsldbgCallStackImpl : public XsldbgCallStack, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgconfig.ui b/kxsldbg/kxsldbgpart/xsldbgconfig.ui index 57a979bb..181bc7c3 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfig.ui +++ b/kxsldbg/kxsldbgpart/xsldbgconfig.ui @@ -799,7 +799,7 @@ <tabstop>xmlDataEdit</tabstop> <tabstop>xslSourceEdit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotCancel()</slot> <slot>slotAddParam()</slot> <slot>slotApply()</slot> @@ -812,6 +812,6 @@ <slot>slotPrevParam()</slot> <slot>slotSourcefile(TQString)</slot> <slot>slotoutputfile(TQString)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp index ade07c6e..18fa6f29 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp @@ -78,10 +78,10 @@ XsldbgConfigImpl::XsldbgConfigImpl(XsldbgDebugger *debugger, : XsldbgConfig(parent, name) { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(parameterItem(TQString /* name*/, TQString /* value */)), - this, TQT_SLOT(slotProcParameterItem(TQString /* name*/, TQString /* value */))); - connect(debugger, TQT_SIGNAL(fileDetailsChanged()), - this, TQT_SLOT(slotReloadFileNames())); + connect(debugger, TQ_SIGNAL(parameterItem(TQString /* name*/, TQString /* value */)), + this, TQ_SLOT(slotProcParameterItem(TQString /* name*/, TQString /* value */))); + connect(debugger, TQ_SIGNAL(fileDetailsChanged()), + this, TQ_SLOT(slotReloadFileNames())); paramIndex= 0; catalogs = false; debug = false; diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h index 5a550a94..1ea50c64 100644 --- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.h @@ -48,7 +48,7 @@ private: class XsldbgDebugger; class XsldbgConfigImpl : public XsldbgConfig, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp index a9521964..c926eca1 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp @@ -213,7 +213,7 @@ void XsldbgDebugger::slotConfigure() if(inspector == 0L ){ inspector = new XsldbgInspector(this); - connect(inspector, TQT_SIGNAL(closedWindow()), this, TQT_SLOT(slotConfigClosed())); + connect(inspector, TQ_SIGNAL(closedWindow()), this, TQ_SLOT(slotConfigClosed())); } } diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.h b/kxsldbg/kxsldbgpart/xsldbgdebugger.h index 7c98b8f2..886f1635 100644 --- a/kxsldbg/kxsldbgpart/xsldbgdebugger.h +++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.h @@ -34,7 +34,7 @@ class TQStringList; class XsldbgWalkSpeedImpl; class XsldbgDebugger : public XsldbgDebuggerBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgentities.ui b/kxsldbg/kxsldbgpart/xsldbgentities.ui index 17b847db..47a9ea2f 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentities.ui +++ b/kxsldbg/kxsldbgpart/xsldbgentities.ui @@ -154,8 +154,8 @@ <slot>refresh()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>refresh()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp index 03f21618..576696db 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.cpp @@ -29,15 +29,15 @@ XsldbgEntitiesImpl::XsldbgEntitiesImpl(XsldbgDebugger *debugger, { this->debugger = debugger; connect(debugger, - TQT_SIGNAL(entityItem(TQString /*SystemID*/, + TQ_SIGNAL(entityItem(TQString /*SystemID*/, TQString /*PublicID*/)), this, - TQT_SLOT(slotProcEntityItem(TQString /*SystemID*/, + TQ_SLOT(slotProcEntityItem(TQString /*SystemID*/, TQString /*PublicID*/))); connect( entitiesListView, - TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h index 0918b566..8c8cc8b7 100644 --- a/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgentitiesimpl.h @@ -28,7 +28,7 @@ class XsldbgDebugger; class XsldbgEntitiesImpl : public XsldbgEntities, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui index 21c7cb19..ce674743 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariables.ui @@ -264,9 +264,9 @@ <slot>refresh()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>refresh()</slot> <slot>slotEvaluate()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp index 235c564a..69affd1e 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.cpp @@ -28,10 +28,10 @@ XsldbgGlobalVariablesImpl::XsldbgGlobalVariablesImpl(XsldbgDebugger *debugger, : XsldbgGlobalVariables(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(globalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */)), - this, TQT_SLOT(slotProcGlobalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */))); - connect( varsListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(debugger, TQ_SIGNAL(globalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */)), + this, TQ_SLOT(slotProcGlobalVariableItem(TQString /*name */, TQString /* fileName */, int /*lineNumber */))); + connect( varsListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h index c3c84e12..eca498b8 100644 --- a/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgglobalvariablesimpl.h @@ -28,7 +28,7 @@ class XsldbgDebugger; class XsldbgGlobalVariablesImpl : public XsldbgGlobalVariables, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.cpp b/kxsldbg/kxsldbgpart/xsldbginspector.cpp index 8b1a2734..7db6ce20 100644 --- a/kxsldbg/kxsldbgpart/xsldbginspector.cpp +++ b/kxsldbg/kxsldbgpart/xsldbginspector.cpp @@ -145,10 +145,10 @@ XsldbgInspector::XsldbgInspector( XsldbgDebugger *debugger, TQWidget* parent, XsldbgInspectorLayout->addMultiCellLayout( Layout1, 1, 1, 0, 1 ); // signals and slots connections - connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - connect( buttonApply, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( update() ) ); - connect( buttonRefresh, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( refresh() ) ); - connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); + connect( buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); + connect( buttonApply, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( update() ) ); + connect( buttonRefresh, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( refresh() ) ); + connect( buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); hide(); } diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.h b/kxsldbg/kxsldbgpart/xsldbginspector.h index ea84eda1..70e51604 100644 --- a/kxsldbg/kxsldbgpart/xsldbginspector.h +++ b/kxsldbg/kxsldbgpart/xsldbginspector.h @@ -30,7 +30,7 @@ class XsldbgEntitiesImpl; class XsldbgInspector : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui index 04872236..45a8eb1d 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariables.ui @@ -365,10 +365,10 @@ <slot>slotSetExpression()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>refresh()</slot> <slot>slotEvaluate()</slot> <slot>slotSetExpression()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp index 7f3e857d..5926734e 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp @@ -31,14 +31,14 @@ XsldbgLocalVariablesImpl::XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, : XsldbgLocalVariables(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(variableItem(TQString /*name */, TQString /* templateContext*/, + connect(debugger, TQ_SIGNAL(variableItem(TQString /*name */, TQString /* templateContext*/, TQString /* fileName */, int /*lineNumber */, TQString /* select XPath */, int /* is it a local variable */)), - this, TQT_SLOT(slotProcVariableItem(TQString /*name */, TQString /* templateContext*/, + this, TQ_SLOT(slotProcVariableItem(TQString /*name */, TQString /* templateContext*/, TQString /* fileName */, int /*lineNumber */, TQString /* select XPath */, int /* is it a local variable */))); - connect(varsListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(varsListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h index fd6af97c..805c41e4 100644 --- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.h @@ -28,7 +28,7 @@ class XsldbgDebugger; class XsldbgLocalVariablesImpl : public XsldbgLocalVariables, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.h b/kxsldbg/kxsldbgpart/xsldbgoutputview.h index b4d89db3..3d1cd1d0 100644 --- a/kxsldbg/kxsldbgpart/xsldbgoutputview.h +++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.h @@ -28,7 +28,7 @@ class TQDialog; class XsldbgMsgDialogImpl; class XsldbgOutputView : public TQTextEdit { - Q_OBJECT + TQ_OBJECT public : diff --git a/kxsldbg/kxsldbgpart/xsldbgsources.ui b/kxsldbg/kxsldbgpart/xsldbgsources.ui index e31f6ea6..ab4cf756 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsources.ui +++ b/kxsldbg/kxsldbgpart/xsldbgsources.ui @@ -146,9 +146,9 @@ <slot>refresh()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>refresh()</slot> <slot>selectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp index f291ab6d..3bad8a51 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.cpp @@ -28,11 +28,11 @@ XsldbgSourcesImpl::XsldbgSourcesImpl(XsldbgDebugger *debugger, : XsldbgSources(parent, name), XsldbgDialogBase() { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */)), - this, TQT_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */))); + connect(debugger, TQ_SIGNAL(sourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */)), + this, TQ_SLOT(slotProcSourceItem(TQString /* fileName */, TQString /* parentFileName */, int /*lineNumber */))); - connect( sourceListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect( sourceListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); refresh(); diff --git a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h index cf2af37e..9915b9c0 100644 --- a/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgsourcesimpl.h @@ -28,7 +28,7 @@ class XsldbgDebugger; class XsldbgSourcesImpl : public XsldbgSources, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplates.ui b/kxsldbg/kxsldbgpart/xsldbgtemplates.ui index eb6528c8..a575f462 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplates.ui +++ b/kxsldbg/kxsldbgpart/xsldbgtemplates.ui @@ -93,8 +93,8 @@ <slot>selectionChanged(TQListViewItem*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>selectionChanged(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp index 66cb9227..2c0de0e9 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.cpp @@ -27,10 +27,10 @@ XsldbgTemplatesImpl::XsldbgTemplatesImpl(XsldbgDebugger *debugger, { this->debugger = debugger; - connect(debugger, TQT_SIGNAL(templateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */)), - this, TQT_SLOT(slotProcTemplateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */))); - connect( templatesListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); + connect(debugger, TQ_SIGNAL(templateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */)), + this, TQ_SLOT(slotProcTemplateItem(TQString /* name*/, TQString /*mode*/, TQString /* fileName */, int /* lineNumber */))); + connect( templatesListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); show(); } diff --git a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h index 7584860d..c7fa5b72 100644 --- a/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgtemplatesimpl.h @@ -30,7 +30,7 @@ class XsldbgDebugger; class XsldbgTemplatesImpl : public XsldbgTemplates, public XsldbgDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h index 290819aa..ec80d4e3 100644 --- a/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h +++ b/kxsldbg/kxsldbgpart/xsldbgwalkspeedimpl.h @@ -27,7 +27,7 @@ class XsldbgDebugger; class XsldbgWalkSpeedImpl : public XsldbgWalkSpeed { - Q_OBJECT + TQ_OBJECT public: diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp index 9d782dc2..ceb275df 100644 --- a/kxsldbg/xsldbgmain.cpp +++ b/kxsldbg/xsldbgmain.cpp @@ -39,6 +39,7 @@ #include <tdelocale.h> #include <tdeglobal.h> #include <kdebug.h> +#include <cstdlib> /* Forward delare private functions */ static int notifyXsldbgAppSimple(XsldbgMessageEnum type, const void *data); static int notifyStateXsldbgAppSimple(XsldbgMessageEnum type, int commandId, diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp index adba273f..e8752b41 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp @@ -125,7 +125,7 @@ void KDockMainWindow::setMainDockWidget( KDockWidget* mdw ) void KDockMainWindow::setView( TQWidget *view ) { if ( view->isA("KDockWidget") ){ - if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((KDockWidget*)view)->applyToWidget( this ); + if ( view->parent() != this ) ((KDockWidget*)view)->applyToWidget( this ); } #ifndef NO_KDE2 @@ -206,7 +206,7 @@ void KDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.begin( this ); - style().tqdrawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); + style().drawPrimitive (TQStyle::PE_DockWindowHandle, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } @@ -222,7 +222,7 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) #ifdef BORDERLESS_WINDOWS setCursor(TQCursor(ArrowCursor)); #endif - d = new KDockWidgetHeaderPrivate( TQT_TQOBJECT(this) ); + d = new KDockWidgetHeaderPrivate( this ); layout = new TQHBoxLayout( this ); layout->setResizeMode( TQLayout::Minimum ); @@ -233,28 +233,28 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) TQToolTip::add( closeButton, i18n("Close") ); closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); - connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); + connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerCloseButtonClicked())); + connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(undock())); stayButton = new KDockButton_Private( this, "DockStayButton" ); TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") ); stayButton->setToggleButton( true ); stayButton->setPixmap( const_cast< const char** >(not_close_xpm) ); stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( stayButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStayClicked())); + connect( stayButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStayClicked())); dockbackButton = new KDockButton_Private( this, "DockbackButton" ); TQToolTip::add( dockbackButton, i18n("Dock this window", "Dock") ); dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm)); dockbackButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked())); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerDockbackButtonClicked())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(dockBack())); d->toDesktopButton = new KDockButton_Private( this, "ToDesktopButton" ); TQToolTip::add( d->toDesktopButton, i18n("Detach") ); d->toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm)); d->toDesktopButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( d->toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop())); + connect( d->toDesktopButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(toDesktop())); stayButton->hide(); d->dummy = new TQWidget( this ); @@ -504,7 +504,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP layout->setResizeMode( TQLayout::Minimum ); manager = dockManager; - manager->childDock->append( TQT_TQOBJECT(this) ); + manager->childDock->append( this ); installEventFilter( manager ); eDocking = DockFullDocking; @@ -528,7 +528,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP setIcon( pixmap); widget = 0L; - TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) ); + TQObject::connect(this, TQ_SIGNAL(hasUndocked()), manager->main, TQ_SLOT(slotDockWidgetUndocked()) ); applyToWidget( parent, TQPoint(0,0) ); } @@ -568,8 +568,8 @@ KDockWidget::~KDockWidget() } } emit iMBeingClosed(); - if (manager->d) manager->d->containerDocks.remove(TQT_TQOBJECT(this)); - manager->childDock->remove( TQT_TQOBJECT(this) ); + if (manager->d) manager->d->containerDocks.remove(this); + manager->childDock->remove( this ); delete pix; delete d; // destroy private data d=0; @@ -580,7 +580,7 @@ void KDockWidget::paintEvent(TQPaintEvent* pe) TQWidget::paintEvent(pe); TQPainter paint; paint.begin( this ); - style().tqdrawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); + style().drawPrimitive (TQStyle::PE_Panel, &paint, TQRect(0,0,width(), height()), colorGroup()); paint.end(); } @@ -782,7 +782,7 @@ void KDockWidget::updateHeader() setCursor(TQCursor(ArrowCursor)); #endif - if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == KDockWidget::DockNone) ){ + if ( (parent() == manager->main) || isGroup || (eDocking == KDockWidget::DockNone) ){ header->hide(); } else { header->setTopLevel( false ); @@ -803,7 +803,7 @@ void KDockWidget::updateHeader() void KDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) { - if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) ) + if ( parent() != s ) { hide(); reparent(s, 0, TQPoint(0,0), false); @@ -925,7 +925,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) { if (!parent()) return 0; if (!parent()->inherits("KDockSplitter")) return 0; - Qt::Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ?Qt::Vertical:Qt::Horizontal; + TQt::Orientation orientation=((pos==DockLeft) || (pos==DockRight)) ?TQt::Vertical:TQt::Horizontal; if (((KDockSplitter*)(parent()))->orientation()==orientation) { KDockWidget *neighbor= @@ -934,7 +934,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) static_cast<KDockWidget*>(((KDockSplitter*)(parent()))->getLast()); if (neighbor==this) - return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); + return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos)); else if (neighbor->getWidget() && (neighbor->getWidget()->tqt_cast("KDockTabGroup"))) return (KDockWidget*)(((KDockTabGroup*)neighbor->getWidget())->page(0)); @@ -942,7 +942,7 @@ KDockWidget *KDockWidget::findNearestDockWidget(DockPosition pos) return neighbor; } else - return (static_cast<KDockWidget*>(TQT_TQWIDGET(parent()->parent()))->findNearestDockWidget(pos)); + return (static_cast<KDockWidget*>(parent()->parent())->findNearestDockWidget(pos)); return 0; } @@ -1109,7 +1109,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, if ( dockPos == KDockWidget::DockCenter ) { KDockTabGroup* tab = new KDockTabGroup( newDock, "_dock_tab"); - TQObject::connect(tab, TQT_SIGNAL(currentChanged(TQWidget*)), d, TQT_SLOT(slotFocusEmbeddedWidget(TQWidget*))); + TQObject::connect(tab, TQ_SIGNAL(currentChanged(TQWidget*)), d, TQ_SLOT(slotFocusEmbeddedWidget(TQWidget*))); newDock->setWidget( tab ); target->applyToWidget( tab ); @@ -1146,13 +1146,13 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, // if to dock not to the center of the target dockwidget, // dock to newDock KDockSplitter* panner = 0L; - if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_",Qt::Horizontal, spliPos, manager->splitterHighResolution() ); - if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_",Qt::Vertical , spliPos, manager->splitterHighResolution() ); + if ( dockPos == KDockWidget::DockTop || dockPos == KDockWidget::DockBottom ) panner = new KDockSplitter( newDock, "_dock_split_",TQt::Horizontal, spliPos, manager->splitterHighResolution() ); + if ( dockPos == KDockWidget::DockLeft || dockPos == KDockWidget::DockRight ) panner = new KDockSplitter( newDock, "_dock_split_",TQt::Vertical , spliPos, manager->splitterHighResolution() ); newDock->setWidget( panner ); panner->setOpaqueResize(manager->splitterOpaqueResize()); panner->setKeepSize(manager->splitterKeepSize()); - panner->setFocusPolicy( TQ_NoFocus ); + panner->setFocusPolicy( TQWidget::NoFocus ); target->applyToWidget( panner ); applyToWidget( panner ); target->formerDockPos = target->currentDockPos; @@ -1331,13 +1331,13 @@ void KDockWidget::undock() split->deactivate(); if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); - if ( ((KDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockLeft ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockTop ); } else { split->activate( 0L, lastTab ); - if ( ((KDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) + if ( ((KDockWidget*)split->parent())->splitterOrientation ==TQt::Vertical ) emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockRight ); else emit ((KDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, KDockWidget::DockBottom ); @@ -1433,7 +1433,7 @@ void KDockWidget::setWidget( TQWidget* mw ) { if ( !mw ) return; - if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){ + if ( mw->parent() != this ){ mw->reparent(this, 0, TQPoint(0,0), false); } @@ -1450,7 +1450,7 @@ void KDockWidget::setWidget( TQWidget* mw ) if (dc) { d->isContainer=true; - manager->d->containerDocks.append(TQT_TQOBJECT(this)); + manager->d->containerDocks.append(this); } else { @@ -1489,13 +1489,13 @@ void KDockWidget::setDockTabName( KDockTabGroup* tab ) bool KDockWidget::mayBeHide() const { - bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (parent() != manager->main); return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)KDockWidget::DockNone ) ); } bool KDockWidget::mayBeShow() const { - bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (parent() != manager->main); return ( !isGroup && !isTabGroup && f && !isVisible() ); } @@ -1544,15 +1544,15 @@ void KDockWidget::setFormerBrotherDockWidget(KDockWidget *dockWidget) { formerBrotherDockWidget = dockWidget; if( formerBrotherDockWidget ) - TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::connect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); } void KDockWidget::loseFormerBrotherDockWidget() { if( formerBrotherDockWidget ) - TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::disconnect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; repaint(); } @@ -1642,8 +1642,8 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name ) menu = new TQPopupMenu(); #endif - connect( menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotMenuPopup()) ); - connect( menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuActivated(int)) ); + connect( menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotMenuPopup()) ); + connect( menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuActivated(int)) ); childDock = new TQObjectList(); childDock->setAutoDelete( false ); @@ -1703,7 +1703,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) break; case TQEvent::MouseButtonPress: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( curdw->eDocking != (int)KDockWidget::DockNone ){ dropCancel = true; curdw->setFocus(); @@ -1728,7 +1728,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) } break; case TQEvent::MouseButtonRelease: - if ( ((TQMouseEvent*)event)->button() == Qt::LeftButton ){ + if ( ((TQMouseEvent*)event)->button() == TQt::LeftButton ){ if ( dragging ){ if ( !dropCancel ) drop(); @@ -1806,7 +1806,7 @@ bool KDockManager::eventFilter( TQObject *obj, TQEvent *event ) if (d->readyToDrag) { d->readyToDrag = false; } - if ( (((TQMouseEvent*)event)->state() == Qt::LeftButton) && + if ( (((TQMouseEvent*)event)->state() == TQt::LeftButton) && (curdw->eDocking != (int)KDockWidget::DockNone) ) { startDrag( curdw); } @@ -1844,8 +1844,8 @@ KDockWidget* KDockManager::findDockWidgetAt( const TQPoint& pos ) } w = p; } - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockSplitter", "_dock_split_" ) ) return 0L; - if ( tqt_find_obj_child( TQT_TQOBJECT(w), "KDockTabGroup", "_dock_tab" ) ) return 0L; + if ( tqt_find_obj_child( w, "KDockSplitter", "_dock_split_" ) ) return 0L; + if ( tqt_find_obj_child( w, "KDockTabGroup", "_dock_tab" ) ) return 0L; if (dynamic_cast<KDockContainer*>(w)) return 0L; if (!childDockWidgetList) return 0L; @@ -2162,7 +2162,7 @@ void KDockManager::writeConfig(TQDomElement &base) TQObjectListIt it(*childDock); KDockWidget *obj1; while ( (obj1=(KDockWidget*)it.current()) ) { - if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) ) + if ( obj1->parent() == main ) mainWidgetStr = TQString::fromLatin1(obj1->name()); nList.append(obj1->name()); ++it; @@ -2350,7 +2350,7 @@ void KDockManager::readConfig(TQDomElement &base) KDockWidget *second = getDockWidgetFromName(secondName); if (first && second) { obj = first->manualDock(second, - (orientation == (int)Qt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, + (orientation == (int)TQt::Vertical)? KDockWidget::DockLeft : KDockWidget::DockTop, separatorPos); if (obj) obj->setName(name.latin1()); @@ -2461,7 +2461,7 @@ void KDockManager::removeFromAutoCreateList(KDockWidget* pDockWidget) { if (!autoCreateDock) return; autoCreateDock->setAutoDelete(false); - autoCreateDock->removeRef(TQT_TQOBJECT(pDockWidget)); + autoCreateDock->removeRef(pDockWidget); autoCreateDock->setAutoDelete(true); } @@ -2497,7 +2497,7 @@ void KDockManager::writeConfig( TDEConfig* c, TQString group ) ++it; //debug(" +Add subdock %s", obj->name()); nList.append( obj->name() ); - if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) ) + if ( obj->parent() == main ) c->writeEntry( "Main:view", obj->name() ); } @@ -2705,9 +2705,9 @@ void KDockManager::readConfig( TDEConfig* c, TQString group ) KDockWidget* last = getDockWidgetFromName( c->readEntry( oname + ":last_name" ) ); int sepPos = c->readNumEntry( oname + ":sepPos" ); - Qt::Orientation p = (Qt::Orientation)c->readNumEntry( oname + ":orientation" ); + TQt::Orientation p = (TQt::Orientation)c->readNumEntry( oname + ":orientation" ); if ( first && last ){ - obj = first->manualDock( last, ( p ==Qt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); + obj = first->manualDock( last, ( p ==TQt::Vertical ) ? KDockWidget::DockLeft : KDockWidget::DockTop, sepPos ); if (obj){ obj->setName( oname.latin1() ); } @@ -2834,7 +2834,7 @@ KDockWidget* KDockManager::getDockWidgetFromName( const TQString& dockName ) if ( autoCreateDock ){ kdDebug(282)<<"Autocreating dock: "<<dockName<<endl; autoCreate = new KDockWidget( this, dockName.latin1(), TQPixmap(TQString("")) ); - autoCreateDock->append( TQT_TQOBJECT(autoCreate) ); + autoCreateDock->append( autoCreate ); } return autoCreate; } diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h index aad41407..2f4d4d01 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.h +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.h @@ -104,7 +104,7 @@ namespace KMDI */ class KDockWidgetAbstractHeader : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -154,7 +154,7 @@ private: */ class TDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -200,7 +200,7 @@ private: */ class TDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag { - Q_OBJECT + TQ_OBJECT public: @@ -242,7 +242,7 @@ private: */ class TDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader { - Q_OBJECT + TQ_OBJECT public: @@ -368,7 +368,7 @@ private: */ class TDEUI_EXPORT KDockTabGroup : public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -429,7 +429,7 @@ private: */ class TDEUI_EXPORT KDockWidget: public TQWidget { - Q_OBJECT + TQ_OBJECT friend class KDockManager; friend class KDockSplitter; @@ -911,7 +911,7 @@ private: */ class TDEUI_EXPORT KDockManager: public TQObject { - Q_OBJECT + TQ_OBJECT friend class KDockWidget; friend class KDockMainWindow; @@ -1308,7 +1308,7 @@ private: */ class TDEUI_EXPORT KDockMainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT friend class KDockManager; @@ -1475,7 +1475,7 @@ private: class TDEUI_EXPORT KDockArea : public TQWidget { - Q_OBJECT + TQ_OBJECT friend class KDockManager; diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp index ef60f031..06a3481a 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.cpp @@ -26,7 +26,7 @@ #include <tqtimer.h> #include <tqapplication.h> -KDockSplitter::KDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution) +KDockSplitter::KDockSplitter(TQWidget *parent, const char *name, TQt::Orientation orient, int pos, bool highResolution) : TQWidget(parent, name) { m_dontRecalc=false; @@ -59,7 +59,7 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1) divider->setLineWidth(1); divider->raise(); - if (m_orientation ==Qt::Horizontal) + if (m_orientation ==TQt::Horizontal) divider->setCursor(TQCursor(sizeVerCursor)); else divider->setCursor(TQCursor(sizeHorCursor)); @@ -76,25 +76,25 @@ void KDockSplitter::activate(TQWidget *c0, TQWidget *c1) if (((KDockWidget*)child0)->forcedFixedWidth()!=-1) { setForcedFixedWidth(((KDockWidget*)child0),((KDockWidget*)child0)->forcedFixedWidth()); - //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize())); + //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize())); } else if (((KDockWidget*)child1)->forcedFixedWidth()!=-1) { setForcedFixedWidth(((KDockWidget*)child1),((KDockWidget*)child1)->forcedFixedWidth()); - //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize())); + //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize())); } if (((KDockWidget*)child0)->forcedFixedHeight()!=-1) { setForcedFixedHeight(((KDockWidget*)child0),((KDockWidget*)child0)->forcedFixedHeight()); - //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize())); + //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize())); } else if (((KDockWidget*)child1)->forcedFixedHeight()!=-1) { setForcedFixedHeight(((KDockWidget*)child1),((KDockWidget*)child1)->forcedFixedHeight()); - //TQTimer::singleShot(100,this,TQT_SLOT(delayedResize())); + //TQTimer::singleShot(100,this,TQ_SLOT(delayedResize())); } @@ -179,7 +179,7 @@ void KDockSplitter::setupMinMaxSize() { // Set the minimum and maximum sizes int minx, maxx, miny, maxy; - if (m_orientation ==Qt::Horizontal) { + if (m_orientation ==TQt::Horizontal) { miny = child0->minimumSize().height() + child1->minimumSize().height()+4; maxy = child0->maximumSize().height() + child1->maximumSize().height()+4; minx = (child0->minimumSize().width() > child1->minimumSize().width()) ? child0->minimumSize().width() : child1->minimumSize().width(); @@ -238,11 +238,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) double factor = (mHighResolution)? 10000.0:100.0; // real resize event, recalculate xpos if (ev && mKeepSize && isVisible()) { -// kdDebug(282)<<"mKeepSize : "<< ((m_orientation ==Qt::Horizontal) ? "Horizontal":"Vertical") <<endl; +// kdDebug(282)<<"mKeepSize : "<< ((m_orientation ==TQt::Horizontal) ? "Horizontal":"Vertical") <<endl; if (ev->oldSize().width() != ev->size().width()) { - if (m_orientation ==Qt::Horizontal) { + if (m_orientation ==TQt::Horizontal) { xpos = tqRound(factor * checkValue( child0->height()+1 ) / height()); } else { xpos = tqRound(factor * checkValue( child0->width()+1 ) / width()); @@ -252,9 +252,9 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) } else { -// kdDebug(282)<<"!mKeepSize : "<< ((m_orientation ==Qt::Horizontal) ? "Horizontal":"Vertical") <<endl; +// kdDebug(282)<<"!mKeepSize : "<< ((m_orientation ==TQt::Horizontal) ? "Horizontal":"Vertical") <<endl; if (/*ev &&*/ isVisible()) { - if (m_orientation ==Qt::Horizontal) { + if (m_orientation ==TQt::Horizontal) { /* if (ev->oldSize().height() != ev->size().height())*/ { if (fixedHeight0!=-1) @@ -287,15 +287,15 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) KDockWidget *c0=(KDockWidget*)child0; KDockWidget *c1=(KDockWidget*)child1; bool stdHandling=false; - if ( ( (m_orientation==Qt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || - ( (m_orientation==Qt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { + if ( ( (m_orientation==TQt::Vertical) &&((fixedWidth0==-1) && (fixedWidth1==-1)) ) || + ( (m_orientation==TQt::Horizontal) &&((fixedHeight0==-1) && (fixedHeight1==-1)) ) ) { if ((c0->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c0->getWidget())) && (dc->m_overlapMode)) { - int position= tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor); + int position= tqRound((m_orientation ==TQt::Vertical ? width() : height()) * xpos/factor); position=checkValueOverlapped(position,child0); child0->raise(); divider->raise(); - if (m_orientation ==Qt::Horizontal){ + if (m_orientation ==TQt::Horizontal){ child0->setGeometry(0, 0, width(), position); child1->setGeometry(0, dc->m_nonOverlapSize+4, width(), height()-dc->m_nonOverlapSize-4); @@ -309,11 +309,11 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) } else { if ((c1->getWidget()) && (dc=dynamic_cast<KDockContainer*>(c1->getWidget())) && (dc->m_overlapMode)) { - int position= tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor); + int position= tqRound((m_orientation ==TQt::Vertical ? width() : height()) * xpos/factor); position=checkValueOverlapped(position,child1); child1->raise(); divider->raise(); - if (m_orientation ==Qt::Horizontal){ + if (m_orientation ==TQt::Horizontal){ child0->setGeometry(0, 0, width(), height()-dc->m_nonOverlapSize-4); child1->setGeometry(0, position+4, width(), height()-position-4); @@ -331,8 +331,8 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) else stdHandling=true; if (stdHandling) { - int position = checkValue( tqRound((m_orientation ==Qt::Vertical ? width() : height()) * xpos/factor) ); - if (m_orientation ==Qt::Horizontal){ + int position = checkValue( tqRound((m_orientation ==TQt::Vertical ? width() : height()) * xpos/factor) ); + if (m_orientation ==TQt::Horizontal){ child0->setGeometry(0, 0, width(), position); child1->setGeometry(0, position+4, width(), height()-position-4); divider->setGeometry(0, position, width(), 4); @@ -349,7 +349,7 @@ void KDockSplitter::resizeEvent(TQResizeEvent *ev) int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidget) const { if (initialised) { - if (m_orientation ==Qt::Vertical) { + if (m_orientation ==TQt::Vertical) { if (child0==overlappingWidget) { if (position<(child0->minimumSize().width())) position=child0->minimumSize().width(); @@ -358,7 +358,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge position=width()-(child1->minimumSize().width())-4; if (position<0) position=0; } - } else {// orientation ==Qt::Horizontal + } else {// orientation ==TQt::Horizontal if (child0==overlappingWidget) { if (position<(child0->minimumSize().height())) position=child0->minimumSize().height(); @@ -377,7 +377,7 @@ int KDockSplitter::checkValueOverlapped(int position, TQWidget *overlappingWidge int KDockSplitter::checkValue( int position ) const { if (initialised){ - if (m_orientation ==Qt::Vertical){ + if (m_orientation ==TQt::Vertical){ if (position < (child0->minimumSize().width())) position = child0->minimumSize().width(); if ((width()-4-position) < (child1->minimumSize().width())) @@ -392,9 +392,9 @@ int KDockSplitter::checkValue( int position ) const if (position < 0) position = 0; - if ((m_orientation ==Qt::Vertical) && (position > width())) + if ((m_orientation ==TQt::Vertical) && (position > width())) position = width(); - if ((m_orientation ==Qt::Horizontal) && (position > height())) + if ((m_orientation ==TQt::Horizontal) && (position > height())) position = height(); return position; @@ -411,7 +411,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) mev= (TQMouseEvent*)e; child0->setUpdatesEnabled(mOpaqueResize); child1->setUpdatesEnabled(mOpaqueResize); - if (m_orientation ==Qt::Horizontal) { + if (m_orientation ==TQt::Horizontal) { if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; @@ -445,7 +445,7 @@ bool KDockSplitter::eventFilter(TQObject *o, TQEvent *e) child0->setUpdatesEnabled(true); child1->setUpdatesEnabled(true); mev= (TQMouseEvent*)e; - if (m_orientation ==Qt::Horizontal){ + if (m_orientation ==TQt::Horizontal){ if ((fixedHeight0!=-1) || (fixedHeight1!=-1)) { handled=true; break; @@ -544,7 +544,7 @@ KDockButton_Private::KDockButton_Private( TQWidget *parent, const char * name ) :TQPushButton( parent, name ) { moveMouse = false; - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); } KDockButton_Private::~KDockButton_Private() @@ -620,7 +620,7 @@ void KDockWidgetPrivate::slotFocusEmbeddedWidget(TQWidget* w) { if (w) { TQWidget* embeddedWdg = ((KDockWidget*)w)->getWidget(); - if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQ_ClickFocus) || (embeddedWdg->focusPolicy() == TQ_StrongFocus))) { + if (embeddedWdg && ((embeddedWdg->focusPolicy() == TQWidget::ClickFocus) || (embeddedWdg->focusPolicy() == TQWidget::StrongFocus))) { embeddedWdg->setFocus(); } } diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h index 1a4d021f..44760156 100644 --- a/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h +++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget_private.h @@ -42,7 +42,7 @@ class KDockContainer; */ class TDEUI_EXPORT KDockSplitter : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KDockSplitter(TQWidget *parent= 0, const char *name= 0, Orientation orient=TQt::Vertical, int pos= 50, bool highResolution=false); @@ -117,7 +117,7 @@ private: */ class TDEUI_EXPORT KDockButton_Private : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: KDockButton_Private( TQWidget *parent=0, const char *name=0 ); @@ -143,7 +143,7 @@ private: */ class TDEUI_EXPORT KDockWidgetPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: KDockWidgetPrivate(); diff --git a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp index fff6b2c1..dd339c61 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp @@ -43,12 +43,12 @@ KTabBar::KTabBar( TQWidget *parent, const char *name ) setMouseTracking( true ); mEnableCloseButtonTimer = new TQTimer( this ); - connect( mEnableCloseButtonTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( enableCloseButton() ) ); + connect( mEnableCloseButtonTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( enableCloseButton() ) ); mActivateDragSwitchTabTimer = new TQTimer( this ); - connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) ); + connect( mActivateDragSwitchTabTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( activateDragSwitchTab() ) ); - connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange())); + connect(this, TQ_SIGNAL(layoutChanged()), TQ_SLOT(onLayoutChange())); } KTabBar::~KTabBar() @@ -87,7 +87,7 @@ void KTabBar::setTabEnabled( int id, bool enabled ) void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; TQTab *tab = selectTab( e->pos() ); @@ -100,11 +100,11 @@ void KTabBar::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabBar::mousePressEvent( TQMouseEvent *e ) { - if( e->button() == Qt::LeftButton ) { + if( e->button() == TQt::LeftButton ) { mEnableCloseButtonTimer->stop(); mDragStart = e->pos(); } - else if( e->button() == Qt::RightButton ) { + else if( e->button() == TQt::RightButton ) { TQTab *tab = selectTab( e->pos() ); if( tab ) { emit( contextMenu( indexOf( tab->identifier() ), mapToGlobal( e->pos() ) ) ); @@ -116,7 +116,7 @@ void KTabBar::mousePressEvent( TQMouseEvent *e ) void KTabBar::mouseMoveEvent( TQMouseEvent *e ) { - if ( e->state() == Qt::LeftButton ) { + if ( e->state() == TQt::LeftButton ) { TQTab *tab = selectTab( e->pos() ); if ( mDragSwitchTab && tab != mDragSwitchTab ) { mActivateDragSwitchTabTimer->stop(); @@ -134,7 +134,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) } } } - else if ( e->state() == Qt::MidButton ) { + else if ( e->state() == TQt::MidButton ) { if (mReorderStartTab==-1) { int delay = TDEGlobalSettings::dndEventDelay(); TQPoint newPos = e->pos(); @@ -200,7 +200,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) mEnableCloseButtonTimer->start( TQApplication::doubleClickInterval(), true ); } mHoverCloseButtonTab = t; - connect( mHoverCloseButton, TQT_SIGNAL( clicked() ), TQT_SLOT( closeButtonClicked() ) ); + connect( mHoverCloseButton, TQ_SIGNAL( clicked() ), TQ_SLOT( closeButtonClicked() ) ); return; } } @@ -229,7 +229,7 @@ void KTabBar::activateDragSwitchTab() void KTabBar::mouseReleaseEvent( TQMouseEvent *e ) { - if( e->button() == Qt::MidButton ) { + if( e->button() == TQt::MidButton ) { if ( mReorderStartTab==-1 ) { TQTab *tab = selectTab( e->pos() ); if( tab ) { @@ -281,7 +281,7 @@ void KTabBar::dropEvent( TQDropEvent *e ) #ifndef TQT_NO_WHEELEVENT void KTabBar::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() ==Qt::Horizontal ) + if ( e->orientation() ==TQt::Horizontal ) return; emit( wheelDelta( e->delta() ) ); diff --git a/lib/compatibility/tdemdi/qextmdi/ktabbar.h b/lib/compatibility/tdemdi/qextmdi/ktabbar.h index 53e87c8b..14d5e738 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabbar.h +++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.h @@ -34,7 +34,7 @@ class KTabBarPrivate; */ class TDEUI_EXPORT KTabBar: public TQTabBar { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp index 3b17a43a..abb0a447 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.cpp @@ -55,16 +55,16 @@ KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f ) setTabBar( new KTabBar(this, "tabbar") ); setAcceptDrops( true ); - connect(tabBar(), TQT_SIGNAL(contextMenu( int, const TQPoint & )), TQT_SLOT(contextMenu( int, const TQPoint & ))); - connect(tabBar(), TQT_SIGNAL(mouseDoubleClick( int )), TQT_SLOT(mouseDoubleClick( int ))); - connect(tabBar(), TQT_SIGNAL(mouseMiddleClick( int )), TQT_SLOT(mouseMiddleClick( int ))); - connect(tabBar(), TQT_SIGNAL(initiateDrag( int )), TQT_SLOT(initiateDrag( int ))); - connect(tabBar(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); - connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * ))); - connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int ))); - connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int ))); + connect(tabBar(), TQ_SIGNAL(contextMenu( int, const TQPoint & )), TQ_SLOT(contextMenu( int, const TQPoint & ))); + connect(tabBar(), TQ_SIGNAL(mouseDoubleClick( int )), TQ_SLOT(mouseDoubleClick( int ))); + connect(tabBar(), TQ_SIGNAL(mouseMiddleClick( int )), TQ_SLOT(mouseMiddleClick( int ))); + connect(tabBar(), TQ_SIGNAL(initiateDrag( int )), TQ_SLOT(initiateDrag( int ))); + connect(tabBar(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); + connect(tabBar(), TQ_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQ_SLOT(receivedDropEvent( int, TQDropEvent * ))); + connect(tabBar(), TQ_SIGNAL(moveTab( int, int )), TQ_SLOT(moveTab( int, int ))); + connect(tabBar(), TQ_SIGNAL(closeRequest( int )), TQ_SLOT(closeRequest( int ))); #ifndef TQT_NO_WHEELEVENT - connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int ))); + connect(tabBar(), TQ_SIGNAL(wheelDelta( int )), TQ_SLOT(wheelDelta( int ))); #endif } @@ -174,7 +174,7 @@ unsigned int KTabWidget::tabBarWidthForMaxChars( uint maxLength ) int iw = 0; if ( tab->iconSet() ) iw = tab->iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4; - x += ( tabBar()->style().tqsizeFromContents( TQStyle::CT_TabBarTab, this, + x += ( tabBar()->style().sizeFromContents( TQStyle::CT_TabBarTab, this, TQSize( TQMAX( lw + hframe + iw, TQApplication::globalStrut().width() ), 0 ), TQStyleOption( tab ) ) ).width(); } @@ -316,7 +316,7 @@ void KTabWidget::dropEvent( TQDropEvent *e ) #ifndef TQT_NO_WHEELEVENT void KTabWidget::wheelEvent( TQWheelEvent *e ) { - if ( e->orientation() ==Qt::Horizontal ) + if ( e->orientation() ==TQt::Horizontal ) return; if ( isEmptyTabbarSpace( e->pos() ) ) @@ -344,7 +344,7 @@ void KTabWidget::wheelDelta( int delta ) void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) { - if( e->button() != Qt::LeftButton ) + if( e->button() != TQt::LeftButton ) return; if ( isEmptyTabbarSpace( e->pos() ) ) { @@ -356,12 +356,12 @@ void KTabWidget::mouseDoubleClickEvent( TQMouseEvent *e ) void KTabWidget::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( contextMenu( mapToGlobal( e->pos() ) ) ); return; } - } else if ( e->button() == Qt::MidButton ) { + } else if ( e->button() == TQt::MidButton ) { if ( isEmptyTabbarSpace( e->pos() ) ) { emit( mouseMiddleClick() ); return; diff --git a/lib/compatibility/tdemdi/qextmdi/ktabwidget.h b/lib/compatibility/tdemdi/qextmdi/ktabwidget.h index 5c9ba940..e2ac7c94 100644 --- a/lib/compatibility/tdemdi/qextmdi/ktabwidget.h +++ b/lib/compatibility/tdemdi/qextmdi/ktabwidget.h @@ -35,7 +35,7 @@ class KTabWidgetPrivate; */ class TDEUI_EXPORT KTabWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT TQ_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled ) TQ_PROPERTY( bool hoverCloseButton READ hoverCloseButton WRITE setHoverCloseButton ) diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp index d68322a6..1d654392 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp @@ -58,7 +58,7 @@ KMdiChildArea::KMdiChildArea( TQWidget *parent ) m_captionInactiveForeColor = TDEGlobalSettings::inactiveTextColor(); m_pZ = new TQPtrList<KMdiChildFrm>; m_pZ->setAutoDelete( true ); - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); m_defaultChildFrmSize = TQSize( 400, 300 ); } @@ -112,7 +112,7 @@ void KMdiChildArea::destroyChild( KMdiChildFrm *child, bool focusTop ) bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized ); // destroy the old one - TQT_BASE_OBJECT_NAME::disconnect( child ); + TQObject::disconnect( child ); child->blockSignals( true ); m_pZ->setAutoDelete( false ); m_pZ->removeRef( child ); @@ -144,7 +144,7 @@ void KMdiChildArea::destroyChildButNotItsView( KMdiChildFrm* child, bool focusTo bool wasMaximized = ( child->state() == KMdiChildFrm::Maximized ); // destroy the old one - TQT_BASE_OBJECT_NAME::disconnect( child ); + TQObject::disconnect( child ); child->unsetClient(); m_pZ->setAutoDelete( false ); m_pZ->removeRef( child ); @@ -218,12 +218,8 @@ void KMdiChildArea::setTopChild( KMdiChildFrm* child, bool /* bSetFocus */ ) else child->raise(); -#ifdef USE_QT4 - child->m_pClient->setFocus(); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Other ); child->m_pClient->setFocus(); -#endif // USE_QT4 } } @@ -253,7 +249,7 @@ void KMdiChildArea::resizeEvent( TQResizeEvent* e ) void KMdiChildArea::mousePressEvent( TQMouseEvent *e ) { //Popup the window menu - if ( e->button() & Qt::RightButton ) + if ( e->button() & TQt::RightButton ) emit popupWindowMenu( mapToGlobal( e->pos() ) ); } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h index a5909862..11a93414 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.h @@ -54,7 +54,7 @@ class KMDI_EXPORT KMdiChildArea : public TQFrame friend class KMdiChildFrmCaption; friend class KMdiChildFrm; -Q_OBJECT +TQ_OBJECT // attributes diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp index 515c27dc..54eba787 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp @@ -138,10 +138,10 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) m_pClose = new TQToolButton( m_pCaption, "tdemdi_toolbutton_close" ); m_pUndock = new TQToolButton( m_pCaption, "tdemdi_toolbutton_undock" ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pMaximize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( maximizePressed() ) ); - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closePressed() ) ); - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pMaximize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( maximizePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), this, TQ_SLOT( undockPressed() ) ); m_pIconButtonPixmap = new TQPixmap( SmallIcon( "document-new" ) ); if ( m_pIconButtonPixmap->isNull() ) @@ -149,15 +149,15 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) redecorateButtons(); - m_pWinIcon->setFocusPolicy( TQ_NoFocus ); - m_pUnixIcon->setFocusPolicy( TQ_NoFocus ); - m_pClose->setFocusPolicy( TQ_NoFocus ); - m_pMinimize->setFocusPolicy( TQ_NoFocus ); - m_pMaximize->setFocusPolicy( TQ_NoFocus ); - m_pUndock->setFocusPolicy( TQ_NoFocus ); + m_pWinIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pClose->setFocusPolicy( TQWidget::NoFocus ); + m_pMinimize->setFocusPolicy( TQWidget::NoFocus ); + m_pMaximize->setFocusPolicy( TQWidget::NoFocus ); + m_pUndock->setFocusPolicy( TQWidget::NoFocus ); setFrameStyle( TQFrame::WinPanel | TQFrame::Raised ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); setMouseTracking( true ); @@ -283,7 +283,7 @@ void KMdiChildFrm::mouseMoveEvent( TQMouseEvent *e ) if ( m_bResizing ) { - if ( !( e->state() & Qt::RightButton ) && !( e->state() & Qt::MidButton ) ) + if ( !( e->state() & TQt::RightButton ) && !( e->state() & TQt::MidButton ) ) { // same as: if no button or left button pressed TQPoint p = parentWidget()->mapFromGlobal( e->globalPos() ); @@ -540,8 +540,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) } m_pMinimize->setPixmap( *m_pMinButtonPixmap ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); setGeometry( m_restoredRect ); break; case Normal: @@ -566,8 +566,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) // reset to maximize-captionbar m_pMaximize->setPixmap( *m_pRestoreButtonPixmap ); m_pMinimize->setPixmap( *m_pMinButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER; int nFrameHeight = KMDI_CHILDFRM_DOUBLE_BORDER + KMDI_CHILDFRM_SEPARATOR + m_pCaption->heightHint(); @@ -705,7 +705,7 @@ void KMdiChildFrm::setIcon( const TQPixmap& pxm ) if ( p.width() != 18 || p.height() != 18 ) { TQImage img = p.convertToImage(); - p = img.smoothScale( 18, 18, TQ_ScaleMin ); + p = img.smoothScale( 18, 18, TQImage::ScaleMin ); } const bool do_resize = m_pIconButtonPixmap->size() != p.size(); *m_pIconButtonPixmap = p; @@ -750,7 +750,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) } // memorize the focuses in a dictionary because they will get lost during reparenting - TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>; + TQDict<TQWidget::FocusPolicy>* pFocPolDict = new TQDict<TQWidget::FocusPolicy>; pFocPolDict->setAutoDelete( true ); TQObjectList *list = m_pClient->queryList( "TQWidget" ); TQObjectListIt it( *list ); // iterate over the buttons @@ -768,14 +768,14 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) widg->setName( tmpStr.latin1() ); i++; } - TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy; + TQWidget::FocusPolicy* pFocPol = new TQWidget::FocusPolicy; *pFocPol = widg->focusPolicy(); pFocPolDict->insert( widg->name(), pFocPol ); } delete list; // delete the list, not the objects //Reparent if needed - if ( TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(this) ) + if ( w->parent() != this ) { //reparent to this widget , no flags , point , show it TQPoint pnt2( KMDI_CHILDFRM_BORDER, clientYPos ); @@ -795,7 +795,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) linkChildren( pFocPolDict ); - TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); + TQObject::connect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) ); if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() ) setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER ); @@ -814,10 +814,10 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) if ( !m_pClient ) return ; - TQObject::disconnect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); + TQObject::disconnect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) ); //reparent to desktop widget , no flags , point , show it - TQDict<TQ_FocusPolicy>* pFocPolDict; + TQDict<TQWidget::FocusPolicy>* pFocPolDict; pFocPolDict = unlinkChildren(); // get name of focused child widget @@ -842,7 +842,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) { // for each found object... TQWidget * widg = ( TQWidget* ) obj; ++it; - TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent + TQWidget::FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent if ( pFocPol ) widg->setFocusPolicy( *pFocPol ); @@ -851,7 +851,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) widg->setFocus(); // get first and last focusable widget - if ( ( widg->focusPolicy() == TQ_StrongFocus ) || ( widg->focusPolicy() == TQ_TabFocus ) ) + if ( ( widg->focusPolicy() == TQWidget::StrongFocus ) || ( widg->focusPolicy() == TQWidget::TabFocus ) ) { if ( firstFocusableChildWidget == 0 ) firstFocusableChildWidget = widg; // first widget @@ -860,7 +860,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) } else { - if ( widg->focusPolicy() == TQ_WheelFocus ) + if ( widg->focusPolicy() == TQWidget::WheelFocus ) { if ( firstFocusableChildWidget == 0 ) firstFocusableChildWidget = widg; // first widget @@ -877,14 +877,14 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) m_pClient->setLastFocusableChildWidget( lastFocusableChildWidget ); // reset the focus policy of the view - m_pClient->setFocusPolicy( TQ_ClickFocus ); + m_pClient->setFocusPolicy( TQWidget::ClickFocus ); // lose information about the view (because it's undocked now) m_pClient = 0; } //============== linkChildren =============// -void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict ) +void KMdiChildFrm::linkChildren( TQDict<TQWidget::FocusPolicy>* pFocPolDict ) { // reset the focus policies for all widgets in the view (take them from the dictionary) TQObjectList* list = m_pClient->queryList( "TQWidget" ); @@ -894,7 +894,7 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict ) { // for each found object... TQWidget* widg = ( TQWidget* ) obj; ++it; - TQ_FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent + TQWidget::FocusPolicy* pFocPol = pFocPolDict->find( widg->name() ); // remember the focus policy from before the reparent if ( pFocPol != 0 ) widg->setFocusPolicy( *pFocPol ); @@ -907,14 +907,14 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict ) delete pFocPolDict; // reset the focus policies for the rest - m_pWinIcon->setFocusPolicy( TQ_NoFocus ); - m_pUnixIcon->setFocusPolicy( TQ_NoFocus ); - m_pClient->setFocusPolicy( TQ_ClickFocus ); - m_pCaption->setFocusPolicy( TQ_NoFocus ); - m_pUndock->setFocusPolicy( TQ_NoFocus ); - m_pMinimize->setFocusPolicy( TQ_NoFocus ); - m_pMaximize->setFocusPolicy( TQ_NoFocus ); - m_pClose->setFocusPolicy( TQ_NoFocus ); + m_pWinIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pUnixIcon->setFocusPolicy( TQWidget::NoFocus ); + m_pClient->setFocusPolicy( TQWidget::ClickFocus ); + m_pCaption->setFocusPolicy( TQWidget::NoFocus ); + m_pUndock->setFocusPolicy( TQWidget::NoFocus ); + m_pMinimize->setFocusPolicy( TQWidget::NoFocus ); + m_pMaximize->setFocusPolicy( TQWidget::NoFocus ); + m_pClose->setFocusPolicy( TQWidget::NoFocus ); // install the event filter (catch mouse clicks) for the rest m_pWinIcon->installEventFilter( this ); @@ -930,10 +930,10 @@ void KMdiChildFrm::linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict ) //============== unlinkChildren =============// -TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren() +TQDict<TQWidget::FocusPolicy>* KMdiChildFrm::unlinkChildren() { // memorize the focuses in a dictionary because they will get lost during reparenting - TQDict<TQ_FocusPolicy>* pFocPolDict = new TQDict<TQ_FocusPolicy>; + TQDict<TQWidget::FocusPolicy>* pFocPolDict = new TQDict<TQWidget::FocusPolicy>; pFocPolDict->setAutoDelete( true ); TQObjectList *list = m_pClient->queryList( "TQWidget" ); @@ -953,7 +953,7 @@ TQDict<TQ_FocusPolicy>* KMdiChildFrm::unlinkChildren() w->setName( tmpStr.latin1() ); i++; } - TQ_FocusPolicy* pFocPol = new TQ_FocusPolicy; + TQWidget::FocusPolicy* pFocPol = new TQWidget::FocusPolicy; *pFocPol = w->focusPolicy(); // memorize focus policy pFocPolDict->insert( w->name(), pFocPol ); @@ -1085,7 +1085,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) TQObject* pObj = obj; while ( ( pObj != 0L ) && !bIsChild ) { - bIsChild = ( TQT_BASE_OBJECT(pObj) == TQT_BASE_OBJECT(this) ); + bIsChild = ( pObj == this ); pObj = pObj->parent(); } // unset the resize cursor if the cursor moved from the frame into a inner widget @@ -1095,13 +1095,13 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) break; case TQEvent::MouseButtonPress: { - if ( !hasParent( TQT_TQOBJECT(m_pClient), TQT_TQOBJECT(obj) ) ) + if ( !hasParent( m_pClient, obj ) ) { bool bIsSecondClick = false; if ( m_timeMeasure.elapsed() <= TQApplication::doubleClickInterval() ) bIsSecondClick = true; // of a possible double click - if ( !( ( ( TQT_BASE_OBJECT(obj) == m_pWinIcon ) || ( TQT_BASE_OBJECT(obj) == m_pUnixIcon ) ) && bIsSecondClick ) ) + if ( !( ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) && bIsSecondClick ) ) { // in case we didn't click on the icon button TQFocusEvent* pFE = new TQFocusEvent( TQFocusEvent::FocusIn ); @@ -1112,16 +1112,16 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) m_pClient->activate(); } - if ( ( TQT_BASE_OBJECT(obj->parent()) != TQT_BASE_OBJECT(m_pCaption) ) && ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(m_pCaption) ) ) + if ( ( obj->parent() != m_pCaption ) && ( obj != m_pCaption ) ) { TQWidget* w = ( TQWidget* ) obj; - if ( ( w->focusPolicy() == TQ_ClickFocus ) || ( w->focusPolicy() == TQ_StrongFocus ) ) + if ( ( w->focusPolicy() == TQWidget::ClickFocus ) || ( w->focusPolicy() == TQWidget::StrongFocus ) ) { w->setFocus(); } } } - if ( ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(m_pWinIcon) ) || ( TQT_TQOBJECT(obj) == TQT_BASE_OBJECT(m_pUnixIcon) ) ) + if ( ( obj == m_pWinIcon ) || ( obj == m_pUnixIcon ) ) { // in case we clicked on the icon button if ( m_timeMeasure.elapsed() > TQApplication::doubleClickInterval() ) @@ -1139,7 +1139,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) break; case TQEvent::Resize: { - if ( ( ( TQWidget* ) TQT_TQOBJECT(obj) == m_pClient ) && ( m_state == Normal ) ) + if ( ( ( TQWidget* ) obj == m_pClient ) && ( m_state == Normal ) ) { TQResizeEvent* re = ( TQResizeEvent* ) e; int captionHeight = m_pCaption->heightHint(); @@ -1154,7 +1154,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - TQObject* pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e )->child()); + TQObject* pLostChild = ( ( TQChildEvent* ) e )->child(); if ( ( pLostChild != 0L ) /*&& (pLostChild->inherits("TQWidget"))*/ ) { TQObjectList* list = pLostChild->queryList(); @@ -1176,10 +1176,10 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) // if we got a new child we install ourself as event filter for the new // child and its children (as we did when we got our client). // XXX see linkChildren() and focus policy stuff - TQObject* pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); - if ( ( pNewChild != 0L ) && ::tqqt_cast<TQWidget*>( pNewChild ) ) + TQObject* pNewChild = ( ( TQChildEvent* ) e ) ->child(); + if ( ( pNewChild != 0L ) && ::tqt_cast<TQWidget*>( pNewChild ) ) { - TQWidget * pNewWidget = TQT_TQWIDGET( pNewChild ); + TQWidget * pNewWidget = static_cast<TQWidget*>( pNewChild ); TQObjectList *list = pNewWidget->queryList( "TQWidget" ); list->insert( 0, pNewChild ); // add the new child to the list too, just to save code TQObjectListIt it( *list ); // iterate over all new child widgets @@ -1188,7 +1188,7 @@ bool KMdiChildFrm::eventFilter( TQObject *obj, TQEvent *e ) { // for each found object... TQWidget * widg = ( TQWidget* ) obj; ++it; - if ( !::tqqt_cast<TQPopupMenu*>( widg ) ) + if ( !::tqt_cast<TQPopupMenu*>( widg ) ) { widg->installEventFilter( this ); } @@ -1234,11 +1234,11 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) { - m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) ); - m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) ); - m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) ); - m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQT_SLOT( minimizePressed() ) ); - m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQT_SLOT( maximizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQ_SLOT( minimizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQ_SLOT( maximizePressed() ) ); if ( state() == Normal ) m_pSystemMenu->setItemEnabled( m_pSystemMenu->idAt( 0 ), false ); else if ( state() == Maximized ) @@ -1256,20 +1256,20 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const else { if ( state() != Normal ) - m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) ); if ( state() != Maximized ) - m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQT_SLOT( maximizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQ_SLOT( maximizePressed() ) ); if ( state() != Minimized ) - m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQT_SLOT( minimizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQ_SLOT( minimizePressed() ) ); if ( state() != Maximized ) - m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) ); if ( state() == Normal ) - m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) ); } - m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQT_SLOT( undockPressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQ_SLOT( undockPressed() ) ); m_pSystemMenu->insertSeparator(); - m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQT_SLOT( closePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQ_SLOT( closePressed() ) ); return m_pSystemMenu; } @@ -1301,8 +1301,8 @@ void KMdiChildFrm::switchToMinimizeLayout() // temporary use of minimize button for restore function m_pMinimize->setPixmap( *m_pRestoreButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); // resizing resize( 300, minimumHeight() ); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h index 0f08c1a8..c9a7faa6 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.h @@ -51,7 +51,7 @@ class TQToolButton; */ class KMDI_EXPORT KMdiWin32IconButton : public TQLabel { - Q_OBJECT + TQ_OBJECT public: KMdiWin32IconButton( TQWidget* parent, const char* name = 0 ); @@ -133,7 +133,7 @@ class KMDI_EXPORT KMdiChildFrm : public TQFrame friend class KMdiChildArea; friend class KMdiChildFrmCaption; - Q_OBJECT + TQ_OBJECT // attributes @@ -424,13 +424,13 @@ protected: * Restore the focus policies for _all_ widgets in the view using the list given as parameter. * Install the event filter for all direct child widgets of this. (See KMdiChildFrm::eventFilter) */ - void linkChildren( TQDict<TQ_FocusPolicy>* pFocPolDict ); + void linkChildren( TQDict<TQWidget::FocusPolicy>* pFocPolDict ); /** * Backups all focus policies of _all_ child widgets in the MDI childview since they get lost during a reparent. * Remove all event filters for all direct child widgets of this. (See KMdiChildFrm::eventFilter) */ - TQDict<TQ_FocusPolicy>* unlinkChildren(); + TQDict<TQWidget::FocusPolicy>* unlinkChildren(); /** * Calculates the corner id for the resize cursor. The return value can be tested for: diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp index f90263b3..4fd24174 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp @@ -72,7 +72,7 @@ KMdiChildFrmCaption::KMdiChildFrmCaption( KMdiChildFrm *parent ) m_bActive = false; m_pParent = parent; setBackgroundMode( NoBackground ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); m_bChildInDrag = false; } @@ -85,7 +85,7 @@ KMdiChildFrmCaption::~KMdiChildFrmCaption() void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { setMouseTracking( false ); if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) @@ -95,7 +95,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e ) m_pParent->m_bDragging = true; m_offset = mapToParent( e->pos() ); } - else if ( e->button() == Qt::RightButton ) + else if ( e->button() == TQt::RightButton ) { m_pParent->systemMenu()->popup( mapToGlobal( e->pos() ) ); } @@ -105,7 +105,7 @@ void KMdiChildFrmCaption::mousePressEvent( TQMouseEvent *e ) void KMdiChildFrmCaption::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) TQApplication::restoreOverrideCursor(); @@ -146,7 +146,7 @@ void KMdiChildFrmCaption::mouseMoveEvent( TQMouseEvent *e ) TQPoint relMousePosInChildArea = m_pParent->m_pManager->mapFromGlobal( e->globalPos() ); // mouse out of child area? stop child frame dragging - if ( !TQT_TQRECT_OBJECT(m_pParent->m_pManager->rect()).contains( relMousePosInChildArea ) ) + if ( !m_pParent->m_pManager->rect().contains( relMousePosInChildArea ) ) { if ( relMousePosInChildArea.x() < 0 ) relMousePosInChildArea.rx() = 0; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h index eed48fc1..4aaf1af7 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.h @@ -43,7 +43,7 @@ class KMdiChildFrmCaptionPrivate; */ class KMDI_EXPORT KMdiChildFrmCaption : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp index d832fe81..76d3b56e 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp @@ -63,7 +63,7 @@ KMdiChildView::KMdiChildView( const TQString& caption, TQWidget* parentWidget, c m_szCaption = i18n( "Unnamed" ); m_sTabCaption = m_szCaption; - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); installEventFilter( this ); // store the current time @@ -87,7 +87,7 @@ KMdiChildView::KMdiChildView( TQWidget* parentWidget, const char* name, WFlags f setGeometry( 0, 0, 0, 0 ); // reset m_szCaption = i18n( "Unnamed" ); m_sTabCaption = m_szCaption; - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); installEventFilter( this ); // store the current time @@ -362,7 +362,7 @@ void KMdiChildView::youAreDetached() if ( myIconPtr() ) setIcon( *( myIconPtr() ) ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); emit isDetachedNow(); } @@ -492,7 +492,7 @@ void KMdiChildView::slot_childDestroyed() // if we lost a child we uninstall ourself as event filter for the lost // child and its children - const TQObject * pLostChild = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(TQT_BASE_OBJECT_NAME::sender())); + const TQObject * pLostChild = TQObject::sender(); if ( pLostChild && ( pLostChild->isWidgetType() ) ) { TQObjectList* list = ( ( TQObject* ) ( pLostChild ) ) ->queryList( "TQWidget" ); @@ -526,8 +526,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) if ( ke->key() == TQt::Key_Tab ) { TQWidget* w = ( TQWidget* ) obj; - TQ_FocusPolicy wfp = w->focusPolicy(); - if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || w->focusPolicy() == TQ_WheelFocus ) + TQWidget::FocusPolicy wfp = w->focusPolicy(); + if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || w->focusPolicy() == TQWidget::WheelFocus ) { if ( m_lastFocusableChildWidget != 0 ) { @@ -565,7 +565,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) { // if we lost a child we uninstall ourself as event filter for the lost // child and its children - TQObject * pLostChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); + TQObject * pLostChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pLostChild != 0L ) && ( pLostChild->isWidgetType() ) ) { TQObjectList * list = pLostChild->queryList( "TQWidget" ); @@ -577,8 +577,8 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQWidget * widg = ( TQWidget* ) o; ++it; widg->removeEventFilter( this ); - TQ_FocusPolicy wfp = widg->focusPolicy(); - if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus ) + TQWidget::FocusPolicy wfp = widg->focusPolicy(); + if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus ) { if ( m_firstFocusableChildWidget == widg ) m_firstFocusableChildWidget = 0L; // reset first widget @@ -595,7 +595,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) // if we got a new child and we are attached to the MDI system we // install ourself as event filter for the new child and its children // (as we did when we were added to the MDI system). - TQObject * pNewChild = TQT_TQOBJECT(( ( TQChildEvent* ) e ) ->child()); + TQObject * pNewChild = ( ( TQChildEvent* ) e ) ->child(); if ( ( pNewChild != 0L ) && ( pNewChild->isWidgetType() ) ) { TQWidget * pNewWidget = ( TQWidget* ) pNewChild; @@ -610,9 +610,9 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQWidget * widg = ( TQWidget* ) o; ++it; widg->installEventFilter( this ); - connect( widg, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slot_childDestroyed() ) ); - TQ_FocusPolicy wfp = widg->focusPolicy(); - if ( wfp == TQ_StrongFocus || wfp == TQ_TabFocus || widg->focusPolicy() == TQ_WheelFocus ) + connect( widg, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slot_childDestroyed() ) ); + TQWidget::FocusPolicy wfp = widg->focusPolicy(); + if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus ) { if ( m_firstFocusableChildWidget == 0 ) m_firstFocusableChildWidget = widg; // first widge @@ -628,14 +628,14 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) if ( e->type() == TQEvent::IconChange ) { // tqDebug("KMDiChildView:: TQEvent:IconChange intercepted\n"); - if ( TQT_BASE_OBJECT(obj) == this ) + if ( obj == this ) iconUpdated( this, icon() ? ( *icon() ) : TQPixmap() ); - else if ( TQT_BASE_OBJECT(obj) == m_trackChanges ) + else if ( obj == m_trackChanges ) setIcon( m_trackChanges->icon() ? ( *( m_trackChanges->icon() ) ) : TQPixmap() ); } if ( e->type() == TQEvent::CaptionChange ) { - if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(this) ) + if ( obj == this ) captionUpdated( this, caption() ); } } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h index b17049e3..90e5f3ae 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.h @@ -94,7 +94,7 @@ class KMdiChildViewPrivate; * flags = KMdi::Hide; * } * // set the accelerators for Toplevel MDI mode (each toplevel window needs its own accels - * connect( m_pParent, TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQT_SLOT(initKeyAccel(TQWidget*)) ); + * connect( m_pParent, TQ_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQ_SLOT(initKeyAccel(TQWidget*)) ); * * m_pParent->addWindow( pMDICover, flags); * // correct the default settings of KMdi ('cause we haven't a tab order for subwidget focuses) @@ -109,7 +109,7 @@ class KMDI_EXPORT KMdiChildView : public TQWidget { friend class KMdiMainFrm; friend class KMdiChildFrm; - Q_OBJECT + TQ_OBJECT // attributes diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp index 998eeea6..738711e7 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp @@ -220,7 +220,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const m_overlapButtons.insert( w, btn ); btn->setOn( !isOverlapMode() ); - connect( btn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeOverlapMode() ) ); + connect( btn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changeOverlapMode() ) ); } m_tb->appendTab( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap, tab, w->tabPageLabel() ); @@ -228,7 +228,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const kdDebug( 760 ) << k_funcinfo << "Added tab with label " << w->tabPageLabel() << " to the tabbar" << endl; - connect( m_tb->tab( tab ), TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( tabClicked( int ) ) ); + connect( m_tb->tab( tab ), TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( tabClicked( int ) ) ); mTabCnt++; m_inserted = tab; @@ -277,7 +277,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) } m_dockManager = w->dockManager(); - m_dragPanel = TQT_TQOBJECT(hdr->dragPanel()); + m_dragPanel = hdr->dragPanel(); if ( m_dragPanel ) m_movingState = WaitingForMoveStart; @@ -300,7 +300,7 @@ bool KMdiDockContainer::eventFilter( TQObject *obj, TQEvent *event ) TQPoint p( ( ( TQMouseEvent* ) event )->pos() - m_startEvent->pos() ); if ( p.manhattanLength() > TDEGlobalSettings::dndEventDelay() ) { - m_dockManager->eventFilter( m_dragPanel, TQT_TQEVENT(m_startEvent) ); + m_dockManager->eventFilter( m_dragPanel, m_startEvent ); m_dockManager->eventFilter( m_dragPanel, event ); m_movingState = Moving; } @@ -610,7 +610,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) if ( it.key() ->name() == raise ) { m_delayedRaise = it.data(); - TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) ); kdDebug( 760 ) << k_funcinfo << "raising " << it.key()->name() << endl; break; } @@ -618,7 +618,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) } if ( m_delayedRaise == -1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); } void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix ) @@ -742,7 +742,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) kapp->syncX();*/ m_delayedRaise = it.data(); - TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) ); kdDebug( 760 ) << k_funcinfo << "raising" << it.key() ->name() << endl; break; } @@ -750,7 +750,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) } if ( m_delayedRaise == -1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); cfg->setGroup( grp ); } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h index 64d2bec3..613505cf 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.h @@ -36,7 +36,7 @@ class KDockButton_Private; class KMDI_EXPORT KMdiDockContainer: public TQWidget, public KDockContainer { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp index c8a92e34..0f8b5396 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.cpp @@ -20,7 +20,7 @@ KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const ch setHoverCloseButton( true ); #endif - connect( this, TQT_SIGNAL( closeRequest( TQWidget* ) ), this, TQT_SLOT( closeTab( TQWidget* ) ) ); + connect( this, TQ_SIGNAL( closeRequest( TQWidget* ) ), this, TQ_SLOT( closeTab( TQWidget* ) ) ); } KMdiDocumentViewTabWidget::~KMdiDocumentViewTabWidget() diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h index 3db02c43..2e05039b 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdidocumentviewtabwidget.h @@ -22,7 +22,7 @@ class TDEPopupMenu; class KMDI_EXPORT KMdiDocumentViewTabWidget: public KTabWidget { - Q_OBJECT + TQ_OBJECT public: KMdiDocumentViewTabWidget( TQWidget* parent, const char* name = 0 ); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp index 63024aa2..edabbae4 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.cpp @@ -31,9 +31,9 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) { //this method should never be called twice on the same hierarchy m_list.insert( w, w->focusPolicy() ); - w->setFocusPolicy( TQ_ClickFocus ); + w->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl; - connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); + connect( w, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); TQObjectList *l = w->queryList( "TQWidget" ); TQObjectListIt it( *l ); TQObject *obj; @@ -41,9 +41,9 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) { TQWidget * wid = ( TQWidget* ) obj; m_list.insert( wid, wid->focusPolicy() ); - wid->setFocusPolicy( TQ_ClickFocus ); + wid->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding widget" << endl; - connect( wid, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); + connect( wid, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); ++it; } delete l; @@ -51,7 +51,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) void KMdiFocusList::restore() { - for ( TQMap<TQWidget*, TQ_FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it ) + for ( TQMap<TQWidget*, TQWidget::FocusPolicy>::const_iterator it = m_list.constBegin();it != m_list.constEnd();++it ) { it.key() ->setFocusPolicy( it.data() ); } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h index e2c576f4..63290687 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdifocuslist.h @@ -25,7 +25,7 @@ class KMDI_EXPORT KMdiFocusList: public TQObject { - Q_OBJECT + TQ_OBJECT public: KMdiFocusList( TQObject *parent ); @@ -35,7 +35,7 @@ public: protected slots: void objectHasBeenDestroyed( TQObject* ); private: - TQMap<TQWidget*, TQ_FocusPolicy> m_list; + TQMap<TQWidget*, TQWidget::FocusPolicy> m_list; }; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp index 15303006..d718601b 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp @@ -63,9 +63,9 @@ ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const TDEShort { if ( m_dw ) { - connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) ); - connect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) ); - connect( m_dw, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToggled( bool ) ) ); + connect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) ); + connect( m_dw, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotWidgetDestroyed() ) ); setChecked( m_dw->mayBeHide() ); } } @@ -104,8 +104,8 @@ void ToggleToolViewAction::slotToggled( bool t ) void ToggleToolViewAction::slotWidgetDestroyed() { - disconnect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) ); - disconnect( this, TQT_SIGNAL( toggled( bool ) ), 0, 0 ); + disconnect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) ); + disconnect( this, TQ_SIGNAL( toggled( bool ) ), 0, 0 ); unplugAll(); deleteLater(); } @@ -116,8 +116,8 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c { m_mdiMode = KMdi::ChildframeMode; m_mdiMainFrm = mdiMainFrm; - connect( mdiMainFrm->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( mdiMainFrm->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) ); /* re-use an existing resource file if it exists. can happen if the user launches the * toolbar editor */ @@ -143,27 +143,27 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c TQStringList modes; modes << i18n( "&Toplevel Mode" ) << i18n( "C&hildframe Mode" ) << i18n( "Ta&b Page Mode" ) << i18n( "I&DEAl Mode" ); m_mdiModeAction->setItems( modes ); - connect( m_mdiModeAction, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( changeViewMode( int ) ) ); + connect( m_mdiModeAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( changeViewMode( int ) ) ); } else m_mdiModeAction = 0; - connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ), - this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) ); + connect( m_mdiMainFrm, TQ_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ), + this, TQ_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) ); m_gotoToolDockMenu = new TDEActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, TQT_TQOBJECT(this), TQT_SIGNAL( toggleTop() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQ_SIGNAL( toggleTop() ), actionCollection(), "tdemdi_activate_top" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, TQT_TQOBJECT(this), TQT_SIGNAL( toggleLeft() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQ_SIGNAL( toggleLeft() ), actionCollection(), "tdemdi_activate_left" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, TQT_TQOBJECT(this), TQT_SIGNAL( toggleRight() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQ_SIGNAL( toggleRight() ), actionCollection(), "tdemdi_activate_right" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, TQT_TQOBJECT(this), TQT_SIGNAL( toggleBottom() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQ_SIGNAL( toggleBottom() ), actionCollection(), "tdemdi_activate_bottom" ) ); m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( prevToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQ_SLOT( prevToolViewInDock() ), actionCollection(), "tdemdi_prev_toolview" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, TQT_TQOBJECT(m_mdiMainFrm), TQT_SLOT( nextToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQ_SLOT( nextToolViewInDock() ), actionCollection(), "tdemdi_next_toolview" ) ); actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() ); @@ -225,7 +225,7 @@ void KMDIGUIClient::setupActions() // m_toolBars = builder.toolBars(); // m_toolViewActions.append(new TDEAction( "TESTKMDIGUICLIENT", TQString(), 0, - // this, TQT_SLOT(blah()),actionCollection(),"nothing")); + // this, TQ_SLOT(blah()),actionCollection(),"nothing")); TQPtrList<TDEAction> addList; if ( m_toolViewActions.count() < 3 ) @@ -265,7 +265,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) ( ( ToggleToolViewAction* ) a ) ->setCheckedState( i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() ) ); #endif - connect( a, TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( actionDeleted( TQObject* ) ) ); + connect( a, TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( actionDeleted( TQObject* ) ) ); m_toolViewActions.append( a ); m_toolMenu->insert( a ); mtva->d->action = a; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h index 69a15a09..60004a7b 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.h @@ -41,7 +41,7 @@ namespace KMDIPrivate class KMDI_EXPORT KMDIGUIClient : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: @@ -121,7 +121,7 @@ private: */ class KMDI_EXPORT ToggleToolViewAction: public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp index 74c82f53..779e3388 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp @@ -185,7 +185,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pToolViews = new TQMap<TQWidget*, KMdiToolViewAccessor*>; // This seems to be needed (re-check it after TQt2.0 comed out) - setFocusPolicy( TQ_ClickFocus ); + setFocusPolicy( TQWidget::ClickFocus ); // create the central widget createMdiManager(); @@ -208,7 +208,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pWindowMenu = new TQPopupMenu( this, "window_menu" ); m_pWindowMenu->setCheckable( true ); - TQObject::connect( m_pWindowMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillWindowMenu() ) ); + TQObject::connect( m_pWindowMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillWindowMenu() ) ); m_pDockMenu = new TQPopupMenu( this, "dock_menu" ); m_pDockMenu->setCheckable( true ); @@ -224,7 +224,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod #else 0, #endif - TQT_TQOBJECT(this), TQT_SLOT(closeActiveView()), actionCollection(), "window_close"); + this, TQ_SLOT(closeActiveView()), actionCollection(), "window_close"); // the MDI view taskbar createTaskBar(); @@ -255,11 +255,11 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod // drag end timer m_pDragEndTimer = new TQTimer(); - connect( m_pDragEndTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( dragEndTimeOut() ) ); - connect( guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient* ) ), - this, TQT_SLOT( verifyToplevelHeight() ) ); - connect( guiFactory(), TQT_SIGNAL( clientRemoved( KXMLGUIClient* ) ), - this, TQT_SLOT( verifyToplevelHeight() ) ); + connect( m_pDragEndTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( dragEndTimeOut() ) ); + connect( guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient* ) ), + this, TQ_SLOT( verifyToplevelHeight() ) ); + connect( guiFactory(), TQ_SIGNAL( clientRemoved( KXMLGUIClient* ) ), + this, TQ_SLOT( verifyToplevelHeight() ) ); } void KMdiMainFrm::verifyToplevelHeight() @@ -277,21 +277,21 @@ void KMdiMainFrm::verifyToplevelHeight() void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu ) { m_mdiGUIClient = new KMDIPrivate::KMDIGUIClient( this, showModeMenu ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleTop() ), this, TQT_SIGNAL( toggleTop() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleLeft() ), this, TQT_SIGNAL( toggleLeft() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleRight() ), this, TQT_SIGNAL( toggleRight() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleBottom() ), this, TQT_SIGNAL( toggleBottom() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleTop() ), this, TQ_SIGNAL( toggleTop() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleLeft() ), this, TQ_SIGNAL( toggleLeft() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleRight() ), this, TQ_SIGNAL( toggleRight() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleBottom() ), this, TQ_SIGNAL( toggleBottom() ) ); if ( m_mdiMode == KMdi::IDEAlMode ) { if ( m_topContainer ) - connect( this, TQT_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_leftContainer ) - connect( this, TQT_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_rightContainer ) - connect( this, TQT_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_bottomContainer ) - connect( this, TQT_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQ_SLOT( toggle() ) ); } emit mdiModeHasBeenChangedTo( m_mdiMode ); @@ -369,16 +369,16 @@ void KMdiMainFrm::createMdiManager() kdDebug(760) << k_funcinfo << "creating MDI manager" << endl; m_pMdi = new KMdiChildArea( this ); setCentralWidget( m_pMdi ); - TQObject::connect( m_pMdi, TQT_SIGNAL( nowMaximized( bool ) ), - this, TQT_SLOT( setEnableMaximizedChildFrmMode( bool ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ), - this, TQT_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ), - this, TQT_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( popupWindowMenu( TQPoint ) ), - this, TQT_SLOT( popupWindowMenu( TQPoint ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( lastChildFrmClosed() ), - this, TQT_SIGNAL( lastChildFrmClosed() ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( nowMaximized( bool ) ), + this, TQ_SLOT( setEnableMaximizedChildFrmMode( bool ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ), + this, TQ_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ), + this, TQ_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( popupWindowMenu( TQPoint ) ), + this, TQ_SLOT( popupWindowMenu( TQPoint ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( lastChildFrmClosed() ), + this, TQ_SIGNAL( lastChildFrmClosed() ) ); } //============ createTaskBar ==============// @@ -464,14 +464,14 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) d->closeWindowAction->setEnabled(true); // common connections used when under MDI control - TQObject::connect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( activated( KMdiChildView* ) ), this, TQT_SIGNAL( viewActivated( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( deactivated( KMdiChildView* ) ), this, TQT_SIGNAL( viewDeactivated( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( activated( KMdiChildView* ) ), this, TQ_SIGNAL( viewActivated( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( deactivated( KMdiChildView* ) ), this, TQ_SIGNAL( viewDeactivated( KMdiChildView* ) ) ); if ( index == -1 ) m_pDocumentViews->append( pWnd ); @@ -481,7 +481,7 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) if ( m_pTaskBar ) { KMdiTaskBarButton* but = m_pTaskBar->addWinButton( pWnd ); - TQObject::connect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) ); } // embed the view depending on the current MDI mode @@ -493,8 +493,8 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) m_documentTabWidget->insertTab( pWnd, pixmap, pWnd->tabCaption(), index ); - connect( pWnd, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); - connect( pWnd, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); + connect( pWnd, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); + connect( pWnd, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); } else { @@ -742,19 +742,19 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd ) if ( m_pWinList->count() == 0 ) m_pCurrentWindow = 0L; - TQObject::disconnect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) ); if ( m_pTaskBar ) { KMdiTaskBarButton * but = m_pTaskBar->getButton( pWnd ); if ( but != 0L ) { - TQObject::disconnect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) ); } m_pTaskBar->removeWinButton( pWnd ); } @@ -995,19 +995,19 @@ TQPopupMenu* KMdiMainFrm::taskBarPopup( KMdiChildView *pWnd, bool /*bIncludeWind m_pTaskBarPopup->clear(); if ( pWnd->isAttached() ) { - m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQT_SLOT( detach() ) ); + m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQ_SLOT( detach() ) ); m_pTaskBarPopup->insertSeparator(); if ( pWnd->isMinimized() || pWnd->isMaximized() ) - m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQT_SLOT( restore() ) ); + m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQ_SLOT( restore() ) ); if ( !pWnd->isMaximized() ) - m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQT_SLOT( maximize() ) ); + m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQ_SLOT( maximize() ) ); if ( !pWnd->isMinimized() ) - m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQT_SLOT( minimize() ) ); + m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQ_SLOT( minimize() ) ); } else - m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQT_SLOT( attach() ) ); + m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQ_SLOT( attach() ) ); m_pTaskBarPopup->insertSeparator(); - m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQT_SLOT( close() ) ); + m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQ_SLOT( close() ) ); // the window has a view...get the window popup m_pTaskBarPopup->insertSeparator(); m_pTaskBarPopup->insertItem( i18n( "Operations" ), windowPopup( pWnd, false ) ); //alvoid recursion @@ -1297,12 +1297,12 @@ void KMdiMainFrm::findRootDockWidgets( TQPtrList<KDockWidget>* rootDockWidgetLis KDockWidget* dockWindow = 0L; /* pDockW */ KDockWidget* rootDockWindow = 0L; /* pRootDockWindow */ KDockWidget* undockCandidate = 0L; /* pUndockCandidate */ - TQWidget* pW = TQT_TQWIDGET( ( *it ) ); + TQWidget* pW = static_cast<TQWidget*>( ( *it ) ); // find the oldest ancestor of the current dockwidget that can be undocked while ( !pW->isTopLevel() ) { - if ( ::tqqt_cast<KDockWidget*>( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) ) + if ( ::tqt_cast<KDockWidget*>( pW ) || pW->inherits( "KDockWidget_Compat::KDockWidget" ) ) { undockCandidate = static_cast<KDockWidget*>( pW ); if ( undockCandidate->enableDocking() != KDockWidget::DockNone ) @@ -1639,7 +1639,7 @@ void KMdiMainFrm::switchToTabPageMode() if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); if ( m_pDocumentViews->count() > 0 ) m_pClose->show(); } @@ -1656,7 +1656,7 @@ void KMdiMainFrm::finishTabPageMode() if ( m_mdiMode == KMdi::TabPageMode ) { m_pClose->hide(); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); TQPtrListIterator<KMdiChildView> it( *m_pDocumentViews ); for ( ; it.current(); ++it ) @@ -1721,7 +1721,7 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace() #endif delete m_documentTabWidget; m_documentTabWidget = new KMdiDocumentViewTabWidget( m_pDockbaseAreaOfDocumentViews ); - connect( m_documentTabWidget, TQT_SIGNAL( currentChanged( TQWidget* ) ), this, TQT_SLOT( slotDocCurrentChanged( TQWidget* ) ) ); + connect( m_documentTabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), this, TQ_SLOT( slotDocCurrentChanged( TQWidget* ) ) ); m_pDockbaseAreaOfDocumentViews->setWidget( m_documentTabWidget ); m_documentTabWidget->show(); TQPtrListIterator<KMdiChildView> it4( *m_pDocumentViews ); @@ -1730,11 +1730,11 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace() KMdiChildView* pView = it4.current(); m_documentTabWidget->addTab( pView, pView->icon() ? *( pView->icon() ) : TQPixmap(), pView->tabCaption() ); /* - connect(pView,TQT_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)), - m_documentTabWidget,TQT_SLOT(updateView(TQWidget*,TQPixmap,const TQString&))); + connect(pView,TQ_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)), + m_documentTabWidget,TQ_SLOT(updateView(TQWidget*,TQPixmap,const TQString&))); */ - connect( pView, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); - connect( pView, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); + connect( pView, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); + connect( pView, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); } } @@ -1864,7 +1864,7 @@ void KMdiMainFrm::switchToIDEAlMode() if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); if ( m_pDocumentViews->count() > 0 ) m_pClose->show(); } @@ -1905,7 +1905,7 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock KDockWidget* widget = mainDock->findNearestDockWidget( dprtmw ); if ( widget && widget->parentDockTabGroup() ) { - widget = static_cast<KDockWidget*>( TQT_TQWIDGET(widget->parentDockTabGroup() ->parent()) ); + widget = static_cast<KDockWidget*>( widget->parentDockTabGroup() ->parent() ); if ( widget ) { @@ -1937,7 +1937,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() KDockWidget *mainDock = getMainDockWidget(); KDockWidget *w = mainDock; if ( mainDock->parentDockTabGroup() ) - w = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup()->parent()) ); + w = static_cast<KDockWidget*>( mainDock->parentDockTabGroup()->parent() ); TQPtrList<KDockWidget> leftReparentWidgets; TQPtrList<KDockWidget> rightReparentWidgets; @@ -1945,7 +1945,7 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() TQPtrList<KDockWidget> topReparentWidgets; if ( mainDock->parentDockTabGroup() ) - mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); + mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() ); findToolViewsDockedToMain( &leftReparentWidgets, KDockWidget::DockLeft ); findToolViewsDockedToMain( &rightReparentWidgets, KDockWidget::DockRight ); @@ -1962,40 +1962,40 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() m_leftContainer->manualDock( mainDock, KDockWidget::DockLeft, 20 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleLeft() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleLeft() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_rightContainer->setWidget( tmpDC = new KMdiDockContainer( m_rightContainer, this, KDockWidget::DockRight, d->m_styleIDEAlMode ) ); m_rightContainer->setEnableDocking( KDockWidget::DockRight ); m_rightContainer->manualDock( mainDock, KDockWidget::DockRight, 80 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleRight() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleRight() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_topContainer->setWidget( tmpDC = new KMdiDockContainer( m_topContainer, this, KDockWidget::DockTop, d->m_styleIDEAlMode ) ); m_topContainer->setEnableDocking( KDockWidget::DockTop ); m_topContainer->manualDock( mainDock, KDockWidget::DockTop, 20 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleTop() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleTop() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_bottomContainer->setWidget( tmpDC = new KMdiDockContainer( m_bottomContainer, this, KDockWidget::DockBottom, d->m_styleIDEAlMode ) ); m_bottomContainer->setEnableDocking( KDockWidget::DockBottom ); m_bottomContainer->manualDock( mainDock, KDockWidget::DockBottom, 80 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleBottom() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleBottom() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_leftContainer->setDockSite( KDockWidget::DockCenter ); m_rightContainer->setDockSite( KDockWidget::DockCenter ); @@ -2030,7 +2030,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) { assert( m_pClose ); m_pClose->hide(); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); TQStringList leftNames; @@ -2143,7 +2143,7 @@ void KMdiMainFrm::idealToolViewsToStandardTabs( TQStringList widgetNames, KDockW KDockWidget * mainDock = getMainDockWidget(); if ( mainDock->parentDockTabGroup() ) { - mainDock = static_cast<KDockWidget*>( TQT_TQWIDGET(mainDock->parentDockTabGroup() ->parent()) ); + mainDock = static_cast<KDockWidget*>( mainDock->parentDockTabGroup() ->parent() ); } if ( widgetNames.count() > 0 ) @@ -2438,23 +2438,23 @@ void KMdiMainFrm::setEnableMaximizedChildFrmMode( bool enableMaxChildFrameMode ) if ( !pCurrentChild || !m_pMainMenuBar ) return ; - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( undockPressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( maximizePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( maximizePressed() ) ); m_pMinimize->show(); m_pUndock->show(); m_pRestore->show(); if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook ) { - m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQT_SLOT( closePressed() ), 0, -1, 0 ); + m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQ_SLOT( closePressed() ), 0, -1, 0 ); } else { m_pMainMenuBar->insertItem( *pCurrentChild->icon(), pCurrentChild->systemMenu(), -1, 0 ); if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( closePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( closePressed() ) ); m_pClose->show(); } else @@ -2490,10 +2490,10 @@ void KMdiMainFrm::switchOffMaximizeModeForMenu( KMdiChildFrm* oldChild ) if ( oldChild ) { Q_ASSERT( m_pClose ); - TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) ); - TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) ); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) ); + TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) ); } m_pUndock->hide(); m_pMinimize->hide(); @@ -2512,7 +2512,7 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF if ( newChild ) { if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook ) - m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQT_SLOT( closePressed() ), 0, -1, 0 ); + m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQ_SLOT( closePressed() ), 0, -1, 0 ); else m_pMainMenuBar->insertItem( *newChild->icon(), newChild->systemMenu(), -1, 0 ); } @@ -2521,18 +2521,18 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF { m_pMainMenuBar->removeItem( m_pMainMenuBar->idAt( 1 ) ); Q_ASSERT( m_pClose ); - TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) ); - TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) ); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) ); + TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) ); } if ( newChild ) { Q_ASSERT( m_pClose ); - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( undockPressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( maximizePressed() ) ); - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( closePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( maximizePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( closePressed() ) ); } } @@ -2580,7 +2580,7 @@ void KMdiMainFrm::fillWindowMenu() d->closeWindowAction->plug(m_pWindowMenu); - int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQT_SLOT( closeAllViews() ) ); + int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQ_SLOT( closeAllViews() ) ); if ( noViewOpened ) { d->closeWindowAction->setEnabled(false); @@ -2589,7 +2589,7 @@ void KMdiMainFrm::fillWindowMenu() if ( !tabPageMode && !IDEAlMode ) { - int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQT_SLOT( iconifyAllViews() ) ); + int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQ_SLOT( iconifyAllViews() ) ); if ( noViewOpened ) m_pWindowMenu->setItemEnabled( iconifyId, false ); } @@ -2597,10 +2597,10 @@ void KMdiMainFrm::fillWindowMenu() m_pWindowMenu->insertSeparator(); m_pWindowMenu->insertItem( i18n( "&MDI Mode" ), m_pMdiModeMenu ); m_pMdiModeMenu->clear(); - m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQT_SLOT( switchToToplevelMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQT_SLOT( switchToChildframeMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQT_SLOT( switchToTabPageMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQT_SLOT( switchToIDEAlMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQ_SLOT( switchToToplevelMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQ_SLOT( switchToChildframeMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQ_SLOT( switchToTabPageMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQ_SLOT( switchToIDEAlMode() ) ); switch ( m_mdiMode ) { case KMdi::ToplevelMode: @@ -2624,13 +2624,13 @@ void KMdiMainFrm::fillWindowMenu() { int placMenuId = m_pWindowMenu->insertItem( i18n( "&Tile" ), m_pPlacingMenu ); m_pPlacingMenu->clear(); - m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQT_SLOT( cascadeWindows() ) ); - m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQT_SLOT( cascadeMaximized() ) ); - m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQT_SLOT( expandVertical() ) ); - m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQT_SLOT( expandHorizontal() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQT_SLOT( tileAnodine() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQT_SLOT( tilePragma() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQT_SLOT( tileVertically() ) ); + m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQ_SLOT( cascadeWindows() ) ); + m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQ_SLOT( cascadeMaximized() ) ); + m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQ_SLOT( expandVertical() ) ); + m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQ_SLOT( expandHorizontal() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQ_SLOT( tileAnodine() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQ_SLOT( tilePragma() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQ_SLOT( tileVertically() ) ); if ( m_mdiMode == KMdi::ToplevelMode ) { m_pWindowMenu->setItemEnabled( placMenuId, false ); @@ -2692,7 +2692,7 @@ void KMdiMainFrm::fillWindowMenu() } if ( putHere ) { - m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount ); + m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount ); if ( pView == m_pCurrentWindow ) { m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( indx + entryCount ), true ); @@ -2700,7 +2700,7 @@ void KMdiMainFrm::fillWindowMenu() pView->setWindowMenuID( i ); if ( !tabPageMode ) { - m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, indx ); + m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, indx ); if ( pView->isAttached() ) { m_pDockMenu->setItemChecked( m_pDockMenu->idAt( indx ), true ); @@ -2713,7 +2713,7 @@ void KMdiMainFrm::fillWindowMenu() } if ( !inserted ) { // append it - m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount ); + m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount ); if ( pView == m_pCurrentWindow ) { m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( windowItemCount + entryCount ), true ); @@ -2721,7 +2721,7 @@ void KMdiMainFrm::fillWindowMenu() pView->setWindowMenuID( i ); if ( !tabPageMode ) { - m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount ); + m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount ); if ( pView->isAttached() ) { m_pDockMenu->setItemChecked( m_pDockMenu->idAt( windowItemCount ), true ); diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h index 80bb6abc..733c2b62 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h @@ -240,7 +240,7 @@ class KMDI_EXPORT KMdiMainFrm : public KParts::DockMainWindow { friend class KMdiChildView; friend class KMdiTaskBar; - Q_OBJECT + TQ_OBJECT friend class KMdiToolViewAccessor; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp index d38824c2..1d5c9ab7 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.cpp @@ -63,7 +63,7 @@ KMdiTaskBarButton::KMdiTaskBarButton( KMdiTaskBar *pTaskBar, KMdiChildView *win_ m_pWindow = win_ptr; TQToolTip::add ( this, win_ptr->caption() ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); } KMdiTaskBarButton::~KMdiTaskBarButton() @@ -73,10 +73,10 @@ void KMdiTaskBarButton::mousePressEvent( TQMouseEvent* e ) { switch ( e->button() ) { - case Qt::LeftButton: + case TQt::LeftButton: emit leftMouseButtonClicked( m_pWindow ); break; - case Qt::RightButton: + case TQt::RightButton: emit rightMouseButtonClicked( m_pWindow ); break; default: @@ -152,7 +152,7 @@ KMdiTaskBar::KMdiTaskBar( KMdiMainFrm *parent, TQMainWindow::ToolBarDock dock ) m_pButtonList->setAutoDelete( true ); //QT30 setFontPropagation(TQWidget::SameFont); setMinimumWidth( 1 ); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); parent->moveToolBar( this, dock ); //XXX obsolete! } @@ -171,11 +171,11 @@ KMdiTaskBarButton * KMdiTaskBar::addWinButton( KMdiChildView *win_ptr ) } KMdiTaskBarButton *b = new KMdiTaskBarButton( this, win_ptr ); - TQObject::connect( b, TQT_SIGNAL( clicked() ), win_ptr, TQT_SLOT( setFocus() ) ); - TQObject::connect( b, TQT_SIGNAL( clicked( KMdiChildView* ) ), this, TQT_SLOT( setActiveButton( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( layoutTaskBar( int ) ) ); + TQObject::connect( b, TQ_SIGNAL( clicked() ), win_ptr, TQ_SLOT( setFocus() ) ); + TQObject::connect( b, TQ_SIGNAL( clicked( KMdiChildView* ) ), this, TQ_SLOT( setActiveButton( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( buttonTextChanged( int ) ), this, TQ_SLOT( layoutTaskBar( int ) ) ); m_pButtonList->append( b ); b->setToggleButton( true ); b->setText( win_ptr->tabCaption() ); @@ -359,7 +359,7 @@ void KMdiTaskBar::layoutTaskBar( int taskBarWidth ) newButtonWidth = buttonAreaWidth / buttonCount; else newButtonWidth = 0; - if ( orientation() == Qt::Vertical ) + if ( orientation() == TQt::Vertical ) newButtonWidth = 80; if ( newButtonWidth > 0 ) for ( b = m_pButtonList->first();b;b = m_pButtonList->next() ) diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h index 6d29740a..5071e076 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemditaskbar.h @@ -50,7 +50,7 @@ class KMdiTaskBarButtonPrivate; */ class KMdiTaskBarButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT // methods public: @@ -129,7 +129,7 @@ class KMdiTaskBarPrivate; */ class KMDI_EXPORT KMdiTaskBar : public TDEToolBar { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp index 1ab3b4b6..25562e34 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.cpp @@ -95,7 +95,7 @@ TQWidget *KMdiToolViewAccessor::wrapperWidget() if ( !d->widgetContainer ) { d->widgetContainer = mdiMainFrm->createDockWidget( "KMdiToolViewAccessor::null", TQPixmap() ); - connect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) ); + connect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) ); } return d->widgetContainer; } @@ -110,7 +110,7 @@ void KMdiToolViewAccessor::setWidgetToWrap( TQWidget *widgetToWrap, const TQStri { Q_ASSERT( !( d->widget ) ); Q_ASSERT( !widgetToWrap->inherits( "KDockWidget" ) ); - disconnect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) ); + disconnect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) ); delete d->widget; d->widget = widgetToWrap; KDockWidget *tmp = d->widgetContainer; diff --git a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h index a22fc8b1..244c1487 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemditoolviewaccessor.h @@ -37,7 +37,7 @@ class KMDIGUIClient; class KMDI_EXPORT KMdiToolViewAccessor : public TQObject { - Q_OBJECT + TQ_OBJECT diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp index b33fc27f..422e1aa9 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp +++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.cpp @@ -395,7 +395,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, setFixedWidth(24); m_id=id; TQToolTip::add(this,text); - connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); } KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, @@ -410,7 +410,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, setFixedWidth(24); m_id=id; TQToolTip::add(this,text); - connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); } KMultiTabBarButton::~KMultiTabBarButton() { @@ -492,7 +492,7 @@ TQSize KMultiTabBarButton::sizeHint() const h = TQMAX(h, sz.height()); } - return (style().tqsizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). + return (style().sizeFromContents(TQStyle::CT_ToolButton, this, TQSize(w, h)). expandedTo(TQApplication::globalStrut())); } diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h index be5bf4a5..42e3f545 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar.h @@ -53,7 +53,7 @@ class KMultiTabBarInternal; */ class TDEUTILS_EXPORT KMultiTabBar: public TQWidget { - Q_OBJECT + TQ_OBJECT public: enum KMultiTabBarMode{Horizontal,Vertical}; @@ -154,7 +154,7 @@ private: */ class TDEUTILS_EXPORT KMultiTabBarButton: public TQPushButton { - Q_OBJECT + TQ_OBJECT public: KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup, @@ -207,7 +207,7 @@ protected slots: */ class TDEUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton { - Q_OBJECT + TQ_OBJECT public: KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent, diff --git a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h index 878f3ff0..203d436d 100644 --- a/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h +++ b/lib/compatibility/tdemdi/qextmdi/tdemultitabbar_p.h @@ -29,7 +29,7 @@ class KMultiTabBarInternal: public TQScrollView { - Q_OBJECT + TQ_OBJECT public: KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm); diff --git a/lib/ksavealldialog.cpp b/lib/ksavealldialog.cpp index d8b04b5e..e303b1f6 100644 --- a/lib/ksavealldialog.cpp +++ b/lib/ksavealldialog.cpp @@ -79,9 +79,9 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co ++it; } - connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(save()) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(saveNone()) ); + connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) ); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(save()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(saveNone()) ); } KSaveSelectDialog::~KSaveSelectDialog() {} @@ -159,9 +159,9 @@ KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent setButtonTip( User1, i18n("Lose all modifications") ); setButtonTip( Close, i18n("Cancels the action") ); - connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(cancel()) ); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(saveAll()) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(revert()) ); + connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(cancel()) ); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(saveAll()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(revert()) ); } KSaveAllDialog::~KSaveAllDialog() diff --git a/lib/ksavealldialog.h b/lib/ksavealldialog.h index fcd63fc0..59a16f87 100644 --- a/lib/ksavealldialog.h +++ b/lib/ksavealldialog.h @@ -35,7 +35,7 @@ Dialog to save selected files. */ class KSaveSelectDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -61,7 +61,7 @@ Dialog to save all files. */ class KSaveAllDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp index 094e1f77..72cdb56d 100644 --- a/lib/qextfileinfo.cpp +++ b/lib/qextfileinfo.cpp @@ -300,10 +300,10 @@ KURL::List QExtFileInfo::allFilesInternal(const KURL& startURL, const TQString& TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true); job->setWindow(window); m_listJobCount = 1; - connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), - this, TQT_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotListResult (TDEIO::Job *) ) ); + connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), + this, TQ_SLOT(slotNewEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotListResult (TDEIO::Job *) ) ); m_listStartURL = startURL.url(); //kdDebug(24000) << "Now listing: " << startURL.url() << endl; @@ -338,10 +338,10 @@ TQDict<KFileItem> QExtFileInfo::allFilesDetailedInternal(const KURL& startURL, c TDEIO::ListJob *job = TDEIO::listRecursive(startURL, false, true); job->setWindow(window); m_listJobCount = 1; - connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), - this, TQT_SLOT(slotNewDetailedEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotListResult (TDEIO::Job *) ) ); + connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList&)), + this, TQ_SLOT(slotNewDetailedEntries(TDEIO::Job *, const TDEIO::UDSEntryList&))); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotListResult (TDEIO::Job *) ) ); m_listStartURL = startURL.url(); //kdDebug(24000) << "Now listing: " << startURL.url() << endl; enter_loop(); @@ -397,11 +397,11 @@ bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, TQWidget *w job->setWindow(window); job->setDetails(0); job->setSide(readingOnly); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); //To avoid lock-ups, start a timer. - TQTimer::singleShot(60*1000, this,TQT_SLOT(slotTimeout())); + TQTimer::singleShot(60*1000, this,TQ_SLOT(slotTimeout())); //kdDebug(24000)<<"QExtFileInfo::internalExists:before enter_loop"<<endl; enter_loop(); //kdDebug(24000)<<"QExtFileInfo::internalExists:after enter_loop"<<endl; @@ -417,8 +417,8 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss TDEIO::Job * job = TDEIO::file_copy( src, target, permissions, overwrite, resume, false ); // TDEIO::Job * job2 = TDEIO::del(target, false ); //job2->setWindow (window); - //connect( job2, TQT_SIGNAL( result (TDEIO::Job *) ), -// this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + //connect( job2, TQ_SIGNAL( result (TDEIO::Job *) ), +// this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); //enter_loop(); //if (bJobOK) @@ -426,8 +426,8 @@ bool QExtFileInfo::internalCopy(const KURL& src, const KURL& target, int permiss // kdDebug(24000) << "Copying " << src << " to " << target << endl; // TDEIO::Job *job = TDEIO::copy( src, target, false ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); } return bJobOK; @@ -440,7 +440,7 @@ void tqt_leave_modal( TQWidget *widget ); void QExtFileInfo::enter_loop() { TQWidget dummy(0,0,WType_Dialog | WShowModal); - dummy.setFocusPolicy( TQ_NoFocus ); + dummy.setFocusPolicy( TQWidget::NoFocus ); tqt_enter_modal(&dummy); //kdDebug(24000)<<"QExtFileInfo::enter_loop:before tqApp->enter_loop()"<< endl; tqApp->enter_loop(); @@ -536,10 +536,10 @@ void QExtFileInfo::slotNewEntries(TDEIO::Job *job, const TDEIO::UDSEntryList& ud TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true); m_listJobCount++; //kdDebug(24000) << "Now listing: " << (*it)->url() << endl; - connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (slotNewEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListResult(TDEIO::Job *))); + connect( ljob, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (slotNewEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListResult(TDEIO::Job *))); } } @@ -603,10 +603,10 @@ void QExtFileInfo::slotNewDetailedEntries(TDEIO::Job *job, const TDEIO::UDSEntry TDEIO::ListJob *ljob = TDEIO::listRecursive((*it)->url(), false, true); m_listJobCount++; // kdDebug(24000) << "Now listing: " << (*it)->url() << endl; - connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (slotNewDetailedEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListResult(TDEIO::Job *))); + connect( ljob, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (slotNewDetailedEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListResult(TDEIO::Job *))); } } diff --git a/lib/qextfileinfo.h b/lib/qextfileinfo.h index bb3f3c05..df2267ec 100644 --- a/lib/qextfileinfo.h +++ b/lib/qextfileinfo.h @@ -24,7 +24,7 @@ class QExtFileInfo:public TQObject { - Q_OBJECT + TQ_OBJECT public: QExtFileInfo() {}; diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp index 2548917b..395889dd 100644 --- a/quanta/components/csseditor/colorrequester.cpp +++ b/quanta/components/csseditor/colorrequester.cpp @@ -31,7 +31,7 @@ class colorRequester::colorRequesterPrivate{ KLineEdit *edit; colorRequesterPrivate() { edit = 0L; } void setText( const TQString& text ) { edit->setText( text ); } - void connectSignals( TQObject *receiver ) { connect( edit, TQT_SIGNAL( textChanged( const TQString& )),receiver, TQT_SIGNAL( textChanged( const TQString& ))); } + void connectSignals( TQObject *receiver ) { connect( edit, TQ_SIGNAL( textChanged( const TQString& )),receiver, TQ_SIGNAL( textChanged( const TQString& ))); } }; colorRequester::colorRequester(TQWidget *parent, const char* name) : miniEditor(parent,name){ @@ -45,7 +45,7 @@ colorRequester::~colorRequester(){ } void colorRequester::connectToPropertySetter(propertySetter* p){ - connect( this, TQT_SIGNAL(textChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect( this, TQ_SIGNAL(textChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } void colorRequester::init() @@ -67,12 +67,12 @@ void colorRequester::init() TQWidget *widget = (TQWidget*) d->edit; setFocusProxy( widget ); - d->connectSignals( TQT_TQOBJECT(this) ); - connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( openColorDialog() )); - connect( d->edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( setInitialValue(/*const TQString&*/ ) )); + d->connectSignals( this ); + connect( myButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( openColorDialog() )); + connect( d->edit, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( setInitialValue(/*const TQString&*/ ) )); TDEAccel *accel = new TDEAccel( this ); - accel->insert( TDEStdAccel::Open, TQT_TQOBJECT(this), TQT_SLOT( openColorDialog() )); + accel->insert( TDEStdAccel::Open, this, TQ_SLOT( openColorDialog() )); accel->readSettings(); } diff --git a/quanta/components/csseditor/colorrequester.h b/quanta/components/csseditor/colorrequester.h index 75d74d98..1f7b5bd0 100644 --- a/quanta/components/csseditor/colorrequester.h +++ b/quanta/components/csseditor/colorrequester.h @@ -24,7 +24,7 @@ class KLineEdit; class KColorDialog; class colorRequester : public miniEditor{ - Q_OBJECT + TQ_OBJECT public: colorRequester(TQWidget *parent, const char* name=0); diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp index d8d2b0f6..8191d8c6 100644 --- a/quanta/components/csseditor/colorslider.cpp +++ b/quanta/components/csseditor/colorslider.cpp @@ -43,13 +43,13 @@ colorSlider::colorSlider(const TQString& fn,const TQString& l,const TQString& c, leftLabel->setTextFormat (TQt::RichText ) ; centerLabel->setTextFormat ( TQt::RichText ) ; rightLabel->setTextFormat (TQt::RichText ) ; - m_leftValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , leftBox); - m_centerValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , centerBox); - m_rightValue = new TQSlider ( 0, 255, 1, 0, Qt::Horizontal , rightBox); + m_leftValue = new TQSlider ( 0, 255, 1, 0, TQt::Horizontal , leftBox); + m_centerValue = new TQSlider ( 0, 255, 1, 0, TQt::Horizontal , centerBox); + m_rightValue = new TQSlider ( 0, 255, 1, 0, TQt::Horizontal , rightBox); setSpacing(10); - connect(m_leftValue, TQT_SIGNAL(valueChanged ( int)), this, TQT_SLOT(convertLeftValue(int))); - connect(m_centerValue, TQT_SIGNAL(valueChanged ( int)), this, TQT_SLOT(convertCenterValue(int))); - connect(m_rightValue, TQT_SIGNAL(valueChanged ( int)), this, TQT_SLOT(convertRightValue(int))); + connect(m_leftValue, TQ_SIGNAL(valueChanged ( int)), this, TQ_SLOT(convertLeftValue(int))); + connect(m_centerValue, TQ_SIGNAL(valueChanged ( int)), this, TQ_SLOT(convertCenterValue(int))); + connect(m_rightValue, TQ_SIGNAL(valueChanged ( int)), this, TQ_SLOT(convertRightValue(int))); } colorSlider::~colorSlider(){ @@ -59,7 +59,7 @@ colorSlider::~colorSlider(){ } void colorSlider::connectToPropertySetter(propertySetter* p){ - connect( this, TQT_SIGNAL(valueChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect( this, TQ_SIGNAL(valueChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } void colorSlider::convertLeftValue(int i){ diff --git a/quanta/components/csseditor/colorslider.h b/quanta/components/csseditor/colorslider.h index 33c75c30..b1c350bb 100644 --- a/quanta/components/csseditor/colorslider.h +++ b/quanta/components/csseditor/colorslider.h @@ -29,7 +29,7 @@ */ class colorSlider : public miniEditor { - Q_OBJECT + TQ_OBJECT private : TQString m_functionName; @@ -52,7 +52,7 @@ class colorSlider : public miniEditor { }; class RGBcolorSlider : public colorSlider { - Q_OBJECT + TQ_OBJECT public: RGBcolorSlider(TQWidget *parent=0, const char *name=0); @@ -61,7 +61,7 @@ class RGBcolorSlider : public colorSlider { //FOR CSS3 /*class HSLcolorSlider : public colorSlider { - Q_OBJECT + TQ_OBJECT public: HSLcolorSlider(TQWidget *parent=0, const char *name=0); diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp index c449b184..34ea4a23 100644 --- a/quanta/components/csseditor/csseditor.cpp +++ b/quanta/components/csseditor/csseditor.cpp @@ -117,7 +117,7 @@ void CSSEditor::appendSub(TQDomNodeList l, myCheckListItem *cli){ unsigned int i; for(i=0;i<l.length();i++) { myCheckListItem *item = new myCheckListItem(cli,l.item(i).toElement().tagName()); - item->connect(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&))); + item->connect(this,TQ_SLOT(removeProperty(const TQVariant&))); if(l.item(i).toElement().attribute("hasSub") == "yes") appendSub(l.item(i).childNodes(),item); } @@ -127,7 +127,7 @@ void CSSEditor::buildListView(TQDomNodeList l, TQListView *lv){ unsigned int i; for(i=0;i<l.length();i++) { myCheckListItem *item = new myCheckListItem(lv,l.item(i).toElement().tagName()); - item->connect(TQT_TQOBJECT(this),TQT_SLOT(removeProperty(const TQVariant&))); + item->connect(this,TQ_SLOT(removeProperty(const TQVariant&))); if(l.item(i).toElement().attribute("hasSub") == "yes") { TQDomNodeList listSub = l.item(i).childNodes(); appendSub(listSub,item); @@ -184,7 +184,7 @@ void CSSEditor::hidePreviewer(){ void CSSEditor::initialize(){ m_config = kapp->config(); - connect(pbOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleShortendForm())); + connect(pbOk, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleShortendForm())); m_config->setGroup("CSSEditor Options"); SHckb->setChecked(m_config->readBoolEntry("Shorthand form enabled",false)); @@ -243,7 +243,7 @@ void CSSEditor::initialize(){ m_ps = new propertySetter(fEditing); fEditingLayout->addWidget(m_ps); - connect(m_ps, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(checkProperty(const TQString&))); + connect(m_ps, TQ_SIGNAL(valueChanged(const TQString&)), this, TQ_SLOT(checkProperty(const TQString&))); TQStringList props; TQString temp; @@ -592,12 +592,12 @@ void CSSEditor::checkProperty(const TQString& v){ } void CSSEditor::Connect(){ - connect(this, TQT_SIGNAL(signalUpdatePreview()), this, TQT_SLOT(updatePreview())); - connect(lvVisual,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvAll,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvAural,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvInteractive,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); - connect(lvPaged,TQT_SIGNAL( selectionChanged( TQListViewItem * )),this,TQT_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(this, TQ_SIGNAL(signalUpdatePreview()), this, TQ_SLOT(updatePreview())); + connect(lvVisual,TQ_SIGNAL(selectionChanged ( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvAll,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvAural,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvInteractive,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); + connect(lvPaged,TQ_SIGNAL( selectionChanged( TQListViewItem * )),this,TQ_SLOT(setMiniEditors ( TQListViewItem * ))); } void CSSEditor::removeProperty(const TQVariant& v){ diff --git a/quanta/components/csseditor/csseditor.h b/quanta/components/csseditor/csseditor.h index 0df95553..dd72a2fc 100644 --- a/quanta/components/csseditor/csseditor.h +++ b/quanta/components/csseditor/csseditor.h @@ -55,7 +55,7 @@ class myCheckListItem : public TQCheckListItem /** CSSEditor is the base class of the project */ class CSSEditor : public CSSEditorS { - Q_OBJECT + TQ_OBJECT private: TQMyHighlighter *m_myhi; diff --git a/quanta/components/csseditor/csseditor_globals.cpp b/quanta/components/csseditor/csseditor_globals.cpp index c2be79c0..ef2227cf 100644 --- a/quanta/components/csseditor/csseditor_globals.cpp +++ b/quanta/components/csseditor/csseditor_globals.cpp @@ -19,13 +19,13 @@ #include "csseditor_globals.h" mySpinBox::mySpinBox(TQWidget * parent , const char * name ) : TQSpinBox (parent, name){ - connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & ))); - connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(checkSuffix( const TQString & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(valueChanged( const TQString & ))); } mySpinBox::mySpinBox( int minValue, int maxValue, int step, TQWidget * parent, const char * name ) : TQSpinBox( minValue, maxValue, step, parent,name ){ - connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(checkSuffix( const TQString & ))); - connect( editor(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged( const TQString & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(checkSuffix( const TQString & ))); + connect( editor(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(valueChanged( const TQString & ))); } mySpinBox::~mySpinBox(){} diff --git a/quanta/components/csseditor/csseditor_globals.h b/quanta/components/csseditor/csseditor_globals.h index e63a9f20..88223c9c 100644 --- a/quanta/components/csseditor/csseditor_globals.h +++ b/quanta/components/csseditor/csseditor_globals.h @@ -50,7 +50,7 @@ const TQStringList HTMLColors(TQStringList::split(",",TQString("aliceblue,antiqu class mySpinBox : public TQSpinBox{ - Q_OBJECT + TQ_OBJECT public: mySpinBox(TQWidget * parent = 0, const char * name = 0 ); diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp index 389b5402..c624a696 100644 --- a/quanta/components/csseditor/cssselector.cpp +++ b/quanta/components/csseditor/cssselector.cpp @@ -110,34 +110,34 @@ CSSSelector::~CSSSelector(){ void CSSSelector::Connect(){ - connect(cbDTD,TQT_SIGNAL(activated(const TQString&)),this,TQT_SLOT(setDTDTags(const TQString&))); - - connect(pbAddTag,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addTag())); - connect(pbAddClass,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addClass())); - connect(pbAddID,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addID())); - connect(pbAddPseudo,TQT_SIGNAL(clicked()), this ,TQT_SLOT(addPseudo())); - - connect(lvTags, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - connect(lvClasses, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - connect(lvIDs, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - connect(lvPseudo, TQT_SIGNAL(doubleClicked( TQListViewItem * )), this, TQT_SLOT(openCSSEditor(TQListViewItem *))); - - connect(lvTags, TQT_SIGNAL(selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - connect(lvClasses, TQT_SIGNAL(selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - connect(lvIDs, TQT_SIGNAL(selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - connect(lvPseudo, TQT_SIGNAL( selectionChanged( TQListViewItem * )), this, TQT_SLOT(setCurrentItem(TQListViewItem *))); - - connect(pbRemoveSelectedTag,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - connect(pbRemoveSelectedClass,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - connect(pbRemoveSelectedID,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - connect(pbRemoveSelectedPseudo,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeSelected())); - - connect(twSelectors,TQT_SIGNAL(currentChanged ( TQWidget * )), this ,TQT_SLOT(setCurrentListView( TQWidget * ))); - - connect(pbRemoveAllTags,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); - connect(pbRemoveAllClasses,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); - connect(pbRemoveAllIDs,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); - connect(pbRemoveAllPseudo,TQT_SIGNAL(clicked()), this ,TQT_SLOT(removeAll())); + connect(cbDTD,TQ_SIGNAL(activated(const TQString&)),this,TQ_SLOT(setDTDTags(const TQString&))); + + connect(pbAddTag,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addTag())); + connect(pbAddClass,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addClass())); + connect(pbAddID,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addID())); + connect(pbAddPseudo,TQ_SIGNAL(clicked()), this ,TQ_SLOT(addPseudo())); + + connect(lvTags, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + connect(lvClasses, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + connect(lvIDs, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + connect(lvPseudo, TQ_SIGNAL(doubleClicked( TQListViewItem * )), this, TQ_SLOT(openCSSEditor(TQListViewItem *))); + + connect(lvTags, TQ_SIGNAL(selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + connect(lvClasses, TQ_SIGNAL(selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + connect(lvIDs, TQ_SIGNAL(selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + connect(lvPseudo, TQ_SIGNAL( selectionChanged( TQListViewItem * )), this, TQ_SLOT(setCurrentItem(TQListViewItem *))); + + connect(pbRemoveSelectedTag,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + connect(pbRemoveSelectedClass,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + connect(pbRemoveSelectedID,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + connect(pbRemoveSelectedPseudo,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeSelected())); + + connect(twSelectors,TQ_SIGNAL(currentChanged ( TQWidget * )), this ,TQ_SLOT(setCurrentListView( TQWidget * ))); + + connect(pbRemoveAllTags,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); + connect(pbRemoveAllClasses,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); + connect(pbRemoveAllIDs,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); + connect(pbRemoveAllPseudo,TQ_SIGNAL(clicked()), this ,TQ_SLOT(removeAll())); } void CSSSelector::setDTDTags(const TQString& s){ @@ -292,7 +292,7 @@ void CSSSelector::openCSSEditor(TQListViewItem * i){ void CSSSelector::setCurrentListView(TQWidget* w){ TQObjectList *l = w->queryList( "TQListView" ); - m_currentListView = static_cast<TQListView*>(TQT_TQWIDGET(l->first())); + m_currentListView = static_cast<TQListView*>(l->first()); } void CSSSelector::removeAll(){ @@ -315,7 +315,7 @@ void CSSSelector::removeSelected(){ void CSSSelector::loadCSSContent(const TQString& s){ stylesheetParser p(s); - connect(&p,TQT_SIGNAL(errorOccurred(const TQString&)), this, TQT_SLOT(setStylesheetProcessing(const TQString&))); + connect(&p,TQ_SIGNAL(errorOccurred(const TQString&)), this, TQ_SLOT(setStylesheetProcessing(const TQString&))); p.parse(); m_orderNumber = p.orderNumber(); diff --git a/quanta/components/csseditor/cssselector.h b/quanta/components/csseditor/cssselector.h index a71f587b..5bee0f48 100644 --- a/quanta/components/csseditor/cssselector.h +++ b/quanta/components/csseditor/cssselector.h @@ -29,7 +29,7 @@ class TQStringList; */ class CSSSelector : public CSSSelectorS { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/csseditor/doubleeditors.cpp b/quanta/components/csseditor/doubleeditors.cpp index e877e2ac..18e18ce4 100644 --- a/quanta/components/csseditor/doubleeditors.cpp +++ b/quanta/components/csseditor/doubleeditors.cpp @@ -58,8 +58,8 @@ void doubleEditorBase::dxValueSlot(const TQString& v){ m_ssbDx->insertItem("pt"); m_ssbDx->insertItem("px"); - connect(m_ssbSx, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(sxValueSlot(const TQString&))); - connect(m_ssbDx, TQT_SIGNAL(valueChanged(const TQString&)), this, TQT_SLOT(dxValueSlot(const TQString&))); + connect(m_ssbSx, TQ_SIGNAL(valueChanged(const TQString&)), this, TQ_SLOT(sxValueSlot(const TQString&))); + connect(m_ssbDx, TQ_SIGNAL(valueChanged(const TQString&)), this, TQ_SLOT(dxValueSlot(const TQString&))); } doubleLengthEditor::~doubleLengthEditor(){ @@ -68,7 +68,7 @@ doubleLengthEditor::~doubleLengthEditor(){ } void doubleLengthEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } void doubleLengthEditor::setInitialValue(const TQString& sx, const TQString& dx){ @@ -79,8 +79,8 @@ void doubleLengthEditor::setInitialValue(const TQString& sx, const TQString& dx) doubleComboBoxEditor::doubleComboBoxEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ m_cbSx = new TQComboBox(this); m_cbDx = new TQComboBox(this); - connect(m_cbSx, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(sxValueSlot(const TQString&))); - connect(m_cbDx, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(dxValueSlot(const TQString&))); + connect(m_cbSx, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(sxValueSlot(const TQString&))); + connect(m_cbDx, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(dxValueSlot(const TQString&))); } doubleComboBoxEditor::~doubleComboBoxEditor(){ @@ -89,7 +89,7 @@ doubleComboBoxEditor::~doubleComboBoxEditor(){ } void doubleComboBoxEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } doublePercentageEditor::doublePercentageEditor(TQWidget *parent, const char *name) : doubleEditorBase(parent,name){ @@ -97,8 +97,8 @@ doublePercentageEditor::doublePercentageEditor(TQWidget *parent, const char *nam m_sbDx = new mySpinBox(this); m_sbSx->setSuffix("%"); m_sbDx->setSuffix("%"); - connect(m_sbSx,TQT_SIGNAL(valueChanged(const TQString&)),this,TQT_SLOT(sxValueSlot(const TQString&))); - connect(m_sbDx,TQT_SIGNAL(valueChanged(const TQString&)),this,TQT_SLOT(dxValueSlot(const TQString&))); + connect(m_sbSx,TQ_SIGNAL(valueChanged(const TQString&)),this,TQ_SLOT(sxValueSlot(const TQString&))); + connect(m_sbDx,TQ_SIGNAL(valueChanged(const TQString&)),this,TQ_SLOT(dxValueSlot(const TQString&))); } doublePercentageEditor::~doublePercentageEditor(){ @@ -107,7 +107,7 @@ doublePercentageEditor::~doublePercentageEditor(){ } void doublePercentageEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } void doublePercentageEditor::setInitialValue(const TQString& a_sx, const TQString& a_dx){ diff --git a/quanta/components/csseditor/doubleeditors.h b/quanta/components/csseditor/doubleeditors.h index 94cbf164..396a13c5 100644 --- a/quanta/components/csseditor/doubleeditors.h +++ b/quanta/components/csseditor/doubleeditors.h @@ -24,7 +24,7 @@ class TQComboBox; class doubleEditorBase : public miniEditor { - Q_OBJECT + TQ_OBJECT protected: TQString m_sxValue, @@ -45,7 +45,7 @@ class doubleEditorBase : public miniEditor { }; class doublePercentageEditor : public doubleEditorBase { - Q_OBJECT + TQ_OBJECT private: mySpinBox *m_sbSx, @@ -59,7 +59,7 @@ class doublePercentageEditor : public doubleEditorBase { }; class doubleComboBoxEditor : public doubleEditorBase { - Q_OBJECT + TQ_OBJECT private: TQComboBox *m_cbSx, @@ -74,7 +74,7 @@ class doubleComboBoxEditor : public doubleEditorBase { }; class doubleLengthEditor : public doubleEditorBase { - Q_OBJECT + TQ_OBJECT private: specialSB *m_ssbSx, diff --git a/quanta/components/csseditor/encodingselector.h b/quanta/components/csseditor/encodingselector.h index 6ee05ccd..eddcdc1d 100644 --- a/quanta/components/csseditor/encodingselector.h +++ b/quanta/components/csseditor/encodingselector.h @@ -27,7 +27,7 @@ */ class encodingSelector : public encodingSelectorS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp index 8a64d589..cab7efbb 100644 --- a/quanta/components/csseditor/fontfamilychooser.cpp +++ b/quanta/components/csseditor/fontfamilychooser.cpp @@ -69,17 +69,17 @@ fontFamilyChooser::fontFamilyChooser(TQWidget* parent, const char *name) : fontF pbMoveDown->setIconSet(iconSet); pbMoveDown->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - connect(pbAdd, TQT_SIGNAL(clicked()), this ,TQT_SLOT( addFont() )); - connect( lbAvailable, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( updatePreview( const TQString&) ) ); - connect( lbAvailable, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( setCurrentSelectedAvailableFamilyFont( const TQString&) ) ); - connect( lbGeneric, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( updatePreview( const TQString&) ) ); - connect( lbGeneric, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( setCurrentSelectedGenericFamilyFont( const TQString&) ) ); - connect( lbSelected, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( updatePreview( const TQString&) ) ); - connect( lbSelected, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( setCurrentSelectedFont( int ) ) ); - connect( lbSelected, TQT_SIGNAL( highlighted( const TQString& ) ), this, TQT_SLOT( setCurrentSelectedFont( const TQString&) ) ); - connect( pbRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeFont() ) ); - connect( pbMoveUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveFontUp() ) ); - connect( pbMoveDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveFontDown() ) ); + connect(pbAdd, TQ_SIGNAL(clicked()), this ,TQ_SLOT( addFont() )); + connect( lbAvailable, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( updatePreview( const TQString&) ) ); + connect( lbAvailable, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( setCurrentSelectedAvailableFamilyFont( const TQString&) ) ); + connect( lbGeneric, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( updatePreview( const TQString&) ) ); + connect( lbGeneric, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( setCurrentSelectedGenericFamilyFont( const TQString&) ) ); + connect( lbSelected, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( updatePreview( const TQString&) ) ); + connect( lbSelected, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( setCurrentSelectedFont( int ) ) ); + connect( lbSelected, TQ_SIGNAL( highlighted( const TQString& ) ), this, TQ_SLOT( setCurrentSelectedFont( const TQString&) ) ); + connect( pbRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeFont() ) ); + connect( pbMoveUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveFontUp() ) ); + connect( pbMoveDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveFontDown() ) ); TQWhatsThis::add(lbAvailable,i18n("These are the names of the available fonts on your system")); TQWhatsThis::add(lbGeneric,i18n("These are the names of the generic fonts ")); diff --git a/quanta/components/csseditor/fontfamilychooser.h b/quanta/components/csseditor/fontfamilychooser.h index 70d359eb..58d52299 100644 --- a/quanta/components/csseditor/fontfamilychooser.h +++ b/quanta/components/csseditor/fontfamilychooser.h @@ -23,7 +23,7 @@ class TQStringList; class fontFamilyChooser : public fontFamilyChooserS { - Q_OBJECT + TQ_OBJECT private: enum FontOrigin { available, generic }; diff --git a/quanta/components/csseditor/percentageeditor.cpp b/quanta/components/csseditor/percentageeditor.cpp index b02a1615..f6363563 100644 --- a/quanta/components/csseditor/percentageeditor.cpp +++ b/quanta/components/csseditor/percentageeditor.cpp @@ -23,7 +23,7 @@ percentageEditor::percentageEditor(const TQString& initialValue, TQWidget *paren m_sb = new mySpinBox(0,9999,1,this); m_sb->setValue(temp.remove("%").toInt()); m_sb->setSuffix("%"); - connect(m_sb, TQT_SIGNAL(valueChanged ( const TQString & )), this, TQT_SIGNAL(valueChanged(const TQString&))); + connect(m_sb, TQ_SIGNAL(valueChanged ( const TQString & )), this, TQ_SIGNAL(valueChanged(const TQString&))); } percentageEditor::~percentageEditor() @@ -32,7 +32,7 @@ percentageEditor::~percentageEditor() } void percentageEditor::connectToPropertySetter(propertySetter* p){ - connect( this, TQT_SIGNAL(valueChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect( this, TQ_SIGNAL(valueChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } #include "percentageeditor.moc" diff --git a/quanta/components/csseditor/percentageeditor.h b/quanta/components/csseditor/percentageeditor.h index 34cf3903..eae4261d 100644 --- a/quanta/components/csseditor/percentageeditor.h +++ b/quanta/components/csseditor/percentageeditor.h @@ -37,7 +37,7 @@ class KPushButton; class propertySetter; class percentageEditor : public miniEditor { - Q_OBJECT + TQ_OBJECT private: mySpinBox *m_sb; diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp index cbaabe5c..c4a46ca7 100644 --- a/quanta/components/csseditor/propertysetter.cpp +++ b/quanta/components/csseditor/propertysetter.cpp @@ -60,8 +60,8 @@ void propertySetter::reset(){ void propertySetter::setComboBox() { m_cb = new TQComboBox(this); - connect(m_cb, TQT_SIGNAL(activated(const TQString&)), this, TQT_SIGNAL(valueChanged(const TQString&))); - connect(m_cb, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SIGNAL(valueChanged(const TQString&))); + connect(m_cb, TQ_SIGNAL(activated(const TQString&)), this, TQ_SIGNAL(valueChanged(const TQString&))); + connect(m_cb, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SIGNAL(valueChanged(const TQString&))); m_list.append(m_cb); } @@ -70,14 +70,14 @@ void propertySetter::setSpinBox(const TQString& initialValue, const TQString& mi mySpinBox *editor = new mySpinBox(min.toInt(), max.toInt(), 1, this); editor->setSuffix(s); editor->setValue(initialValue.toInt()); - connect(editor, TQT_SIGNAL(valueChanged(const TQString&)), this ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(editor, TQ_SIGNAL(valueChanged(const TQString&)), this ,TQ_SIGNAL(valueChanged(const TQString&))); m_list.append(editor); } void propertySetter::setLineEdit() { TQLineEdit *editor = new TQLineEdit(this); - connect(editor,TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SIGNAL(valueChanged ( const TQString & ))); + connect(editor,TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SIGNAL(valueChanged ( const TQString & ))); m_list.append(editor); } @@ -85,7 +85,7 @@ void propertySetter::setPredefinedColorListEditor() { TQComboBox *editor = new TQComboBox(this); editor->insertStringList(CSSEditorGlobals::HTMLColors); - connect(editor, TQT_SIGNAL(activated(const TQString&)), this, TQT_SIGNAL(valueChanged(const TQString&))); + connect(editor, TQ_SIGNAL(activated(const TQString&)), this, TQ_SIGNAL(valueChanged(const TQString&))); m_list.append(editor); } @@ -118,7 +118,7 @@ void propertySetter::addButton(){ m_pb->setIconSet(iconSet); m_pb->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); m_pb->hide(); - connect(m_pb, TQT_SIGNAL(clicked()), this ,TQT_SLOT(Show())); + connect(m_pb, TQ_SIGNAL(clicked()), this ,TQ_SLOT(Show())); } void propertySetter::installMiniEditor(miniEditor *m){ diff --git a/quanta/components/csseditor/propertysetter.h b/quanta/components/csseditor/propertysetter.h index a49f585c..2095d6d5 100644 --- a/quanta/components/csseditor/propertysetter.h +++ b/quanta/components/csseditor/propertysetter.h @@ -32,7 +32,7 @@ class KPushButton; */ class propertySetter : public TQHBox { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/csseditor/specialsb.cpp b/quanta/components/csseditor/specialsb.cpp index 6edf110c..2c725e03 100644 --- a/quanta/components/csseditor/specialsb.cpp +++ b/quanta/components/csseditor/specialsb.cpp @@ -26,16 +26,16 @@ specialSB::specialSB(TQWidget *parent, const char *name, bool useLineEdit ) : mi { m_lineEdit = new KLineEdit(this); m_sb = 0L; - connect(m_lineEdit, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(lineEditValueSlot ( const TQString & ))); + connect(m_lineEdit, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(lineEditValueSlot ( const TQString & ))); } else { m_sb=new mySpinBox(this); - connect(m_sb, TQT_SIGNAL(valueChanged ( const TQString & )), this, TQT_SLOT(sbValueSlot(const TQString&))); + connect(m_sb, TQ_SIGNAL(valueChanged ( const TQString & )), this, TQ_SLOT(sbValueSlot(const TQString&))); m_lineEdit = 0L; } m_cb = new TQComboBox(this); - connect(m_cb, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(cbValueSlot(const TQString&))); + connect(m_cb, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(cbValueSlot(const TQString&))); } specialSB::~specialSB(){ @@ -45,7 +45,7 @@ specialSB::~specialSB(){ } void specialSB::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p,TQ_SIGNAL(valueChanged(const TQString&))); } diff --git a/quanta/components/csseditor/specialsb.h b/quanta/components/csseditor/specialsb.h index ef74213f..cda9b040 100644 --- a/quanta/components/csseditor/specialsb.h +++ b/quanta/components/csseditor/specialsb.h @@ -28,7 +28,7 @@ class KLineEdit; */ class specialSB : public miniEditor { - Q_OBJECT + TQ_OBJECT protected: TQComboBox *m_cb; @@ -54,28 +54,28 @@ class specialSB : public miniEditor { }; class angleEditor : public specialSB { - Q_OBJECT + TQ_OBJECT public: angleEditor(TQWidget *parent=0, const char *name=0); }; class frequencyEditor : public specialSB { - Q_OBJECT + TQ_OBJECT public: frequencyEditor(TQWidget *parent=0, const char *name=0); }; class timeEditor : public specialSB { - Q_OBJECT + TQ_OBJECT public: timeEditor(TQWidget *parent=0, const char *name=0); }; class lengthEditor : public specialSB { - Q_OBJECT + TQ_OBJECT public: lengthEditor(TQWidget *parent=0, const char *name=0); diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp index d40812ed..c523115a 100644 --- a/quanta/components/csseditor/styleeditor.cpp +++ b/quanta/components/csseditor/styleeditor.cpp @@ -40,7 +40,7 @@ #include "csseditor.h" StyleEditor::StyleEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name){ - connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openCSSEditor())); + connect(m_pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(openCSSEditor())); setToolTip(i18n("Open css dialog")); TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("stylesheet")); TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); diff --git a/quanta/components/csseditor/styleeditor.h b/quanta/components/csseditor/styleeditor.h index 83b54349..206033a6 100644 --- a/quanta/components/csseditor/styleeditor.h +++ b/quanta/components/csseditor/styleeditor.h @@ -24,7 +24,7 @@ //forward declarations class propertySetter; class StyleEditor : public TLPEditor{ - Q_OBJECT + TQ_OBJECT private: int m_iconWidth, diff --git a/quanta/components/csseditor/stylesheetparser.h b/quanta/components/csseditor/stylesheetparser.h index c5183dfe..4d1b1233 100644 --- a/quanta/components/csseditor/stylesheetparser.h +++ b/quanta/components/csseditor/stylesheetparser.h @@ -27,7 +27,7 @@ */ class stylesheetParser : public TQObject{ - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp index 678ba827..4aa738d7 100644 --- a/quanta/components/csseditor/tlpeditors.cpp +++ b/quanta/components/csseditor/tlpeditors.cpp @@ -73,19 +73,19 @@ URIEditor::URIEditor(TQWidget *parent, const char* name) : TLPEditor(parent,name setButtonIcon("document-open"); setToolTip(i18n("Open the URI selector")); - connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openFileDialog())); + connect(m_pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(openFileDialog())); } void URIEditor::connectToPropertySetter(propertySetter* p){ - connect(this,TQT_SIGNAL(valueChanged(const TQString&)), p ,TQT_SIGNAL(valueChanged(const TQString&))); + connect(this,TQ_SIGNAL(valueChanged(const TQString&)), p ,TQ_SIGNAL(valueChanged(const TQString&))); } void URIEditor::setMode(const mode& m) { m_Mode = m ; if( m_Mode == Single ) - connect(m_le, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(selectedURI(const TQString&))); + connect(m_le, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(selectedURI(const TQString&))); else{ - connect(m_le, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(selectedURIs(const TQStringList&))); + connect(m_le, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(selectedURIs(const TQStringList&))); } } @@ -156,12 +156,12 @@ fontEditor::fontEditor(TQWidget *parent, const char* name) : TLPEditor(parent,na setLabelText(i18n("Font family:")); setButtonIcon("fonts"); setToolTip(i18n("Open font family chooser")); - connect(m_pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(openFontChooser())); - connect(m_le, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SIGNAL( valueChanged( const TQString& ) ) ); + connect(m_pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(openFontChooser())); + connect(m_le, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SIGNAL( valueChanged( const TQString& ) ) ); } void fontEditor::connectToPropertySetter(propertySetter* p){ - connect(this, TQT_SIGNAL(valueChanged(const TQString&)), p, TQT_SIGNAL(valueChanged(const TQString&))); + connect(this, TQ_SIGNAL(valueChanged(const TQString&)), p, TQ_SIGNAL(valueChanged(const TQString&))); } void fontEditor::openFontChooser(){ diff --git a/quanta/components/csseditor/tlpeditors.h b/quanta/components/csseditor/tlpeditors.h index 09c2e1f8..5a341b81 100644 --- a/quanta/components/csseditor/tlpeditors.h +++ b/quanta/components/csseditor/tlpeditors.h @@ -30,7 +30,7 @@ class TQLabel; class TLPEditor : public miniEditor { //editor with a line text and a button calling a dialog - Q_OBJECT + TQ_OBJECT protected: @@ -55,7 +55,7 @@ class TLPEditor : public miniEditor { //editor with a line text and a button cal }; class fontEditor : public TLPEditor{ - Q_OBJECT + TQ_OBJECT private: TQString m_initialValue; @@ -70,7 +70,7 @@ class fontEditor : public TLPEditor{ }; class URIEditor : public TLPEditor { - Q_OBJECT + TQ_OBJECT public: enum mode{ Multi, Single }; diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp index e979c417..4035ed2f 100644 --- a/quanta/components/cvsservice/cvsservice.cpp +++ b/quanta/components/cvsservice/cvsservice.cpp @@ -47,30 +47,30 @@ CVSService::CVSService(TDEActionCollection *ac) { m_menu = new TDEPopupMenu(); - TDEAction *action = new TDEAction(i18n("&Commit..."), "vcs_commit", 0, this, TQT_SLOT(slotCommit()), ac, "vcs_commit"); + TDEAction *action = new TDEAction(i18n("&Commit..."), "vcs_commit", 0, this, TQ_SLOT(slotCommit()), ac, "vcs_commit"); action->plug(m_menu); - action = new TDEAction(i18n("&Update"), "vcs_update", 0, this, TQT_SLOT(slotUpdate()), ac, "vcs_update"); + action = new TDEAction(i18n("&Update"), "vcs_update", 0, this, TQ_SLOT(slotUpdate()), ac, "vcs_update"); action->plug(m_menu); TDEPopupMenu *updateToMenu = new TDEPopupMenu(m_menu); m_menu->insertItem(SmallIconSet("vcs_update"), i18n("Update &To"), updateToMenu); - action = new TDEAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQT_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date"); + action = new TDEAction(i18n("&Tag/Date..."), "vcs_update", 0, this, TQ_SLOT(slotUpdateToTag()), ac, "vcs_update_tag_date"); action->plug(updateToMenu); - action = new TDEAction(i18n("&HEAD"), "vcs_update", 0, this, TQT_SLOT(slotUpdateToHead()), ac, "vcs_update_head"); + action = new TDEAction(i18n("&HEAD"), "vcs_update", 0, this, TQ_SLOT(slotUpdateToHead()), ac, "vcs_update_head"); action->plug(updateToMenu); - action = new TDEAction(i18n("Re&vert"), "reload", 0, this, TQT_SLOT(slotRevert()), ac, "vcs_revert"); + action = new TDEAction(i18n("Re&vert"), "reload", 0, this, TQ_SLOT(slotRevert()), ac, "vcs_revert"); action->plug(m_menu); m_menu->insertSeparator(); - action = new TDEAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQT_SLOT(slotAdd()), ac, "vcs_add"); + action = new TDEAction(i18n("&Add to Repository..."), "vcs_add", 0, this, TQ_SLOT(slotAdd()), ac, "vcs_add"); action->plug(m_menu); - action = new TDEAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQT_SLOT(slotRemove()), ac, "vcs_remove"); + action = new TDEAction(i18n("&Remove From Repository..."), "vcs_remove", 0, this, TQ_SLOT(slotRemove()), ac, "vcs_remove"); action->plug(m_menu); - action = new TDEAction(i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotAddToCVSIgnore()), ac); + action = new TDEAction(i18n("&Ignore in CVS Operations"), 0, this, TQ_SLOT(slotAddToCVSIgnore()), ac); action->plug(m_menu); - action = new TDEAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotRemoveFromCVSIgnore()), ac); + action = new TDEAction(i18n("Do &Not Ignore in CVS Operations"), 0, this, TQ_SLOT(slotRemoveFromCVSIgnore()), ac); action->plug(m_menu); m_menu->insertSeparator(); - action = new TDEAction(i18n("Show &Log Messages"), 0, this, TQT_SLOT(slotBrowseLog()), ac); + action = new TDEAction(i18n("Show &Log Messages"), 0, this, TQ_SLOT(slotBrowseLog()), ac); action->plug(m_menu); m_cvsJob = 0L; @@ -79,7 +79,7 @@ CVSService::CVSService(TDEActionCollection *ac) m_commitDlg = new CVSCommitDlgS(); m_updateToDlg = new CVSUpdateToDlgS(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } CVSService::~CVSService() diff --git a/quanta/components/cvsservice/cvsservice.h b/quanta/components/cvsservice/cvsservice.h index 5c12d91a..0f0fd4f1 100644 --- a/quanta/components/cvsservice/cvsservice.h +++ b/quanta/components/cvsservice/cvsservice.h @@ -40,7 +40,7 @@ class CVSUpdateToDlgS; */ class CVSService : public TQObject, public CVSServiceDCOPIf { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp index 637f76a4..1e02305f 100644 --- a/quanta/components/debugger/backtracelistview.cpp +++ b/quanta/components/debugger/backtracelistview.cpp @@ -64,7 +64,7 @@ BacktraceListview::BacktraceListview(TQWidget *parent, const char *name) setAllColumnsShowFocus(true); // Jump to bt - connect(this, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(slotBacktraceDoubleClick( TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT(slotBacktraceDoubleClick( TQListViewItem *, const TQPoint &, int))); } diff --git a/quanta/components/debugger/backtracelistview.h b/quanta/components/debugger/backtracelistview.h index 01c34c45..d821ad5a 100644 --- a/quanta/components/debugger/backtracelistview.h +++ b/quanta/components/debugger/backtracelistview.h @@ -70,7 +70,7 @@ class BacktraceListviewItem : public TDEListViewItem class BacktraceListview : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/conditionalbreakpointdialog.cpp b/quanta/components/debugger/conditionalbreakpointdialog.cpp index 055512da..630fbf8b 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.cpp +++ b/quanta/components/debugger/conditionalbreakpointdialog.cpp @@ -40,11 +40,11 @@ ConditionalBreakpointDialog::ConditionalBreakpointDialog(const TQString& express buttonClearClass->setPixmap(SmallIcon("clear_left")); buttonClearFunction->setPixmap(SmallIcon("clear_left")); - connect(comboExpression, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotExpressionChanged())); + connect(comboExpression, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotExpressionChanged())); - connect(buttonClearFile, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearFile())); - connect(buttonClearClass, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearClass())); - connect(buttonClearFunction, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotClearFunction())); + connect(buttonClearFile, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearFile())); + connect(buttonClearClass, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearClass())); + connect(buttonClearFunction, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotClearFunction())); slotExpressionChanged(); } diff --git a/quanta/components/debugger/conditionalbreakpointdialog.h b/quanta/components/debugger/conditionalbreakpointdialog.h index 5fb8a1bd..8dd15371 100644 --- a/quanta/components/debugger/conditionalbreakpointdialog.h +++ b/quanta/components/debugger/conditionalbreakpointdialog.h @@ -22,7 +22,7 @@ class ConditionalBreakpointDialog : public ConditionalBreakpointDialogS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/conditionalbreakpointdialogs.ui b/quanta/components/debugger/conditionalbreakpointdialogs.ui index 221b5bcd..109abfbd 100644 --- a/quanta/components/debugger/conditionalbreakpointdialogs.ui +++ b/quanta/components/debugger/conditionalbreakpointdialogs.ui @@ -76,9 +76,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -93,9 +90,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp index 7730960d..03fb82aa 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp +++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp @@ -48,11 +48,11 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt if(m_socket) { // m_socket->setBufferSize(-1); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KNetwork::KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); - connect(m_socket, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotSocketDestroyed())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KNetwork::KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotSocketDestroyed())); m_socket->connect(); emit active(false); kdDebug(24002) << k_funcinfo << ", proxy:" << server << ", " << service << endl; @@ -65,8 +65,8 @@ void DBGpNetwork::sessionStart(bool useproxy, const TQString& server, const TQSt m_server = new KNetwork::TDEServerSocket(service); m_server->setAddressReuseable(true); - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - connect(m_server, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); if(m_server->listen()) { @@ -91,7 +91,7 @@ void DBGpNetwork::sessionEnd() if(m_socket) { m_socket->flush(); - disconnect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); + disconnect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); if (m_socket) m_socket->close(); delete m_socket; @@ -146,7 +146,7 @@ void DBGpNetwork::slotReadyAccept() kdDebug(24002) << k_funcinfo << ", m_server: " << m_server << ", m_socket" << m_socket << endl; if(!m_socket) { - disconnect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + disconnect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // TDESocketServer returns a KStreamSocket (!) if(m_socket) @@ -156,10 +156,10 @@ void DBGpNetwork::slotReadyAccept() m_socket->setAddressReuseable(true); // m_socket->setSocketFlags(KExtendedSocket::inetSocket | KExtendedSocket::inputBufferedSocket); // m_socket->setBufferSize(-1); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); connected(); } else @@ -215,7 +215,7 @@ void DBGpNetwork::slotConnectionClosed() } if(m_server) - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); // Disable all session related actions and enable connection action emit connected(false); diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.h b/quanta/components/debugger/dbgp/dbgpnetwork.h index 1ac8e2f4..8c8f7ca9 100644 --- a/quanta/components/debugger/dbgp/dbgpnetwork.h +++ b/quanta/components/debugger/dbgp/dbgpnetwork.h @@ -30,7 +30,7 @@ class KResolverEntry; class DBGpNetwork : public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/debugger/dbgp/dbgpsettings.cpp b/quanta/components/debugger/dbgp/dbgpsettings.cpp index e9bbc249..13b1f46c 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.cpp +++ b/quanta/components/debugger/dbgp/dbgpsettings.cpp @@ -24,7 +24,7 @@ DBGpSettings::DBGpSettings(const TQString &protocolversion) : DBGpSettingsS(0, "DBGpSettings", false, 0) { textAbout->setText(textAbout->text().replace("%PROTOCOLVERSION%", protocolversion)); - connect(checkLocalProject, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotLocalProjectToggle(bool))); + connect(checkLocalProject, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotLocalProjectToggle(bool))); } DBGpSettings::~DBGpSettings() diff --git a/quanta/components/debugger/dbgp/dbgpsettings.h b/quanta/components/debugger/dbgp/dbgpsettings.h index 96a25f25..c5e96afe 100644 --- a/quanta/components/debugger/dbgp/dbgpsettings.h +++ b/quanta/components/debugger/dbgp/dbgpsettings.h @@ -21,7 +21,7 @@ class DBGpSettings : public DBGpSettingsS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/dbgp/dbgpsettingss.ui b/quanta/components/debugger/dbgp/dbgpsettingss.ui index 2f98a16b..b8dba8de 100644 --- a/quanta/components/debugger/dbgp/dbgpsettingss.ui +++ b/quanta/components/debugger/dbgp/dbgpsettingss.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -285,9 +282,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLabel" row="1" column="0"> <property name="name"> @@ -402,9 +396,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>If this checkbox is checked, the profiler output filename will be mapped using the basedirs just like the remote script files.</string> </property> @@ -440,9 +431,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>If this checkbox is checked, the profiler output will be opened automatically once the session ends.</string> </property> @@ -716,11 +704,11 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotLocalProjectToggled(bool)</slot> <slot>checkLocalProject_toggled(bool)</slot> <slot>slotLocalProjectToggle(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">ktextbrowser.h</include> diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp index 6e2ec6ce..f4204ec2 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp @@ -59,10 +59,10 @@ QuantaDebuggerDBGp::QuantaDebuggerDBGp (TQObject *parent, const char*, const TQS setExecutionState(m_defaultExecutionState); emit updateStatus(DebuggerUI::NoSession); - connect(&m_network, TQT_SIGNAL(command(const TQString&)), this, TQT_SLOT(processCommand(const TQString&))); - connect(&m_network, TQT_SIGNAL(active(bool)), this, TQT_SLOT(slotNetworkActive(bool))); - connect(&m_network, TQT_SIGNAL(connected(bool)), this, TQT_SLOT(slotNetworkConnected(bool))); - connect(&m_network, TQT_SIGNAL(networkError(const TQString &, bool)), this, TQT_SLOT(slotNetworkError(const TQString &, bool))); + connect(&m_network, TQ_SIGNAL(command(const TQString&)), this, TQ_SLOT(processCommand(const TQString&))); + connect(&m_network, TQ_SIGNAL(active(bool)), this, TQ_SLOT(slotNetworkActive(bool))); + connect(&m_network, TQ_SIGNAL(connected(bool)), this, TQ_SLOT(slotNetworkConnected(bool))); + connect(&m_network, TQ_SIGNAL(networkError(const TQString &, bool)), this, TQ_SLOT(slotNetworkError(const TQString &, bool))); } diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h index 5d7d551b..37d776db 100644 --- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.h +++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.h @@ -31,7 +31,7 @@ typedef TQMap<TQString, TQString> StringMap; class QuantaDebuggerDBGp : public DebuggerClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp index 7cb4c097..140ee4b7 100644 --- a/quanta/components/debugger/debuggerbreakpointview.cpp +++ b/quanta/components/debugger/debuggerbreakpointview.cpp @@ -67,12 +67,12 @@ DebuggerBreakpointView::DebuggerBreakpointView(TQWidget *parent, const char *nam setAllColumnsShowFocus(true); m_breakpointPopup = new TDEPopupMenu(this); - m_breakpointPopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected())); + m_breakpointPopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQ_SLOT(slotRemoveSelected())); - connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQ_SLOT(slotBreakpointContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); // Jump to bp - connect(this, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(slotBreakpointDoubleClick( TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT(slotBreakpointDoubleClick( TQListViewItem *, const TQPoint &, int))); } diff --git a/quanta/components/debugger/debuggerbreakpointview.h b/quanta/components/debugger/debuggerbreakpointview.h index 074de811..0686a4ac 100644 --- a/quanta/components/debugger/debuggerbreakpointview.h +++ b/quanta/components/debugger/debuggerbreakpointview.h @@ -43,7 +43,7 @@ class DebuggerBreakpointViewItem : public TDEListViewItem class DebuggerBreakpointView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp index ff41b764..b672617c 100644 --- a/quanta/components/debugger/debuggermanager.cpp +++ b/quanta/components/debugger/debuggermanager.cpp @@ -67,7 +67,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); delete m_client; m_client = NULL; @@ -143,7 +143,7 @@ void DebuggerManager::slotNewProjectLoaded(const TQString &projectname, const KU // recreate UI m_debuggerui = new DebuggerUI(this, "debuggerui"); - connect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + connect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); // Load saved breakpoints if(Project::ref()->debuggerPersistentBreakpoints()) @@ -212,65 +212,65 @@ void DebuggerManager::initActions() return; //Debugger, breakpoint - newaction = new TDEAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); + newaction = new TDEAction(i18n("Toggle &Breakpoint"), SmallIcon("debug_breakpoint"), TQt::CTRL+TQt::SHIFT+TQt::Key_B, this, TQ_SLOT(toggleBreakpoint()), ac, "debug_breakpoints_toggle"); newaction->setToolTip(i18n("Toggles a breakpoint at the current cursor location")); - newaction = new TDEAction(i18n("&Clear Breakpoints"), 0, this, TQT_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear"); + newaction = new TDEAction(i18n("&Clear Breakpoints"), 0, this, TQ_SLOT(clearBreakpoints()), ac, "debug_breakpoints_clear"); newaction->setToolTip(i18n("Clears all breakpoints")); - newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break"); + newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQ_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_break"); newaction->setToolTip(i18n("Adds a new conditional breakpoint")); - newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQT_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog"); + newaction = new TDEAction(i18n("Break When..."), SmallIcon("math_int"), 0, this, TQ_SLOT(slotConditionalBreakpoint()), ac, "debug_conditional_breakdialog"); newaction->setToolTip(i18n("Adds a new conditional breakpoint")); // Execution - newaction = new TDEAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQT_SLOT(slotDebugRequest()), ac, "debug_request"); + newaction = new TDEAction(i18n("Send HTTP R&equest"), SmallIcon("debug_currentline"), 0, this, TQ_SLOT(slotDebugRequest()), ac, "debug_request"); newaction->setToolTip(i18n("Initiate HTTP Request to the server with debugging activated")); - newaction = new TDEAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQT_SLOT(slotDebugTrace()), ac, "debug_trace"); + newaction = new TDEAction(i18n("&Trace"), SmallIcon("debug_run"), 0, this, TQ_SLOT(slotDebugTrace()), ac, "debug_trace"); newaction->setToolTip(i18n("Traces through the script. If a script is currently not being debugged, it will start in trace mode when started")); - newaction = new TDEAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQT_SLOT(slotDebugRun()), ac, "debug_run"); + newaction = new TDEAction(i18n("&Run"), SmallIcon("debug_leap"), 0, this, TQ_SLOT(slotDebugRun()), ac, "debug_run"); newaction->setToolTip(i18n("Runs the script. If a script is currently not being debugged, it will start in run mode when started")); - newaction = new TDEAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQT_SLOT(slotDebugStepOver()), ac, "debug_stepover"); + newaction = new TDEAction(i18n("&Step"), SmallIcon("debug_stepover"), 0, this, TQ_SLOT(slotDebugStepOver()), ac, "debug_stepover"); newaction->setToolTip(i18n("Executes the next line of execution, but does not step into functions or includes")); - newaction = new TDEAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQT_SLOT(slotDebugStepInto()), ac, "debug_stepinto"); + newaction = new TDEAction(i18n("Step &Into"), SmallIcon("debug_stepinto"), 0, this, TQ_SLOT(slotDebugStepInto()), ac, "debug_stepinto"); newaction->setToolTip(i18n("Executes the next line of execution and steps into it if it is a function call or inclusion of a file")); - newaction = new TDEAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQT_SLOT(slotDebugSkip()), ac, "debug_skip"); + newaction = new TDEAction(i18n("S&kip"), SmallIcon("debug_skip"), 0, this, TQ_SLOT(slotDebugSkip()), ac, "debug_skip"); newaction->setToolTip(i18n("Skips the next command of execution and makes the next command the current one")); - newaction = new TDEAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQT_SLOT(slotDebugStepOut()), ac, "debug_stepout"); + newaction = new TDEAction(i18n("Step &Out"), SmallIcon("debug_stepout"), 0, this, TQ_SLOT(slotDebugStepOut()), ac, "debug_stepout"); newaction->setToolTip(i18n("Executes the rest of the commands in the current function/file and pauses when it is done (when it reaches a higher level in the backtrace)")); - newaction = new TDEAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQT_SLOT(slotDebugPause()), ac, "debug_pause"); + newaction = new TDEAction(i18n("&Pause"), SmallIcon("debug_pause"), 0, this, TQ_SLOT(slotDebugPause()), ac, "debug_pause"); newaction->setToolTip(i18n("Pauses the scripts if it is running or tracing. If a script is currently not being debugged, it will start in paused mode when started")); - newaction = new TDEAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQT_SLOT(slotDebugKill()), ac, "debug_kill"); + newaction = new TDEAction(i18n("Kill"), SmallIcon("debug_kill"), 0, this, TQ_SLOT(slotDebugKill()), ac, "debug_kill"); newaction->setToolTip(i18n("Kills the currently running script")); - newaction = new TDEAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQT_SLOT(slotDebugStartSession()), ac, "debug_connect"); + newaction = new TDEAction(i18n("Start Session"), SmallIcon("debug_connect"), 0, this, TQ_SLOT(slotDebugStartSession()), ac, "debug_connect"); newaction->setToolTip(i18n("Starts the debugger internally (Makes debugging possible)")); - newaction = new TDEAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQT_SLOT(slotDebugEndSession()), ac, "debug_disconnect"); + newaction = new TDEAction(i18n("End Session"), SmallIcon("debug_disconnect"), 0, this, TQ_SLOT(slotDebugEndSession()), ac, "debug_disconnect"); newaction->setToolTip(i18n("Stops the debugger internally (debugging not longer possible)")); // Variables - newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatch"); + newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQ_SLOT(slotAddWatch()), ac, "debug_addwatch"); newaction->setToolTip(i18n("Adds a variable to the watch list")); - newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQT_SLOT(slotAddWatch()), ac, "debug_addwatchdialog"); + newaction = new TDEAction(i18n("Watch Variable"), SmallIcon("math_brace"), 0, this, TQ_SLOT(slotAddWatch()), ac, "debug_addwatchdialog"); newaction->setToolTip(i18n("Adds a variable to the watch list")); - newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_set"); + newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQ_SLOT(slotVariableSet()), ac, "debug_variable_set"); newaction->setToolTip(i18n("Changes the value of a variable")); - newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQT_SLOT(slotVariableSet()), ac, "debug_variable_setdialog"); + newaction = new TDEAction(i18n("Set Value of Variable"), SmallIcon("edit"), 0, this, TQ_SLOT(slotVariableSet()), ac, "debug_variable_setdialog"); newaction->setToolTip(i18n("Changes the value of a variable")); - newaction = new TDEAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQT_SLOT(slotProfilerOpen()), ac, "debug_profiler_open"); + newaction = new TDEAction(i18n("Open Profiler Output"), SmallIcon("launch"), 0, this, TQ_SLOT(slotProfilerOpen()), ac, "debug_profiler_open"); newaction->setToolTip(i18n("Opens the profiler output file")); enableAction("*", false); @@ -299,7 +299,7 @@ DebuggerManager::~DebuggerManager() if(m_client) { - disconnect(m_client, TQT_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQT_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); + disconnect(m_client, TQ_SIGNAL(updateStatus(DebuggerUI::DebuggerStatus)), m_debuggerui, TQ_SLOT(slotStatus(DebuggerUI::DebuggerStatus))); delete m_client; m_client = 0L; @@ -642,20 +642,20 @@ void DebuggerManager::setMark(const TQString& filename, long line, bool set, int void DebuggerManager::connectBreakpointSignals(Document* qdoc) { - connect(qdoc, TQT_SIGNAL(breakpointMarked(Document*, int)), - this, TQT_SLOT(slotBreakpointMarked(Document*, int))); + connect(qdoc, TQ_SIGNAL(breakpointMarked(Document*, int)), + this, TQ_SLOT(slotBreakpointMarked(Document*, int))); - connect(qdoc, TQT_SIGNAL(breakpointUnmarked(Document*, int)), - this, TQT_SLOT(slotBreakpointUnmarked(Document*, int))); + connect(qdoc, TQ_SIGNAL(breakpointUnmarked(Document*, int)), + this, TQ_SLOT(slotBreakpointUnmarked(Document*, int))); } void DebuggerManager::disconnectBreakpointSignals(Document* qdoc) { - disconnect(qdoc, TQT_SIGNAL(breakpointMarked(Document*, int)), - this, TQT_SLOT(slotBreakpointMarked(Document*, int))); + disconnect(qdoc, TQ_SIGNAL(breakpointMarked(Document*, int)), + this, TQ_SLOT(slotBreakpointMarked(Document*, int))); - disconnect(qdoc, TQT_SIGNAL(breakpointUnmarked(Document*, int)), - this, TQT_SLOT(slotBreakpointUnmarked(Document*, int))); + disconnect(qdoc, TQ_SIGNAL(breakpointUnmarked(Document*, int)), + this, TQ_SLOT(slotBreakpointUnmarked(Document*, int))); } // Show a status message and optionally put it on the log diff --git a/quanta/components/debugger/debuggermanager.h b/quanta/components/debugger/debuggermanager.h index 1a4bec52..ef91551a 100644 --- a/quanta/components/debugger/debuggermanager.h +++ b/quanta/components/debugger/debuggermanager.h @@ -32,7 +32,7 @@ class Document; class DebuggerManager : public TQObject { - Q_OBJECT + TQ_OBJECT private: // client diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp index 9f512460..1fcdc7da 100644 --- a/quanta/components/debugger/debuggerui.cpp +++ b/quanta/components/debugger/debuggerui.cpp @@ -64,14 +64,14 @@ DebuggerUI::DebuggerUI(TQObject *parent, const char *name) m_preview->view()->setIcon(UserIcon("debug_run")); m_preview->view()->setCaption(i18n("Debug Output")); m_previewTVA = quantaApp->addToolWindow(m_preview->view(), quantaApp->prevDockPosition(m_preview->view(), KDockWidget::DockBottom), quantaApp->getMainDockWidget()); - connect(m_preview, TQT_SIGNAL(openFile(const KURL&, const TQString&, bool)), quantaApp, TQT_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); + connect(m_preview, TQ_SIGNAL(openFile(const KURL&, const TQString&, bool)), quantaApp, TQ_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); // Show debugger toolbar quantaApp->toolBar("debugger_toolbar")->show(); - connect(m_variablesListView, TQT_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQT_SLOT(slotRemoveVariable(DebuggerVariable* ))); + connect(m_variablesListView, TQ_SIGNAL(removeVariable(DebuggerVariable* )), parent, TQ_SLOT(slotRemoveVariable(DebuggerVariable* ))); - connect(m_debuggerBreakpointView, TQT_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQT_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); + connect(m_debuggerBreakpointView, TQ_SIGNAL(removeBreakpoint(DebuggerBreakpoint* )), parent, TQ_SLOT(slotRemoveBreakpoint(DebuggerBreakpoint* ))); showMenu(); } diff --git a/quanta/components/debugger/debuggerui.h b/quanta/components/debugger/debuggerui.h index 04db4e94..4d972d08 100644 --- a/quanta/components/debugger/debuggerui.h +++ b/quanta/components/debugger/debuggerui.h @@ -34,7 +34,7 @@ class KURL; class DebuggerUI : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/debuggervariablesets.ui b/quanta/components/debugger/debuggervariablesets.ui index f8d674d5..2616edab 100644 --- a/quanta/components/debugger/debuggervariablesets.ui +++ b/quanta/components/debugger/debuggervariablesets.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -77,9 +74,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/quanta/components/debugger/gubed/gubedsettings.h b/quanta/components/debugger/gubed/gubedsettings.h index ab07a6c6..300287bd 100644 --- a/quanta/components/debugger/gubed/gubedsettings.h +++ b/quanta/components/debugger/gubed/gubedsettings.h @@ -21,7 +21,7 @@ class GubedSettings : public GubedSettingsS { - Q_OBJECT + TQ_OBJECT public slots: diff --git a/quanta/components/debugger/gubed/gubedsettingss.ui b/quanta/components/debugger/gubed/gubedsettingss.ui index 92e5efd1..a9e80bc2 100644 --- a/quanta/components/debugger/gubed/gubedsettingss.ui +++ b/quanta/components/debugger/gubed/gubedsettingss.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -752,9 +749,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot specifier="pure virtual">slotUseProxyToggle( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">ktextbrowser.h</include> diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp index 14d46941..086ff878 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp +++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp @@ -98,10 +98,10 @@ void QuantaDebuggerGubed::startSession() { m_socket = new KNetwork::KStreamSocket(m_serverHost, m_serverPort); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); m_socket->connect(); debuggerInterface()->enableAction("debug_connect", true); @@ -119,7 +119,7 @@ void QuantaDebuggerGubed::startSession() m_server = new KNetwork::TDEServerSocket(m_listenPort); m_server->setAddressReuseable(true); - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); if(m_server->listen()) { @@ -280,7 +280,7 @@ void QuantaDebuggerGubed::slotReadyAccept() { // Perhaps this shouldnt be disconnected - instead check if connections are available at disconnect? - disconnect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + disconnect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); m_socket = (KNetwork::KStreamSocket *)m_server->accept(); // TDESocketServer returns a KStreamSocket (!) if(m_socket) @@ -288,10 +288,10 @@ void QuantaDebuggerGubed::slotReadyAccept() kdDebug(24002) << k_funcinfo << ", ready" << endl; m_socket->enableRead(true); - connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry &)), this, TQT_SLOT(slotConnected(const KResolverEntry &))); - connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); + connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry &)), this, TQ_SLOT(slotConnected(const KResolverEntry &))); + connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); connected(); emit updateStatus(DebuggerUI::Connected); @@ -339,7 +339,7 @@ void QuantaDebuggerGubed::slotConnectionClosed() } if(m_server) - connect(m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); + connect(m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); // Disable all session related actions and enable connection action debuggerInterface()->enableAction("*", false); diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.h b/quanta/components/debugger/gubed/quantadebuggergubed.h index ead8ffd5..e6d33fd7 100644 --- a/quanta/components/debugger/gubed/quantadebuggergubed.h +++ b/quanta/components/debugger/gubed/quantadebuggergubed.h @@ -30,7 +30,7 @@ typedef TQMap<TQString, TQString> StringMap; class QuantaDebuggerGubed : public DebuggerClient { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/interfaces/debuggerclient.h b/quanta/components/debugger/interfaces/debuggerclient.h index adc914f8..ca51566e 100644 --- a/quanta/components/debugger/interfaces/debuggerclient.h +++ b/quanta/components/debugger/interfaces/debuggerclient.h @@ -62,7 +62,7 @@ namespace DebuggerClientCapabilities class DebuggerClient : public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/debugger/interfaces/debuggerinterface.h b/quanta/components/debugger/interfaces/debuggerinterface.h index fc8f0f2f..e62cd8c4 100644 --- a/quanta/components/debugger/interfaces/debuggerinterface.h +++ b/quanta/components/debugger/interfaces/debuggerinterface.h @@ -30,7 +30,7 @@ class PathMapper; class DebuggerInterface : public TQObject { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/debugger/pathmapper.h b/quanta/components/debugger/pathmapper.h index f7d2c44a..d012189c 100644 --- a/quanta/components/debugger/pathmapper.h +++ b/quanta/components/debugger/pathmapper.h @@ -27,7 +27,7 @@ class KURL; class PathMapper : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/pathmapperdialog.cpp b/quanta/components/debugger/pathmapperdialog.cpp index 7f6f4027..343b55f3 100644 --- a/quanta/components/debugger/pathmapperdialog.cpp +++ b/quanta/components/debugger/pathmapperdialog.cpp @@ -32,9 +32,9 @@ PathMapperDialog::PathMapperDialog(const TQString& path, const PathMapperDialog: if(m_direction == LocalToServer) ledTranslationExists->hide(); - connect(listHistory, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); - connect(lineLocalPath, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPathsChanged())); - connect(lineServerPath, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPathsChanged())); + connect(listHistory, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); + connect(lineLocalPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPathsChanged())); + connect(lineServerPath, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPathsChanged())); } PathMapperDialog::~PathMapperDialog() diff --git a/quanta/components/debugger/pathmapperdialog.h b/quanta/components/debugger/pathmapperdialog.h index 8c198416..922c9512 100644 --- a/quanta/components/debugger/pathmapperdialog.h +++ b/quanta/components/debugger/pathmapperdialog.h @@ -21,7 +21,7 @@ class PathMapperDialog : public PathMapperDialogS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/debugger/pathmapperdialogs.ui b/quanta/components/debugger/pathmapperdialogs.ui index 266989b9..22bedbf4 100644 --- a/quanta/components/debugger/pathmapperdialogs.ui +++ b/quanta/components/debugger/pathmapperdialogs.ui @@ -123,9 +123,6 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -140,9 +137,6 @@ The quanta will know that files starting with "/home/user/project/" on the local <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -335,9 +329,9 @@ The quanta will know that files starting with "/home/user/project/" on the local <slot>reject()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotHistoryclicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kled.h</include> diff --git a/quanta/components/debugger/quantadebuggerinterface.h b/quanta/components/debugger/quantadebuggerinterface.h index 736bf517..4bdf6e1c 100644 --- a/quanta/components/debugger/quantadebuggerinterface.h +++ b/quanta/components/debugger/quantadebuggerinterface.h @@ -27,7 +27,7 @@ class DebuggerManager; class QuantaDebuggerInterface : public DebuggerInterface { - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp index 9624416f..8fc97aaf 100644 --- a/quanta/components/debugger/variableslistview.cpp +++ b/quanta/components/debugger/variableslistview.cpp @@ -60,16 +60,16 @@ VariablesListView::VariablesListView(TQWidget *parent, const char *name) setSorting(-1); // No sorting m_variablePopup = new TDEPopupMenu(this); - m_variablePopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQT_SLOT(slotRemoveSelected()), 0, removeWatch); + m_variablePopup->insertItem(SmallIcon("edit-delete"), i18n("&Remove"), this, TQ_SLOT(slotRemoveSelected()), 0, removeWatch); if(quantaApp->debugger()->client()->supports(DebuggerClientCapabilities::VariableSetValue)) - m_variablePopup->insertItem(SmallIcon("edit"), i18n("&Set Value"), this, TQT_SLOT(slotVariableSetValue()), 0, setValue); + m_variablePopup->insertItem(SmallIcon("edit"), i18n("&Set Value"), this, TQ_SLOT(slotVariableSetValue()), 0, setValue); - m_variablePopup->insertItem(SmallIcon("viewmag"), i18n("&Dump in Messages Log"), this, TQT_SLOT(slotVariableDump()), 0, dumpValue); + m_variablePopup->insertItem(SmallIcon("viewmag"), i18n("&Dump in Messages Log"), this, TQ_SLOT(slotVariableDump()), 0, dumpValue); - m_variablePopup->insertItem(SmallIcon("edit-copy"), i18n("&Copy to Clipboard"), this, TQT_SLOT(slotVariableCopyToClipboard()), 0, copyValue); + m_variablePopup->insertItem(SmallIcon("edit-copy"), i18n("&Copy to Clipboard"), this, TQ_SLOT(slotVariableCopyToClipboard()), 0, copyValue); - connect(this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQT_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), this, TQ_SLOT(slotVariableContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); } diff --git a/quanta/components/debugger/variableslistview.h b/quanta/components/debugger/variableslistview.h index 69b27852..296fa7d9 100644 --- a/quanta/components/debugger/variableslistview.h +++ b/quanta/components/debugger/variableslistview.h @@ -27,7 +27,7 @@ class DebuggerVariable; class VariablesListView : public TDEListView { - Q_OBJECT + TQ_OBJECT enum menuitems diff --git a/quanta/components/framewizard/areaattributedb.h b/quanta/components/framewizard/areaattributedb.h index a4e3a837..2d986a3b 100644 --- a/quanta/components/framewizard/areaattributedb.h +++ b/quanta/components/framewizard/areaattributedb.h @@ -25,7 +25,7 @@ */ class areaAttribute : public TQObject{ - Q_OBJECT + TQ_OBJECT private: diff --git a/quanta/components/framewizard/fmfpeditor.h b/quanta/components/framewizard/fmfpeditor.h index 9080cc4d..d74ffa2e 100644 --- a/quanta/components/framewizard/fmfpeditor.h +++ b/quanta/components/framewizard/fmfpeditor.h @@ -25,7 +25,7 @@ */ class fmFPeditor : public fmFPeditorS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/framewizard/fmrceditor.h b/quanta/components/framewizard/fmrceditor.h index abebe4ee..aff4e960 100644 --- a/quanta/components/framewizard/fmrceditor.h +++ b/quanta/components/framewizard/fmrceditor.h @@ -25,7 +25,7 @@ */ class fmRCeditor : public fmRCeditorS { - Q_OBJECT + TQ_OBJECT public: fmRCeditor(); diff --git a/quanta/components/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp index 97cfadf0..6992d78e 100644 --- a/quanta/components/framewizard/framewizard.cpp +++ b/quanta/components/framewizard/framewizard.cpp @@ -33,14 +33,14 @@ m_hasSelected(false),m_saved(false) { m_hasSelected = false; m_currSA=vfe->internalTree()->root()->label(); - connect(this, TQT_SIGNAL(launchDraw()), this, TQT_SLOT(draw())); - connect(vfe, TQT_SIGNAL(areaSelected(const TQString &)), this, TQT_SLOT(catchSelectedArea(const TQString &))); + connect(this, TQ_SIGNAL(launchDraw()), this, TQ_SLOT(draw())); + connect(vfe, TQ_SIGNAL(areaSelected(const TQString &)), this, TQ_SLOT(catchSelectedArea(const TQString &))); - connect(pbHorizontal, TQT_SIGNAL(clicked()), this, TQT_SLOT(split())); - connect(pbVertical, TQT_SIGNAL(clicked()), this, TQT_SLOT(split())); - connect(pbEditFrame, TQT_SIGNAL(clicked()), this, TQT_SLOT(showFrameEditorDlg())); - connect(pbReset, TQT_SIGNAL(clicked()), this, TQT_SLOT(reset())); - connect(pbDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove())); + connect(pbHorizontal, TQ_SIGNAL(clicked()), this, TQ_SLOT(split())); + connect(pbVertical, TQ_SIGNAL(clicked()), this, TQ_SLOT(split())); + connect(pbEditFrame, TQ_SIGNAL(clicked()), this, TQ_SLOT(showFrameEditorDlg())); + connect(pbReset, TQ_SIGNAL(clicked()), this, TQ_SLOT(reset())); + connect(pbDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(remove())); } FrameWizard::~FrameWizard(){ @@ -57,7 +57,7 @@ void FrameWizard::split(){ if(m_hasSelected) { int split = 0; TQString currNodeLabel = m_currSA; - TQString senderName=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(); + TQString senderName=sender()->name(); if(senderName=="pbHorizontal"){ split = showRCeditorDlg(i18n("Enter the desired number of rows:")); if(split>=2) vfe->split(currNodeLabel,split,HORIZONTAL); diff --git a/quanta/components/framewizard/framewizard.h b/quanta/components/framewizard/framewizard.h index c71a4e5a..fb40b029 100644 --- a/quanta/components/framewizard/framewizard.h +++ b/quanta/components/framewizard/framewizard.h @@ -25,7 +25,7 @@ class TQStringList; /** FrameWizard is the base class of the project */ class FrameWizard : public FrameWizardS { - Q_OBJECT + TQ_OBJECT private: bool m_hasSelected, diff --git a/quanta/components/framewizard/framewizards.ui b/quanta/components/framewizard/framewizards.ui index 3a3a1efd..22a702c0 100644 --- a/quanta/components/framewizard/framewizards.ui +++ b/quanta/components/framewizard/framewizards.ui @@ -363,7 +363,7 @@ </connections> <pixmapinproject/> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>visualframeeditor.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">visualframeeditor.h</include> +</includes> </UI> diff --git a/quanta/components/framewizard/selectablearea.h b/quanta/components/framewizard/selectablearea.h index 0efccc72..b31f3ab4 100644 --- a/quanta/components/framewizard/selectablearea.h +++ b/quanta/components/framewizard/selectablearea.h @@ -28,7 +28,7 @@ class SelectableArea : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public : diff --git a/quanta/components/framewizard/visualframeeditor.cpp b/quanta/components/framewizard/visualframeeditor.cpp index 36974d0d..3f74574f 100644 --- a/quanta/components/framewizard/visualframeeditor.cpp +++ b/quanta/components/framewizard/visualframeeditor.cpp @@ -289,8 +289,8 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ TQSplitter *splitter = new TQSplitter(parent,splitterName.ascii()); if(SIZES.contains(splitterName)) splitter->setSizes( SIZES[splitterName] ); switch( n->splitType() ){ - case VERTICAL : splitter->setOrientation(Qt::Horizontal);break; - case HORIZONTAL : splitter->setOrientation(Qt::Vertical);break; + case VERTICAL : splitter->setOrientation(TQt::Horizontal);break; + case HORIZONTAL : splitter->setOrientation(TQt::Vertical);break; default:break; } n->firstChild(); @@ -307,8 +307,8 @@ void VisualFrameEditor::drawGUI(treeNode *n, TQWidget* parent){ sa->view()->setGeometry(n->atts()->geometry()); sa->setIdLabel( n->label() ); sa->setSource( n->atts()->src() ); - connect(sa, TQT_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQT_SLOT(setGeometry(TQRect))); - connect(sa, TQT_SIGNAL(selected(const TQString &)),this, TQT_SIGNAL(areaSelected(const TQString &))); + connect(sa, TQ_SIGNAL(Resized(TQRect)), m_internalTree->findNode(sa->idLabel())->atts(), TQ_SLOT(setGeometry(TQRect))); + connect(sa, TQ_SIGNAL(selected(const TQString &)),this, TQ_SIGNAL(areaSelected(const TQString &))); } } diff --git a/quanta/components/framewizard/visualframeeditor.h b/quanta/components/framewizard/visualframeeditor.h index 57ac82fe..69c51702 100644 --- a/quanta/components/framewizard/visualframeeditor.h +++ b/quanta/components/framewizard/visualframeeditor.h @@ -28,7 +28,7 @@ class VisualFrameEditor : public TQHBox { - Q_OBJECT + TQ_OBJECT private: enum MarkupLanguage{XHTML,HTML}; diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp index 258f7783..96c5ccf8 100644 --- a/quanta/components/tableeditor/tableeditor.cpp +++ b/quanta/components/tableeditor/tableeditor.cpp @@ -52,21 +52,21 @@ TableEditor::TableEditor(TQWidget* parent, const char* name) : TableEditorS(parent, name) { m_popup = new TDEPopupMenu(); - m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQT_SLOT(slotEditCell())); - m_rowEditId = m_popup->insertItem(i18n("Edit &Row Properties"), this ,TQT_SLOT(slotEditRow())); - // m_colEditId = m_popup->insertItem(i18n("Edit &Column Properties"), this ,TQT_SLOT(slotEditCol())); + m_cellEditId = m_popup->insertItem(i18n("&Edit Cell Properties"), this ,TQ_SLOT(slotEditCell())); + m_rowEditId = m_popup->insertItem(i18n("Edit &Row Properties"), this ,TQ_SLOT(slotEditRow())); + // m_colEditId = m_popup->insertItem(i18n("Edit &Column Properties"), this ,TQ_SLOT(slotEditCol())); m_mergeSeparatorId = m_popup->insertSeparator(); - m_mergeCellsId = m_popup->insertItem(i18n("Merge Cells"), this, TQT_SLOT(slotMergeCells())); - m_unmergeCellsId = m_popup->insertItem(i18n("Break Merging"), this, TQT_SLOT(slotUnmergeCells())); + m_mergeCellsId = m_popup->insertItem(i18n("Merge Cells"), this, TQ_SLOT(slotMergeCells())); + m_unmergeCellsId = m_popup->insertItem(i18n("Break Merging"), this, TQ_SLOT(slotUnmergeCells())); m_popup->insertSeparator(); - m_popup->insertItem(i18n("&Insert Row"), this, TQT_SLOT(slotInsertRow())); - m_popup->insertItem(i18n("Insert Co&lumn"), this, TQT_SLOT(slotInsertCol())); - m_popup->insertItem(i18n("Remove Row"), this, TQT_SLOT(slotRemoveRow())); - m_popup->insertItem(i18n("Remove Column"), this, TQT_SLOT(slotRemoveCol())); + m_popup->insertItem(i18n("&Insert Row"), this, TQ_SLOT(slotInsertRow())); + m_popup->insertItem(i18n("Insert Co&lumn"), this, TQ_SLOT(slotInsertCol())); + m_popup->insertItem(i18n("Remove Row"), this, TQ_SLOT(slotRemoveRow())); + m_popup->insertItem(i18n("Remove Column"), this, TQ_SLOT(slotRemoveCol())); m_popup->insertSeparator(); - m_popup->insertItem(i18n("Edit &Table Properties"), this, TQT_SLOT(slotEditTable())); - m_editChildId = m_popup->insertItem(i18n("Edit Child Table"), this, TQT_SLOT(slotEditChildTable())); + m_popup->insertItem(i18n("Edit &Table Properties"), this, TQ_SLOT(slotEditTable())); + m_editChildId = m_popup->insertItem(i18n("Edit Child Table"), this, TQ_SLOT(slotEditChildTable())); buttonOk->setIconSet(SmallIconSet("button_ok")); buttonCancel->setIconSet(SmallIconSet("button_cancel")); @@ -90,27 +90,27 @@ TableEditor::TableEditor(TQWidget* parent, const char* name) m_createNodes = true; newNum += 7; - connect(headerColSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveCol(int))); - connect(headerRowSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveRow(int))); - connect(rowSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveRow(int))); - connect(colSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveCol(int))); - connect(footerRowSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveRow(int))); - connect(footerColSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotAddRemoveCol(int))); - connect(tableData, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), - TQT_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); - connect(pushButton7, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTable())); - connect(pushButton7_2, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTableBody())); - connect(pushButton7_3, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTableHeader())); - connect(pushButton7_4, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditTableFooter())); - connect(headerTableData, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), - TQT_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); - connect(footerTableData, TQT_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), - TQT_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); - connect(tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(slotTabChanged(TQWidget*))); - connect(buttonHelp, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelpInvoked())); - connect(tableData, TQT_SIGNAL(valueChanged(int,int)), TQT_SLOT(slotEditCellText(int,int))); - connect(headerTableData, TQT_SIGNAL(valueChanged(int,int)), TQT_SLOT(slotEditCellText(int,int))); - connect(footerTableData, TQT_SIGNAL(valueChanged(int,int)), TQT_SLOT(slotEditCellText(int,int))); + connect(headerColSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveCol(int))); + connect(headerRowSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveRow(int))); + connect(rowSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveRow(int))); + connect(colSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveCol(int))); + connect(footerRowSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveRow(int))); + connect(footerColSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotAddRemoveCol(int))); + connect(tableData, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), + TQ_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); + connect(pushButton7, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTable())); + connect(pushButton7_2, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTableBody())); + connect(pushButton7_3, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTableHeader())); + connect(pushButton7_4, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditTableFooter())); + connect(headerTableData, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), + TQ_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); + connect(footerTableData, TQ_SIGNAL(contextMenuRequested(int,int,const TQPoint&)), + TQ_SLOT(slotContextMenuRequested(int,int,const TQPoint&))); + connect(tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(slotTabChanged(TQWidget*))); + connect(buttonHelp, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelpInvoked())); + connect(tableData, TQ_SIGNAL(valueChanged(int,int)), TQ_SLOT(slotEditCellText(int,int))); + connect(headerTableData, TQ_SIGNAL(valueChanged(int,int)), TQ_SLOT(slotEditCellText(int,int))); + connect(footerTableData, TQ_SIGNAL(valueChanged(int,int)), TQ_SLOT(slotEditCellText(int,int))); } TableEditor::~TableEditor() diff --git a/quanta/components/tableeditor/tableeditor.h b/quanta/components/tableeditor/tableeditor.h index 171cb9c1..445d1590 100644 --- a/quanta/components/tableeditor/tableeditor.h +++ b/quanta/components/tableeditor/tableeditor.h @@ -46,7 +46,7 @@ class Parser; class TableEditor : public TableEditorS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/components/tableeditor/tableeditors.ui b/quanta/components/tableeditor/tableeditors.ui index be3c7553..24a05ed4 100644 --- a/quanta/components/tableeditor/tableeditors.ui +++ b/quanta/components/tableeditor/tableeditors.ui @@ -54,9 +54,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/quanta/components/tableeditor/tableitem.cpp b/quanta/components/tableeditor/tableitem.cpp index 0b704529..ba10c9bb 100644 --- a/quanta/components/tableeditor/tableitem.cpp +++ b/quanta/components/tableeditor/tableitem.cpp @@ -48,7 +48,7 @@ TQWidget* TableItem::createEditor() const Editor->setVScrollBarMode(TQScrollView::AlwaysOff); Editor->setBold(m_header); Editor->setText(text()); - TQObject::connect(Editor, TQT_SIGNAL(textChanged()), table(), TQT_SLOT(doValueChanged())); + TQObject::connect(Editor, TQ_SIGNAL(textChanged()), table(), TQ_SLOT(doValueChanged())); return Editor; } diff --git a/quanta/data/dtep/CMakeLists.txt b/quanta/data/dtep/CMakeLists.txt index 235aa073..ae310636 100644 --- a/quanta/data/dtep/CMakeLists.txt +++ b/quanta/data/dtep/CMakeLists.txt @@ -10,6 +10,7 @@ ################################################# add_subdirectory( html ) +add_subdirectory( html5 ) add_subdirectory( html-frameset ) add_subdirectory( html-strict ) add_subdirectory( tagxml ) diff --git a/quanta/data/dtep/Makefile.am b/quanta/data/dtep/Makefile.am index 8adf55fa..51ddb8e5 100644 --- a/quanta/data/dtep/Makefile.am +++ b/quanta/data/dtep/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = html html-frameset html-strict tagxml php xhtml xhtml-basic xhtml-frameset xhtml-strict xhtml11 xslt wml-1-2 css docbook-4.2 schema cfml cffunct kde-docbook-4.1.2 kde-docbook-4.2 relaxng empty dtd +SUBDIRS = html html5 html-frameset html-strict tagxml php xhtml xhtml-basic xhtml-frameset xhtml-strict xhtml11 xslt wml-1-2 css docbook-4.2 schema cfml cffunct kde-docbook-4.1.2 kde-docbook-4.2 relaxng empty dtd install-data-local: # rm -f `find ${quanta_datadir}/tags -type f -name "*"` # rmdir `find ${quanta_datadir}/tags -type d -name "*"` diff --git a/quanta/data/dtep/html-frameset/common.tag b/quanta/data/dtep/html-frameset/common.tag index e5adf8f7..47adb16b 100644 --- a/quanta/data/dtep/html-frameset/common.tag +++ b/quanta/data/dtep/html-frameset/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/html-strict/common.tag b/quanta/data/dtep/html-strict/common.tag index e5adf8f7..47adb16b 100644 --- a/quanta/data/dtep/html-strict/common.tag +++ b/quanta/data/dtep/html-strict/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/html/common.tag b/quanta/data/dtep/html/common.tag index e5adf8f7..47adb16b 100644 --- a/quanta/data/dtep/html/common.tag +++ b/quanta/data/dtep/html/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/html5/CMakeLists.txt b/quanta/data/dtep/html5/CMakeLists.txt new file mode 100644 index 00000000..f5f1acb3 --- /dev/null +++ b/quanta/data/dtep/html5/CMakeLists.txt @@ -0,0 +1,31 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + abbr.tag acronym.tag address.tag applet.tag area.tag article.tag + aside.tag a.tag audio.tag base.tag bdi.tag bdo.tag + big.tag blockquote.tag body.tag br.tag b.tag button.tag + caption.tag center.tag cite.tag code.tag colgroup.tag col.tag + common.tag data.tag dd.tag del.tag description.rc details.tag + dfn.tag dir.tag div.tag dl.tag dt.tag embed.tag + empty.tag em.tag fieldset.tag figcaption.tag figure.tag footer.tag + form.tag header.tag headings.tag head.tag hr.tag html.tag + img.tag input.tag ins.tag i.tag kbd.tag label.tag + legend.tag link.tag li.tag main.tag map.tag mark.tag + meta.tag nav.tag noscript.tag object.tag ol.tag optgroup.tag + option.tag param.tag picture.tag pre.tag p.tag q.tag + rbc.tag rb.tag rp.tag rtc.tag rt.tag ruby.tag + samp.tag script.tag section.tag select.tag small.tag source.tag + span.tag strong.tag style.tag sub.tag sup.tag svg.tag + table.tag tbody.tag td.tag textarea.tag tfoot.tag thead.tag + th.tag time.tag title.tag track.tag tr.tag tt.tag + ul.tag u.tag var.tag video.tag wbr.tag + DESTINATION ${DATA_INSTALL_DIR}/quanta/dtep/html5 ) diff --git a/quanta/data/dtep/html5/Makefile.am b/quanta/data/dtep/html5/Makefile.am new file mode 100644 index 00000000..e2190890 --- /dev/null +++ b/quanta/data/dtep/html5/Makefile.am @@ -0,0 +1,20 @@ +quanta_DATA = abbr.tag acronym.tag address.tag applet.tag area.tag article.tag \ + aside.tag a.tag audio.tag base.tag bdi.tag bdo.tag \ + big.tag blockquote.tag body.tag br.tag b.tag button.tag \ + caption.tag center.tag cite.tag code.tag colgroup.tag col.tag \ + common.tag data.tag dd.tag del.tag description.rc details.tag \ + dfn.tag dir.tag div.tag dl.tag dt.tag embed.tag \ + empty.tag em.tag fieldset.tag figcaption.tag figure.tag footer.tag \ + form.tag header.tag headings.tag head.tag hr.tag html.tag \ + img.tag input.tag ins.tag i.tag kbd.tag label.tag \ + legend.tag link.tag li.tag main.tag map.tag mark.tag \ + meta.tag nav.tag noscript.tag object.tag ol.tag optgroup.tag \ + option.tag param.tag picture.tag pre.tag p.tag q.tag \ + rbc.tag rb.tag rp.tag rtc.tag rt.tag ruby.tag \ + samp.tag script.tag section.tag select.tag small.tag source.tag \ + span.tag strong.tag style.tag sub.tag sup.tag svg.tag \ + table.tag tbody.tag td.tag textarea.tag tfoot.tag thead.tag \ + th.tag time.tag title.tag track.tag tr.tag tt.tag \ + ul.tag u.tag var.tag video.tag wbr.tag +quantadir = ${quanta_datadir}/dtep/html5 + diff --git a/quanta/data/dtep/html5/a.tag b/quanta/data/dtep/html5/a.tag new file mode 100644 index 00000000..50a40f53 --- /dev/null +++ b/quanta/data/dtep/html5/a.tag @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="a" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="href" type="input" source="selection"> + <text>href</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="3"/> + </attr> + + <attr name="rel" type="input"> + <text>rel</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" /> + </attr> + + <attr name="rev" type="input"> + <text>rev</text> + <textlocation col="2" row="2" /> + <location col="3" row="2" /> + </attr> + + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" /> + <items> + <item>text/html</item> + <item>image/jpeg</item> + <item>image/gif</item> + <item>image/png</item> + <item>model/vrml</item> + <item>video/quicktime</item> + <item>application/java</item> + <item>application/mathml+xml</item> + <item>application/rss+xml</item> + <item>application/xhtml+xml</item> + <item>application/xml</item> + <item>text/css</item> + <item>text/javascript</item> + <item>text/xml</item> + </items> + </attr> + + <attr name="onfocus" type="input"> + <text>onfocus</text> + <textlocation col="0" row="8" /> + <location col="1" row="8" colspan="3" /> + </attr> + + <attr name="onblur" type="input"> + <text>onblur</text> + <textlocation col="0" row="9" /> + <location col="1" row="9" colspan="3" /> + </attr> + + <attr name="hreflang" type="input" /> + <attr name="charset" type="input" /> + <attr name="accesskey" type="input" /> + <attr name="tabindex" type="input" /> + <attr name="shape" type="list"> + <items> + <item>rect</item> + <item>circle</item> + <item>poly</item> + <item>default</item> + </items> + </attr> + <attr name="coords" type="input" /> + +<children> +<child name="#text" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/abbr.tag b/quanta/data/dtep/html5/abbr.tag new file mode 100644 index 00000000..e2c74acd --- /dev/null +++ b/quanta/data/dtep/html5/abbr.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="abbr" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/acronym.tag b/quanta/data/dtep/html5/acronym.tag new file mode 100644 index 00000000..407b5ecd --- /dev/null +++ b/quanta/data/dtep/html5/acronym.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="acronym" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/address.tag b/quanta/data/dtep/html5/address.tag new file mode 100644 index 00000000..512364ce --- /dev/null +++ b/quanta/data/dtep/html5/address.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="address" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/applet.tag b/quanta/data/dtep/html5/applet.tag new file mode 100644 index 00000000..df3c0c4f --- /dev/null +++ b/quanta/data/dtep/html5/applet.tag @@ -0,0 +1,144 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="applet" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="archive" type="input"> + <text>archive</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="classid" type="input"> + <text>classid</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="codebase" type="input"> + <text>codebase</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="code" type="input"> + <text>code</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="object" type="input"> + <text>object</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="2" /> + </attr> + + <attr name="align" type="input"> + <text>align</text> + <textlocation col="2" row="7" /> + <location col="3" row="7" colspan="1" /> + </attr> + + <attr name="hspace" type="input"> + <text>hspace</text> + <textlocation col="2" row="8" /> + <location col="3" row="8" colspan="1" /> + </attr> + + <attr name="vspace" type="input"> + <text>vspace</text> + <textlocation col="2" row="9" /> + <location col="3" row="9" colspan="1" /> + </attr> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="di" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="param" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/area.tag b/quanta/data/dtep/html5/area.tag new file mode 100644 index 00000000..dac881d1 --- /dev/null +++ b/quanta/data/dtep/html5/area.tag @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="area" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1" single="1"> + + <attr name="shape" type="list"> + <text>shape</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2"/> + <items> + <item>rect</item> + <item>circle</item> + <item>poly</item> + <item>default</item> + </items> + </attr> + + <attr name="coords" type="text"> + <text>coords</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2"/> + </attr> + + <attr name="href" type="url"> + <text>href</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2"/> + </attr> + + <attr name="accesskey" type="input"> + <text>accesskey</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="1" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="2"/> + </attr> + + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/article.tag b/quanta/data/dtep/html5/article.tag new file mode 100644 index 00000000..1765735e --- /dev/null +++ b/quanta/data/dtep/html5/article.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="article" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/aside.tag b/quanta/data/dtep/html5/aside.tag new file mode 100644 index 00000000..381fb796 --- /dev/null +++ b/quanta/data/dtep/html5/aside.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="aside" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/audio.tag b/quanta/data/dtep/html5/audio.tag new file mode 100644 index 00000000..69476078 --- /dev/null +++ b/quanta/data/dtep/html5/audio.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="audio" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/b.tag b/quanta/data/dtep/html5/b.tag new file mode 100644 index 00000000..033d36b5 --- /dev/null +++ b/quanta/data/dtep/html5/b.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="b" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/base.tag b/quanta/data/dtep/html5/base.tag new file mode 100644 index 00000000..200f1c1d --- /dev/null +++ b/quanta/data/dtep/html5/base.tag @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="base" single="1"> + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > <text>Id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" /> + </attr> + + <attr name="href" type="input"> + <text>Href</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/bdi.tag b/quanta/data/dtep/html5/bdi.tag new file mode 100644 index 00000000..c1f20363 --- /dev/null +++ b/quanta/data/dtep/html5/bdi.tag @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="bdi" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="dir" type="list"> + <text>dir</text> + <textlocation col="0" row="1" /> + <tooltip>This is not widely supported</tooltip> + <location col="1" row="1" colspan="2" /> + <items> + <item>ltr</item> + <item>rtl</item> + </items> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/bdo.tag b/quanta/data/dtep/html5/bdo.tag new file mode 100644 index 00000000..1c5ba5a6 --- /dev/null +++ b/quanta/data/dtep/html5/bdo.tag @@ -0,0 +1,65 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="bdo" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="dir" type="list"> + <text>dir</text> + <textlocation col="0" row="1" /> + <tooltip>This is not widely supported</tooltip> + <location col="1" row="1" colspan="2" /> + <items> + <item>ltr</item> + <item>rtl</item> + </items> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/big.tag b/quanta/data/dtep/html5/big.tag new file mode 100644 index 00000000..17b8b52c --- /dev/null +++ b/quanta/data/dtep/html5/big.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="big" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/blockquote.tag b/quanta/data/dtep/html5/blockquote.tag new file mode 100644 index 00000000..25a9c4c3 --- /dev/null +++ b/quanta/data/dtep/html5/blockquote.tag @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="blockquote" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="cite" type="input"> + <text>cite</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> +<children> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="blockquote" /> +<child name="del" /> +<child name="di" /> +<child name="dl" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="ins" /> +<child name="noscript" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="script" /> +<child name="table" /> +<child name="ul" /> +<child name="dir" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/body.tag b/quanta/data/dtep/html5/body.tag new file mode 100644 index 00000000..29c38226 --- /dev/null +++ b/quanta/data/dtep/html5/body.tag @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="body" hasCore="1" hasI18n="1" hasScript="1"> + <attr name="onload" type="input"> + <text>onload</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="onunload" type="input"> + <text>onunload</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + +<children> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="blockquote" /> +<child name="del" /> +<child name="div" /> +<child name="dl" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="ins" /> +<child name="noscript" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="script" /> +<child name="table" /> +<child name="ul" /> +<child name="dir" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/br.tag b/quanta/data/dtep/html5/br.tag new file mode 100644 index 00000000..d4d2bb06 --- /dev/null +++ b/quanta/data/dtep/html5/br.tag @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="br" hasCore="1" single="1" /> +</TAGS> diff --git a/quanta/data/dtep/html5/button.tag b/quanta/data/dtep/html5/button.tag new file mode 100644 index 00000000..039443b1 --- /dev/null +++ b/quanta/data/dtep/html5/button.tag @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="button" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1"> + +<attr name="value" type="input" /> + +<attr name="type" type="list"> +<items> +<item>submit</item> +<item>button</item> +<item>reset</item> +</items> +</attr> + +<attr name="disabled" type="check" /> + +<children> +<child name="#text" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="ins" /> +<child name="kbd" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/caption.tag b/quanta/data/dtep/html5/caption.tag new file mode 100644 index 00000000..10d69177 --- /dev/null +++ b/quanta/data/dtep/html5/caption.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="caption" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/center.tag b/quanta/data/dtep/html5/center.tag new file mode 100644 index 00000000..7ed9dcac --- /dev/null +++ b/quanta/data/dtep/html5/center.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="center" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/cite.tag b/quanta/data/dtep/html5/cite.tag new file mode 100644 index 00000000..6dc55aef --- /dev/null +++ b/quanta/data/dtep/html5/cite.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="cite" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/code.tag b/quanta/data/dtep/html5/code.tag new file mode 100644 index 00000000..df071b02 --- /dev/null +++ b/quanta/data/dtep/html5/code.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="code" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/col.tag b/quanta/data/dtep/html5/col.tag new file mode 100644 index 00000000..54f5b93c --- /dev/null +++ b/quanta/data/dtep/html5/col.tag @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="col" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="0" /> + <tooltip>Use % for percent or it will set pixels +You can add multiple values with commas</tooltip> + <location col="1" row="0" /> + </attr> + + <attr name="span" type="input"> + <text>span</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" /> + </attr> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="2" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="2" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="3" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="3" colspan="1" /> + </attr> + + <attr name="char" type="input"> + <text>char</text> + <textlocation col="0" row="4" /> + <tooltip>alignment character for cells</tooltip> + <location col="1" row="4" /> + </attr> + + <attr name="charoff" type="input"> + <text>charoff</text> + <textlocation col="0" row="5" /> + <tooltip>alignment character offset</tooltip> + <location col="1" row="5" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/colgroup.tag b/quanta/data/dtep/html5/colgroup.tag new file mode 100644 index 00000000..53ef59ee --- /dev/null +++ b/quanta/data/dtep/html5/colgroup.tag @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="colgroup" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="0" /> + <tooltip>Use % for percent or it will set pixels +You can add multiple values with commas</tooltip> + <location col="1" row="0" /> + </attr> + + <attr name="span" type="input"> + <text>span</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" /> + </attr> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="2" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="2" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="3" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="3" colspan="1" /> + </attr> + + <attr name="char" type="input"> + <text>char</text> + <textlocation col="0" row="4" /> + <tooltip>alignment character for cells</tooltip> + <location col="1" row="4" /> + </attr> + + <attr name="charoff" type="input"> + <text>charoff</text> + <textlocation col="0" row="5" /> + <tooltip>alignment character offset</tooltip> + <location col="1" row="5" /> + </attr> +<children> +<child name="col" usage="required" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/common.tag b/quanta/data/dtep/html5/common.tag new file mode 100644 index 00000000..a380f05b --- /dev/null +++ b/quanta/data/dtep/html5/common.tag @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="Core" common="yes"> + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + </attr> + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > + </attr> + <attr name="style" type="css-style"> + </attr> + <attr name="title" type="input"> + </attr> +</tag> + +<tag name="I18n" common="yes"> + <attr name="xml:lang" type="input"> + </attr> + <attr name="dir" type="input"> + </attr> +</tag> + +<tag name="Script" common="yes"> + <attr name="onclick" type="input"> + </attr> + <attr name="ondblclick" type="input"> + </attr> + <attr name="onmousedown" type="input"> + </attr> + <attr name="onmouseup" type="input"> + </attr> + <attr name="onmouseover" type="input"> + </attr> + <attr name="onmousemove" type="input"> + </attr> + <attr name="onmouseout" type="input"> + </attr> + <attr name="onkeypress" type="input"> + </attr> + <attr name="onkeydown" type="input"> + </attr> + <attr name="onkeyup" type="input"> + </attr> +</tag> + +<tag name="Focus" common="yes"> + <attr name="accesskey" type="input"> + </attr> + <attr name="tabindex" type="input"> + </attr> + <attr name="onfocus" type="input"> + </attr> + <attr name="onblur" type="input"> + </attr> +</tag> + +</TAGS>
\ No newline at end of file diff --git a/quanta/data/dtep/html5/data.tag b/quanta/data/dtep/html5/data.tag new file mode 100644 index 00000000..098bf906 --- /dev/null +++ b/quanta/data/dtep/html5/data.tag @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="del" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="value" type="input"> + <text>value</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/dd.tag b/quanta/data/dtep/html5/dd.tag new file mode 100644 index 00000000..0e377f4e --- /dev/null +++ b/quanta/data/dtep/html5/dd.tag @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="dd" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/del.tag b/quanta/data/dtep/html5/del.tag new file mode 100644 index 00000000..b6515eb5 --- /dev/null +++ b/quanta/data/dtep/html5/del.tag @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="del" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="cite" type="input"> + <text>cite</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="datetime" type="input"> + <text>datetime</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/description.rc b/quanta/data/dtep/html5/description.rc new file mode 100644 index 00000000..02e1f8cd --- /dev/null +++ b/quanta/data/dtep/html5/description.rc @@ -0,0 +1,58 @@ +[General] +Name = HTML 5 +NickName = HTML 5 +URL = https://www.w3.org/TR/html5/syntax.html#the-doctype +DoctypeString = html +MimeTypes = text/html +DefaultExtension = html +Groups = Core, I18n, Script,Focus +NumOfPages = 3 +CaseSensitive = true +Documentation = HTML + +[Toolbars] +Location = html5 +Names = base, style, meta, tools + +[Page1] +Title = Core and i18n +Groups = Core, I18n + +[Page2] +Title = Events +Groups = Script + +[Page3] +Title = Focus +Groups = Focus + +[Extra rules] +BooleanAttributes = simple +Single Tag Style = XML +StructGroupsCount = 3 + +[Parsing rules] +SpecialTags = script(language) +MayContain = php, css + +[StructGroup_1] +Name = Images (anchor) +No_Name = No Images (anchor) +Icon = image +Tag = img(src) +HasFileName = true + +[StructGroup_2] +Name = Links +No_Name = No Links +Icon = www +Tag = a(name,href) +HasFileName = true +FileNameRx = .*\||#.* + +[StructGroup_3] +Name = Resources (link) +No_Name = No Links (link) +Icon = www +Tag = link(href) +HasFileName = true diff --git a/quanta/data/dtep/html5/details.tag b/quanta/data/dtep/html5/details.tag new file mode 100644 index 00000000..13522d41 --- /dev/null +++ b/quanta/data/dtep/html5/details.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="details" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/dfn.tag b/quanta/data/dtep/html5/dfn.tag new file mode 100644 index 00000000..30f9107f --- /dev/null +++ b/quanta/data/dtep/html5/dfn.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="dfn" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/dir.tag b/quanta/data/dtep/html5/dir.tag new file mode 100644 index 00000000..ac27af08 --- /dev/null +++ b/quanta/data/dtep/html5/dir.tag @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="dir" hasCore="1" hasI18n="1" hasScript="1"> + +<children> +<child name="li" usage="required" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/div.tag b/quanta/data/dtep/html5/div.tag new file mode 100644 index 00000000..24537952 --- /dev/null +++ b/quanta/data/dtep/html5/div.tag @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="div" hasCore="1" hasI18n="1" hasScript="1" scope="paragraph"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/dl.tag b/quanta/data/dtep/html5/dl.tag new file mode 100644 index 00000000..430067b8 --- /dev/null +++ b/quanta/data/dtep/html5/dl.tag @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="dl" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="dt" /> +<child name="dd" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/dt.tag b/quanta/data/dtep/html5/dt.tag new file mode 100644 index 00000000..59f005d5 --- /dev/null +++ b/quanta/data/dtep/html5/dt.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="dt" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/em.tag b/quanta/data/dtep/html5/em.tag new file mode 100644 index 00000000..7022b925 --- /dev/null +++ b/quanta/data/dtep/html5/em.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="em" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/embed.tag b/quanta/data/dtep/html5/embed.tag new file mode 100644 index 00000000..c8faddae --- /dev/null +++ b/quanta/data/dtep/html5/embed.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="embed" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/empty.tag b/quanta/data/dtep/html5/empty.tag new file mode 100644 index 00000000..06fe883c --- /dev/null +++ b/quanta/data/dtep/html5/empty.tag @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name=""> + + <attr name="rows" type="input"> + <text>Rows</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/fieldset.tag b/quanta/data/dtep/html5/fieldset.tag new file mode 100644 index 00000000..3af076cd --- /dev/null +++ b/quanta/data/dtep/html5/fieldset.tag @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="fieldset" hasScript="1" hasCore="1"> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="attr" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="legend" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/figcaption.tag b/quanta/data/dtep/html5/figcaption.tag new file mode 100644 index 00000000..187a181c --- /dev/null +++ b/quanta/data/dtep/html5/figcaption.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="figcaption" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/figure.tag b/quanta/data/dtep/html5/figure.tag new file mode 100644 index 00000000..5b4a3428 --- /dev/null +++ b/quanta/data/dtep/html5/figure.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="figure" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/footer.tag b/quanta/data/dtep/html5/footer.tag new file mode 100644 index 00000000..628f7aca --- /dev/null +++ b/quanta/data/dtep/html5/footer.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="footer" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/form.tag b/quanta/data/dtep/html5/form.tag new file mode 100644 index 00000000..af33b0e1 --- /dev/null +++ b/quanta/data/dtep/html5/form.tag @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="form" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="action" type="url"> + <text>action</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="3" /> + </attr> + + <attr name="method" type="list"> + <text>method</text> + <textlocation col="0" row="1" /> + <location col="1" row="1"/> + <items> + <item>GET</item> + <item>POST</item> + </items> + </attr> + + <attr name="enctype" type="list"> + <text>enctype</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="3"/> + <items> + <item>application/x-www-form-urlencoded</item> + <item>multipart/form-data</item> + </items> + </attr> + + <attr name="accept-charset" type="input"> + <text>acceptcharset</text> + <textlocation col="2" row="3" /> + <location col="3" row="3"/> + </attr> + + <attr name="accept" type="list"> + <text>accept</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3"/> + <items> + <item>application/x-www-form-urlencoded</item> + <item>multipart/form-data</item> + </items> + </attr> + + <attr name="onsubmit" type="input"> + <text>onsubmit</text> + <textlocation col="2" row="5" /> + <location col="3" row="5"/> + </attr> + + <attr name="onreset" type="input"> + <text>onreset</text> + <textlocation col="2" row="6" /> + <location col="3" row="6"/> + </attr> + +<children> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="blockquote" /> +<child name="del" /> +<child name="div" /> +<child name="dl" /> +<child name="fieldset" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="ins" /> +<child name="noscript" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="script" /> +<child name="table" /> +<child name="ul" /> +<child name="dir" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/head.tag b/quanta/data/dtep/html5/head.tag new file mode 100644 index 00000000..b53932b3 --- /dev/null +++ b/quanta/data/dtep/html5/head.tag @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="head" hasI18n="1"> + + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="profile" type="url"> + <text>profile</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + +<children> +<child name="base" /> +<child name="link" /> +<child name="meta" usage="required" /> +<child name="object" /> +<child name="title" usage="required" /> +<child name="script" /> +<child name="style" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/header.tag b/quanta/data/dtep/html5/header.tag new file mode 100644 index 00000000..9ddd3550 --- /dev/null +++ b/quanta/data/dtep/html5/header.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="header" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/headings.tag b/quanta/data/dtep/html5/headings.tag new file mode 100644 index 00000000..3951989c --- /dev/null +++ b/quanta/data/dtep/html5/headings.tag @@ -0,0 +1,311 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> + +<tag name="h1" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +<tag name="h2" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +<tag name="h3" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +<tag name="h4" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +<tag name="h5" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +<tag name="h6" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> + +</TAGS> diff --git a/quanta/data/dtep/html5/hr.tag b/quanta/data/dtep/html5/hr.tag new file mode 100644 index 00000000..2bc7e29c --- /dev/null +++ b/quanta/data/dtep/html5/hr.tag @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="hr" hasScript="1" single="1" hasCore="1" single="1" /> +</TAGS> diff --git a/quanta/data/dtep/html5/html.tag b/quanta/data/dtep/html5/html.tag new file mode 100644 index 00000000..22894f8d --- /dev/null +++ b/quanta/data/dtep/html5/html.tag @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="html" hasI18n="1"> + + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="xmlns" type="list"> + <text>xmlns</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + <items><item>http://www.w3.org/1999/xhtml</item></items> + </attr> + +<children> +<child name="body" /> +<child name="head" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/i.tag b/quanta/data/dtep/html5/i.tag new file mode 100644 index 00000000..2bf4dae2 --- /dev/null +++ b/quanta/data/dtep/html5/i.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="i" hasCore="1" hasI18n="1" hasScript="1" scope="word"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/img.tag b/quanta/data/dtep/html5/img.tag new file mode 100644 index 00000000..edeb3729 --- /dev/null +++ b/quanta/data/dtep/html5/img.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="img" hasCore="1" hasI18n="1" hasScript="1" single="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/input.tag b/quanta/data/dtep/html5/input.tag new file mode 100644 index 00000000..d9e54de6 --- /dev/null +++ b/quanta/data/dtep/html5/input.tag @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="input" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="0" colspan="1" /> + <items> + <item>text</item> + <item>password</item> + <item>checkbox</item> + <item>radio</item> + <item>submit</item> + <item>reset</item> + <item>file</item> + <item>hidden</item> + <item>image</item> + <item>button</item> + </items> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="disabled" type="check"> + <text>disabled</text> + <location col="2" row="0" colspan="1" /> + <tooltip>Disable the element</tooltip> + </attr> + + <attr name="checked" type="check"> + <text>checked</text> + <location col="3" row="0" colspan="1" /> + <tooltip>For radio button or check box</tooltip> + </attr> + + <attr name="value" type="input"> + <text>value</text> + <textlocation col="2" row="1" colspan="1" /> + <location col="3" row="1" colspan="1" /> + </attr> + + <attr name="size" type="input"> + <text>size</text> + <textlocation col="0" row="2" colspan="1" /> + <location col="1" row="2" colspan="1" /> + <tooltip>No of characters for text input</tooltip> + </attr> + + <attr name="maxlength" type="input"> + <text>maxlength</text> + <textlocation col="2" row="2" colspan="1" /> + <location col="3" row="2" colspan="1" /> + <tooltip>Max characters allowed</tooltip> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="3" colspan="1" /> + <location col="1" row="3" colspan="3" /> + <tooltip>Alternate text for image</tooltip> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="4" colspan="1" /> + <location col="1" row="4" colspan="3" /> + <tooltip>URL for image to use</tooltip> + </attr> + + <attr name="accept" type="list"> + <text>accept</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3"/> + <items> + <item>application/x-www-form-urlencoded</item> + <item>multipart/form-data</item> + </items> + </attr> + + <attr name="readonly" type="check"> + <text>readonly</text> + <location col="3" row="5" colspan="1" /> + </attr> + + <attr name="usemap" type="input"> + <text>use</text> + <textlocation col="0" row="3" colspan="1" /> + <location col="1" row="3" colspan="3" /> + </attr> + + <attr name="onselect" type="input"> + <text>onselect</text> + <textlocation col="0" row="3" colspan="1" /> + <location col="1" row="3" colspan="3" /> + </attr> + + <attr name="onchange" type="input"> + <text>onchange</text> + <textlocation col="0" row="3" colspan="1" /> + <location col="1" row="3" colspan="3" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/ins.tag b/quanta/data/dtep/html5/ins.tag new file mode 100644 index 00000000..486d4169 --- /dev/null +++ b/quanta/data/dtep/html5/ins.tag @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="ins" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="cite" type="url"> + <text>cite</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="datetime" type="input"> + <text>datetime</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/kbd.tag b/quanta/data/dtep/html5/kbd.tag new file mode 100644 index 00000000..92075861 --- /dev/null +++ b/quanta/data/dtep/html5/kbd.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="kbd" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/label.tag b/quanta/data/dtep/html5/label.tag new file mode 100644 index 00000000..7e7f0bf1 --- /dev/null +++ b/quanta/data/dtep/html5/label.tag @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="label" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="accesskey" type="input"> + <text>accesskey</text> + <textlocation col="2" row="0" colspan="1" /> + <location col="3" row="0" colspan="1" /> + <tooltip>Shortcut</tooltip> + </attr> + + <attr name="for" type="input"> + <text>for</text> + <textlocation col="2" row="1" colspan="1" /> + <location col="3" row="1" colspan="1" /> + </attr> + <attr name="onfocus" type="input"> + <text>onfocus</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" /> + </attr> + + <attr name="onblur" type="input"> + <text>onblur</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/legend.tag b/quanta/data/dtep/html5/legend.tag new file mode 100644 index 00000000..aaa7ab25 --- /dev/null +++ b/quanta/data/dtep/html5/legend.tag @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="legend" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="accesskey" type="input"> + <text>accesskey</text> + <textlocation col="2" row="0" colspan="1" /> + <location col="3" row="0" colspan="1" /> + <tooltip>Shortcut</tooltip> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/li.tag b/quanta/data/dtep/html5/li.tag new file mode 100644 index 00000000..3b8149aa --- /dev/null +++ b/quanta/data/dtep/html5/li.tag @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="li" hasCore="1" hasI18n="1" hasScript="1"> + + <stoppingtags> + <stoppingtag name="li" /> + </stoppingtags> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/link.tag b/quanta/data/dtep/html5/link.tag new file mode 100644 index 00000000..367ee800 --- /dev/null +++ b/quanta/data/dtep/html5/link.tag @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="link" hasCore="1" hasI18n="1" hasScript="1" single="1"> + <attr name="rel" type="input"> + <text>rel</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="rev" type="input"> + <text>rev</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="href" type="url"> + <text>href</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + <items> + <item>text/html</item> + <item>image/jpeg</item> + <item>image/gif</item> + <item>image/png</item> + <item>model/vrml</item> + <item>video/quicktime</item> + <item>application/java</item> + <item>text/css</item> + <item>text/javascript</item> + </items> + </attr> + + <attr name="media" type="list"> + <text>media</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="2" /> + <items> + <item>screen</item> + <item>tty</item> + <item>tv</item> + <item>projection</item> + <item>handheld</item> + <item>print</item> + <item>braille</item> + <item>aural</item> + <item>all</item> + </items> + </attr> + + <attr name="hreflang" type="input"> + <text>hreflang</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="2" /> + </attr> + + <attr name="charset" type="input"> + <text>charset</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="2" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/main.tag b/quanta/data/dtep/html5/main.tag new file mode 100644 index 00000000..f5105db0 --- /dev/null +++ b/quanta/data/dtep/html5/main.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="main" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/map.tag b/quanta/data/dtep/html5/map.tag new file mode 100644 index 00000000..e13496b4 --- /dev/null +++ b/quanta/data/dtep/html5/map.tag @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="map" hasCore="1" hasI18n="1" hasScript="1"> + +<children> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="area" /> +<child name="blockquote" /> +<child name="del" /> +<child name="div" /> +<child name="dl" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="ins" /> +<child name="noscript" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="script" /> +<child name="table" /> +<child name="ul" /> +<child name="dir" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/mark.tag b/quanta/data/dtep/html5/mark.tag new file mode 100644 index 00000000..50e592eb --- /dev/null +++ b/quanta/data/dtep/html5/mark.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="mark" hasCore="1" hasI18n="1" hasScript="1" scope="word"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/meta.tag b/quanta/data/dtep/html5/meta.tag new file mode 100644 index 00000000..794eb693 --- /dev/null +++ b/quanta/data/dtep/html5/meta.tag @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="meta" hasI18n="1" single="1"> + + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="http-equiv" type="input"> + <text>http-equiv</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="content" type="input"> + <text>content</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="scheme" type="input"> + <text>scheme</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/nav.tag b/quanta/data/dtep/html5/nav.tag new file mode 100644 index 00000000..151e0bf8 --- /dev/null +++ b/quanta/data/dtep/html5/nav.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="nav" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/noscript.tag b/quanta/data/dtep/html5/noscript.tag new file mode 100644 index 00000000..32533805 --- /dev/null +++ b/quanta/data/dtep/html5/noscript.tag @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="noscript" hasCore="1" hasI18n="1" hasScript="1"> + +<children> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="blockquote" /> +<child name="del" /> +<child name="di" /> +<child name="dl" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="ins" /> +<child name="noscript" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="script" /> +<child name="table" /> +<child name="ul" /> +<child name="dir" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/object.tag b/quanta/data/dtep/html5/object.tag new file mode 100644 index 00000000..2550a7d3 --- /dev/null +++ b/quanta/data/dtep/html5/object.tag @@ -0,0 +1,202 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="object" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="archive" type="input"> + <text>archive</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="classid" type="input"> + <text>classid</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="codebase" type="input"> + <text>codebase</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="codetype" type="list"> + <text>codetype</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + <items> + <item>image/jpeg</item> + <item>image/gif</item> + <item>image/png</item> + <item>model/vrml</item> + <item>video/quicktime</item> + <item>application/java</item> + <item>audio/basic</item> + <item>text/html</item> + <item>text/css</item> + </items> + </attr> + + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="2" /> + <items> + <item>image/jpeg</item> + <item>image/gif</item> + <item>image/png</item> + <item>model/vrml</item> + <item>video/quicktime</item> + <item>application/java</item> + <item>audio/basic</item> + <item>text/html</item> + <item>text/css</item> + </items> + </attr> + + <attr name="data" type="url"> + <text>data</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="7" /> + <location col="1" row="7" colspan="2" /> + </attr> + + <attr name="tabindex" type="input"> + <text>tabindex</text> + <textlocation col="0" row="8" /> + <location col="1" row="8" colspan="1" /> + </attr> + + <attr name="standby" type="input"> + <text>standby</text> + <textlocation col="2" row="9" /> + <location col="3" row="9" colspan="1" /> + </attr> + + <attr name="declare" type="check"> + <text>declare</text> + <textlocation col="2" row="10" /> + <location col="3" row="10" colspan="1" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="2" row="11" /> + <location col="3" row="11" colspan="1" /> + </attr> + + <attr name="align" type="input"> + <text>align</text> + <textlocation col="2" row="12" /> + <location col="3" row="12" colspan="1" /> + </attr> + + <attr name="border" type="input"> + <text>border</text> + <textlocation col="2" row="13" /> + <location col="3" row="13" colspan="1" /> + </attr> + + <attr name="hspace" type="input"> + <text>hspace</text> + <textlocation col="2" row="14" /> + <location col="3" row="14" colspan="1" /> + </attr> + + <attr name="vspace" type="input"> + <text>vspace</text> + <textlocation col="2" row="15" /> + <location col="3" row="15" colspan="1" /> + </attr> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="di" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="param" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/ol.tag b/quanta/data/dtep/html5/ol.tag new file mode 100644 index 00000000..afd6bcc2 --- /dev/null +++ b/quanta/data/dtep/html5/ol.tag @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="ol" hasCore="1" hasI18n="1" hasScript="1"> + +<children> +<child name="li" usage="required" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/optgroup.tag b/quanta/data/dtep/html5/optgroup.tag new file mode 100644 index 00000000..82452057 --- /dev/null +++ b/quanta/data/dtep/html5/optgroup.tag @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="optgroup" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="disabled" type="check"> + <text>disabled</text> + <location col="2" row="0" colspan="1" /> + <tooltip>Disable the element</tooltip> + </attr> + + <attr name="label" type="input"> + <text>label</text> + <textlocation col="0" row="1" colspan="1" /> + <location col="1" row="1" colspan="1" /> + </attr> + +<children> +<child name="option" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/option.tag b/quanta/data/dtep/html5/option.tag new file mode 100644 index 00000000..ea08093f --- /dev/null +++ b/quanta/data/dtep/html5/option.tag @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="option" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="value" type="input"> + <text>value</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" /> + </attr> + + <attr name="selected" type="list"> + <text>Selected</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" /> + <items> + <item>selected</item> + </items> + </attr> + + <attr name="disabled" type="list"> + <text>Disabled</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" /> + <items> + <item>disabled</item> + </items> + </attr> + + <attr name="label" type="input"> + <text>label</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" /> + </attr> + + <stoppingtags> + <stoppingtag name="option" /> + </stoppingtags> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/p.tag b/quanta/data/dtep/html5/p.tag new file mode 100644 index 00000000..21bcfe71 --- /dev/null +++ b/quanta/data/dtep/html5/p.tag @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="p" hasCore="1" hasI18n="1" hasScript="1"> + + <stoppingtags> + <stoppingtag name="p" /> + <stoppingtag name="li" /> + <stoppingtag name="td" /> + <stoppingtag name="tr" /> + <stoppingtag name="th" /> + <stoppingtag name="dt" /> + <stoppingtag name="dd" /> + </stoppingtags> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/param.tag b/quanta/data/dtep/html5/param.tag new file mode 100644 index 00000000..4211b9c2 --- /dev/null +++ b/quanta/data/dtep/html5/param.tag @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="param" single="1"> + + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + <items> + <item>image/jpeg</item> + <item>image/gif</item> + <item>image/png</item> + <item>model/vrml</item> + <item>video/quicktime</item> + <item>application/java</item> + <item>audio/basic</item> + <item>text/html</item> + <item>text/css</item> + </items> + </attr> + + <attr name="value" type="input"> + <text>value</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="1" /> + </attr> + + <attr name="valuetype" type="list"> + <text>valuetype</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + <items> + <item>data</item> + <item>ref</item> + <item>object</item> + </items> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/picture.tag b/quanta/data/dtep/html5/picture.tag new file mode 100644 index 00000000..86591f24 --- /dev/null +++ b/quanta/data/dtep/html5/picture.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="picture" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/pre.tag b/quanta/data/dtep/html5/pre.tag new file mode 100644 index 00000000..89855428 --- /dev/null +++ b/quanta/data/dtep/html5/pre.tag @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="pre" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="xml:space" type="list"> + <text>xml:space</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + <items> + <item>preserve</item> + </items> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="span" /> +<child name="strong" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/q.tag b/quanta/data/dtep/html5/q.tag new file mode 100644 index 00000000..99f030a1 --- /dev/null +++ b/quanta/data/dtep/html5/q.tag @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="q" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="cite" type="input"> + <text>cite</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/rb.tag b/quanta/data/dtep/html5/rb.tag new file mode 100644 index 00000000..6c465cd9 --- /dev/null +++ b/quanta/data/dtep/html5/rb.tag @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="rb" hasCore="1" hasI18n="1" hasScript="1"> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/rbc.tag b/quanta/data/dtep/html5/rbc.tag new file mode 100644 index 00000000..fbd5b7ec --- /dev/null +++ b/quanta/data/dtep/html5/rbc.tag @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="rbc" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="rb" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/rp.tag b/quanta/data/dtep/html5/rp.tag new file mode 100644 index 00000000..36df8a3a --- /dev/null +++ b/quanta/data/dtep/html5/rp.tag @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="rp" hasCore="1" hasI18n="1" hasScript="1"> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/rt.tag b/quanta/data/dtep/html5/rt.tag new file mode 100644 index 00000000..da0098ed --- /dev/null +++ b/quanta/data/dtep/html5/rt.tag @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="rt" hasCore="1" hasI18n="1" hasScript="1"> + +<attr name="rbspan" type="input" /> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/rtc.tag b/quanta/data/dtep/html5/rtc.tag new file mode 100644 index 00000000..97c21176 --- /dev/null +++ b/quanta/data/dtep/html5/rtc.tag @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="rtc" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="rt" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/ruby.tag b/quanta/data/dtep/html5/ruby.tag new file mode 100644 index 00000000..d133114f --- /dev/null +++ b/quanta/data/dtep/html5/ruby.tag @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="ruby" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="rb" /> +<child name="rt" /> +<child name="rp" /> +<child name="rtc" /> +<child name="rbc" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/samp.tag b/quanta/data/dtep/html5/samp.tag new file mode 100644 index 00000000..6e5b3662 --- /dev/null +++ b/quanta/data/dtep/html5/samp.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="samp" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/script.tag b/quanta/data/dtep/html5/script.tag new file mode 100644 index 00000000..2dccc895 --- /dev/null +++ b/quanta/data/dtep/html5/script.tag @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="script"> + + <attr name="type" type="list"> + <text>Type</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + <items> + <item>text/html</item> + <item>text/css</item> + <item>text/php</item> + <item>text/javascript</item> + <item>application/x-javascript</item> + </items> + </attr> + + <attr name="src" type="url"> + <text>Source</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="charset" type="input"> + <text>Charset</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="defer" type="check"> + <text>Defer (script execution may wait)</text> + <location col="0" row="3" colspan="2" /> + </attr> + + <attr name="xml:space" type="list"> + <text>xml:space</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="2" /> + <items> + <item>preserve</item> + </items> + </attr> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/section.tag b/quanta/data/dtep/html5/section.tag new file mode 100644 index 00000000..1d13fcc6 --- /dev/null +++ b/quanta/data/dtep/html5/section.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="section" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/select.tag b/quanta/data/dtep/html5/select.tag new file mode 100644 index 00000000..c3143fc2 --- /dev/null +++ b/quanta/data/dtep/html5/select.tag @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="select" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="multiple" type="check"> + <text>multiple</text> + <location col="1" row="0" /> + </attr> + + <attr name="disabled" type="check"> + <text>disabled</text> + <location col="1" row="1" /> + </attr> + + <attr name="tabindex" type="input"> + <text>tabindex</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" /> + </attr> + + <attr name="size" type="input"> + <text>size</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" /> + </attr> + + <attr name="onfocus" type="input"> + <text>onfocus</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" /> + </attr> + + <attr name="onblur" type="input"> + <text>onblur</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" /> + </attr> + + <attr name="onchange" type="input"> + <text>onchange</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" /> + </attr> + + <stoppingtags> + <stoppingtag name="select" /> + </stoppingtags> + +<children> +<child name="optgroup" /> +<child name="option" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/small.tag b/quanta/data/dtep/html5/small.tag new file mode 100644 index 00000000..92871b73 --- /dev/null +++ b/quanta/data/dtep/html5/small.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="small" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/source.tag b/quanta/data/dtep/html5/source.tag new file mode 100644 index 00000000..306db28b --- /dev/null +++ b/quanta/data/dtep/html5/source.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="source" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/span.tag b/quanta/data/dtep/html5/span.tag new file mode 100644 index 00000000..73b4e932 --- /dev/null +++ b/quanta/data/dtep/html5/span.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="span" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/strong.tag b/quanta/data/dtep/html5/strong.tag new file mode 100644 index 00000000..33ecd419 --- /dev/null +++ b/quanta/data/dtep/html5/strong.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="strong" hasCore="1" hasI18n="1" hasScript="1" scope="word"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/style.tag b/quanta/data/dtep/html5/style.tag new file mode 100644 index 00000000..d3c16a0e --- /dev/null +++ b/quanta/data/dtep/html5/style.tag @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="style" hasI18n="1"> + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + <attr name="type" type="list"> + <text>type</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + <items> + <item>text/css</item> + </items> + </attr> + + <attr name="media" type="list"> + <text>media</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + <items> + <item>screen</item> + <item>tty</item> + <item>tv</item> + <item>projection</item> + <item>handheld</item> + <item>print</item> + <item>braille</item> + <item>aural</item> + <item>all</item> + </items> + </attr> + + <attr name="title" type="input"> + <text>title</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="xml:space" type="list"> + <text>xml:space</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="2" /> + <items> + <item>preserve</item> + </items> + </attr> + + <attr name="defer" type="check"> + <text>defer</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="2" /> + </attr> + <children> + <child name="#text" /> + </children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/sub.tag b/quanta/data/dtep/html5/sub.tag new file mode 100644 index 00000000..33e41e0c --- /dev/null +++ b/quanta/data/dtep/html5/sub.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="sub" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/sup.tag b/quanta/data/dtep/html5/sup.tag new file mode 100644 index 00000000..441688dd --- /dev/null +++ b/quanta/data/dtep/html5/sup.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="sup" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/svg.tag b/quanta/data/dtep/html5/svg.tag new file mode 100644 index 00000000..b08e5913 --- /dev/null +++ b/quanta/data/dtep/html5/svg.tag @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="svg" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="shape" type="list"> + <text>shape</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2"/> + <items> + <item>rect</item> + <item>circle</item> + <item>poly</item> + <item>default</item> + </items> + </attr> + + <attr name="coords" type="text"> + <text>coords</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2"/> + </attr> + + <attr name="href" type="url"> + <text>href</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2"/> + </attr> + + <attr name="accesskey" type="input"> + <text>accesskey</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="1" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="2"/> + </attr> + + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/table.tag b/quanta/data/dtep/html5/table.tag new file mode 100644 index 00000000..97d9b2be --- /dev/null +++ b/quanta/data/dtep/html5/table.tag @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="table" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="0" /> + <tooltip>Use % for percent or it will set pixels</tooltip> + <location col="1" row="0" /> + </attr> + + <attr name="cellspacing" type="input"> + <text>cellspacing</text> + <textlocation col="2" row="0" /> + <location col="3" row="0" /> + </attr> + + <attr name="border" type="input"> + <text>border</text> + <textlocation col="0" row="1" /> + <tooltip>Set in pixels</tooltip> + <location col="1" row="1" /> + </attr> + + <attr name="cellpadding" type="input"> + <text>cellpadding</text> + <textlocation col="2" row="1" /> + <location col="3" row="1" /> + </attr> + + <attr name="frame" type="list"> + <text>frame</text> + <textlocation col="0" row="2" /> + <items> + <item>above</item> + <item>below</item> + <item>border</item> + <item>box</item> + <item>hsides</item> + <item>lhs</item> + <item>rhs</item> + <item>void</item> + <item>vsides</item> + </items> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="rules" type="list"> + <text>rules</text> + <textlocation col="0" row="3" /> + <items> + <item>none</item> + <item>groups</item> + <item>rows</item> + <item>cols</item> + <item>all</item> + </items> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="summary" type="input"> + <text>summary</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="2"/> + </attr> + +<children> +<child name="caption" /> +<child name="col" /> +<child name="colgroup" /> +<child name="thead" /> +<child name="tfoot" /> +<child name="tbody" /> +<child name="tr" usage="required" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/tbody.tag b/quanta/data/dtep/html5/tbody.tag new file mode 100644 index 00000000..a59a4a5b --- /dev/null +++ b/quanta/data/dtep/html5/tbody.tag @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="tbody" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="0" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="1" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="1" colspan="1" /> + </attr> + + <attr name="char" type="input" /> + <attr name="charoff" type="input" /> + +<children> +<child name="tr" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/td.tag b/quanta/data/dtep/html5/td.tag new file mode 100644 index 00000000..67a3efd6 --- /dev/null +++ b/quanta/data/dtep/html5/td.tag @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="td" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="0" /> + <tooltip>use % for percent or it will set pixels</tooltip> + <location col="1" row="0" /> + </attr> + + <attr name="colspan" type="input"> + <text>colspan</text> + <textlocation col="2" row="0" /> + <location col="3" row="0" /> + </attr> + + <attr name="rowspan" type="input"> + <text>rowspan</text> + <textlocation col="2" row="1" /> + <location col="3" row="1" /> + </attr> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="2" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="2" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="2" row="2" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="3" row="2" colspan="1" /> + </attr> + + <attr name="headers" type="input" /> + + <attr name="abbr" type="input" /> + + <attr name="scope" type="list"> + <items> + <item>row</item> + <item>col</item> + <item>rowgroup</item> + <item>colgroup</item> + </items> + </attr> + + <attr name="axis" type="input" /> + + <attr name="char" type="input" /> + + <attr name="charoff" type="input" /> + + <stoppingtags> + <stoppingtag name="td" /> + <stoppingtag name="tr" /> + <stoppingtag name="th" /> + </stoppingtags> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/textarea.tag b/quanta/data/dtep/html5/textarea.tag new file mode 100644 index 00000000..5ede1af6 --- /dev/null +++ b/quanta/data/dtep/html5/textarea.tag @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="textarea" hasFocus="1" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="cols" type="input"> + <text>cols</text> + <textlocation col="0" row="0" colspan="1" /> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="rows" type="input"> + <text>rows</text> + <textlocation col="2" row="1" colspan="1" /> + <location col="3" row="1" colspan="1" /> + </attr> + + <attr name="disabled" type="check"> + <text>disabled</text> + <location col="0" row="2" colspan="2" /> + </attr> + + <attr name="readonly" type="check"> + <text>readonly</text> + <location col="0" row="3" colspan="2" /> + </attr> + + <attr name="onselect" type="input"> + <text>onselect</text> + <textlocation col="2" row="4" colspan="1" /> + <location col="3" row="4" colspan="1" /> + </attr> + + <attr name="onchange" type="input"> + <text>onchange</text> + <textlocation col="2" row="5" colspan="1" /> + <location col="3" row="5" colspan="1" /> + </attr> + <children> + <child name="#text" /> + </children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/tfoot.tag b/quanta/data/dtep/html5/tfoot.tag new file mode 100644 index 00000000..7ddd2033 --- /dev/null +++ b/quanta/data/dtep/html5/tfoot.tag @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="tfoot" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="0" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="1" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="1" colspan="1" /> + </attr> + + <attr name="char" type="input" /> + <attr name="charoff" type="input" /> + +<children> +<child name="tr" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/th.tag b/quanta/data/dtep/html5/th.tag new file mode 100644 index 00000000..a0e8acac --- /dev/null +++ b/quanta/data/dtep/html5/th.tag @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="th" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="0" /> + <tooltip>use % for percent or it will set pixels</tooltip> + <location col="1" row="0" /> + </attr> + + <attr name="colspan" type="input"> + <text>colspan</text> + <textlocation col="2" row="0" /> + <location col="3" row="0" /> + </attr> + + <attr name="rowspan" type="input"> + <text>rowspan</text> + <textlocation col="2" row="1" /> + <location col="3" row="1" /> + </attr> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="2" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="2" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="2" row="2" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="3" row="2" colspan="1" /> + </attr> + + <attr name="headers" type="input" /> + + <attr name="abbr" type="input" /> + + <attr name="scope" type="list"> + <items> + <item>row</item> + <item>col</item> + <item>rowgroup</item> + <item>colgroup</item> + </items> + </attr> + + <attr name="axis" type="input" /> + + <attr name="char" type="input" /> + + <attr name="charoff" type="input" /> + + <stoppingtags> + <stoppingtag name="td" /> + <stoppingtag name="tr" /> + <stoppingtag name="th" /> + </stoppingtags> + +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/thead.tag b/quanta/data/dtep/html5/thead.tag new file mode 100644 index 00000000..b77c577a --- /dev/null +++ b/quanta/data/dtep/html5/thead.tag @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="thead" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="0" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="1" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="1" colspan="1" /> + </attr> + + <attr name="char" type="input" /> + <attr name="charoff" type="input" /> + +<children> +<child name="tr" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/time.tag b/quanta/data/dtep/html5/time.tag new file mode 100644 index 00000000..aa214373 --- /dev/null +++ b/quanta/data/dtep/html5/time.tag @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="del" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="datetime" type="input"> + <text>datetime</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="address" /> +<child name="article" /> +<child name="aside" /> +<child name="center" /> +<child name="details" /> +<child name="figcaption" /> +<child name="figure" /> +<child name="footer" /> +<child name="header" /> +<child name="main" /> +<child name="nav" /> +<child name="picture" /> +<child name="section" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="blockquote" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="div" /> +<child name="dl" /> +<child name="em" /> +<child name="fieldset" /> +<child name="form" /> +<child name="h1" /> +<child name="h2" /> +<child name="h3" /> +<child name="h4" /> +<child name="h5" /> +<child name="h6" /> +<child name="hr" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="noscript" /> +<child name="object" /> +<child name="ol" /> +<child name="p" /> +<child name="pre" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="table" /> +<child name="textarea" /> +<child name="tt" /> +<child name="ul" /> +<child name="dir" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/title.tag b/quanta/data/dtep/html5/title.tag new file mode 100644 index 00000000..4c9f61b7 --- /dev/null +++ b/quanta/data/dtep/html5/title.tag @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="title" hasI18n="1"> + <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > + <text>id</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> +</attr> +<children> + <child name="#text" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/tr.tag b/quanta/data/dtep/html5/tr.tag new file mode 100644 index 00000000..990b7415 --- /dev/null +++ b/quanta/data/dtep/html5/tr.tag @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="tr" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="align" type="list"> + <text>align</text> + <textlocation col="0" row="0" /> + <items> + <item>left</item> + <item>center</item> + <item>right</item> + <item>justify</item> + <item>char</item> + </items> + <location col="1" row="0" colspan="1" /> + </attr> + + <attr name="valign" type="list"> + <text>valign</text> + <textlocation col="0" row="1" /> + <items> + <item>baseline</item> + <item>bottom</item> + <item>middle</item> + <item>top</item> + </items> + <location col="1" row="1" colspan="1" /> + </attr> + + <attr name="char" type="input" /> + <attr name="charoff" type="input" /> + + <stoppingtags> + <stoppingtag name="tr" /> + <stoppingtag name="tfoot" /> + </stoppingtags> + +<children> +<child name="th" /> +<child name="td" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/track.tag b/quanta/data/dtep/html5/track.tag new file mode 100644 index 00000000..6cd3561a --- /dev/null +++ b/quanta/data/dtep/html5/track.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="track" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/tt.tag b/quanta/data/dtep/html5/tt.tag new file mode 100644 index 00000000..78bba25d --- /dev/null +++ b/quanta/data/dtep/html5/tt.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="tt" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/u.tag b/quanta/data/dtep/html5/u.tag new file mode 100644 index 00000000..56f60724 --- /dev/null +++ b/quanta/data/dtep/html5/u.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="u" hasCore="1" hasI18n="1" hasScript="1" scope="word"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/ul.tag b/quanta/data/dtep/html5/ul.tag new file mode 100644 index 00000000..2f9fd1be --- /dev/null +++ b/quanta/data/dtep/html5/ul.tag @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="ul" hasCore="1" hasI18n="1" hasScript="1"> + +<children> +<child name="li" usage="required" /> +</children> + +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/var.tag b/quanta/data/dtep/html5/var.tag new file mode 100644 index 00000000..10503a11 --- /dev/null +++ b/quanta/data/dtep/html5/var.tag @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="var" hasCore="1" hasI18n="1" hasScript="1"> +<children> +<child name="#text" /> +<child name="a" /> +<child name="abbr" /> +<child name="acronym" /> +<child name="b" /> +<child name="bdi" /> +<child name="bdo" /> +<child name="big" /> +<child name="br" /> +<child name="wbr" /> +<child name="button" /> +<child name="cite" /> +<child name="code" /> +<child name="del" /> +<child name="dfn" /> +<child name="em" /> +<child name="i" /> +<child name="mark" /> +<child name="u" /> +<child name="data" /> +<child name="time" /> +<child name="img" /> +<child name="audio" /> +<child name="embed" /> +<child name="source" /> +<child name="track" /> +<child name="video" /> +<child name="svg" /> +<child name="input" /> +<child name="ins" /> +<child name="kbd" /> +<child name="label" /> +<child name="map" /> +<child name="object" /> +<child name="q" /> +<child name="samp" /> +<child name="script" /> +<child name="select" /> +<child name="small" /> +<child name="span" /> +<child name="strong" /> +<child name="sub" /> +<child name="sup" /> +<child name="textarea" /> +<child name="tt" /> +<child name="var" /> +</children> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/video.tag b/quanta/data/dtep/html5/video.tag new file mode 100644 index 00000000..fc212862 --- /dev/null +++ b/quanta/data/dtep/html5/video.tag @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="video" hasCore="1" hasI18n="1" hasScript="1"> + + <attr name="longdesc" type="url"> + <text>longdesc</text> + <textlocation col="0" row="0" /> + <location col="1" row="0" colspan="2" /> + </attr> + + <attr name="src" type="url"> + <text>src</text> + <textlocation col="0" row="1" /> + <location col="1" row="1" colspan="2" /> + </attr> + + <attr name="height" type="input"> + <text>height</text> + <textlocation col="0" row="2" /> + <location col="1" row="2" colspan="2" /> + </attr> + + <attr name="width" type="input"> + <text>width</text> + <textlocation col="0" row="3" /> + <location col="1" row="3" colspan="2" /> + </attr> + + <attr name="alt" type="input"> + <text>alt</text> + <textlocation col="0" row="4" /> + <location col="1" row="4" colspan="3" /> + </attr> + + <attr name="usemap" type="input"> + <text>usemap</text> + <textlocation col="0" row="5" /> + <location col="1" row="5" colspan="3" /> + </attr> + + <attr name="ismap" type="check"> + <text>ismap</text> + <textlocation col="0" row="6" /> + <location col="1" row="6" colspan="3" /> + </attr> +</tag> +</TAGS> diff --git a/quanta/data/dtep/html5/wbr.tag b/quanta/data/dtep/html5/wbr.tag new file mode 100644 index 00000000..529cf947 --- /dev/null +++ b/quanta/data/dtep/html5/wbr.tag @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE TAGS> +<TAGS> +<tag name="wbr" hasCore="1" single="1" /> +</TAGS> diff --git a/quanta/data/dtep/wml-1-2/common.tag b/quanta/data/dtep/wml-1-2/common.tag index 7be9453e..c59bda3c 100644 --- a/quanta/data/dtep/wml-1-2/common.tag +++ b/quanta/data/dtep/wml-1-2/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> </tag> diff --git a/quanta/data/dtep/xhtml-basic/common.tag b/quanta/data/dtep/xhtml-basic/common.tag index 25baba50..b8418b20 100644 --- a/quanta/data/dtep/xhtml-basic/common.tag +++ b/quanta/data/dtep/xhtml-basic/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="title" type="input"> </attr> diff --git a/quanta/data/dtep/xhtml-frameset/common.tag b/quanta/data/dtep/xhtml-frameset/common.tag index 72c0d679..e0148338 100644 --- a/quanta/data/dtep/xhtml-frameset/common.tag +++ b/quanta/data/dtep/xhtml-frameset/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/xhtml-strict/common.tag b/quanta/data/dtep/xhtml-strict/common.tag index e52f08ea..cb7e6e30 100644 --- a/quanta/data/dtep/xhtml-strict/common.tag +++ b/quanta/data/dtep/xhtml-strict/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/xhtml/common.tag b/quanta/data/dtep/xhtml/common.tag index 1fd94db2..c8f53e0b 100644 --- a/quanta/data/dtep/xhtml/common.tag +++ b/quanta/data/dtep/xhtml/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/dtep/xhtml11/common.tag b/quanta/data/dtep/xhtml11/common.tag index 0ff1796a..a380f05b 100644 --- a/quanta/data/dtep/xhtml11/common.tag +++ b/quanta/data/dtep/xhtml11/common.tag @@ -4,7 +4,7 @@ <tag name="Core" common="yes"> <attr name="id" type="list" source="dcop" interface="QuantaIf" method="idSelectors()" arguments="" > </attr> - <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(QString)" arguments="%tagname%" > + <attr name="class" type="list" source="dcop" interface="QuantaIf" method="selectors(TQString)" arguments="%tagname%" > </attr> <attr name="style" type="css-style"> </attr> diff --git a/quanta/data/icons/22x22/CMakeLists.txt b/quanta/data/icons/22x22/CMakeLists.txt index 896d99a1..18584447 100644 --- a/quanta/data/icons/22x22/CMakeLists.txt +++ b/quanta/data/icons/22x22/CMakeLists.txt @@ -10,61 +10,92 @@ ################################################# install( FILES - ball.png check_clear.png check_grey.png - check.png css.png date.png debug_leap.png - debug_run.png debug_skip.png debug_stepinto.png - debug_stepout.png debug_stepover.png - div_center.png div_justify.png div_left.png - div_right.png font_dec.png font_inc.png form.png - frame.png ftab.png ftpclient.png lineedit.png + ball.png button.png check_clear.png + check_grey.png check.png css.png + date.png debug_leap.png debug_run.png + debug_skip.png debug_stepinto.png debug_stepout.png + debug_stepover.png div_center.png div_justify.png + div_left.png div_right.png font_dec.png + font_inc.png form.png frame.png + ftab.png ftpclient.png html5_abbr.png + html5_address.png html5_a.png html5_area.png + html5_article.png html5_aside.png html5_audio.png + html5_base.png html5_bdi.png html5_bdo.png + html5_big.png html5_blockquote.png html5_body.png + html5_b.png html5_br.png html5_caption.png + html5_center.png html5_cite.png html5_code.png + html5_colgroup.png html5_col.png html5_com.png + html5_data.png html5_dd.png html5_del.png + html5_details.png html5_dir.png html5_div.png + html5_dl.png html5_dt.png html5_DT.png + html5_embed.png html5_figcaption.png html5_figure.png + html5_font.png html5_footer.png html5_h1.png + html5_h2.png html5_h3.png html5_h4.png + html5_h5.png html5_h6.png html5_header.png + html5_head.png html5_hr.png html5_html.png + html5_img.png html5_ins.png html5_i.png + html5_kbd.png html5_link.png html5_li.png + html5_main.png html5_map.png html5_mark.png + html5_meta.png html5_nav.png html5_noscript.png + html5_object.png html5_ol.png html5_picture.png + html5_p.png html5_pre.png html5_q.png + html5_rp.png html5_rt.png html5_ruby.png + html5_samp.png html5_script.png html5_section.png + html5_small.png html5_source.png html5_span.png + html5_strong.png html5_style.png html5_sub.png + html5_sup.png html5_svg.png html5_table.png + html5_tbody.png html5_td.png html5_tfoot.png + html5_thead.png html5_th.png html5_time.png + html5_title.png html5_track.png html5_tr.png + html5_ul.png html5_u.png html5_var.png + html5_video.png html5_wbr.png lineedit.png linepas.png output_win.png preview.png ptab.png quick_list.png quick-screenshot.png quick_start.png quick_table.png radio.png - replace.png reset.png select.png submit.png - button.png table_data.png table_head.png - tag_access.png tag_all.png tag_anyAttribute.png - tag_any.png tag_a.png tag_appInfo.png - tag_attributeGroup.png tag_attribute.png + replace.png reset.png select.png + submit.png table_data.png table_head.png + tag_access.png tag_all.png tag_amp.png + tag_anyAttribute.png tag_any.png tag_a.png + tag_appInfo.png tag_attributeGroup.png tag_attribute.png tag_attr.png tag_a_url.png tag_bold.png tag_br.png tag_caption.png tag_card.png - tag_chapter.png tag_choice.png tag_comm.png - tag_complexContent.png tag_complexType.png + tag_cdata.png tag_chapter.png tag_choice.png + tag_comm.png tag_complexContent.png tag_complexType.png tag_dd.png tag_dl.png tag_documenation.png - tag_do.png tag_dt.png tag_element.png tag_em.png - tag_example.png tag_extension.png tag_field.png - tag_font_base.png tag_font.png tag_footnote.png - tag_footnoteref.png tag_fractionDigits.png + tag_do.png tag_dt.png tag_element.png + tag_em.png tag_example.png tag_extension.png + tag_field.png tag_font_base.png tag_font.png + tag_footnote.png tag_footnoteref.png tag_fractionDigits.png tag_go.png tag_group.png tag_guimenuitem.png tag_guimenu.png tag_guisubmenu.png tag_h1.png - tag_h2.png tag_h3.png tag_h4.png tag_h5.png - tag_head.png tag_hr.png tag_imagedata.png - tag_image.png tag_import.png tag_include.png - tag_informalexample.png tag_inlinemediaobject.png + tag_h2.png tag_h3.png tag_h4.png + tag_h5.png tag_head.png tag_hr.png + tag_imagedata.png tag_image.png tag_import.png + tag_include.png tag_informalexample.png tag_inlinemediaobject.png tag_i.png tag_keycap.png tag_keycombo.png tag_key.png tag_keyref.png tag_label.png tag_link.png tag_li.png tag_listitem.png tag_list.png tag_loc.png tag_mail.png - tag_member.png tag_menuchoice.png - tag_menu.png tag_meta.png tag_misc.png - tag_nbsp.png tag_noop.png tag_notation.png - tag_ol.png tag_onevent.png tag_para.png - tag_postfield.png tag_p.png tag_pre.png - tag_procedure.png tag_redefine.png - tag_restriction.png tag_schema.png - tag_screenshotinfo.png tag_screenshot.png - tag_sect1.png tag_sect2.png tag_sect3.png - tag_sect4.png tag_sect5.png tag_selector.png - tag_sequence.png tag_setvar.png tag_shortcut.png - tag_simpleContent.png tag_simpleType.png - tag_step.png tag_sub.png tag_substeps.png - tag_sup.png tag_table_body.png tag_table.png - tag_table_row.png tag_tag.png tag_tbody.png - tag_td.png tag_term.png tag_tgroup.png tag_th.png - tag_title.png tag_tr.png tag_ulink.png tag_ul.png + tag_member.png tag_menuchoice.png tag_menu.png + tag_meta.png tag_misc.png tag_nbsp.png + tag_noop.png tag_notation.png tag_ol.png + tag_onevent.png tag_para.png tag_postfield.png + tag_p.png tag_pre.png tag_procedure.png + tag_redefine.png tag_restriction.png tag_schema.png + tag_screenshotinfo.png tag_screenshot.png tag_sect1.png + tag_sect2.png tag_sect3.png tag_sect4.png + tag_sect5.png tag_selector.png tag_sequence.png + tag_setvar.png tag_shortcut.png tag_simpleContent.png + tag_simpleType.png tag_step.png tag_sub.png + tag_substeps.png tag_sup.png tag_table_body.png + tag_table.png tag_table_row.png tag_tag.png + tag_tbody.png tag_td.png tag_term.png + tag_tgroup.png tag_th.png tag_title.png + tag_tr.png tag_ulink.png tag_ul.png tag_union.png tag_unique.png tag_u.png - tag_variablelist.png tag_varlistentry.png - tag_varlistitem.png tag_what.png tag_wml.png - tag_xref.png textarea.png tree_win.png ttab.png - view_text.png vpl.png vpl_text.png xmlval.png - xsltproc.png tag_amp.png tag_cdata.png + tag_variablelist.png tag_varlistentry.png tag_varlistitem.png + tag_what.png tag_wml.png tag_xref.png + textarea.png tree_win.png ttab.png + view_text.png vpl.png vpl_text.png + xmlval.png xsltproc.png DESTINATION ${DATA_INSTALL_DIR}/quanta/toolbar ) diff --git a/quanta/data/icons/22x22/Makefile.am b/quanta/data/icons/22x22/Makefile.am index 7eb10c7d..4cd1e390 100644 --- a/quanta/data/icons/22x22/Makefile.am +++ b/quanta/data/icons/22x22/Makefile.am @@ -1,5 +1,6 @@ quantadir = ${quanta_datadir}/toolbar quanta_DATA = ball.png \ +button.png \ check_clear.png \ check_grey.png \ check.png \ @@ -21,6 +22,99 @@ form.png \ frame.png \ ftab.png \ ftpclient.png \ +html5_abbr.png \ +html5_address.png \ +html5_a.png \ +html5_area.png \ +html5_article.png \ +html5_aside.png \ +html5_audio.png \ +html5_base.png \ +html5_bdi.png \ +html5_bdo.png \ +html5_big.png \ +html5_blockquote.png \ +html5_body.png \ +html5_b.png \ +html5_br.png \ +html5_caption.png \ +html5_center.png \ +html5_cite.png \ +html5_code.png \ +html5_colgroup.png \ +html5_col.png \ +html5_com.png \ +html5_data.png \ +html5_dd.png \ +html5_del.png \ +html5_details.png \ +html5_dir.png \ +html5_div.png \ +html5_dl.png \ +html5_dt.png \ +html5_DT.png \ +html5_embed.png \ +html5_figcaption.png \ +html5_figure.png \ +html5_font.png \ +html5_footer.png \ +html5_h1.png \ +html5_h2.png \ +html5_h3.png \ +html5_h4.png \ +html5_h5.png \ +html5_h6.png \ +html5_header.png \ +html5_head.png \ +html5_hr.png \ +html5_html.png \ +html5_img.png \ +html5_ins.png \ +html5_i.png \ +html5_kbd.png \ +html5_link.png \ +html5_li.png \ +html5_main.png \ +html5_map.png \ +html5_mark.png \ +html5_meta.png \ +html5_nav.png \ +html5_noscript.png \ +html5_object.png \ +html5_ol.png \ +html5_picture.png \ +html5_p.png \ +html5_pre.png \ +html5_q.png \ +html5_rp.png \ +html5_rt.png \ +html5_ruby.png \ +html5_samp.png \ +html5_script.png \ +html5_section.png \ +html5_small.png \ +html5_source.png \ +html5_span.png \ +html5_strong.png \ +html5_style.png \ +html5_sub.png \ +html5_sup.png \ +html5_svg.png \ +html5_table.png \ +html5_tbody.png \ +html5_td.png \ +html5_tfoot.png \ +html5_thead.png \ +html5_th.png \ +html5_time.png \ +html5_title.png \ +html5_track.png \ +html5_tr.png \ +html5_ul.png \ +html5_u.png \ +html5_var.png \ +html5_video.png \ +html5_wbr.png \ lineedit.png \ linepas.png \ output_win.png \ @@ -35,11 +129,11 @@ replace.png \ reset.png \ select.png \ submit.png \ -button.png \ table_data.png \ table_head.png \ tag_access.png \ tag_all.png \ +tag_amp.png \ tag_anyAttribute.png \ tag_any.png \ tag_a.png \ @@ -52,6 +146,7 @@ tag_bold.png \ tag_br.png \ tag_caption.png \ tag_card.png \ +tag_cdata.png \ tag_chapter.png \ tag_choice.png \ tag_comm.png \ @@ -166,7 +261,4 @@ view_text.png \ vpl.png \ vpl_text.png \ xmlval.png \ -xsltproc.png \ -tag_amp.png \ -tag_cdata.png - +xsltproc.png diff --git a/quanta/data/icons/22x22/html5_DT.png b/quanta/data/icons/22x22/html5_DT.png Binary files differnew file mode 100644 index 00000000..a1453930 --- /dev/null +++ b/quanta/data/icons/22x22/html5_DT.png diff --git a/quanta/data/icons/22x22/html5_a.png b/quanta/data/icons/22x22/html5_a.png Binary files differnew file mode 100644 index 00000000..e9ff6a72 --- /dev/null +++ b/quanta/data/icons/22x22/html5_a.png diff --git a/quanta/data/icons/22x22/html5_abbr.png b/quanta/data/icons/22x22/html5_abbr.png Binary files differnew file mode 100644 index 00000000..42af2587 --- /dev/null +++ b/quanta/data/icons/22x22/html5_abbr.png diff --git a/quanta/data/icons/22x22/html5_address.png b/quanta/data/icons/22x22/html5_address.png Binary files differnew file mode 100644 index 00000000..75fc33a9 --- /dev/null +++ b/quanta/data/icons/22x22/html5_address.png diff --git a/quanta/data/icons/22x22/html5_area.png b/quanta/data/icons/22x22/html5_area.png Binary files differnew file mode 100644 index 00000000..caad509c --- /dev/null +++ b/quanta/data/icons/22x22/html5_area.png diff --git a/quanta/data/icons/22x22/html5_article.png b/quanta/data/icons/22x22/html5_article.png Binary files differnew file mode 100644 index 00000000..c2aa738f --- /dev/null +++ b/quanta/data/icons/22x22/html5_article.png diff --git a/quanta/data/icons/22x22/html5_aside.png b/quanta/data/icons/22x22/html5_aside.png Binary files differnew file mode 100644 index 00000000..da321bee --- /dev/null +++ b/quanta/data/icons/22x22/html5_aside.png diff --git a/quanta/data/icons/22x22/html5_audio.png b/quanta/data/icons/22x22/html5_audio.png Binary files differnew file mode 100644 index 00000000..e2fd30dc --- /dev/null +++ b/quanta/data/icons/22x22/html5_audio.png diff --git a/quanta/data/icons/22x22/html5_b.png b/quanta/data/icons/22x22/html5_b.png Binary files differnew file mode 100644 index 00000000..29c3c4cc --- /dev/null +++ b/quanta/data/icons/22x22/html5_b.png diff --git a/quanta/data/icons/22x22/html5_base.png b/quanta/data/icons/22x22/html5_base.png Binary files differnew file mode 100644 index 00000000..abc2013b --- /dev/null +++ b/quanta/data/icons/22x22/html5_base.png diff --git a/quanta/data/icons/22x22/html5_bdi.png b/quanta/data/icons/22x22/html5_bdi.png Binary files differnew file mode 100644 index 00000000..78cdbcad --- /dev/null +++ b/quanta/data/icons/22x22/html5_bdi.png diff --git a/quanta/data/icons/22x22/html5_bdo.png b/quanta/data/icons/22x22/html5_bdo.png Binary files differnew file mode 100644 index 00000000..ab8a5b10 --- /dev/null +++ b/quanta/data/icons/22x22/html5_bdo.png diff --git a/quanta/data/icons/22x22/html5_big.png b/quanta/data/icons/22x22/html5_big.png Binary files differnew file mode 100644 index 00000000..79ad4075 --- /dev/null +++ b/quanta/data/icons/22x22/html5_big.png diff --git a/quanta/data/icons/22x22/html5_blockquote.png b/quanta/data/icons/22x22/html5_blockquote.png Binary files differnew file mode 100644 index 00000000..9e50c2e1 --- /dev/null +++ b/quanta/data/icons/22x22/html5_blockquote.png diff --git a/quanta/data/icons/22x22/html5_body.png b/quanta/data/icons/22x22/html5_body.png Binary files differnew file mode 100644 index 00000000..f48cbf42 --- /dev/null +++ b/quanta/data/icons/22x22/html5_body.png diff --git a/quanta/data/icons/22x22/html5_br.png b/quanta/data/icons/22x22/html5_br.png Binary files differnew file mode 100644 index 00000000..cd047a22 --- /dev/null +++ b/quanta/data/icons/22x22/html5_br.png diff --git a/quanta/data/icons/22x22/html5_caption.png b/quanta/data/icons/22x22/html5_caption.png Binary files differnew file mode 100644 index 00000000..b5d2d71a --- /dev/null +++ b/quanta/data/icons/22x22/html5_caption.png diff --git a/quanta/data/icons/22x22/html5_center.png b/quanta/data/icons/22x22/html5_center.png Binary files differnew file mode 100644 index 00000000..a830104a --- /dev/null +++ b/quanta/data/icons/22x22/html5_center.png diff --git a/quanta/data/icons/22x22/html5_cite.png b/quanta/data/icons/22x22/html5_cite.png Binary files differnew file mode 100644 index 00000000..ae7cabac --- /dev/null +++ b/quanta/data/icons/22x22/html5_cite.png diff --git a/quanta/data/icons/22x22/html5_code.png b/quanta/data/icons/22x22/html5_code.png Binary files differnew file mode 100644 index 00000000..880e08fd --- /dev/null +++ b/quanta/data/icons/22x22/html5_code.png diff --git a/quanta/data/icons/22x22/html5_col.png b/quanta/data/icons/22x22/html5_col.png Binary files differnew file mode 100644 index 00000000..e7d926d8 --- /dev/null +++ b/quanta/data/icons/22x22/html5_col.png diff --git a/quanta/data/icons/22x22/html5_colgroup.png b/quanta/data/icons/22x22/html5_colgroup.png Binary files differnew file mode 100644 index 00000000..ea7d23d0 --- /dev/null +++ b/quanta/data/icons/22x22/html5_colgroup.png diff --git a/quanta/data/icons/22x22/html5_com.png b/quanta/data/icons/22x22/html5_com.png Binary files differnew file mode 100644 index 00000000..244fd8f2 --- /dev/null +++ b/quanta/data/icons/22x22/html5_com.png diff --git a/quanta/data/icons/22x22/html5_data.png b/quanta/data/icons/22x22/html5_data.png Binary files differnew file mode 100644 index 00000000..eae99c74 --- /dev/null +++ b/quanta/data/icons/22x22/html5_data.png diff --git a/quanta/data/icons/22x22/html5_dd.png b/quanta/data/icons/22x22/html5_dd.png Binary files differnew file mode 100644 index 00000000..958ada02 --- /dev/null +++ b/quanta/data/icons/22x22/html5_dd.png diff --git a/quanta/data/icons/22x22/html5_del.png b/quanta/data/icons/22x22/html5_del.png Binary files differnew file mode 100644 index 00000000..228bbdaa --- /dev/null +++ b/quanta/data/icons/22x22/html5_del.png diff --git a/quanta/data/icons/22x22/html5_details.png b/quanta/data/icons/22x22/html5_details.png Binary files differnew file mode 100644 index 00000000..81c02d37 --- /dev/null +++ b/quanta/data/icons/22x22/html5_details.png diff --git a/quanta/data/icons/22x22/html5_dir.png b/quanta/data/icons/22x22/html5_dir.png Binary files differnew file mode 100644 index 00000000..1c21f7e9 --- /dev/null +++ b/quanta/data/icons/22x22/html5_dir.png diff --git a/quanta/data/icons/22x22/html5_div.png b/quanta/data/icons/22x22/html5_div.png Binary files differnew file mode 100644 index 00000000..03d700e3 --- /dev/null +++ b/quanta/data/icons/22x22/html5_div.png diff --git a/quanta/data/icons/22x22/html5_dl.png b/quanta/data/icons/22x22/html5_dl.png Binary files differnew file mode 100644 index 00000000..51e9cc6a --- /dev/null +++ b/quanta/data/icons/22x22/html5_dl.png diff --git a/quanta/data/icons/22x22/html5_dt.png b/quanta/data/icons/22x22/html5_dt.png Binary files differnew file mode 100644 index 00000000..87da2ffe --- /dev/null +++ b/quanta/data/icons/22x22/html5_dt.png diff --git a/quanta/data/icons/22x22/html5_embed.png b/quanta/data/icons/22x22/html5_embed.png Binary files differnew file mode 100644 index 00000000..6a684cba --- /dev/null +++ b/quanta/data/icons/22x22/html5_embed.png diff --git a/quanta/data/icons/22x22/html5_figcaption.png b/quanta/data/icons/22x22/html5_figcaption.png Binary files differnew file mode 100644 index 00000000..19204936 --- /dev/null +++ b/quanta/data/icons/22x22/html5_figcaption.png diff --git a/quanta/data/icons/22x22/html5_figure.png b/quanta/data/icons/22x22/html5_figure.png Binary files differnew file mode 100644 index 00000000..3d38ea0e --- /dev/null +++ b/quanta/data/icons/22x22/html5_figure.png diff --git a/quanta/data/icons/22x22/html5_font.png b/quanta/data/icons/22x22/html5_font.png Binary files differnew file mode 100644 index 00000000..4483a7e2 --- /dev/null +++ b/quanta/data/icons/22x22/html5_font.png diff --git a/quanta/data/icons/22x22/html5_footer.png b/quanta/data/icons/22x22/html5_footer.png Binary files differnew file mode 100644 index 00000000..73e6aefe --- /dev/null +++ b/quanta/data/icons/22x22/html5_footer.png diff --git a/quanta/data/icons/22x22/html5_h1.png b/quanta/data/icons/22x22/html5_h1.png Binary files differnew file mode 100644 index 00000000..7274abc7 --- /dev/null +++ b/quanta/data/icons/22x22/html5_h1.png diff --git a/quanta/data/icons/22x22/html5_h2.png b/quanta/data/icons/22x22/html5_h2.png Binary files differnew file mode 100644 index 00000000..f54219a4 --- /dev/null +++ b/quanta/data/icons/22x22/html5_h2.png diff --git a/quanta/data/icons/22x22/html5_h3.png b/quanta/data/icons/22x22/html5_h3.png Binary files differnew file mode 100644 index 00000000..08ee9d14 --- /dev/null +++ b/quanta/data/icons/22x22/html5_h3.png diff --git a/quanta/data/icons/22x22/html5_h4.png b/quanta/data/icons/22x22/html5_h4.png Binary files differnew file mode 100644 index 00000000..6a7880fb --- /dev/null +++ b/quanta/data/icons/22x22/html5_h4.png diff --git a/quanta/data/icons/22x22/html5_h5.png b/quanta/data/icons/22x22/html5_h5.png Binary files differnew file mode 100644 index 00000000..73f153d9 --- /dev/null +++ b/quanta/data/icons/22x22/html5_h5.png diff --git a/quanta/data/icons/22x22/html5_h6.png b/quanta/data/icons/22x22/html5_h6.png Binary files differnew file mode 100644 index 00000000..bcc80a1e --- /dev/null +++ b/quanta/data/icons/22x22/html5_h6.png diff --git a/quanta/data/icons/22x22/html5_head.png b/quanta/data/icons/22x22/html5_head.png Binary files differnew file mode 100644 index 00000000..d9aa4777 --- /dev/null +++ b/quanta/data/icons/22x22/html5_head.png diff --git a/quanta/data/icons/22x22/html5_header.png b/quanta/data/icons/22x22/html5_header.png Binary files differnew file mode 100644 index 00000000..62a99473 --- /dev/null +++ b/quanta/data/icons/22x22/html5_header.png diff --git a/quanta/data/icons/22x22/html5_hr.png b/quanta/data/icons/22x22/html5_hr.png Binary files differnew file mode 100644 index 00000000..a73694e7 --- /dev/null +++ b/quanta/data/icons/22x22/html5_hr.png diff --git a/quanta/data/icons/22x22/html5_html.png b/quanta/data/icons/22x22/html5_html.png Binary files differnew file mode 100644 index 00000000..c7c11c8c --- /dev/null +++ b/quanta/data/icons/22x22/html5_html.png diff --git a/quanta/data/icons/22x22/html5_i.png b/quanta/data/icons/22x22/html5_i.png Binary files differnew file mode 100644 index 00000000..860abe10 --- /dev/null +++ b/quanta/data/icons/22x22/html5_i.png diff --git a/quanta/data/icons/22x22/html5_img.png b/quanta/data/icons/22x22/html5_img.png Binary files differnew file mode 100644 index 00000000..271a9989 --- /dev/null +++ b/quanta/data/icons/22x22/html5_img.png diff --git a/quanta/data/icons/22x22/html5_ins.png b/quanta/data/icons/22x22/html5_ins.png Binary files differnew file mode 100644 index 00000000..849661ae --- /dev/null +++ b/quanta/data/icons/22x22/html5_ins.png diff --git a/quanta/data/icons/22x22/html5_kbd.png b/quanta/data/icons/22x22/html5_kbd.png Binary files differnew file mode 100644 index 00000000..06c8c9f0 --- /dev/null +++ b/quanta/data/icons/22x22/html5_kbd.png diff --git a/quanta/data/icons/22x22/html5_li.png b/quanta/data/icons/22x22/html5_li.png Binary files differnew file mode 100644 index 00000000..ec8bcf45 --- /dev/null +++ b/quanta/data/icons/22x22/html5_li.png diff --git a/quanta/data/icons/22x22/html5_link.png b/quanta/data/icons/22x22/html5_link.png Binary files differnew file mode 100644 index 00000000..88d956c3 --- /dev/null +++ b/quanta/data/icons/22x22/html5_link.png diff --git a/quanta/data/icons/22x22/html5_main.png b/quanta/data/icons/22x22/html5_main.png Binary files differnew file mode 100644 index 00000000..2dc24c6f --- /dev/null +++ b/quanta/data/icons/22x22/html5_main.png diff --git a/quanta/data/icons/22x22/html5_map.png b/quanta/data/icons/22x22/html5_map.png Binary files differnew file mode 100644 index 00000000..e7adaa5a --- /dev/null +++ b/quanta/data/icons/22x22/html5_map.png diff --git a/quanta/data/icons/22x22/html5_mark.png b/quanta/data/icons/22x22/html5_mark.png Binary files differnew file mode 100644 index 00000000..2e869a6c --- /dev/null +++ b/quanta/data/icons/22x22/html5_mark.png diff --git a/quanta/data/icons/22x22/html5_meta.png b/quanta/data/icons/22x22/html5_meta.png Binary files differnew file mode 100644 index 00000000..6a169691 --- /dev/null +++ b/quanta/data/icons/22x22/html5_meta.png diff --git a/quanta/data/icons/22x22/html5_nav.png b/quanta/data/icons/22x22/html5_nav.png Binary files differnew file mode 100644 index 00000000..af3aa6ac --- /dev/null +++ b/quanta/data/icons/22x22/html5_nav.png diff --git a/quanta/data/icons/22x22/html5_noscript.png b/quanta/data/icons/22x22/html5_noscript.png Binary files differnew file mode 100644 index 00000000..52180391 --- /dev/null +++ b/quanta/data/icons/22x22/html5_noscript.png diff --git a/quanta/data/icons/22x22/html5_object.png b/quanta/data/icons/22x22/html5_object.png Binary files differnew file mode 100644 index 00000000..0bdcd70c --- /dev/null +++ b/quanta/data/icons/22x22/html5_object.png diff --git a/quanta/data/icons/22x22/html5_ol.png b/quanta/data/icons/22x22/html5_ol.png Binary files differnew file mode 100644 index 00000000..27ab357f --- /dev/null +++ b/quanta/data/icons/22x22/html5_ol.png diff --git a/quanta/data/icons/22x22/html5_p.png b/quanta/data/icons/22x22/html5_p.png Binary files differnew file mode 100644 index 00000000..ae8dc38c --- /dev/null +++ b/quanta/data/icons/22x22/html5_p.png diff --git a/quanta/data/icons/22x22/html5_picture.png b/quanta/data/icons/22x22/html5_picture.png Binary files differnew file mode 100644 index 00000000..89524cb1 --- /dev/null +++ b/quanta/data/icons/22x22/html5_picture.png diff --git a/quanta/data/icons/22x22/html5_pre.png b/quanta/data/icons/22x22/html5_pre.png Binary files differnew file mode 100644 index 00000000..b5b8fd74 --- /dev/null +++ b/quanta/data/icons/22x22/html5_pre.png diff --git a/quanta/data/icons/22x22/html5_q.png b/quanta/data/icons/22x22/html5_q.png Binary files differnew file mode 100644 index 00000000..a78c998e --- /dev/null +++ b/quanta/data/icons/22x22/html5_q.png diff --git a/quanta/data/icons/22x22/html5_rp.png b/quanta/data/icons/22x22/html5_rp.png Binary files differnew file mode 100644 index 00000000..83195c19 --- /dev/null +++ b/quanta/data/icons/22x22/html5_rp.png diff --git a/quanta/data/icons/22x22/html5_rt.png b/quanta/data/icons/22x22/html5_rt.png Binary files differnew file mode 100644 index 00000000..002dbbf2 --- /dev/null +++ b/quanta/data/icons/22x22/html5_rt.png diff --git a/quanta/data/icons/22x22/html5_ruby.png b/quanta/data/icons/22x22/html5_ruby.png Binary files differnew file mode 100644 index 00000000..5eb2e561 --- /dev/null +++ b/quanta/data/icons/22x22/html5_ruby.png diff --git a/quanta/data/icons/22x22/html5_samp.png b/quanta/data/icons/22x22/html5_samp.png Binary files differnew file mode 100644 index 00000000..05ca7536 --- /dev/null +++ b/quanta/data/icons/22x22/html5_samp.png diff --git a/quanta/data/icons/22x22/html5_script.png b/quanta/data/icons/22x22/html5_script.png Binary files differnew file mode 100644 index 00000000..766c2ff7 --- /dev/null +++ b/quanta/data/icons/22x22/html5_script.png diff --git a/quanta/data/icons/22x22/html5_section.png b/quanta/data/icons/22x22/html5_section.png Binary files differnew file mode 100644 index 00000000..3a428273 --- /dev/null +++ b/quanta/data/icons/22x22/html5_section.png diff --git a/quanta/data/icons/22x22/html5_small.png b/quanta/data/icons/22x22/html5_small.png Binary files differnew file mode 100644 index 00000000..c941d93d --- /dev/null +++ b/quanta/data/icons/22x22/html5_small.png diff --git a/quanta/data/icons/22x22/html5_source.png b/quanta/data/icons/22x22/html5_source.png Binary files differnew file mode 100644 index 00000000..c1a91e70 --- /dev/null +++ b/quanta/data/icons/22x22/html5_source.png diff --git a/quanta/data/icons/22x22/html5_span.png b/quanta/data/icons/22x22/html5_span.png Binary files differnew file mode 100644 index 00000000..06223aaf --- /dev/null +++ b/quanta/data/icons/22x22/html5_span.png diff --git a/quanta/data/icons/22x22/html5_strong.png b/quanta/data/icons/22x22/html5_strong.png Binary files differnew file mode 100644 index 00000000..8145590e --- /dev/null +++ b/quanta/data/icons/22x22/html5_strong.png diff --git a/quanta/data/icons/22x22/html5_style.png b/quanta/data/icons/22x22/html5_style.png Binary files differnew file mode 100644 index 00000000..ec6e0861 --- /dev/null +++ b/quanta/data/icons/22x22/html5_style.png diff --git a/quanta/data/icons/22x22/html5_sub.png b/quanta/data/icons/22x22/html5_sub.png Binary files differnew file mode 100644 index 00000000..ae053aeb --- /dev/null +++ b/quanta/data/icons/22x22/html5_sub.png diff --git a/quanta/data/icons/22x22/html5_sup.png b/quanta/data/icons/22x22/html5_sup.png Binary files differnew file mode 100644 index 00000000..0ea37e0e --- /dev/null +++ b/quanta/data/icons/22x22/html5_sup.png diff --git a/quanta/data/icons/22x22/html5_svg.png b/quanta/data/icons/22x22/html5_svg.png Binary files differnew file mode 100644 index 00000000..1e6050c2 --- /dev/null +++ b/quanta/data/icons/22x22/html5_svg.png diff --git a/quanta/data/icons/22x22/html5_table.png b/quanta/data/icons/22x22/html5_table.png Binary files differnew file mode 100644 index 00000000..e8dd8e03 --- /dev/null +++ b/quanta/data/icons/22x22/html5_table.png diff --git a/quanta/data/icons/22x22/html5_tbody.png b/quanta/data/icons/22x22/html5_tbody.png Binary files differnew file mode 100644 index 00000000..c84522c8 --- /dev/null +++ b/quanta/data/icons/22x22/html5_tbody.png diff --git a/quanta/data/icons/22x22/html5_td.png b/quanta/data/icons/22x22/html5_td.png Binary files differnew file mode 100644 index 00000000..38d3ea97 --- /dev/null +++ b/quanta/data/icons/22x22/html5_td.png diff --git a/quanta/data/icons/22x22/html5_tfoot.png b/quanta/data/icons/22x22/html5_tfoot.png Binary files differnew file mode 100644 index 00000000..dc633655 --- /dev/null +++ b/quanta/data/icons/22x22/html5_tfoot.png diff --git a/quanta/data/icons/22x22/html5_th.png b/quanta/data/icons/22x22/html5_th.png Binary files differnew file mode 100644 index 00000000..28f5fc82 --- /dev/null +++ b/quanta/data/icons/22x22/html5_th.png diff --git a/quanta/data/icons/22x22/html5_thead.png b/quanta/data/icons/22x22/html5_thead.png Binary files differnew file mode 100644 index 00000000..bcabca1a --- /dev/null +++ b/quanta/data/icons/22x22/html5_thead.png diff --git a/quanta/data/icons/22x22/html5_time.png b/quanta/data/icons/22x22/html5_time.png Binary files differnew file mode 100644 index 00000000..7b53c65c --- /dev/null +++ b/quanta/data/icons/22x22/html5_time.png diff --git a/quanta/data/icons/22x22/html5_title.png b/quanta/data/icons/22x22/html5_title.png Binary files differnew file mode 100644 index 00000000..157e4109 --- /dev/null +++ b/quanta/data/icons/22x22/html5_title.png diff --git a/quanta/data/icons/22x22/html5_tr.png b/quanta/data/icons/22x22/html5_tr.png Binary files differnew file mode 100644 index 00000000..f4eb080a --- /dev/null +++ b/quanta/data/icons/22x22/html5_tr.png diff --git a/quanta/data/icons/22x22/html5_track.png b/quanta/data/icons/22x22/html5_track.png Binary files differnew file mode 100644 index 00000000..8df75171 --- /dev/null +++ b/quanta/data/icons/22x22/html5_track.png diff --git a/quanta/data/icons/22x22/html5_u.png b/quanta/data/icons/22x22/html5_u.png Binary files differnew file mode 100644 index 00000000..5ba3034c --- /dev/null +++ b/quanta/data/icons/22x22/html5_u.png diff --git a/quanta/data/icons/22x22/html5_ul.png b/quanta/data/icons/22x22/html5_ul.png Binary files differnew file mode 100644 index 00000000..8c4e1f6d --- /dev/null +++ b/quanta/data/icons/22x22/html5_ul.png diff --git a/quanta/data/icons/22x22/html5_var.png b/quanta/data/icons/22x22/html5_var.png Binary files differnew file mode 100644 index 00000000..467eba4c --- /dev/null +++ b/quanta/data/icons/22x22/html5_var.png diff --git a/quanta/data/icons/22x22/html5_video.png b/quanta/data/icons/22x22/html5_video.png Binary files differnew file mode 100644 index 00000000..68baec39 --- /dev/null +++ b/quanta/data/icons/22x22/html5_video.png diff --git a/quanta/data/icons/22x22/html5_wbr.png b/quanta/data/icons/22x22/html5_wbr.png Binary files differnew file mode 100644 index 00000000..6ea9f6b8 --- /dev/null +++ b/quanta/data/icons/22x22/html5_wbr.png diff --git a/quanta/data/templates/documents/CMakeLists.txt b/quanta/data/templates/documents/CMakeLists.txt index e114aeb6..e37e5927 100644 --- a/quanta/data/templates/documents/CMakeLists.txt +++ b/quanta/data/templates/documents/CMakeLists.txt @@ -10,6 +10,7 @@ ################################################# add_subdirectory( html ) +add_subdirectory( html5 ) add_subdirectory( others ) add_subdirectory( scripts ) diff --git a/quanta/data/templates/documents/Makefile.am b/quanta/data/templates/documents/Makefile.am index eb6533cd..f35b06b6 100644 --- a/quanta/data/templates/documents/Makefile.am +++ b/quanta/data/templates/documents/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = html others scripts +SUBDIRS = html html5 others scripts templatesdocumentsdir = ${quanta_datadir}/templates/documents templatesdocuments_DATA = dirinfo diff --git a/quanta/data/templates/documents/html5/CMakeLists.txt b/quanta/data/templates/documents/html5/CMakeLists.txt new file mode 100644 index 00000000..352ba774 --- /dev/null +++ b/quanta/data/templates/documents/html5/CMakeLists.txt @@ -0,0 +1,14 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + demo.html + DESTINATION ${DATA_INSTALL_DIR}/quanta/templates/documents/html5 ) diff --git a/quanta/data/templates/documents/html5/Makefile.am b/quanta/data/templates/documents/html5/Makefile.am new file mode 100644 index 00000000..a4b04fe0 --- /dev/null +++ b/quanta/data/templates/documents/html5/Makefile.am @@ -0,0 +1,2 @@ +templatesdocumentshtmldir = ${quanta_datadir}/templates/documents/html5 +templatesdocumentshtml_DATA = demo.html diff --git a/quanta/data/templates/documents/html5/demo.html b/quanta/data/templates/documents/html5/demo.html new file mode 100644 index 00000000..d2974677 --- /dev/null +++ b/quanta/data/templates/documents/html5/demo.html @@ -0,0 +1,9 @@ +<!DOCTYPE html> +<html> +<head> + <meta charset="utf-8"> + <title></title> +</head> +<body> +</body> +</html> diff --git a/quanta/data/templates/pages/CMakeLists.txt b/quanta/data/templates/pages/CMakeLists.txt index 965a9475..9aca96f7 100644 --- a/quanta/data/templates/pages/CMakeLists.txt +++ b/quanta/data/templates/pages/CMakeLists.txt @@ -11,6 +11,7 @@ add_subdirectory( php ) add_subdirectory( html ) +add_subdirectory( html5 ) add_subdirectory( docbook ) install( FILES dirinfo diff --git a/quanta/data/templates/pages/Makefile.am b/quanta/data/templates/pages/Makefile.am index 6eaaa6a8..f7b47129 100644 --- a/quanta/data/templates/pages/Makefile.am +++ b/quanta/data/templates/pages/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = php html docbook +SUBDIRS = php html html5 docbook templatespagesdir = ${quanta_datadir}/templates/pages templatespages_DATA = dirinfo diff --git a/quanta/data/templates/pages/html5/CMakeLists.txt b/quanta/data/templates/pages/html5/CMakeLists.txt new file mode 100644 index 00000000..0bddf292 --- /dev/null +++ b/quanta/data/templates/pages/html5/CMakeLists.txt @@ -0,0 +1,14 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +install( FILES + base.html + DESTINATION ${DATA_INSTALL_DIR}/quanta/templates/pages/html5 ) diff --git a/quanta/data/templates/pages/html5/Makefile.am b/quanta/data/templates/pages/html5/Makefile.am new file mode 100644 index 00000000..21dded22 --- /dev/null +++ b/quanta/data/templates/pages/html5/Makefile.am @@ -0,0 +1,2 @@ +templatespageshtml401dir = ${quanta_datadir}/templates/pages/html5 +templatespageshtml401_DATA = base.html diff --git a/quanta/data/templates/pages/html5/base.html b/quanta/data/templates/pages/html5/base.html new file mode 100644 index 00000000..d2974677 --- /dev/null +++ b/quanta/data/templates/pages/html5/base.html @@ -0,0 +1,9 @@ +<!DOCTYPE html> +<html> +<head> + <meta charset="utf-8"> + <title></title> +</head> +<body> +</body> +</html> diff --git a/quanta/data/toolbars/Makefile.am b/quanta/data/toolbars/Makefile.am index bc03a375..4a279373 100644 --- a/quanta/data/toolbars/Makefile.am +++ b/quanta/data/toolbars/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = html xml wml-1-2 tagxml schema cfml kde-docbook docbook css +SUBDIRS = html html5 xml wml-1-2 tagxml schema cfml kde-docbook docbook css toolbarsdir = ${quanta_datadir}/toolbars toolbars_DATA = debug.toolbar.tgz diff --git a/quanta/data/toolbars/html5/CMakeLists.txt b/quanta/data/toolbars/html5/CMakeLists.txt new file mode 100644 index 00000000..2ebdff25 --- /dev/null +++ b/quanta/data/toolbars/html5/CMakeLists.txt @@ -0,0 +1,26 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# (C) 2019 Slávek Banko +# slavek.banko (AT) axis.cz +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + + +##### style data ################################ + +foreach( _toolbar base meta style tools ) + + tde_create_tarball( + TARGET ${_toolbar}.toolbar.tgz + FILES ${_toolbar}.actions ${_toolbar}.toolbar + DESTINATION ${DATA_INSTALL_DIR}/quanta/toolbars/html5 + ) + +endforeach( ) diff --git a/quanta/data/toolbars/html5/Makefile.am b/quanta/data/toolbars/html5/Makefile.am new file mode 100644 index 00000000..353c7dad --- /dev/null +++ b/quanta/data/toolbars/html5/Makefile.am @@ -0,0 +1,14 @@ +htmltemplatedir = ${quanta_datadir}/toolbars/html5 +htmltemplate_DATA = base.toolbar.tgz meta.toolbar.tgz style.toolbar.tgz tools.toolbar.tgz + +base.toolbar.tgz: base.actions base.toolbar + tar cfz $@ -C $(<D) $(^F) + +meta.toolbar.tgz: meta.actions meta.toolbar + tar cfz $@ -C $(<D) $(^F) + +style.toolbar.tgz: style.actions style.toolbar + tar cfz $@ -C $(<D) $(^F) + +tools.toolbar.tgz: tools.actions tools.toolbar + tar cfz $@ -C $(<D) $(^F) diff --git a/quanta/data/toolbars/html5/base.actions b/quanta/data/toolbars/html5/base.actions new file mode 100644 index 00000000..2fa3cebb --- /dev/null +++ b/quanta/data/toolbars/html5/base.actions @@ -0,0 +1,126 @@ +<!DOCTYPE actionsconfig> +<actions> + <action shortcut="" icon="html5_h1" type="tag" tooltip="" name="h1" text="h1" > + <tag useDialog="false" ><h1></tag> + <xtag use="true" ></h1></xtag> + </action> + <action shortcut="" icon="html5_h2" type="tag" tooltip="" name="h2" text="h2" > + <tag useDialog="false" ><h2></tag> + <xtag use="true" ></h2></xtag> + </action> + <action shortcut="" icon="html5_h3" type="tag" tooltip="" name="h3" text="h3" > + <tag useDialog="false" ><h3></tag> + <xtag use="true" ></h3></xtag> + </action> + <action shortcut="" icon="html5_h4" type="tag" tooltip="" name="h4" text="h4" > + <tag useDialog="false" ><h4></tag> + <xtag use="true" ></h4></xtag> + </action> + <action shortcut="" icon="html5_h5" type="tag" tooltip="" name="h5" text="h5" > + <tag useDialog="false" ><h5></tag> + <xtag use="true" ></h5></xtag> + </action> + <action shortcut="" icon="html5_h6" type="tag" tooltip="" name="h6" text="h6" > + <tag useDialog="false" ><h6></tag> + <xtag use="true" ></h6></xtag> + </action> + <action shortcut="" icon="html5_p" type="tag" tooltip="" name="p" text="p" > + <tag useDialog="false" ><p></tag> + <xtag use="true" ></p></xtag> + </action> + <action shortcut="" icon="html5_pre" type="tag" tooltip="" name="pre" text="pre" > + <tag useDialog="false" ><pre></tag> + <xtag use="true" ></pre></xtag> + </action> + <action shortcut="" icon="html5_div" type="tag" tooltip="" name="div" text="div" > + <tag useDialog="false" ><div></tag> + <xtag use="true" ></div></xtag> + </action> + <action shortcut="" icon="html5_blockquote" type="tag" tooltip="" name="blockquote" text="blockquote" > + <tag useDialog="false" ><blockquote></tag> + <xtag use="true" ></blockquote></xtag> + </action> + <action shortcut="" icon="html5_details" type="tag" tooltip="" name="details" text="details" > + <tag useDialog="false" ><details></tag> + <xtag use="true" ></details></xtag> + </action> + <action shortcut="" icon="html5_center" type="tag" tooltip="" name="center" text="center" > + <tag useDialog="false" ><center></tag> + <xtag use="true" ></center></xtag> + </action> + <action shortcut="" icon="html5_hr" type="tag" tooltip="" name="hr" text="hr" > + <tag useDialog="false" ><hr></tag> + </action> + <action shortcut="" icon="html5_com" type="tag" tooltip="" name="com" text="com" > + <tag useDialog="false" ><!-- </tag> + <xtag use="true" > --></xtag> + </action> + <action shortcut="" icon="html5_ul" type="tag" tooltip="" name="ul" text="ul" > + <tag useDialog="false" ><ul></tag> + <xtag use="true" ></ul></xtag> + </action> + <action shortcut="" icon="html5_ol" type="tag" tooltip="" name="ol" text="ol" > + <tag useDialog="false" ><ol></tag> + <xtag use="true" ></ol></xtag> + </action> + <action shortcut="" icon="html5_li" type="tag" tooltip="" name="li" text="li" > + <tag useDialog="false" ><li></tag> + <xtag use="true" ></li></xtag> + </action> + <action shortcut="" icon="html5_dir" type="tag" tooltip="" name="dir" text="dir" > + <tag useDialog="false" ><dir></tag> + <xtag use="true" ></dir></xtag> + </action> + <action shortcut="" icon="html5_dl" type="tag" tooltip="" name="dl" text="dl" > + <tag useDialog="false" ><dl></tag> + <xtag use="true" ></dl></xtag> + </action> + <action shortcut="" icon="html5_dt" type="tag" tooltip="" name="dt" text="dt" > + <tag useDialog="false" ><dt></tag> + <xtag use="true" ></dt></xtag> + </action> + <action shortcut="" icon="html5_dd" type="tag" tooltip="" name="dd" text="dd" > + <tag useDialog="false" ><dd></tag> + <xtag use="true" ></dd></xtag> + </action> + <action shortcut="" icon="html5_table" type="tag" tooltip="" name="table" text="table" > + <tag useDialog="false" ><table></tag> + <xtag use="true" ></table></xtag> + </action> + <action shortcut="" icon="html5_tbody" type="tag" tooltip="" name="tbody" text="tbody" > + <tag useDialog="false" ><tbody></tag> + <xtag use="true" ></tbody></xtag> + </action> + <action shortcut="" icon="html5_thead" type="tag" tooltip="" name="thead" text="thead" > + <tag useDialog="false" ><thead></tag> + <xtag use="true" ></thead></xtag> + </action> + <action shortcut="" icon="html5_tfoot" type="tag" tooltip="" name="tfoot" text="tfoot" > + <tag useDialog="false" ><tfoot></tag> + <xtag use="true" ></tfoot></xtag> + </action> + <action shortcut="" icon="html5_tr" type="tag" tooltip="" name="tr" text="tr" > + <tag useDialog="false" ><tr></tag> + <xtag use="true" ></tr></xtag> + </action> + <action shortcut="" icon="html5_colgroup" type="tag" tooltip="" name="colgroup" text="colgroup" > + <tag useDialog="false" ><colgroup></tag> + <xtag use="true" ></colgroup></xtag> + </action> + <action shortcut="" icon="html5_col" type="tag" tooltip="" name="col" text="col" > + <tag useDialog="false" ><col></tag> + <xtag use="true" ></col></xtag> + </action> + <action shortcut="" icon="html5_td" type="tag" tooltip="" name="td" text="td" > + <tag useDialog="false" ><td></tag> + <xtag use="true" ></td></xtag> + </action> + <action shortcut="" icon="html5_th" type="tag" tooltip="" name="th" text="th" > + <tag useDialog="false" ><th></tag> + <xtag use="true" ></th></xtag> + </action> + <action shortcut="" icon="html5_caption" type="tag" tooltip="" name="caption" text="caption" > + <tag useDialog="false" ><caption></tag> + <xtag use="true" ></caption></xtag> + </action> +</actions> diff --git a/quanta/data/toolbars/html5/base.toolbar b/quanta/data/toolbars/html5/base.toolbar new file mode 100644 index 00000000..e4e786cf --- /dev/null +++ b/quanta/data/toolbars/html5/base.toolbar @@ -0,0 +1,37 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="quanta" version="2"> + <ToolBar tabname="Base" noMerge="1" name="base" > + <text>Base</text> + <Action name="h1" /> + <Action name="h2" /> + <Action name="h3" /> + <Action name="h4" /> + <Action name="h5" /> + <Action name="h6" /> + <Action name="p" /> + <Action name="pre" /> + <Action name="div" /> + <Action name="blockquote" /> + <Action name="details" /> + <Action name="center" /> + <Action name="hr" /> + <Action name="com" /> + <Action name="ul" /> + <Action name="ol" /> + <Action name="li" /> + <Action name="dir" /> + <Action name="dl" /> + <Action name="dt" /> + <Action name="dd" /> + <Action name="table" /> + <Action name="tbody" /> + <Action name="thead" /> + <Action name="tfoot" /> + <Action name="tr" /> + <Action name="colgroup" /> + <Action name="col" /> + <Action name="td" /> + <Action name="th" /> + <Action name="caption" /> + </ToolBar> +</kpartgui> diff --git a/quanta/data/toolbars/html5/meta.actions b/quanta/data/toolbars/html5/meta.actions new file mode 100644 index 00000000..0ea1ee5a --- /dev/null +++ b/quanta/data/toolbars/html5/meta.actions @@ -0,0 +1,125 @@ +<!DOCTYPE actionsconfig> +<actions> + <action shortcut="" icon="html5_img" type="tag" tooltip="" name="img" text="img" > + <tag useDialog="false" ><img src=""></tag> + </action> + <action shortcut="" icon="html5_map" type="tag" tooltip="" name="map" text="map" > + <tag useDialog="false" ><map name=""></tag> + <xtag use="true" ></map></xtag> + </action> + <action shortcut="" icon="html5_area" type="tag" tooltip="" name="area" text="area" > + <tag useDialog="false" ><area shape="" coords=",,," alt="" href=""></tag> + </action> + <action shortcut="" icon="html5_picture" type="tag" tooltip="" name="picture" text="picture" > + <tag useDialog="false" ><picture></tag> + <xtag use="true" ></picture></xtag> + </action> + <action shortcut="" icon="html5_figure" type="tag" tooltip="" name="figure" text="figure" > + <tag useDialog="false" ><figure></tag> + <xtag use="true" ></figure></xtag> + </action> + <action shortcut="" icon="html5_figcaption" type="tag" tooltip="" name="figcaption" text="figcaption" > + <tag useDialog="false" ><figcaption></tag> + <xtag use="true" ></figcaption></xtag> + </action> + <action shortcut="" icon="html5_svg" type="tag" tooltip="" name="svg" text="svg" > + <tag useDialog="false" ><svg></tag> + <xtag use="true" ></svg></xtag> + </action> + <action shortcut="" icon="html5_audio" type="tag" tooltip="" name="audio" text="audio" > + <tag useDialog="false" ><audio src=""></tag> + <xtag use="true" ></audio></xtag> + </action> + <action shortcut="" icon="html5_video" type="tag" tooltip="" name="video" text="video" > + <tag useDialog="false" ><video src=""></tag> + <xtag use="true" ></video></xtag> + </action> + <action shortcut="" icon="html5_track" type="tag" tooltip="" name="track" text="track" > + <tag useDialog="false" ><track src=""></tag> + <xtag use="true" ></track></xtag> + </action> + <action shortcut="" icon="html5_embed" type="tag" tooltip="" name="embed" text="embed" > + <tag useDialog="false" ><embed src=""></tag> + <xtag use="true" ></embed></xtag> + </action> + <action shortcut="" icon="html5_object" type="tag" tooltip="" name="object" text="object" > + <tag useDialog="false" ><object data=""></tag> + <xtag use="true" ></object></xtag> + </action> + <action shortcut="" icon="html5_source" type="tag" tooltip="" name="source" text="source" > + <tag useDialog="false" ><source src=""></tag> + <xtag use="true" ></source></xtag> + </action> + <action shortcut="" icon="html5_header" type="tag" tooltip="" name="header" text="header" > + <tag useDialog="false" ><header></tag> + <xtag use="true" ></header></xtag> + </action> + <action shortcut="" icon="html5_nav" type="tag" tooltip="" name="nav" text="nav" > + <tag useDialog="false" ><nav></tag> + <xtag use="true" ></nav></xtag> + </action> + <action shortcut="" icon="html5_main" type="tag" tooltip="" name="main" text="main" > + <tag useDialog="false" ><main></tag> + <xtag use="true" ></main></xtag> + </action> + <action shortcut="" icon="html5_aside" type="tag" tooltip="" name="aside" text="aside" > + <tag useDialog="false" ><aside></tag> + <xtag use="true" ></aside></xtag> + </action> + <action shortcut="" icon="html5_footer" type="tag" tooltip="" name="footer" text="footer" > + <tag useDialog="false" ><footer></tag> + <xtag use="true" ></footer></xtag> + </action> + <action shortcut="" icon="html5_article" type="tag" tooltip="" name="article" text="article" > + <tag useDialog="false" ><article></tag> + <xtag use="true" ></article></xtag> + </action> + <action shortcut="" icon="html5_address" type="tag" tooltip="" name="address" text="address" > + <tag useDialog="false" ><address></tag> + <xtag use="true" ></address></xtag> + </action> + <action shortcut="" icon="html5_section" type="tag" tooltip="" name="section" text="section" > + <tag useDialog="false" ><section></tag> + <xtag use="true" ></section></xtag> + </action> + <action shortcut="" icon="html5_DT" type="tag" tooltip="" name="DT" text="DT" > + <tag useDialog="false" ><!DOCTYPE html></tag> + </action> + <action shortcut="" icon="html5_html" type="tag" tooltip="" name="html" text="html" > + <tag useDialog="false" ><html></tag> + <xtag use="true" ></html></xtag> + </action> + <action shortcut="" icon="html5_head" type="tag" tooltip="" name="head" text="head" > + <tag useDialog="false" ><head></tag> + <xtag use="true" ></head></xtag> + </action> + <action shortcut="" icon="html5_body" type="tag" tooltip="" name="body" text="body" > + <tag useDialog="false" ><body></tag> + <xtag use="true" ></body></xtag> + </action> + <action shortcut="" icon="html5_title" type="tag" tooltip="" name="title" text="title" > + <tag useDialog="false" ><title></tag> + <xtag use="true" ></title></xtag> + </action> + <action shortcut="" icon="html5_meta" type="tag" tooltip="" name="meta" text="meta" > + <tag useDialog="false" ><meta charset="utf-8"></tag> + </action> + <action shortcut="" icon="html5_base" type="tag" tooltip="" name="base" text="base" > + <tag useDialog="false" ><base href=""></tag> + </action> + <action shortcut="" icon="html5_link" type="tag" tooltip="" name="link" text="link" > + <tag useDialog="false" ><link rel="" type="" href=""></tag> + </action> + <action shortcut="" icon="html5_style" type="tag" tooltip="" name="style" text="style" > + <tag useDialog="false" ><style></tag> + <xtag use="true" ></style></xtag> + </action> + <action shortcut="" icon="html5_script" type="tag" tooltip="" name="script" text="script" > + <tag useDialog="false" ><script></tag> + <xtag use="true" ></script></xtag> + </action> + <action shortcut="" icon="html5_noscript" type="tag" tooltip="" name="noscript" text="noscript" > + <tag useDialog="false" ><noscript></tag> + <xtag use="true" ></noscript></xtag> + </action> +</actions> diff --git a/quanta/data/toolbars/html5/meta.toolbar b/quanta/data/toolbars/html5/meta.toolbar new file mode 100644 index 00000000..2c3c8446 --- /dev/null +++ b/quanta/data/toolbars/html5/meta.toolbar @@ -0,0 +1,38 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="quanta" version="2"> + <ToolBar tabname="Meta" noMerge="1" name="meta" > + <text>Meta</text> + <Action name="img" /> + <Action name="map" /> + <Action name="area" /> + <Action name="picture" /> + <Action name="figure" /> + <Action name="figcaption" /> + <Action name="svg" /> + <Action name="audio" /> + <Action name="video" /> + <Action name="track" /> + <Action name="embed" /> + <Action name="object" /> + <Action name="source" /> + <Action name="header" /> + <Action name="nav" /> + <Action name="main" /> + <Action name="aside" /> + <Action name="footer" /> + <Action name="article" /> + <Action name="address" /> + <Action name="section" /> + <Action name="DT" /> + <Action name="html" /> + <Action name="head" /> + <Action name="body" /> + <Action name="title" /> + <Action name="meta" /> + <Action name="base" /> + <Action name="link" /> + <Action name="style" /> + <Action name="script" /> + <Action name="noscript" /> + </ToolBar> +</kpartgui> diff --git a/quanta/data/toolbars/html5/style.actions b/quanta/data/toolbars/html5/style.actions new file mode 100644 index 00000000..39b8e124 --- /dev/null +++ b/quanta/data/toolbars/html5/style.actions @@ -0,0 +1,121 @@ +<!DOCTYPE actionsconfig> +<actions> + <action shortcut="" icon="html5_a" type="tag" tooltip="" name="a" text="a" > + <tag useDialog="false" ><a href=""></tag> + <xtag use="true" ></a></xtag> + </action> + <action shortcut="" icon="html5_strong" type="tag" tooltip="" name="strong" text="strong" > + <tag useDialog="false" ><strong></tag> + <xtag use="true" ></strong></xtag> + </action> + <action shortcut="" icon="html5_i" type="tag" tooltip="" name="i" text="i" > + <tag useDialog="false" ><i></tag> + <xtag use="true" ></i></xtag> + </action> + <action shortcut="" icon="html5_b" type="tag" tooltip="" name="b" text="b" > + <tag useDialog="false" ><b></tag> + <xtag use="true" ></b></xtag> + </action> + <action shortcut="" icon="html5_del" type="tag" tooltip="" name="del" text="del" > + <tag useDialog="false" ><del></tag> + <xtag use="true" ></del></xtag> + </action> + <action shortcut="" icon="html5_small" type="tag" tooltip="" name="small" text="small" > + <tag useDialog="false" ><small></tag> + <xtag use="true" ></small></xtag> + </action> + <action shortcut="" icon="html5_big" type="tag" tooltip="" name="big" text="big" > + <tag useDialog="false" ><big></tag> + <xtag use="true" ></big></xtag> + </action> + <action shortcut="" icon="html5_font" type="tag" tooltip="" name="font" text="font" > + <tag useDialog="false" ><font></tag> + <xtag use="true" ></font></xtag> + </action> + <action shortcut="" icon="html5_code" type="tag" tooltip="" name="code" text="code" > + <tag useDialog="false" ><code></tag> + <xtag use="true" ></code></xtag> + </action> + <action shortcut="" icon="html5_var" type="tag" tooltip="" name="var" text="var" > + <tag useDialog="false" ><var></tag> + <xtag use="true" ></var></xtag> + </action> + <action shortcut="" icon="html5_kbd" type="tag" tooltip="" name="kbd" text="kbd" > + <tag useDialog="false" ><kbd></tag> + <xtag use="true" ></kbd></xtag> + </action> + <action shortcut="" icon="html5_samp" type="tag" tooltip="" name="samp" text="samp" > + <tag useDialog="false" ><samp></tag> + <xtag use="true" ></samp></xtag> + </action> + <action shortcut="" icon="html5_sup" type="tag" tooltip="" name="sup" text="sup" > + <tag useDialog="false" ><sup></tag> + <xtag use="true" ></sup></xtag> + </action> + <action shortcut="" icon="html5_sub" type="tag" tooltip="" name="sub" text="sub" > + <tag useDialog="false" ><sub></tag> + <xtag use="true" ></sub></xtag> + </action> + <action shortcut="" icon="html5_q" type="tag" tooltip="" name="q" text="q" > + <tag useDialog="false" ><q></tag> + <xtag use="true" ></q></xtag> + </action> + <action shortcut="" icon="html5_ins" type="tag" tooltip="" name="ins" text="ins" > + <tag useDialog="false" ><ins></tag> + <xtag use="true" ></ins></xtag> + </action> + <action shortcut="" icon="html5_cite" type="tag" tooltip="" name="cite" text="cite" > + <tag useDialog="false" ><cite></tag> + <xtag use="true" ></cite></xtag> + </action> + <action shortcut="" icon="html5_time" type="tag" tooltip="" name="time" text="time" > + <tag useDialog="false" ><time></tag> + <xtag use="true" ></time></xtag> + </action> + <action shortcut="" icon="html5_abbr" type="tag" tooltip="" name="abbr" text="abbr" > + <tag useDialog="false" ><abbr title=""></tag> + <xtag use="true" ></abbr></xtag> + </action> + <action shortcut="" icon="html5_data" type="tag" tooltip="" name="data" text="data" > + <tag useDialog="false" ><data value=""></tag> + <xtag use="true" ></data></xtag> + </action> + <action shortcut="" icon="html5_mark" type="tag" tooltip="" name="mark" text="mark" > + <tag useDialog="false" ><mark></tag> + <xtag use="true" ></mark></xtag> + </action> + <action shortcut="" icon="html5_u" type="tag" tooltip="" name="u" text="u" > + <tag useDialog="false" ><u></tag> + <xtag use="true" ></u></xtag> + </action> + <action shortcut="" icon="html5_bdi" type="tag" tooltip="" name="bdi" text="bdi" > + <tag useDialog="false" ><bdi></tag> + <xtag use="true" ></bdi></xtag> + </action> + <action shortcut="" icon="html5_bdo" type="tag" tooltip="" name="bdo" text="bdo" > + <tag useDialog="false" ><bdo dir=""></tag> + <xtag use="true" ></bdo></xtag> + </action> + <action shortcut="" icon="html5_ruby" type="tag" tooltip="" name="ruby" text="ruby" > + <tag useDialog="false" ><ruby></tag> + <xtag use="true" ></ruby></xtag> + </action> + <action shortcut="" icon="html5_rt" type="tag" tooltip="" name="rt" text="rt" > + <tag useDialog="false" ><rt></tag> + <xtag use="true" ></rt></xtag> + </action> + <action shortcut="" icon="html5_rp" type="tag" tooltip="" name="rp" text="rp" > + <tag useDialog="false" ><rp></tag> + <xtag use="true" ></rp></xtag> + </action> + <action shortcut="" icon="html5_br" type="tag" tooltip="" name="br" text="br" > + <tag useDialog="false" ><br></tag> + </action> + <action shortcut="" icon="html5_wbr" type="tag" tooltip="" name="wbr" text="wbr" > + <tag useDialog="false" ><wbr></tag> + </action> + <action shortcut="" icon="html5_span" type="tag" tooltip="" name="span" text="span" > + <tag useDialog="false" ><span></tag> + <xtag use="true" ></span></xtag> + </action> +</actions> diff --git a/quanta/data/toolbars/html5/style.toolbar b/quanta/data/toolbars/html5/style.toolbar new file mode 100644 index 00000000..99f215cd --- /dev/null +++ b/quanta/data/toolbars/html5/style.toolbar @@ -0,0 +1,36 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="quanta" version="2"> + <ToolBar tabname="Style" noMerge="1" name="style" > + <text>Style</text> + <Action name="a" /> + <Action name="strong" /> + <Action name="i" /> + <Action name="b" /> + <Action name="del" /> + <Action name="small" /> + <Action name="big" /> + <Action name="font" /> + <Action name="code" /> + <Action name="var" /> + <Action name="kbd" /> + <Action name="samp" /> + <Action name="sup" /> + <Action name="sub" /> + <Action name="q" /> + <Action name="ins" /> + <Action name="cite" /> + <Action name="time" /> + <Action name="abbr" /> + <Action name="data" /> + <Action name="mark" /> + <Action name="u" /> + <Action name="bdi" /> + <Action name="bdo" /> + <Action name="ruby" /> + <Action name="rt" /> + <Action name="rp" /> + <Action name="br" /> + <Action name="wbr" /> + <Action name="span" /> + </ToolBar> +</kpartgui> diff --git a/quanta/data/toolbars/html5/tools.actions b/quanta/data/toolbars/html5/tools.actions new file mode 100644 index 00000000..bbae9334 --- /dev/null +++ b/quanta/data/toolbars/html5/tools.actions @@ -0,0 +1,6 @@ +<!DOCTYPE actionsconfig> +<actions> + <action shortcut="" icon="quick_start.png" type="script" tooltip="Kommander Quick Start Dialog" name="tag_quick_start_html5" text="Quick Start Dialog" > + <script output="new" error="message" input="none" >kmdr-executor -c quanta %scriptdir/htmlquickstart5.kmdr</script> + </action> +</actions> diff --git a/quanta/data/toolbars/html5/tools.toolbar b/quanta/data/toolbars/html5/tools.toolbar new file mode 100644 index 00000000..348dbc03 --- /dev/null +++ b/quanta/data/toolbars/html5/tools.toolbar @@ -0,0 +1,13 @@ +<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> +<kpartgui name="quanta" version="2"> + <ToolBar tabname="Tools" noMerge="1" name="tools" > + <text>Tools</text> + <Action name="tag_quick_start_html5" /> + <Action name="insert_css" /> + <Action name="tag_color" /> + <Action name="tag_edit_table" /> + <Action name="tag_quick_list" /> + <Action name="tag_nbsp" /> + <Action name="insert_char" /> + </ToolBar> +</kpartgui> diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp index a1a53eab..b93e9bcd 100644 --- a/quanta/dialogs/actionconfigdialog.cpp +++ b/quanta/dialogs/actionconfigdialog.cpp @@ -63,18 +63,18 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, currentAction = 0L; m_toolbarItem = 0L; - connect(actionTreeView, TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)), - TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &))); - connect(actionTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(slotSelectionChanged(TQListViewItem *))); - connect(shortcutKeyButton, TQT_SIGNAL(capturedShortcut(const TDEShortcut &)), - TQT_SLOT(slotShortcutCaptured(const TDEShortcut &))); - connect(scriptPath, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&))); - connect(this, TQT_SIGNAL(addToolbar()), m_mainWindow, TQT_SLOT(slotAddToolbar())); - connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQT_SLOT(slotRemoveToolbar(const TQString&))); - connect(this, TQT_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQT_SLOT(slotDeleteAction(TDEAction*))); - connect(this, TQT_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQT_SLOT(slotConfigureToolbars(const TQString&))); + connect(actionTreeView, TQ_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint &)), + TQ_SLOT(slotContextMenu(TDEListView *,TQListViewItem *,const TQPoint &))); + connect(actionTreeView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(slotSelectionChanged(TQListViewItem *))); + connect(shortcutKeyButton, TQ_SIGNAL(capturedShortcut(const TDEShortcut &)), + TQ_SLOT(slotShortcutCaptured(const TDEShortcut &))); + connect(scriptPath, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&))); + connect(this, TQ_SIGNAL(addToolbar()), m_mainWindow, TQ_SLOT(slotAddToolbar())); + connect(this, TQ_SIGNAL(removeToolbar(const TQString&)), m_mainWindow, TQ_SLOT(slotRemoveToolbar(const TQString&))); + connect(this, TQ_SIGNAL(deleteUserAction(TDEAction*)), m_mainWindow, TQ_SLOT(slotDeleteAction(TDEAction*))); + connect(this, TQ_SIGNAL(configureToolbars(const TQString&)), m_mainWindow, TQ_SLOT(slotConfigureToolbars(const TQString&))); //fill up the tree view with the toolbars and actions actionTreeView->setSorting(-1); allActionsItem = new TDEListViewItem(actionTreeView, i18n("All")); @@ -148,9 +148,9 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList, allActionsItem->sortChildItems(0, true); treeMenu = new TDEPopupMenu(actionTreeView); - treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQT_SLOT(slotAddToolbar())); - treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); - treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQT_SLOT(slotEditToolbar())); + treeMenu->insertItem(i18n("&Add New Toolbar"), this, TQ_SLOT(slotAddToolbar())); + treeMenu->insertItem(i18n("&Remove Toolbar"), this, TQ_SLOT(slotRemoveToolbar())); + treeMenu->insertItem(i18n("&Edit Toolbar"), this, TQ_SLOT(slotEditToolbar())); globalShortcuts = TDEGlobal::config()->entryMap( "Global Shortcuts" ); } @@ -193,7 +193,7 @@ void ActionConfigDialog::slotRemoveToolbar() if ( KMessageBox::warningContinueCancel(this, i18n("Do you really want to remove the \"%1\" toolbar?").arg(s),TQString(),KStdGuiItem::del()) == KMessageBox::Continue ) { m_toolbarItem = item; - connect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), TQT_SLOT(slotToolbarRemoved(const TQString&))); + connect(m_mainWindow, TQ_SIGNAL(toolbarRemoved(const TQString&)), TQ_SLOT(slotToolbarRemoved(const TQString&))); emit removeToolbar(s.lower()); } } @@ -204,7 +204,7 @@ void ActionConfigDialog::slotToolbarRemoved(const TQString &/*name*/) actionTreeView->setCurrentItem(allActionsItem); delete m_toolbarItem; m_toolbarItem = 0L; - disconnect(m_mainWindow, TQT_SIGNAL(toolbarRemoved(const TQString&)), this, TQT_SLOT(slotToolbarRemoved(const TQString&))); + disconnect(m_mainWindow, TQ_SIGNAL(toolbarRemoved(const TQString&)), this, TQ_SLOT(slotToolbarRemoved(const TQString&))); } void ActionConfigDialog::slotEditToolbar() diff --git a/quanta/dialogs/actionconfigdialog.h b/quanta/dialogs/actionconfigdialog.h index 853d839a..bd13c11b 100644 --- a/quanta/dialogs/actionconfigdialog.h +++ b/quanta/dialogs/actionconfigdialog.h @@ -41,7 +41,7 @@ struct ToolbarEntry { class ActionConfigDialog: public ActionConfigDialogS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/actionconfigdialogs.ui b/quanta/dialogs/actionconfigdialogs.ui index f9ecce1b..1a56c42b 100644 --- a/quanta/dialogs/actionconfigdialogs.ui +++ b/quanta/dialogs/actionconfigdialogs.ui @@ -972,7 +972,7 @@ <tabstop>buttonApply</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>buttonOk_clicked()</slot> <slot>slotNewAction()</slot> <slot>slotDeleteAction()</slot> @@ -985,7 +985,7 @@ <slot>shortcutKeyButton_toggled(bool)</slot> <slot>slotToggled(bool)</slot> <slot>slotTextChanged()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kkeybutton.h</include> diff --git a/quanta/dialogs/copyto.cpp b/quanta/dialogs/copyto.cpp index b5c53356..a7d5a55b 100644 --- a/quanta/dialogs/copyto.cpp +++ b/quanta/dialogs/copyto.cpp @@ -63,8 +63,8 @@ KURL CopyTo::copy(const KURL& urlToCopy, const KURL& destination) destURL.adjustPath(1); TDEIO::CopyJob *job = TDEIO::copy(urlToCopy, destURL, true); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); TQString path = destURL.path(); if (path != "." && path != "..") @@ -117,8 +117,8 @@ KURL::List CopyTo::copy(const KURL::List& sourceList, const KURL& destination ) } TDEIO::CopyJob *job = TDEIO::copy(sourceList, targetDirURL, true); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); } return m_destList; diff --git a/quanta/dialogs/copyto.h b/quanta/dialogs/copyto.h index 3e021e0a..212bd014 100644 --- a/quanta/dialogs/copyto.h +++ b/quanta/dialogs/copyto.h @@ -29,7 +29,7 @@ class KURL; class CopyTo : public TQObject{ -Q_OBJECT +TQ_OBJECT public: CopyTo(const KURL& dirURL); diff --git a/quanta/dialogs/dirtydlg.cpp b/quanta/dialogs/dirtydlg.cpp index 720c3d8a..6f8f2b6c 100644 --- a/quanta/dialogs/dirtydlg.cpp +++ b/quanta/dialogs/dirtydlg.cpp @@ -56,7 +56,7 @@ void DirtyDlg::slotOk() TDEProcess *proc = new TDEProcess(); *proc << "kompare" << m_src.path() << m_dest.path(); proc->start(); - connect(proc, TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotCompareDone(TDEProcess*))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotCompareDone(TDEProcess*))); enableButton(KDialogBase::Ok, false); enableButton(KDialogBase::Cancel, false); } else @@ -88,8 +88,8 @@ void DirtyDlg::slotCompareDone(TDEProcess* proc) //TODO: Replace with TDEIO::NetAccess::file_move, when KDE 3.1 support //is dropped TDEIO::FileCopyJob *job = TDEIO::file_move(m_dest, m_src, m_permissions, true, false,false ); - connect( job, TQT_SIGNAL(result( TDEIO::Job *)), - TQT_SLOT (slotResult( TDEIO::Job *))); + connect( job, TQ_SIGNAL(result( TDEIO::Job *)), + TQ_SLOT (slotResult( TDEIO::Job *))); } diff --git a/quanta/dialogs/dirtydlg.h b/quanta/dialogs/dirtydlg.h index 5fd14e36..f8264a1c 100644 --- a/quanta/dialogs/dirtydlg.h +++ b/quanta/dialogs/dirtydlg.h @@ -27,7 +27,7 @@ class TDEProcess; class TQCloseEvent; class DirtyDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/donationdialog.ui b/quanta/dialogs/donationdialog.ui index c8a95785..0d632baf 100644 --- a/quanta/dialogs/donationdialog.ui +++ b/quanta/dialogs/donationdialog.ui @@ -143,9 +143,9 @@ is the future of software, but it is no guarantee of success. How many open sour <tabstop>KTextBrowser2</tabstop> <tabstop>closeButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/quanta/dialogs/dtdselectdialog.ui b/quanta/dialogs/dtdselectdialog.ui index cd6a079b..21b08abf 100644 --- a/quanta/dialogs/dtdselectdialog.ui +++ b/quanta/dialogs/dtdselectdialog.ui @@ -105,8 +105,8 @@ Dialog message2:</string> <includes> <include location="local" impldecl="in implementation">dtdselectdialog.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/dtepeditdlg.h b/quanta/dialogs/dtepeditdlg.h index a570881d..e53a2988 100644 --- a/quanta/dialogs/dtepeditdlg.h +++ b/quanta/dialogs/dtepeditdlg.h @@ -55,7 +55,7 @@ struct StructGroup { class DTEPEditDlg : public DTEPEditDlgS { - Q_OBJECT + TQ_OBJECT public: DTEPEditDlg(const TQString& descriptionFile, TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/dialogs/dtepeditdlgs.ui b/quanta/dialogs/dtepeditdlgs.ui index 6e38acd2..ca68fcff 100644 --- a/quanta/dialogs/dtepeditdlgs.ui +++ b/quanta/dialogs/dtepeditdlgs.ui @@ -1957,12 +1957,12 @@ Example: <b>//&nbsp;EOL,&nbsp;/*&nbsp;*/</b></string> <tabstop>editStructButton</tabstop> <tabstop>deleteStructButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected">slotEditStructGroup()</slot> <slot>slotAddStructGroup()</slot> <slot>slotDeleteStructGroup()</slot> <slot>slotFamilyChanged(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/quanta/dialogs/filecombo.cpp b/quanta/dialogs/filecombo.cpp index 1293d8b4..2f5938f1 100644 --- a/quanta/dialogs/filecombo.cpp +++ b/quanta/dialogs/filecombo.cpp @@ -47,9 +47,9 @@ FileCombo::FileCombo(const KURL& a_baseURL, TQWidget *parent, const char *name ) layout ->addWidget( combo ); layout ->addWidget( button ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); - connect( combo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( combo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); + connect( combo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); setFocusProxy(combo); } @@ -69,9 +69,9 @@ FileCombo::FileCombo( TQWidget *parent, const char *name ) layout ->addWidget( combo ); layout ->addWidget( button ); - connect( button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( combo, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); - connect( combo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( combo, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); + connect( combo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); setFocusProxy(combo); } diff --git a/quanta/dialogs/filecombo.h b/quanta/dialogs/filecombo.h index 3288cd85..ebeef6fe 100644 --- a/quanta/dialogs/filecombo.h +++ b/quanta/dialogs/filecombo.h @@ -30,7 +30,7 @@ class TQPushButton; class KURL; class FileCombo : public TQWidget { - Q_OBJECT + TQ_OBJECT public: FileCombo(const KURL& a_baseURL, TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/fourbuttonmessagebox.ui b/quanta/dialogs/fourbuttonmessagebox.ui index 577f9ea9..924eb83e 100644 --- a/quanta/dialogs/fourbuttonmessagebox.ui +++ b/quanta/dialogs/fourbuttonmessagebox.ui @@ -152,12 +152,12 @@ <variables> <variable>int m_status;</variable> </variables> -<Q_SLOTS> +<slots> <slot>cancelButton_clicked()</slot> <slot>user1Button_clicked()</slot> <slot>user2Button_clicked()</slot> <slot>user3Button_clicked()</slot> -</Q_SLOTS> +</slots> <functions> <function specifier="non virtual" returnType="int">status()</function> </functions> diff --git a/quanta/dialogs/settings/abbreviation.cpp b/quanta/dialogs/settings/abbreviation.cpp index 85d3065b..8d3aa45c 100644 --- a/quanta/dialogs/settings/abbreviation.cpp +++ b/quanta/dialogs/settings/abbreviation.cpp @@ -98,7 +98,7 @@ void AbbreviationDlg::slotNewGroup() if (qConfig.abbreviations.contains(groupName)) { KMessageBox::error(this, i18n("<qt>There is already an abbreviation group called <b>%1</b>. Choose an unique name for the new group.</qt>").arg(groupName), i18n("Group already exists")); - TQTimer::singleShot(0, this, TQT_SLOT(slotNewGroup())); + TQTimer::singleShot(0, this, TQ_SLOT(slotNewGroup())); } else { groupCombo->insertItem(groupName); diff --git a/quanta/dialogs/settings/abbreviation.h b/quanta/dialogs/settings/abbreviation.h index 39f49ff3..35120764 100644 --- a/quanta/dialogs/settings/abbreviation.h +++ b/quanta/dialogs/settings/abbreviation.h @@ -26,7 +26,7 @@ struct DTDStruct; class AbbreviationDlg : public AbbreviationDlgS { - Q_OBJECT + TQ_OBJECT public: AbbreviationDlg(TQWidget *parent, const char *name = 0); diff --git a/quanta/dialogs/settings/abbreviations.ui b/quanta/dialogs/settings/abbreviations.ui index de8cbd6d..7782617d 100644 --- a/quanta/dialogs/settings/abbreviations.ui +++ b/quanta/dialogs/settings/abbreviations.ui @@ -337,7 +337,7 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>slotTemplateSelectionChanged(TQListViewItem*)</slot> <slot>dtdCombo_activated(const TQString&)</slot> <slot>slotGroupChanged(const TQString&)</slot> @@ -348,7 +348,7 @@ <slot>slotAddDTEP()</slot> <slot>slotRemoveDTEP()</slot> <slot>slotNewGroup()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/quanta/dialogs/settings/codetemplatedlgs.ui b/quanta/dialogs/settings/codetemplatedlgs.ui index 7a1367b9..d7e28e55 100644 --- a/quanta/dialogs/settings/codetemplatedlgs.ui +++ b/quanta/dialogs/settings/codetemplatedlgs.ui @@ -72,10 +72,10 @@ <tabstop>templateEdit</tabstop> <tabstop>descriptionEdit</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>accept()</slot> <slot>reject()</slot> <slot>pushButton4_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/dialogs/settings/filemasks.cpp b/quanta/dialogs/settings/filemasks.cpp index fee135f8..5688b920 100644 --- a/quanta/dialogs/settings/filemasks.cpp +++ b/quanta/dialogs/settings/filemasks.cpp @@ -26,7 +26,7 @@ FileMasks::FileMasks(TQWidget *parent, const char *name) :FileMasksS(parent,name) { - connect(buttonDefault, TQT_SIGNAL(clicked()), this, TQT_SLOT(setToDefault())); + connect(buttonDefault, TQ_SIGNAL(clicked()), this, TQ_SLOT(setToDefault())); } FileMasks::~FileMasks(){ diff --git a/quanta/dialogs/settings/filemasks.h b/quanta/dialogs/settings/filemasks.h index 1a76334e..08f49cb1 100644 --- a/quanta/dialogs/settings/filemasks.h +++ b/quanta/dialogs/settings/filemasks.h @@ -23,7 +23,7 @@ class FileMasks : public FileMasksS { - Q_OBJECT + TQ_OBJECT public: FileMasks(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/settings/parseroptions.h b/quanta/dialogs/settings/parseroptions.h index 89058786..bd37836b 100644 --- a/quanta/dialogs/settings/parseroptions.h +++ b/quanta/dialogs/settings/parseroptions.h @@ -22,7 +22,7 @@ class TDEConfig; class ParserOptions : public ParserOptionsUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/settings/previewoptions.h b/quanta/dialogs/settings/previewoptions.h index f688d02d..d92315ed 100644 --- a/quanta/dialogs/settings/previewoptions.h +++ b/quanta/dialogs/settings/previewoptions.h @@ -23,7 +23,7 @@ class TDEConfig; class PreviewOptions : public PreviewOptionsS { - Q_OBJECT + TQ_OBJECT public: PreviewOptions(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/specialchardialog.cpp b/quanta/dialogs/specialchardialog.cpp index b9f90264..378c0c22 100644 --- a/quanta/dialogs/specialchardialog.cpp +++ b/quanta/dialogs/specialchardialog.cpp @@ -31,13 +31,13 @@ SpecialCharDialog::SpecialCharDialog( TQWidget* parent, const char* name, bool modal, WFlags fl) :SpecialCharDialogS( parent, name, modal, fl ) { - connect ( FilterLineEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(filterChars(const TQString&)) ); - connect ( CharsListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - TQT_SLOT(insertCode()) ); - connect (buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(insertCode())); - connect (buttonChar, TQT_SIGNAL(clicked()), TQT_SLOT(insertChar())); - connect (buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancel())); + connect ( FilterLineEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(filterChars(const TQString&)) ); + connect ( CharsListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + TQ_SLOT(insertCode()) ); + connect (buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(insertCode())); + connect (buttonChar, TQ_SIGNAL(clicked()), TQ_SLOT(insertChar())); + connect (buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancel())); filterChars(""); } diff --git a/quanta/dialogs/specialchardialog.h b/quanta/dialogs/specialchardialog.h index 807ece8f..75cc935b 100644 --- a/quanta/dialogs/specialchardialog.h +++ b/quanta/dialogs/specialchardialog.h @@ -23,7 +23,7 @@ class SpecialCharDialog : public SpecialCharDialogS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/specialchardialogs.ui b/quanta/dialogs/specialchardialogs.ui index a9a606bf..136e181b 100644 --- a/quanta/dialogs/specialchardialogs.ui +++ b/quanta/dialogs/specialchardialogs.ui @@ -94,9 +94,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/quanta/dialogs/tagdialogs/colorcombo.cpp b/quanta/dialogs/tagdialogs/colorcombo.cpp index 5b735fcf..c12f2136 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.cpp +++ b/quanta/dialogs/tagdialogs/colorcombo.cpp @@ -78,8 +78,8 @@ ColorCombo::ColorCombo( TQWidget *parent, const char *name ) addColors(); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); - connect( this, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotHighlighted(int) ) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) ); + connect( this, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotHighlighted(int) ) ); } ColorCombo::~ColorCombo() diff --git a/quanta/dialogs/tagdialogs/colorcombo.h b/quanta/dialogs/tagdialogs/colorcombo.h index 0c05dc5a..ad6209d1 100644 --- a/quanta/dialogs/tagdialogs/colorcombo.h +++ b/quanta/dialogs/tagdialogs/colorcombo.h @@ -39,7 +39,7 @@ */ class ColorCombo : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: ColorCombo( TQWidget *parent = 0L, const char *name = 0L ); diff --git a/quanta/dialogs/tagdialogs/listdlg.cpp b/quanta/dialogs/tagdialogs/listdlg.cpp index eeb6bfc2..413add61 100644 --- a/quanta/dialogs/tagdialogs/listdlg.cpp +++ b/quanta/dialogs/tagdialogs/listdlg.cpp @@ -42,7 +42,7 @@ ListDlg::ListDlg(TQStringList &entryList,TQWidget* parent, const char *name ) adjustSize(); resize(sizeHint()); - connect(listbox,TQT_SIGNAL(doubleClicked( TQListBoxItem * )), TQT_SLOT(slotOk())); + connect(listbox,TQ_SIGNAL(doubleClicked( TQListBoxItem * )), TQ_SLOT(slotOk())); } ListDlg::~ListDlg(){ diff --git a/quanta/dialogs/tagdialogs/listdlg.h b/quanta/dialogs/tagdialogs/listdlg.h index 3d190ae7..74663c1f 100644 --- a/quanta/dialogs/tagdialogs/listdlg.h +++ b/quanta/dialogs/tagdialogs/listdlg.h @@ -31,7 +31,7 @@ selected item with the getEntry() method. */ class ListDlg : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: ListDlg(TQStringList &entryList,TQWidget* parent=0, const char *name =0); diff --git a/quanta/dialogs/tagdialogs/pictureview.h b/quanta/dialogs/tagdialogs/pictureview.h index 2ee4cfd0..759ee335 100644 --- a/quanta/dialogs/tagdialogs/pictureview.h +++ b/quanta/dialogs/tagdialogs/pictureview.h @@ -28,7 +28,7 @@ used by TagImgDlg */ class PictureView : public TQFrame { - Q_OBJECT + TQ_OBJECT public: PictureView(TQWidget *parent=0, char *file=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagdialog.cpp b/quanta/dialogs/tagdialogs/tagdialog.cpp index 7db3c307..b788bb3a 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.cpp +++ b/quanta/dialogs/tagdialogs/tagdialog.cpp @@ -118,8 +118,8 @@ void TagDialog::init(TQTag *a_dtdTag, KURL a_baseURL) setOkButton(KStdGuiItem::ok().text()); setCancelButton(KStdGuiItem::cancel().text()); - connect( this, TQT_SIGNAL(applyButtonPressed()), TQT_SLOT(slotAccept()) ); - connect( this, TQT_SIGNAL(cancelButtonPressed()), TQT_SLOT(reject()) ); + connect( this, TQ_SIGNAL(applyButtonPressed()), TQ_SLOT(slotAccept()) ); + connect( this, TQ_SIGNAL(cancelButtonPressed()), TQ_SLOT(reject()) ); if (!a_dtdTag) //the tag is invalid, let's create a default one { diff --git a/quanta/dialogs/tagdialogs/tagdialog.h b/quanta/dialogs/tagdialogs/tagdialog.h index 21ad7b0f..4d9c3fb5 100644 --- a/quanta/dialogs/tagdialogs/tagdialog.h +++ b/quanta/dialogs/tagdialogs/tagdialog.h @@ -38,7 +38,7 @@ class KURL; class TQShowEvent; class TagDialog : public TQTabDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.cpp b/quanta/dialogs/tagdialogs/tagimgdlg.cpp index 4c9531ee..02e61726 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagimgdlg.cpp @@ -36,7 +36,7 @@ TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name) + : TQWidget(parent,name), TagWidget(parent,name) { m_dtd = dtd; img = 0L; @@ -45,9 +45,9 @@ TagImgDlg::TagImgDlg(const DTDStruct *dtd, TQWidget *parent, const char *name) initDialog(); - connect( buttonImgSource, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFileSelect()) ); - connect( buttonRecalcImgSize, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecalcImgSize()) ); - connect( lineImgSource, TQT_SIGNAL( returnPressed()), this, TQT_SLOT(slotLineFileSelect()) ); + connect( buttonImgSource, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFileSelect()) ); + connect( buttonRecalcImgSize, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRecalcImgSize()) ); + connect( lineImgSource, TQ_SIGNAL( returnPressed()), this, TQ_SLOT(slotLineFileSelect()) ); } TagImgDlg::~TagImgDlg() diff --git a/quanta/dialogs/tagdialogs/tagimgdlg.h b/quanta/dialogs/tagdialogs/tagimgdlg.h index 09d3a3ee..e09634ff 100644 --- a/quanta/dialogs/tagdialogs/tagimgdlg.h +++ b/quanta/dialogs/tagdialogs/tagimgdlg.h @@ -39,7 +39,7 @@ class TQImage; */ class TagImgDlg : public TQWidget, TagWidget { - Q_OBJECT + TQ_OBJECT public: TagImgDlg(const DTDStruct *dtd, TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.cpp b/quanta/dialogs/tagdialogs/tagmaildlg.cpp index ff91277d..925d79c0 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmaildlg.cpp @@ -40,9 +40,9 @@ TagMailDlg::TagMailDlg(TQWidget *parent, const char *name) setCaption(name); setModal(true); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); - connect( buttonAddressSelect, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectAddress()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); + connect( buttonAddressSelect, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectAddress()) ); buttonOk->setIconSet(SmallIconSet("button_ok")); buttonCancel->setIconSet(SmallIconSet("button_cancel")); lineEmail->setFocus(); diff --git a/quanta/dialogs/tagdialogs/tagmaildlg.h b/quanta/dialogs/tagdialogs/tagmaildlg.h index 9cb82e5d..8a1a6e21 100644 --- a/quanta/dialogs/tagdialogs/tagmaildlg.h +++ b/quanta/dialogs/tagdialogs/tagmaildlg.h @@ -23,7 +23,7 @@ */ class TagMailDlg : public TagMail { -Q_OBJECT +TQ_OBJECT public: TagMailDlg(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp index bea9a81f..b95fe0e9 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.cpp @@ -23,7 +23,7 @@ TagMiscDlg::TagMiscDlg( TQWidget* parent, const char* name, bool addClosingTag, :KDialogBase( parent, name, true, i18n("Misc. Tag"), KDialogBase::Ok | KDialogBase::Cancel ) { miscWidget = new TagMisc(this); - connect( miscWidget->elementName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotMiscTagChanged(const TQString & ) ) ); + connect( miscWidget->elementName, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotMiscTagChanged(const TQString & ) ) ); setMainWidget(miscWidget); miscWidget->addClosingTag->setChecked(addClosingTag); miscWidget->elementName->setText(element); diff --git a/quanta/dialogs/tagdialogs/tagmiscdlg.h b/quanta/dialogs/tagdialogs/tagmiscdlg.h index 222d6bab..3c56ec07 100644 --- a/quanta/dialogs/tagdialogs/tagmiscdlg.h +++ b/quanta/dialogs/tagdialogs/tagmiscdlg.h @@ -23,7 +23,7 @@ class TagMisc; class TagMiscDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp index 7a9edbdb..f070eeaf 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.cpp @@ -33,8 +33,8 @@ TagQuickListDlg::TagQuickListDlg(TQWidget *parent, const char *name) groupBox->insert(radioOrdered); groupBox->insert(radioUnordered); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); } TagQuickListDlg::~TagQuickListDlg(){ diff --git a/quanta/dialogs/tagdialogs/tagquicklistdlg.h b/quanta/dialogs/tagdialogs/tagquicklistdlg.h index 946efb67..c0f0f310 100644 --- a/quanta/dialogs/tagdialogs/tagquicklistdlg.h +++ b/quanta/dialogs/tagdialogs/tagquicklistdlg.h @@ -32,7 +32,7 @@ class TQButtonGroup; */ class TagQuickListDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT public: TagQuickListDlg(TQWidget *parent=0, const char *name=0); diff --git a/quanta/dialogs/tagdialogs/tagxml.cpp b/quanta/dialogs/tagdialogs/tagxml.cpp index 2db18a3e..c94146bb 100644 --- a/quanta/dialogs/tagdialogs/tagxml.cpp +++ b/quanta/dialogs/tagdialogs/tagxml.cpp @@ -30,13 +30,13 @@ #include "styleeditor.h" Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, TQWidget *parent, const char *name) - :TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name), doc(d) + :TQWidget(parent,name), TagWidget(parent,name), doc(d) { initialize(d, dtdTag); } Tagxml::Tagxml( TQDomNode &d, TQTag *dtdTag, const TQString& selection, TQWidget *parent, const char *name) - : TQWidget(parent,name), TagWidget(TQT_TQOBJECT(parent),name), doc(d), m_selection(selection) + : TQWidget(parent,name), TagWidget(parent,name), doc(d), m_selection(selection) { initialize(d, dtdTag); } diff --git a/quanta/dialogs/tagdialogs/tagxml.h b/quanta/dialogs/tagdialogs/tagxml.h index ec25e7ed..13013056 100644 --- a/quanta/dialogs/tagdialogs/tagxml.h +++ b/quanta/dialogs/tagdialogs/tagxml.h @@ -27,7 +27,7 @@ #include "qtag.h" class Tagxml : public TQWidget, TagWidget { - Q_OBJECT + TQ_OBJECT public: /** construtor */ diff --git a/quanta/messages/annotationoutput.cpp b/quanta/messages/annotationoutput.cpp index 418f7f17..892f6dc9 100644 --- a/quanta/messages/annotationoutput.cpp +++ b/quanta/messages/annotationoutput.cpp @@ -50,7 +50,7 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) m_yourAnnotations->setLineWidth(2); addTab(m_yourAnnotations, i18n("For You")); - connect(m_yourAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(yourAnnotationsItemExecuted(TQListViewItem *))); + connect(m_yourAnnotations, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(yourAnnotationsItemExecuted(TQListViewItem *))); m_allAnnotations = new TDEListView(this); m_allAnnotations->addColumn("1", -1); @@ -59,14 +59,14 @@ AnnotationOutput::AnnotationOutput(TQWidget *parent, const char *name) m_allAnnotations->header()->hide(); m_allAnnotations->setSorting(1); m_allAnnotations->setLineWidth(2); - connect(m_allAnnotations, TQT_SIGNAL(executed(TQListViewItem*)), TQT_SLOT(allAnnotationsItemExecuted(TQListViewItem *))); + connect(m_allAnnotations, TQ_SIGNAL(executed(TQListViewItem*)), TQ_SLOT(allAnnotationsItemExecuted(TQListViewItem *))); addTab(m_allAnnotations, i18n("All Files")); - connect(this, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(tabChanged(TQWidget*))); + connect(this, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(tabChanged(TQWidget*))); m_updateTimer = new TQTimer(this); - connect(m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateNextFile())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateNextFile())); m_yourAnnotationsNum = 0; } @@ -324,7 +324,7 @@ void AnnotationOutput::updateAnnotationForFile(const KURL& url) } else pos++; int pos2 = line.find(rx); - annotations.insert(i, tqMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver)); + annotations.insert(i, qMakePair(line.mid(pos, pos2 - pos).stripWhiteSpace(), receiver)); } ++i; } diff --git a/quanta/messages/annotationoutput.h b/quanta/messages/annotationoutput.h index 850b3e7c..d2060142 100644 --- a/quanta/messages/annotationoutput.h +++ b/quanta/messages/annotationoutput.h @@ -36,7 +36,7 @@ enum AnnotationScope class AnnotationOutput : public KTabWidget { -Q_OBJECT +TQ_OBJECT public: AnnotationOutput(TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/messages/messageoutput.cpp b/quanta/messages/messageoutput.cpp index 06625c74..1abab263 100644 --- a/quanta/messages/messageoutput.cpp +++ b/quanta/messages/messageoutput.cpp @@ -38,20 +38,20 @@ MessageOutput::MessageOutput(TQWidget *parent, const char *name ) m_maxItems = 2000; TQPalette pal = palette(); - pal.setColor(TQColorGroup::HighlightedText, pal.color(TQPalette::Normal, TQColorGroup::Text)); - pal.setColor(TQColorGroup::Highlight, pal.color(TQPalette::Normal, TQColorGroup::Mid)); + pal.setColor(TQColorGroup::HighlightedText, pal.color(TQPalette::Active, TQColorGroup::Text)); + pal.setColor(TQColorGroup::Highlight, pal.color(TQPalette::Active, TQColorGroup::Mid)); setPalette(pal); - setFocusPolicy( TQ_NoFocus ); + setFocusPolicy( TQWidget::NoFocus ); m_popupMenu = new TDEPopupMenu(this); - connect(this, TQT_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); - m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQT_SLOT(copyContent()) ) ; - m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQT_SLOT(saveContent()) ) ; + connect(this, TQ_SIGNAL(contextMenuRequested(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(showMenu(TQListBoxItem*, const TQPoint&))); + m_popupMenu->insertItem( SmallIconSet("edit-copy"), i18n("&Copy"), this, TQ_SLOT(copyContent()) ) ; + m_popupMenu->insertItem( SmallIconSet("document-save-as"), i18n("&Save As..."), this, TQ_SLOT(saveContent()) ) ; m_popupMenu->insertSeparator(); - m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQT_SLOT(clear()) ) ; + m_popupMenu->insertItem( SmallIconSet("edit-clear"), i18n("Clear"), this, TQ_SLOT(clear()) ) ; - connect( this, TQT_SIGNAL(clicked(TQListBoxItem*)), TQT_SLOT(clickItem(TQListBoxItem*)) ); + connect( this, TQ_SIGNAL(clicked(TQListBoxItem*)), TQ_SLOT(clickItem(TQListBoxItem*)) ); } MessageOutput::~MessageOutput() diff --git a/quanta/messages/messageoutput.h b/quanta/messages/messageoutput.h index f958ac00..8a67922b 100644 --- a/quanta/messages/messageoutput.h +++ b/quanta/messages/messageoutput.h @@ -31,7 +31,7 @@ weblint output */ class MessageOutput : public TQListBox { - Q_OBJECT + TQ_OBJECT public: MessageOutput(TQWidget *parent=0, const char *name=0); diff --git a/quanta/parsers/dtd/dtdparser.cpp b/quanta/parsers/dtd/dtdparser.cpp index 0562f61e..9de0f39a 100644 --- a/quanta/parsers/dtd/dtdparser.cpp +++ b/quanta/parsers/dtd/dtdparser.cpp @@ -36,10 +36,6 @@ #include <tdeio/netaccess.h> //other includes -#ifdef LIBXML_2_5 -#include <libxml/hash.h> -#endif - #include <libxml/parser.h> #include <libxml/valid.h> @@ -86,8 +82,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) if( DTD::dtd_ptr == NULL ) { TQString errorStr = i18n("Unknown"); -#ifndef LIBXML_2_5 - xmlErrorPtr errorPtr = xmlGetLastError(); + // The type used is either xmlErrorPtr or const xmlError* + auto errorPtr = xmlGetLastError(); if (errorPtr != NULL) { TQString s = TQString::fromLatin1(errorPtr->message); @@ -103,9 +99,8 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) if (!s.isEmpty()) errorStr += "<br>" + s; errorStr += TQString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2); - xmlResetError(errorPtr); + xmlResetLastError(); } -#endif KMessageBox::error(0, i18n("<qt>Error while parsing the DTD.<br>The error message is:<br><i>%1</i></qt>").arg(errorStr)); return false; } @@ -148,7 +143,7 @@ bool DTDParser::parse(const TQString &targetDir, bool entitiesOnly) TQFile file( DTD::dirName + "entities.tag" ); if ( file.open( IO_WriteOnly ) ) { - DTD::entityStream.setDevice(TQT_TQIODEVICE(&file)); + DTD::entityStream.setDevice(&file); DTD::entityStream.setEncoding(TQTextStream::UnicodeUTF8); DTD::entityStream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl; DTD::entityStream << "<!DOCTYPE TAGS>" << endl diff --git a/quanta/parsers/parser.cpp b/quanta/parsers/parser.cpp index cfca7279..f789f911 100644 --- a/quanta/parsers/parser.cpp +++ b/quanta/parsers/parser.cpp @@ -79,10 +79,10 @@ Parser::Parser() m_parsingNeeded = true; m_parseIncludedFiles = true; m_saParser = new SAParser(); - connect(m_saParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(m_saParser, TQT_SIGNAL(cleanGroups()), TQT_SLOT(cleanGroups())); + connect(m_saParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(m_saParser, TQ_SIGNAL(cleanGroups()), TQ_SLOT(cleanGroups())); ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); } Parser::~Parser() @@ -567,7 +567,7 @@ Node *Parser::parse(Document *w, bool force) emit nodeTreeChanged(); if (saParserEnabled) - TQTimer::singleShot(0, this, TQT_SLOT(slotParseInDetail())); + TQTimer::singleShot(0, this, TQ_SLOT(slotParseInDetail())); return m_node; } @@ -1244,7 +1244,7 @@ Node *Parser::rebuild(Document *w) m_saParser->init(m_node, w); if (saParserEnabled) - TQTimer::singleShot(0, this, TQT_SLOT(slotParseInDetail())); + TQTimer::singleShot(0, this, TQ_SLOT(slotParseInDetail())); emit nodeTreeChanged(); m_parsingNeeded = false; return m_node; @@ -1297,7 +1297,7 @@ void Parser::clearGroups() ParserCommon::includedFilesDTD.clear(); delete ParserCommon::includeWatch; ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); m_parseIncludedFiles = true; } @@ -1345,7 +1345,7 @@ void Parser::cleanGroups() { delete ParserCommon::includeWatch; ParserCommon::includeWatch = new KDirWatch(); - connect(ParserCommon::includeWatch, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotIncludedFileChanged(const TQString&))); + connect(ParserCommon::includeWatch, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotIncludedFileChanged(const TQString&))); parseIncludedFiles(); } } diff --git a/quanta/parsers/parser.h b/quanta/parsers/parser.h index d717f6f2..e3869b6b 100644 --- a/quanta/parsers/parser.h +++ b/quanta/parsers/parser.h @@ -44,7 +44,7 @@ typedef TQMap<TQString, IncludedGroupElements> IncludedGroupElementsMap; class Parser: public TQObject { -Q_OBJECT +TQ_OBJECT public: diff --git a/quanta/parsers/sagroupparser.cpp b/quanta/parsers/sagroupparser.cpp index 000ba002..1b665ebf 100644 --- a/quanta/parsers/sagroupparser.cpp +++ b/quanta/parsers/sagroupparser.cpp @@ -46,7 +46,7 @@ SAGroupParser::SAGroupParser(SAParser *parent, Document *write, Node *startNode, m_write = write; m_count = 0; m_parseForGroupTimer = new TQTimer(this); - connect(m_parseForGroupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseForScriptGroup())); + connect(m_parseForGroupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseForScriptGroup())); } void SAGroupParser::slotParseForScriptGroup() diff --git a/quanta/parsers/sagroupparser.h b/quanta/parsers/sagroupparser.h index ca4add8f..83ec62ef 100644 --- a/quanta/parsers/sagroupparser.h +++ b/quanta/parsers/sagroupparser.h @@ -31,7 +31,7 @@ class SAParser; */ class SAGroupParser : public TQObject { -Q_OBJECT +TQ_OBJECT public: public: diff --git a/quanta/parsers/saparser.cpp b/quanta/parsers/saparser.cpp index 691c2d2e..fcf9b17d 100644 --- a/quanta/parsers/saparser.cpp +++ b/quanta/parsers/saparser.cpp @@ -44,9 +44,9 @@ SAParser::SAParser() m_parsingEnabled = true; m_synchronous = true; m_parseOneLineTimer = new TQTimer(this); - connect(m_parseOneLineTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseOneLine())); + connect(m_parseOneLineTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseOneLine())); m_parseInDetailTimer = new TQTimer(this); - connect(m_parseInDetailTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotParseNodeInDetail())); + connect(m_parseInDetailTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotParseNodeInDetail())); } SAParser::~SAParser() @@ -396,9 +396,9 @@ bool SAParser::slotParseOneLine() } } SAGroupParser *groupParser = new SAGroupParser(this, write(), g_node, g_endNode, m_synchronous, parsingLastNode, true); - connect(groupParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(groupParser, TQT_SIGNAL(cleanGroups()), TQT_SIGNAL(cleanGroups())); - connect(groupParser, TQT_SIGNAL(parsingDone(SAGroupParser*)), TQT_SLOT(slotGroupParsingDone(SAGroupParser*))); + connect(groupParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(groupParser, TQ_SIGNAL(cleanGroups()), TQ_SIGNAL(cleanGroups())); + connect(groupParser, TQ_SIGNAL(parsingDone(SAGroupParser*)), TQ_SLOT(slotGroupParsingDone(SAGroupParser*))); groupParser->slotParseForScriptGroup(); m_groupParsers.append(groupParser); } @@ -818,9 +818,9 @@ Node *SAParser::parsingDone() if (!m_synchronous) { SAGroupParser *groupParser = new SAGroupParser(this, write(), g_node, 0L, m_synchronous, true /*last node*/, true); - connect(groupParser, TQT_SIGNAL(rebuildStructureTree(bool)), TQT_SIGNAL(rebuildStructureTree(bool))); - connect(groupParser, TQT_SIGNAL(cleanGroups()), TQT_SIGNAL(cleanGroups())); - connect(groupParser, TQT_SIGNAL(parsingDone(SAGroupParser*)), TQT_SLOT(slotGroupParsingDone(SAGroupParser*))); + connect(groupParser, TQ_SIGNAL(rebuildStructureTree(bool)), TQ_SIGNAL(rebuildStructureTree(bool))); + connect(groupParser, TQ_SIGNAL(cleanGroups()), TQ_SIGNAL(cleanGroups())); + connect(groupParser, TQ_SIGNAL(parsingDone(SAGroupParser*)), TQ_SLOT(slotGroupParsingDone(SAGroupParser*))); groupParser->slotParseForScriptGroup(); m_groupParsers.append(groupParser); } diff --git a/quanta/parsers/saparser.h b/quanta/parsers/saparser.h index 463cf1b9..8360985d 100644 --- a/quanta/parsers/saparser.h +++ b/quanta/parsers/saparser.h @@ -40,7 +40,7 @@ class SAGroupParser; */ class SAParser: public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/parts/kafka/domtreeview.cpp b/quanta/parts/kafka/domtreeview.cpp index 1c5c572d..6c74b132 100644 --- a/quanta/parts/kafka/domtreeview.cpp +++ b/quanta/parts/kafka/domtreeview.cpp @@ -38,8 +38,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char addColumn(""); setSorting(-1); part = currentpart; - connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, TQT_SLOT(showTree(const DOM::Node &))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, TQ_SLOT(showTree(const DOM::Node &))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotItemClicked(TQListViewItem *))); m_nodedict.setAutoDelete(true); title = ""; titleItem = new TQListViewItem(static_cast<TQListView *>(this), title, ""); diff --git a/quanta/parts/kafka/domtreeview.h b/quanta/parts/kafka/domtreeview.h index bd67d9fd..45e00176 100644 --- a/quanta/parts/kafka/domtreeview.h +++ b/quanta/parts/kafka/domtreeview.h @@ -37,7 +37,7 @@ class TQGridLayout; class DOMTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DOMTreeView(TQWidget *parent, TDEHTMLPart *part, const char * name = 0); @@ -66,7 +66,7 @@ class DOMTreeView : public TDEListView class KafkaDOMTreeDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: KafkaDOMTreeDialog(TQWidget *parent = 0, TDEHTMLPart *part = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); diff --git a/quanta/parts/kafka/htmldocumentproperties.cpp b/quanta/parts/kafka/htmldocumentproperties.cpp index c997ffee..ce078a8c 100644 --- a/quanta/parts/kafka/htmldocumentproperties.cpp +++ b/quanta/parts/kafka/htmldocumentproperties.cpp @@ -69,7 +69,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse ok->setAutoDefault(true); //set the taborder and disable focus for some widgets. - currentDTD->setFocusPolicy(TQ_NoFocus); + currentDTD->setFocusPolicy(TQWidget::NoFocus); TQWidget::setTabOrder(title, metaItems); TQWidget::setTabOrder(metaItems, metaItemsAdd); TQWidget::setTabOrder(metaItemsAdd, metaItemsDelete); @@ -98,7 +98,7 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse cssRules->addColumn(i18n("Rule")); cssRules->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); cssRules->setLineWidth( 2 ); - //cssRules->setFocusPolicy(TQ_ClickFocus); + //cssRules->setFocusPolicy(TQWidget::ClickFocus); cssRules->setSorting(-1); //search for the head, html, title Node @@ -230,20 +230,20 @@ htmlDocumentProperties::htmlDocumentProperties( TQWidget* parent, bool forceInse cancel->setIconSet(SmallIconSet("button_cancel")); //connect buttons - connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); - connect(cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); - connect(cssRulesAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(newCSSRule())); - connect(cssRulesEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(editCSSRule())); - connect (cssRulesDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentCSSRule())); - connect(metaItemsAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(newMetaItem())); - connect(metaItemsDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteCurrentMetaItem())); - connect(title, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(titleChanged(const TQString &))); - connect(metaItems, TQT_SIGNAL(itemModified( TQListViewItem * )), - this, TQT_SLOT(metaChanged(TQListViewItem * ))); - connect(cssRules, TQT_SIGNAL(itemModified( TQListViewItem * )), - this, TQT_SLOT(CSSChanged(TQListViewItem * ))); - connect(cssStylesheet, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(linkChanged( const TQString& ))); + connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); + connect(cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); + connect(cssRulesAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(newCSSRule())); + connect(cssRulesEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(editCSSRule())); + connect (cssRulesDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentCSSRule())); + connect(metaItemsAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(newMetaItem())); + connect(metaItemsDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteCurrentMetaItem())); + connect(title, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(titleChanged(const TQString &))); + connect(metaItems, TQ_SIGNAL(itemModified( TQListViewItem * )), + this, TQ_SLOT(metaChanged(TQListViewItem * ))); + connect(cssRules, TQ_SIGNAL(itemModified( TQListViewItem * )), + this, TQ_SLOT(CSSChanged(TQListViewItem * ))); + connect(cssStylesheet, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(linkChanged( const TQString& ))); } htmlDocumentProperties::~htmlDocumentProperties() diff --git a/quanta/parts/kafka/htmldocumentproperties.h b/quanta/parts/kafka/htmldocumentproperties.h index 2d264366..2d4e2706 100644 --- a/quanta/parts/kafka/htmldocumentproperties.h +++ b/quanta/parts/kafka/htmldocumentproperties.h @@ -44,7 +44,7 @@ public: */ class htmlDocumentProperties : public htmlDocumentPropertiesui { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/quanta/parts/kafka/htmldocumentpropertiesui.ui b/quanta/parts/kafka/htmldocumentpropertiesui.ui index baa146be..b5e18f2c 100644 --- a/quanta/parts/kafka/htmldocumentpropertiesui.ui +++ b/quanta/parts/kafka/htmldocumentpropertiesui.ui @@ -441,7 +441,7 @@ <tabstop>ok</tabstop> <tabstop>cancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="protected" specifier="pure virtual">newMetaItem()</slot> <slot access="protected" specifier="pure virtual">deleteCurrentMetaItem()</slot> <slot access="protected" specifier="pure virtual">newCSSRule()</slot> @@ -451,7 +451,7 @@ <slot access="protected" specifier="pure virtual">metaChanged(TQListViewItem * )</slot> <slot access="protected" specifier="pure virtual">CSSChanged(TQListViewItem * )</slot> <slot access="protected" specifier="pure virtual">linkChanged( const TQString& )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/quanta/parts/kafka/kafkadragobject.h b/quanta/parts/kafka/kafkadragobject.h index 00946ce7..aa73a630 100644 --- a/quanta/parts/kafka/kafkadragobject.h +++ b/quanta/parts/kafka/kafkadragobject.h @@ -28,7 +28,7 @@ class Node; */ class KafkaDragObject: public TQStoredDrag { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/parts/kafka/kafkahtmlpart.cpp b/quanta/parts/kafka/kafkahtmlpart.cpp index 545dec8c..fc0460ad 100644 --- a/quanta/parts/kafka/kafkahtmlpart.cpp +++ b/quanta/parts/kafka/kafkahtmlpart.cpp @@ -85,7 +85,7 @@ public: KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part, const char *name) - : TDEHTMLPart(widgetParent, name, TQT_TQOBJECT(parent), name), + : TDEHTMLPart(widgetParent, name, parent, name), w(part) { m_contextPopupMenu = new TQPopupMenu(); @@ -104,12 +104,12 @@ KafkaWidget::KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument // With the mix of Leo Savernik's caret Mode and the current editing // functions, it will be kind of VERY messy setCaretMode(true); - connect(this, TQT_SIGNAL(caretPositionChanged(const DOM::Node &, long)), - this, TQT_SLOT(slotNewCursorPos(const DOM::Node &, long))); + connect(this, TQ_SIGNAL(caretPositionChanged(const DOM::Node &, long)), + this, TQ_SLOT(slotNewCursorPos(const DOM::Node &, long))); setCaretDisplayPolicyNonFocused(TDEHTMLPart::CaretVisible); - connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), - this, TQT_SLOT(slotContextMenuRequested(const TQString&, const TQPoint&))); + connect(this, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)), + this, TQ_SLOT(slotContextMenuRequested(const TQString&, const TQPoint&))); view()->setMouseTracking(true); view()->installEventFilter(this); @@ -186,7 +186,7 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) kdDebug(25001) << "KafkaWidget::insertText() - added text - 1" << endl; #endif - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); return; } } @@ -263,7 +263,7 @@ void KafkaWidget::insertText(DOM::Node node, const TQString &text, int position) } //document().updateRendering(); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } void KafkaWidget::slotDelayedSetCaretPosition() @@ -467,7 +467,7 @@ void KafkaWidget::keyReturn(bool specialPressed) kdDebug(25001)<< "CURNODE : " << m_currentNode.nodeName().string() << ":" << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); kdDebug(25001)<< "CURNODE : " << m_currentNode.nodeName().string() << ":" << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; //emit domNodeNewCursorPos(m_currentNode, d->m_cursorOffset); @@ -478,7 +478,7 @@ void KafkaWidget::keyReturn(bool specialPressed) << m_currentNode.nodeValue().string() << " : " << d->m_cursorOffset << endl; #endif - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } bool KafkaWidget::eventFilter(TQObject *, TQEvent *event) @@ -508,7 +508,7 @@ bool KafkaWidget::eventFilter(TQObject *, TQEvent *event) if(event->type() == TQEvent::KeyPress || event->type() == TQEvent::IMEnd) { - TQKeyEvent *keyevent = TQT_TQKEYEVENT(event); + TQKeyEvent *keyevent = static_cast<TQKeyEvent*>(event); //Create a new NodeModifsSet where the changes will be logged. m_modifs = new NodeModifsSet(); @@ -657,7 +657,7 @@ bool KafkaWidget::eventFilter(TQObject *, TQEvent *event) kdDebug(25001) << "KafkaWidget::eventFilter() Text - " << keyevent->text() << endl; #endif - //if(( keyevent->state() & TQt::ShiftButton) || ( keyevent->state() == Qt::NoButton)) + //if(( keyevent->state() & TQt::ShiftButton) || ( keyevent->state() == TQt::NoButton)) if( keyevent->text().length() && ( !( keyevent->state() & ControlButton ) && !( keyevent->state() & AltButton ) && @@ -1533,7 +1533,7 @@ void KafkaWidget::keyBackspace() emit domNodeModified(temp, m_modifs); if(boolTmp) - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } } @@ -1599,7 +1599,7 @@ void KafkaWidget::keyBackspace() { m_currentNode = _nodePrev; d->m_cursorOffset += (static_cast<DOM::CharacterData>(_nodePrev)).length(); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } _nodePrev.setNodeValue(_nodePrev.nodeValue() + _node.nodeValue()); emit domNodeModified(_nodePrev, m_modifs); @@ -1620,7 +1620,7 @@ void KafkaWidget::keyBackspace() m_currentNode = m_currentNode.previousSibling(); d->m_cursorOffset = 0; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); } else if(!m_currentNode.nextSibling().isNull()) { @@ -2090,7 +2090,7 @@ void KafkaWidget::setCurrentNode(DOM::Node node, int offset) d->m_cursorOffset = offset; makeCursorVisible(); if(!m_currentNode.isNull() && m_currentNode.nodeName().string() != "#document") - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); //setCaretPosition(m_currentNode, (long)d->m_cursorOffset); } @@ -2141,7 +2141,7 @@ void KafkaWidget::putCursorAtFirstAvailableLocation() } m_currentNode = node; d->m_cursorOffset = 0; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); #ifdef LIGHT_DEBUG @@ -2238,7 +2238,7 @@ void KafkaWidget::removeSelection() setCurrentNode(m_currentNode, domNodeCursorOffset); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCaretPosition())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCaretPosition())); NodeSelection* cursorPos = new NodeSelection(); cursorPos->setCursorNode(cursorNode); @@ -2263,7 +2263,7 @@ void KafkaWidget::applyQueuedToggableTagActions() { if(tag_action->name() == *it) { - tag_action->slotActionActivated(TDEAction::EmulatedActivation, Qt::NoButton); + tag_action->slotActionActivated(TDEAction::EmulatedActivation, TQt::NoButton); break; } } diff --git a/quanta/parts/kafka/kafkahtmlpart.h b/quanta/parts/kafka/kafkahtmlpart.h index e8416be2..dd3f2b0d 100644 --- a/quanta/parts/kafka/kafkahtmlpart.h +++ b/quanta/parts/kafka/kafkahtmlpart.h @@ -45,7 +45,7 @@ class TQPopupMenu; class KafkaWidget : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: KafkaWidget(TQWidget *parent, TQWidget *widgetParent, KafkaDocument *part, diff --git a/quanta/parts/kafka/kafkasyncoptions.h b/quanta/parts/kafka/kafkasyncoptions.h index 75c8c4f5..3bf6ef6b 100644 --- a/quanta/parts/kafka/kafkasyncoptions.h +++ b/quanta/parts/kafka/kafkasyncoptions.h @@ -24,7 +24,7 @@ class TDEConfig; class KafkaSyncOptions : public KafkaSyncOptionsUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/parts/kafka/wkafkapart.cpp b/quanta/parts/kafka/wkafkapart.cpp index 8cb3c05c..483454ee 100644 --- a/quanta/parts/kafka/wkafkapart.cpp +++ b/quanta/parts/kafka/wkafkapart.cpp @@ -116,17 +116,17 @@ TQString ab = i18n("Ident all"); file.close(); } - connect(m_kafkaPart, TQT_SIGNAL(domNodeInserted(DOM::Node, bool, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeInserted(DOM::Node, bool, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeModified(DOM::Node, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeModified(DOM::Node, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeIsAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*))); - connect(m_kafkaPart, TQT_SIGNAL(domNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)), - this, TQT_SLOT(slotDomNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*))); - - connect(m_kafkaPart, TQT_SIGNAL(domNodeNewCursorPos(DOM::Node, int)), - this, TQT_SLOT(slotdomNodeNewCursorPos(DOM::Node, int))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeInserted(DOM::Node, bool, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeInserted(DOM::Node, bool, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeModified(DOM::Node, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeModified(DOM::Node, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeIsAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeAboutToBeRemoved(DOM::Node, bool, NodeModifsSet*))); + connect(m_kafkaPart, TQ_SIGNAL(domNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*)), + this, TQ_SLOT(slotDomNodeIsAboutToBeMoved(DOM::Node, DOM::Node, DOM::Node, NodeModifsSet*))); + + connect(m_kafkaPart, TQ_SIGNAL(domNodeNewCursorPos(DOM::Node, int)), + this, TQ_SLOT(slotdomNodeNewCursorPos(DOM::Node, int))); } diff --git a/quanta/parts/kafka/wkafkapart.h b/quanta/parts/kafka/wkafkapart.h index 5aea1c0e..b17b39b3 100644 --- a/quanta/parts/kafka/wkafkapart.h +++ b/quanta/parts/kafka/wkafkapart.h @@ -49,7 +49,7 @@ class NodeModifsSet; */ class KafkaDocument : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** Returns a reference to the KafkaDocument object */ diff --git a/quanta/parts/preview/whtmlpart.cpp b/quanta/parts/preview/whtmlpart.cpp index 86de0b2d..2de57fbf 100644 --- a/quanta/parts/preview/whtmlpart.cpp +++ b/quanta/parts/preview/whtmlpart.cpp @@ -53,11 +53,11 @@ WHTMLPart::WHTMLPart(TQWidget *parentWidget, const char *widgetName, bool enable if (m_enableViewSource) { m_contextMenu = new TDEPopupMenu(parentWidget); - m_contextMenu->insertItem(i18n("View &Document Source"), this, TQT_SLOT(slotViewSource())); + m_contextMenu->insertItem(i18n("View &Document Source"), this, TQ_SLOT(slotViewSource())); - connect(this, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQT_SLOT(popupMenu(const TQString&, const TQPoint&))); + connect(this, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)), TQ_SLOT(popupMenu(const TQString&, const TQPoint&))); } - connect(browserExtension(), TQT_SIGNAL(openURLRequest (const KURL &, const KParts::URLArgs &)), this, TQT_SLOT(openURL(const KURL&))); + connect(browserExtension(), TQ_SIGNAL(openURLRequest (const KURL &, const KParts::URLArgs &)), this, TQ_SLOT(openURL(const KURL&))); // setCharset( konqConfig.readEntry("DefaultEncoding") ); // setEncoding( konqConfig.readEntry("DefaultEncoding") ); @@ -160,10 +160,10 @@ KParts::ReadOnlyPart *WHTMLPart::createPart( TQWidget * parentWidget, const char bool WHTMLPart::eventFilter(TQObject *watched, TQEvent *e) { - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(view()) && e->type() == TQEvent::FocusOut && (!m_contextMenu || !m_contextMenu->hasFocus())) + if (watched == view() && e->type() == TQEvent::FocusOut && (!m_contextMenu || !m_contextMenu->hasFocus())) emit previewHasFocus(false); else - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(view()) && e->type() == TQEvent::FocusIn) + if (watched == view() && e->type() == TQEvent::FocusIn) emit previewHasFocus(true); return false; } diff --git a/quanta/parts/preview/whtmlpart.h b/quanta/parts/preview/whtmlpart.h index 73bd23e5..1b8e2b87 100644 --- a/quanta/parts/preview/whtmlpart.h +++ b/quanta/parts/preview/whtmlpart.h @@ -28,7 +28,7 @@ class TDEPopupMenu; */ class WHTMLPart : public TDEHTMLPart { - Q_OBJECT + TQ_OBJECT public: WHTMLPart(TQWidget *parentWidget = 0, const char *widgetname = 0, bool enableViewSource = false, diff --git a/quanta/plugins/pluginconfig.ui b/quanta/plugins/pluginconfig.ui index 05766e6b..aa692c44 100644 --- a/quanta/plugins/pluginconfig.ui +++ b/quanta/plugins/pluginconfig.ui @@ -259,12 +259,9 @@ <includes> <include location="global" impldecl="in implementation">kicondialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot>pluginType_highlighted(const TQString&)</slot> <slot>slotPluginTypeHighlighted(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>kicondialog.h</includehint> -</includehints> </UI> diff --git a/quanta/plugins/quantaplugin.cpp b/quanta/plugins/quantaplugin.cpp index 19cc5981..71b6fe1d 100644 --- a/quanta/plugins/quantaplugin.cpp +++ b/quanta/plugins/quantaplugin.cpp @@ -73,7 +73,7 @@ void QuantaPlugin::setPluginName(const TQString &a_name) m_name = a_name; if (!m_action) { - m_action = new TDEToggleAction(i18n(a_name.utf8()), 0, this, TQT_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii()); + m_action = new TDEToggleAction(i18n(a_name.utf8()), 0, this, TQ_SLOT(toggle()), quantaApp->actionCollection(), a_name.ascii()); } m_action->setText(a_name); } @@ -114,9 +114,9 @@ bool QuantaPlugin::load() TQString ow = outputWindow(); m_targetWidget = new TQWidget(quantaApp); if (m_readOnlyPart) - m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 ); + m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadOnlyPart>(partInfo.baseName().latin1(), m_targetWidget, 0, m_targetWidget, 0 ); else - m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>(partInfo.baseName().latin1(), m_targetWidget, 0, TQT_TQOBJECT(m_targetWidget), 0 ); + m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>(partInfo.baseName().latin1(), m_targetWidget, 0, m_targetWidget, 0 ); if(!m_part) { KMessageBox::error(quantaApp, i18n("<qt>The <b>%1</b> plugin could not be loaded.<br>Possible reasons are:<br> - <b>%2</b> is not installed;<br> - the file <i>%3</i> is not installed or it is not reachable.").arg(m_name).arg(m_name).arg(m_fileName)); @@ -126,7 +126,7 @@ bool QuantaPlugin::load() } m_part->setName(m_name.ascii()); // for better debug output m_part->widget()->setName(m_name.ascii()); //needed to be able to dock the same plugin twice in separate toolviews - m_part->widget()->setFocusPolicy(TQ_ClickFocus); + m_part->widget()->setFocusPolicy(TQWidget::ClickFocus); quantaApp->slotNewPart(m_part, false); // register the part in the partmanager return true; } @@ -184,8 +184,8 @@ bool QuantaPlugin::run() } addWidget(); setRunning(true); - connect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), - quantaApp, TQT_SLOT(slotStatusMsg( const TQString & ))); + connect( m_part, TQ_SIGNAL(setStatusBarText(const TQString &)), + quantaApp, TQ_SLOT(slotStatusMsg( const TQString & ))); emit pluginStarted(); @@ -287,8 +287,8 @@ bool QuantaPlugin::unload(bool remove) if(!isLoaded()) return false; - disconnect( m_part, TQT_SIGNAL(setStatusBarText(const TQString &)), - quantaApp, TQT_SLOT(slotStatusMsg( const TQString & ))); + disconnect( m_part, TQ_SIGNAL(setStatusBarText(const TQString &)), + quantaApp, TQ_SLOT(slotStatusMsg( const TQString & ))); delete (KParts::ReadOnlyPart*) m_part; m_part = 0; diff --git a/quanta/plugins/quantaplugin.h b/quanta/plugins/quantaplugin.h index 5f022797..a222909a 100644 --- a/quanta/plugins/quantaplugin.h +++ b/quanta/plugins/quantaplugin.h @@ -38,7 +38,7 @@ class QuantaView; class QuantaPlugin : public TQObject { - Q_OBJECT + TQ_OBJECT public: QuantaPlugin(); diff --git a/quanta/plugins/quantapluginconfig.cpp b/quanta/plugins/quantapluginconfig.cpp index 57488d2f..f4f509d7 100644 --- a/quanta/plugins/quantapluginconfig.cpp +++ b/quanta/plugins/quantapluginconfig.cpp @@ -47,8 +47,8 @@ QuantaPluginConfig::QuantaPluginConfig(TQWidget *a_parent, const char *a_name) m_pluginConfigWidget->outputWindow->insertStringList(windows); m_pluginConfigWidget->iconButton->setStrictIconSize(false); - connect(m_pluginConfigWidget->pluginName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(nameChanged(const TQString &))); - connect(m_pluginConfigWidget->locationButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectLocation())); + connect(m_pluginConfigWidget->pluginName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(nameChanged(const TQString &))); + connect(m_pluginConfigWidget->locationButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectLocation())); setMainWidget(m_pluginConfigWidget); } diff --git a/quanta/plugins/quantapluginconfig.h b/quanta/plugins/quantapluginconfig.h index 6b5dc328..113a252d 100644 --- a/quanta/plugins/quantapluginconfig.h +++ b/quanta/plugins/quantapluginconfig.h @@ -29,7 +29,7 @@ class TQString; class QuantaPluginConfig : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: QuantaPluginConfig(TQWidget *, const char *); diff --git a/quanta/plugins/quantaplugineditor.cpp b/quanta/plugins/quantaplugineditor.cpp index ba5294f2..a3ec85bb 100644 --- a/quanta/plugins/quantaplugineditor.cpp +++ b/quanta/plugins/quantaplugineditor.cpp @@ -52,14 +52,14 @@ QuantaPluginEditor::QuantaPluginEditor(TQWidget *a_parent, const char *a_name) m_pluginEditorWidget->pluginList->setAllColumnsShowFocus(true); m_pluginEditorWidget->pluginList->setColumnAlignment(2, TQt::AlignHCenter); - connect(this, TQT_SIGNAL(pluginsChanged()), TQT_SLOT(refreshPlugins())); - connect(m_pluginEditorWidget->refreshButton, TQT_SIGNAL(clicked()), TQT_SLOT(refreshPlugins())); - connect(m_pluginEditorWidget->addButton, TQT_SIGNAL(clicked()), TQT_SLOT(addPlugin())); - connect(m_pluginEditorWidget->removeButton, TQT_SIGNAL(clicked()), TQT_SLOT(removePlugin())); - connect(m_pluginEditorWidget->addSearchPathButton, TQT_SIGNAL(clicked()), TQT_SLOT(addSearchPath())); - connect(m_pluginEditorWidget->configureButton, TQT_SIGNAL(clicked()), TQT_SLOT(configurePlugin())); - connect(m_pluginEditorWidget->pluginList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT(configurePlugin(TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL(pluginsChanged()), TQ_SLOT(refreshPlugins())); + connect(m_pluginEditorWidget->refreshButton, TQ_SIGNAL(clicked()), TQ_SLOT(refreshPlugins())); + connect(m_pluginEditorWidget->addButton, TQ_SIGNAL(clicked()), TQ_SLOT(addPlugin())); + connect(m_pluginEditorWidget->removeButton, TQ_SIGNAL(clicked()), TQ_SLOT(removePlugin())); + connect(m_pluginEditorWidget->addSearchPathButton, TQ_SIGNAL(clicked()), TQ_SLOT(addSearchPath())); + connect(m_pluginEditorWidget->configureButton, TQ_SIGNAL(clicked()), TQ_SLOT(configurePlugin())); + connect(m_pluginEditorWidget->pluginList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT(configurePlugin(TQListViewItem*, const TQPoint&, int))); } QuantaPluginEditor::~QuantaPluginEditor() diff --git a/quanta/plugins/quantaplugineditor.h b/quanta/plugins/quantaplugineditor.h index 3149f008..750ae12c 100644 --- a/quanta/plugins/quantaplugineditor.h +++ b/quanta/plugins/quantaplugineditor.h @@ -41,7 +41,7 @@ class PluginEditor; class QuantaPluginEditor : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/plugins/quantaplugininterface.cpp b/quanta/plugins/quantaplugininterface.cpp index ce838550..d963f3a1 100644 --- a/quanta/plugins/quantaplugininterface.cpp +++ b/quanta/plugins/quantaplugininterface.cpp @@ -42,7 +42,7 @@ QuantaPluginInterface::QuantaPluginInterface(TQWidget *parent) { m_parent = parent; (void) new TDEAction( i18n( "Configure &Plugins..." ), 0, 0, - this, TQT_SLOT( slotPluginsEdit() ), + this, TQ_SLOT( slotPluginsEdit() ), ((TDEMainWindow*)parent)->actionCollection(), "configure_plugins" ); m_pluginMenu = 0L; // m_plugins.setAutoDelete(true); diff --git a/quanta/plugins/quantaplugininterface.h b/quanta/plugins/quantaplugininterface.h index 28458fad..d045a41d 100644 --- a/quanta/plugins/quantaplugininterface.h +++ b/quanta/plugins/quantaplugininterface.h @@ -37,7 +37,7 @@ class QuantaPlugin; */ class QuantaPluginInterface : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/quanta/project/eventconfigurationdlg.h b/quanta/project/eventconfigurationdlg.h index b7c64779..9f44580e 100644 --- a/quanta/project/eventconfigurationdlg.h +++ b/quanta/project/eventconfigurationdlg.h @@ -26,7 +26,7 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class EventConfigurationDlg : public EventConfigurationDlgS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/project/eventconfigurationdlgs.ui b/quanta/project/eventconfigurationdlgs.ui index 6bdcfb37..06247c75 100644 --- a/quanta/project/eventconfigurationdlgs.ui +++ b/quanta/project/eventconfigurationdlgs.ui @@ -211,11 +211,11 @@ <tabstop>editButton</tabstop> <tabstop>deleteButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotEditEvent()</slot> <slot>slotAddEvent()</slot> <slot>slotDeleteEvent()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/quanta/project/eventeditordlg.h b/quanta/project/eventeditordlg.h index 45b94a95..7dbcea90 100644 --- a/quanta/project/eventeditordlg.h +++ b/quanta/project/eventeditordlg.h @@ -26,7 +26,7 @@ class KComboBox; class EventEditorDlg : public EventEditorDlgS { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/project/eventeditordlgs.ui b/quanta/project/eventeditordlgs.ui index 50f01646..0cc9a0cd 100644 --- a/quanta/project/eventeditordlgs.ui +++ b/quanta/project/eventeditordlgs.ui @@ -229,9 +229,9 @@ <slot>slotActionChanged(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotActionChanged(const TQString &name)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/quanta/project/membereditdlg.h b/quanta/project/membereditdlg.h index 32d26633..2e1b5a51 100644 --- a/quanta/project/membereditdlg.h +++ b/quanta/project/membereditdlg.h @@ -24,7 +24,7 @@ */ class MemberEditDlg : public MemberEditDlgS { -Q_OBJECT +TQ_OBJECT public: MemberEditDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/project/membereditdlgs.ui b/quanta/project/membereditdlgs.ui index 860167a0..ab625a5e 100644 --- a/quanta/project/membereditdlgs.ui +++ b/quanta/project/membereditdlgs.ui @@ -175,12 +175,12 @@ <tabstop>subprojectCombo</tabstop> <tabstop>editSubprojectsButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotRoleSelected(const TQString& roleName)</slot> <slot>slotEditSubprojects()</slot> <slot>slotMemberSelected()</slot> <slot>slotSelectFromAddrBook()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/quanta/project/project.cpp b/quanta/project/project.cpp index 107ba14a..48e13beb 100644 --- a/quanta/project/project.cpp +++ b/quanta/project/project.cpp @@ -72,7 +72,7 @@ Project::Project(TDEMainWindow *parent) : TQObject() { d = new ProjectPrivate(this); - connect(d, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_mainWindow = parent; d->m_uploadDialog = 0L; keepPasswd = true; @@ -131,8 +131,8 @@ void Project::insertFile(const KURL& nameURL, bool repaint ) if ( !destination.isEmpty() ) { CopyTo *dlg = new CopyTo(d->baseURL); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), d, - TQT_SLOT(slotDeleteCopytoDlg(CopyTo*))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo*)), d, + TQ_SLOT(slotDeleteCopytoDlg(CopyTo*))); url = dlg->copy( nameURL, destination ); } else // Copy canceled, addition aborted @@ -307,10 +307,10 @@ void Project::slotAddDirectory(const KURL& p_dirURL, bool showDlg) (!destination.isEmpty()) ) { CopyTo *dlg = new CopyTo(d->baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), d, - TQT_SLOT (slotDeleteCopytoDlg(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), d, + TQ_SLOT (slotDeleteCopytoDlg(CopyTo *))); //if ( rdir.right(1) == "/" ) rdir.remove( rdir.length()-1,1); dirURL = dlg->copy(dirURL, destination); return; @@ -477,10 +477,10 @@ void Project::slotOptions() optionsPage.lineEmail->setText( d->email ); // Signals to handle debugger settings - connect(optionsPage.buttonDebuggerOptions, TQT_SIGNAL(clicked()), - d, TQT_SLOT(slotDebuggerOptions())); - connect(optionsPage.comboDebuggerClient, TQT_SIGNAL(activated(const TQString &)), - d, TQT_SLOT(slotDebuggerChanged(const TQString &))); + connect(optionsPage.buttonDebuggerOptions, TQ_SIGNAL(clicked()), + d, TQ_SLOT(slotDebuggerOptions())); + connect(optionsPage.comboDebuggerClient, TQ_SIGNAL(activated(const TQString &)), + d, TQ_SLOT(slotDebuggerChanged(const TQString &))); // Debuggers Combo @@ -863,7 +863,7 @@ void Project::slotUpload() if (!d->m_uploadDialog) { d->m_uploadDialog = new ProjectUpload(KURL(), "", false, false, false, i18n("Upload project items...").ascii()); - connect(d->m_uploadDialog, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d->m_uploadDialog, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_uploadDialog->show(); } else d->m_uploadDialog->raise(); @@ -878,7 +878,7 @@ void Project::slotUploadURL(const KURL& urlToUpload, const TQString& profileName if (!d->m_uploadDialog) { d->m_uploadDialog = new ProjectUpload(url, profileName, false, quickUpload, markOnly, i18n("Upload project items...").ascii()); - connect(d->m_uploadDialog, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); + connect(d->m_uploadDialog, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), this, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& ))); d->m_uploadDialog->show(); } else d->m_uploadDialog->raise(); @@ -1052,8 +1052,8 @@ void Project::slotReloadProjectDocs() { delete d->m_dirWatch; d->m_dirWatch = new KDirWatch(this); - connect(d->m_dirWatch, TQT_SIGNAL(dirty(const TQString &)), TQT_SIGNAL(reloadProjectDocs())); - connect(d->m_dirWatch, TQT_SIGNAL(deleted(const TQString &)), TQT_SIGNAL(reloadProjectDocs())); + connect(d->m_dirWatch, TQ_SIGNAL(dirty(const TQString &)), TQ_SIGNAL(reloadProjectDocs())); + connect(d->m_dirWatch, TQ_SIGNAL(deleted(const TQString &)), TQ_SIGNAL(reloadProjectDocs())); if (d->baseURL.isLocalFile()) d->m_dirWatch->addDir(d->baseURL.path() + "/doc"); KURL url; diff --git a/quanta/project/project.h b/quanta/project/project.h index e1487ad7..7c55cfef 100644 --- a/quanta/project/project.h +++ b/quanta/project/project.h @@ -52,7 +52,7 @@ struct SubProject { }; class Project : public TQObject { - Q_OBJECT + TQ_OBJECT friend class ProjectPrivate; // need this because I use the signals diff --git a/quanta/project/projectnewfinal.h b/quanta/project/projectnewfinal.h index 654af85a..2b3304ce 100644 --- a/quanta/project/projectnewfinal.h +++ b/quanta/project/projectnewfinal.h @@ -25,7 +25,7 @@ */ class ProjectNewFinal : public ProjectNewFinalS { - Q_OBJECT + TQ_OBJECT public: ProjectNewFinal(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectnewgeneral.cpp b/quanta/project/projectnewgeneral.cpp index ce9faf08..1503b951 100644 --- a/quanta/project/projectnewgeneral.cpp +++ b/quanta/project/projectnewgeneral.cpp @@ -67,21 +67,21 @@ ProjectNewGeneral::ProjectNewGeneral(TQWidget *parent, const char *name ) linePrjTmpl->setText("templates"); linePrjToolbar->setText("toolbars"); - connect(comboProtocol, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotProtocolChanged(const TQString &))); - connect( linePrjFile, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( linePrjName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( linePrjDir, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonDir, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotButtonDir())); - connect( linePrjName, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotChangeNames(const TQString &))); - connect( linePrjTmpl, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonTmpl, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonTmpl())); - connect( linePrjToolbar, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(slotLinePrjFile(const TQString &))); - connect( buttonToolbar, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonToolbar())); + connect(comboProtocol, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotProtocolChanged(const TQString &))); + connect( linePrjFile, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( linePrjName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( linePrjDir, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonDir, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotButtonDir())); + connect( linePrjName, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotChangeNames(const TQString &))); + connect( linePrjTmpl, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonTmpl, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonTmpl())); + connect( linePrjToolbar, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(slotLinePrjFile(const TQString &))); + connect( buttonToolbar, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonToolbar())); linePrjTmpl->installEventFilter(this); linePrjToolbar->installEventFilter(this); @@ -218,7 +218,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) { if (e->type() == TQEvent::FocusOut) { - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjTmpl)) + if (watched == linePrjTmpl) { KURL url = baseUrl; QuantaCommon::setUrl(url, linePrjTmpl->text()); @@ -231,7 +231,7 @@ bool ProjectNewGeneral::eventFilter ( TQObject * watched, TQEvent * e ) } else emit enableNextButton(this, true); } else - if (TQT_BASE_OBJECT(watched) == TQT_BASE_OBJECT(linePrjToolbar)) + if (watched == linePrjToolbar) { KURL url = baseUrl; QuantaCommon::setUrl(url, linePrjToolbar->text()); diff --git a/quanta/project/projectnewgeneral.h b/quanta/project/projectnewgeneral.h index 6a1839b7..ea475989 100644 --- a/quanta/project/projectnewgeneral.h +++ b/quanta/project/projectnewgeneral.h @@ -27,7 +27,7 @@ class KURL; class ProjectNewGeneral : public ProjectNewGeneralS { - Q_OBJECT + TQ_OBJECT public: ProjectNewGeneral(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectnewlocal.cpp b/quanta/project/projectnewlocal.cpp index 1f4750b1..6964b030 100644 --- a/quanta/project/projectnewlocal.cpp +++ b/quanta/project/projectnewlocal.cpp @@ -59,13 +59,13 @@ ProjectNewLocal::ProjectNewLocal(TQWidget *parent, const char *name ) checkInsertWeb->setChecked( true ); - connect( checkInsert, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); - connect( checkInsertWeb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); - connect( checkInsertWithMask, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetFiles(bool))); + connect( checkInsert, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); + connect( checkInsertWeb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); + connect( checkInsertWithMask, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSetFiles(bool))); - connect(addFiles, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotAddFiles())); - connect(addFolder, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotAddFolder())); - connect(clearList, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClearList())); + connect(addFiles, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotAddFiles())); + connect(addFolder, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotAddFolder())); + connect(clearList, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClearList())); } ProjectNewLocal::~ProjectNewLocal(){ @@ -202,10 +202,10 @@ void ProjectNewLocal::slotAddFiles() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), - TQT_SLOT (slotDeleteCopyToDialog(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), + TQ_SLOT (slotDeleteCopyToDialog(CopyTo *))); list = dlg->copy( list, destination ); return; } else @@ -263,10 +263,10 @@ void ProjectNewLocal::slotAddFolder() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), - TQT_SLOT (slotInsertFolderAfterCopying(const KURL::List&))); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo *)), - TQT_SLOT (slotDeleteCopyToDialog(CopyTo *))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), + TQ_SLOT (slotInsertFolderAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo *)), + TQ_SLOT (slotDeleteCopyToDialog(CopyTo *))); dirURL = dlg->copy(dirURL, destination); return; } else diff --git a/quanta/project/projectnewlocal.h b/quanta/project/projectnewlocal.h index 84952553..2663eaeb 100644 --- a/quanta/project/projectnewlocal.h +++ b/quanta/project/projectnewlocal.h @@ -29,7 +29,7 @@ class CopyTo; class ProjectNewLocal : public ProjectNewLocalS { - Q_OBJECT + TQ_OBJECT public: ProjectNewLocal(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectnewlocals.ui b/quanta/project/projectnewlocals.ui index a23e8de7..4da60b9d 100644 --- a/quanta/project/projectnewlocals.ui +++ b/quanta/project/projectnewlocals.ui @@ -338,7 +338,7 @@ <tabstop>clearList</tabstop> </tabstops> <layoutdefaults spacing="6" margin="11"/> -<includehints> - <includehint>uploadtreeview.h</includehint> -</includehints> +<includes> + <include location="global" impldecl="in implementation">uploadtreeview.h</include> +</includes> </UI> diff --git a/quanta/project/projectnewweb.cpp b/quanta/project/projectnewweb.cpp index d1692ab6..7e904fe8 100644 --- a/quanta/project/projectnewweb.cpp +++ b/quanta/project/projectnewweb.cpp @@ -49,14 +49,14 @@ ProjectNewWeb::ProjectNewWeb(TQWidget *parent, const char *name ) listView->removeColumn(1); listView->removeColumn(1); - connect( commandLine, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT (enableStart(const TQString&))); - connect( siteUrl, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT (setCommandL(const TQString&))); - connect( button, TQT_SIGNAL(clicked()), - this, TQT_SLOT (slotStart())); - connect( protocolCombo,TQT_SIGNAL(highlighted(const TQString&)), - this, TQT_SLOT (setProtocol(const TQString&))); + connect( commandLine, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT (enableStart(const TQString&))); + connect( siteUrl, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT (setCommandL(const TQString&))); + connect( button, TQ_SIGNAL(clicked()), + this, TQ_SLOT (slotStart())); + connect( protocolCombo,TQ_SIGNAL(highlighted(const TQString&)), + this, TQ_SLOT (setProtocol(const TQString&))); start = false; KLed1->setState(KLed::Off); @@ -115,12 +115,12 @@ void ProjectNewWeb::slotStart() *proc << *it; } - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess *)), this, - TQT_SLOT( slotGetWgetExited(TDEProcess *))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetWgetOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess *)), this, + TQ_SLOT( slotGetWgetExited(TDEProcess *))); if (proc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput)) { diff --git a/quanta/project/projectnewweb.h b/quanta/project/projectnewweb.h index 5c6e2b5e..50681b09 100644 --- a/quanta/project/projectnewweb.h +++ b/quanta/project/projectnewweb.h @@ -33,7 +33,7 @@ class TDEProcess; class KURL; class ProjectNewWeb : public ProjectNewWebS { - Q_OBJECT + TQ_OBJECT public: ProjectNewWeb(TQWidget *parent=0, const char *name=0); diff --git a/quanta/project/projectoptions.ui b/quanta/project/projectoptions.ui index 5d2e8cc8..ba95e7e2 100644 --- a/quanta/project/projectoptions.ui +++ b/quanta/project/projectoptions.ui @@ -435,9 +435,6 @@ <property name="text"> <string>Remember watches across sessions</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </grid> </widget> @@ -531,10 +528,10 @@ <includes> <include location="local" impldecl="in implementation">projectoptions.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>buttonTemplate_clicked()</slot> <slot>buttonToolbar_clicked()</slot> <slot>comboDebuggerClient_activated( int idx )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/quanta/project/projectprivate.cpp b/quanta/project/projectprivate.cpp index 21040079..f1e13c5d 100644 --- a/quanta/project/projectprivate.cpp +++ b/quanta/project/projectprivate.cpp @@ -83,73 +83,73 @@ ProjectPrivate::~ProjectPrivate() void ProjectPrivate::initActions(TDEActionCollection *ac) { (void) new TDEAction( i18n( "&New Project..." ), "window-new", 0, - this, TQT_SLOT( slotNewProject() ), + this, TQ_SLOT( slotNewProject() ), ac, "project_new" ); (void) new TDEAction( i18n( "&Open Project..." ), "project_open", 0, - this, TQT_SLOT( slotOpenProject() ), + this, TQ_SLOT( slotOpenProject() ), ac, "project_open" ); m_projectRecent = - KStdAction::openRecent(parent, TQT_SLOT(slotOpenProject(const KURL&)), + KStdAction::openRecent(parent, TQ_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent"); m_projectRecent->setText(i18n("Open Recent Project")); m_projectRecent->setIcon("project_open"); m_projectRecent->setToolTip(i18n("Open/Open recent project")); - connect(m_projectRecent, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenProject())); + connect(m_projectRecent, TQ_SIGNAL(activated()), this, TQ_SLOT(slotOpenProject())); closeprjAction = new TDEAction( i18n( "&Close Project" ), "window-close", 0, - this, TQT_SLOT( slotCloseProject() ), + this, TQ_SLOT( slotCloseProject() ), ac, "project_close" ); openPrjViewAction = new TDESelectAction( i18n( "Open Project &View..." ), 0, ac, "project_view_open" ); - connect(openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotOpenProjectView(const TQString &))); + connect(openPrjViewAction, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotOpenProjectView(const TQString &))); openPrjViewAction->setToolTip(i18n("Open project view")); savePrjViewAction = new TDEAction( i18n( "&Save Project View" ), "document-save", 0, - this, TQT_SLOT( slotSaveProjectView() ), + this, TQ_SLOT( slotSaveProjectView() ), ac, "project_view_save" ); saveAsPrjViewAction = new TDEAction( i18n( "Save Project View &As..." ), "document-save-as", 0, - this, TQT_SLOT( slotSaveAsProjectView() ), + this, TQ_SLOT( slotSaveAsProjectView() ), ac, "project_view_save_as" ); deletePrjViewAction = new TDESelectAction( i18n( "&Delete Project View" ), "edit-delete", 0, ac, "project_view_delete" ); - connect(deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotDeleteProjectView(const TQString &))); + connect(deletePrjViewAction, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotDeleteProjectView(const TQString &))); deletePrjViewAction->setToolTip(i18n("Close project view")); insertFileAction = new TDEAction( i18n( "&Insert Files..." ), 0, - this, TQT_SLOT( slotAddFiles() ), + this, TQ_SLOT( slotAddFiles() ), ac, "project_insert_file" ); insertDirAction = new TDEAction( i18n( "Inser&t Folder..." ), 0, - this, TQT_SLOT( slotAddDirectory() ), + this, TQ_SLOT( slotAddDirectory() ), ac, "project_insert_directory" ); rescanPrjDirAction = new TDEAction( i18n( "&Rescan Project Folder..." ), "reload", 0, - parent, TQT_SLOT( slotRescanPrjDir() ), + parent, TQ_SLOT( slotRescanPrjDir() ), ac, "project_rescan" ); uploadProjectAction = new TDEAction( i18n( "&Upload Project..." ), "go-up", Key_F8, - parent, TQT_SLOT( slotUpload() ), + parent, TQ_SLOT( slotUpload() ), ac, "project_upload" ); projectOptionAction = new TDEAction( i18n( "&Project Properties" ), "configure", SHIFT + Key_F7, - parent, TQT_SLOT( slotOptions() ), + parent, TQ_SLOT( slotOptions() ), ac, "project_options" ); saveAsProjectTemplateAction = new TDEAction( i18n( "Save as Project Template..." ), 0, - TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveAsProjectTemplate() ), + m_mainWindow, TQ_SLOT( slotFileSaveAsProjectTemplate() ), ac, "save_project_template" ); saveSelectionAsProjectTemplateAction = new TDEAction( i18n( "Save Selection to Project Template File..." ), 0, - TQT_TQOBJECT(m_mainWindow), TQT_SLOT( slotFileSaveSelectionAsProjectTemplate() ), + m_mainWindow, TQ_SLOT( slotFileSaveSelectionAsProjectTemplate() ), ac, "save_selection_project_template" ); adjustActions(); } @@ -1145,27 +1145,27 @@ void ProjectPrivate::slotNewProject() wiz->setNextEnabled ( pnf, false ); wiz->setFinishEnabled( pnf, true ); - connect( png, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); - connect( png, TQT_SIGNAL(setBaseURL(const KURL&)), - pnl, TQT_SLOT( setBaseURL(const KURL&))); - connect( png, TQT_SIGNAL(setBaseURL(const KURL&)), - pnw, TQT_SLOT( setBaseURL(const KURL&))); - connect( this,TQT_SIGNAL(setLocalFiles(bool)), - pnl, TQT_SLOT(slotSetFiles(bool))); + connect( png, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setNextEnabled(TQWidget*,bool))); + connect( png, TQ_SIGNAL(setBaseURL(const KURL&)), + pnl, TQ_SLOT( setBaseURL(const KURL&))); + connect( png, TQ_SIGNAL(setBaseURL(const KURL&)), + pnw, TQ_SLOT( setBaseURL(const KURL&))); + connect( this,TQ_SIGNAL(setLocalFiles(bool)), + pnl, TQ_SLOT(slotSetFiles(bool))); - connect(wiz, TQT_SIGNAL(selected(const TQString &)), - this, TQT_SLOT (slotSelectProjectType(const TQString &))); - connect(wiz, TQT_SIGNAL(helpClicked()), TQT_SLOT(slotNewProjectHelpClicked())); - - connect( pnw, TQT_SIGNAL(enableMessagesWidget()), - parent, TQT_SIGNAL(enableMessageWidget())); - connect( pnw, TQT_SIGNAL(messages(const TQString&)), - parent, TQT_SLOT (slotGetMessages(const TQString&))); - connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setNextEnabled(TQWidget*,bool))); - connect( pnw, TQT_SIGNAL(enableNextButton(TQWidget *,bool)), - wiz, TQT_SLOT(setBackEnabled(TQWidget*,bool))); + connect(wiz, TQ_SIGNAL(selected(const TQString &)), + this, TQ_SLOT (slotSelectProjectType(const TQString &))); + connect(wiz, TQ_SIGNAL(helpClicked()), TQ_SLOT(slotNewProjectHelpClicked())); + + connect( pnw, TQ_SIGNAL(enableMessagesWidget()), + parent, TQ_SIGNAL(enableMessageWidget())); + connect( pnw, TQ_SIGNAL(messages(const TQString&)), + parent, TQ_SLOT (slotGetMessages(const TQString&))); + connect( pnw, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setNextEnabled(TQWidget*,bool))); + connect( pnw, TQ_SIGNAL(enableNextButton(TQWidget *,bool)), + wiz, TQ_SLOT(setBackEnabled(TQWidget*,bool))); TQStringList lst = DTDs::ref()->nickNameList(true); pnf->dtdCombo->insertStringList(lst); @@ -1204,13 +1204,13 @@ void ProjectPrivate::slotNewProject() void ProjectPrivate::slotCloseProject() { if (!parent->hasProject()) return; - connect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); + connect(ViewManager::ref(), TQ_SIGNAL(filesClosed(bool)), this, TQ_SLOT(slotProceedWithCloseProject(bool))); parent->closeFiles(); } void ProjectPrivate::slotProceedWithCloseProject(bool success) { - disconnect(ViewManager::ref(), TQT_SIGNAL(filesClosed(bool)), this, TQT_SLOT(slotProceedWithCloseProject(bool))); + disconnect(ViewManager::ref(), TQ_SIGNAL(filesClosed(bool)), this, TQ_SLOT(slotProceedWithCloseProject(bool))); if (!success) return; emit eventHappened("before_project_close", baseURL.url(), TQString()); if (!uploadProjectFile()) @@ -1446,10 +1446,10 @@ void ProjectPrivate::slotAddFiles() if ( !destination.isEmpty()) { CopyTo *dlg = new CopyTo( baseURL); - connect(dlg, TQT_SIGNAL(deleteDialog(CopyTo*)), - TQT_SLOT (slotDeleteCopytoDlg(CopyTo*))); - connect(dlg, TQT_SIGNAL(addFilesToProject(const KURL::List&)), parent, - TQT_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); + connect(dlg, TQ_SIGNAL(deleteDialog(CopyTo*)), + TQ_SLOT (slotDeleteCopytoDlg(CopyTo*))); + connect(dlg, TQ_SIGNAL(addFilesToProject(const KURL::List&)), parent, + TQ_SLOT (slotInsertFilesAfterCopying(const KURL::List&))); list = dlg->copy( list, destination ); return; } diff --git a/quanta/project/projectprivate.h b/quanta/project/projectprivate.h index d67d27d3..f7421e8e 100644 --- a/quanta/project/projectprivate.h +++ b/quanta/project/projectprivate.h @@ -50,7 +50,7 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class ProjectPrivate : public TQObject { - Q_OBJECT + TQ_OBJECT public: ProjectPrivate(Project *p); diff --git a/quanta/project/projectupload.cpp b/quanta/project/projectupload.cpp index 481ea134..8c949951 100644 --- a/quanta/project/projectupload.cpp +++ b/quanta/project/projectupload.cpp @@ -83,7 +83,7 @@ ProjectUpload::ProjectUpload(const KURL& url, const TQString& profileName, bool { if (markOnly) markAsUploaded->setChecked(true); - TQTimer::singleShot(10, this, TQT_SLOT(slotBuildTree())); + TQTimer::singleShot(10, this, TQ_SLOT(slotBuildTree())); currentItem = 0L; } } @@ -149,7 +149,7 @@ void ProjectUpload::initProjectInfo(const TQString& defaultProfile) buttonRemoveProfile->setEnabled(comboProfile->count() > 1); keepPasswords->setChecked(m_project->keepPasswd); uploadInProgress = false; - connect( this, TQT_SIGNAL( uploadNext() ), TQT_SLOT( slotUploadNext() ) ); + connect( this, TQ_SIGNAL( uploadNext() ), TQ_SLOT( slotUploadNext() ) ); setProfileTooltip(); } @@ -456,12 +456,12 @@ void ProjectUpload::upload() emit eventHappened("before_upload", from.url(), to.url()); TDEIO::FileCopyJob *job = TDEIO::file_copy( from, to, fileItem->permissions(), true, false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),this, - TQT_SLOT( uploadFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job *,unsigned long ) ), - this, TQT_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ), - this, TQT_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),this, + TQ_SLOT( uploadFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job *,unsigned long ) ), + this, TQ_SLOT( uploadProgress( TDEIO::Job *,unsigned long ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *,const TQString& ) ), + this, TQ_SLOT( uploadMessage( TDEIO::Job *,const TQString& ) ) ); labelCurFile->setText(i18n("Current: %1").arg(currentURL.fileName())); currentProgress->setProgress( 0 ); diff --git a/quanta/project/projectupload.h b/quanta/project/projectupload.h index c3071899..2e99c615 100644 --- a/quanta/project/projectupload.h +++ b/quanta/project/projectupload.h @@ -37,7 +37,7 @@ class UploadProfileDlgS; class ProjectUpload : public ProjectUploadS { - Q_OBJECT + TQ_OBJECT public: /** Initializes the dialog. If showOnlyProfiles is true, the dialog diff --git a/quanta/project/projectuploads.ui b/quanta/project/projectuploads.ui index d8900e5f..2c8cf68c 100644 --- a/quanta/project/projectuploads.ui +++ b/quanta/project/projectuploads.ui @@ -476,7 +476,7 @@ <includes> <include location="global" impldecl="in declaration">../treeviews/uploadtreeview.h</include> </includes> -<Q_SLOTS> +<slots> <slot>clearSelection()</slot> <slot>startUpload()</slot> <slot>selectAll()</slot> @@ -489,7 +489,7 @@ <slot>slotEditProfile()</slot> <slot>slotRemoveProfile()</slot> <slot>slotNewProfileSelected(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">uploadtreeview.h</include> diff --git a/quanta/project/rescanprj.cpp b/quanta/project/rescanprj.cpp index e78eb438..89c65e86 100644 --- a/quanta/project/rescanprj.cpp +++ b/quanta/project/rescanprj.cpp @@ -56,22 +56,22 @@ RescanPrj::RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, co TDEIO::ListJob *job = TDEIO::listRecursive( baseURL, false ); m_listJobCount = 1; - connect( job, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( job, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListDone(TDEIO::Job *))); - - - connect( buttonSelect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelect())); - connect( buttonDeselect, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeselect())); - connect( buttonInvert, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotInvert())); - connect( buttonExpand, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotExpand())); - connect( buttonCollapse, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotCollapse())); + connect( job, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( job, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListDone(TDEIO::Job *))); + + + connect( buttonSelect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelect())); + connect( buttonDeselect, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeselect())); + connect( buttonInvert, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotInvert())); + connect( buttonExpand, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotExpand())); + connect( buttonCollapse, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotCollapse())); } RescanPrj::~RescanPrj() @@ -151,10 +151,10 @@ void RescanPrj::addEntries(TDEIO::Job *job,const TDEIO::UDSEntryList &list) TDEIO::ListJob *ljob = TDEIO::listRecursive( (*it)->url(), false ); m_listJobCount++; - connect( ljob, TQT_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), - this,TQT_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); - connect( ljob, TQT_SIGNAL(result(TDEIO::Job *)), - this,TQT_SLOT (slotListDone(TDEIO::Job *))); + connect( ljob, TQ_SIGNAL(entries(TDEIO::Job *,const TDEIO::UDSEntryList &)), + this,TQ_SLOT (addEntries(TDEIO::Job *,const TDEIO::UDSEntryList &))); + connect( ljob, TQ_SIGNAL(result(TDEIO::Job *)), + this,TQ_SLOT (slotListDone(TDEIO::Job *))); } } diff --git a/quanta/project/rescanprj.h b/quanta/project/rescanprj.h index 5c36efb9..d985ecfd 100644 --- a/quanta/project/rescanprj.h +++ b/quanta/project/rescanprj.h @@ -33,7 +33,7 @@ struct URLListEntry{ }; class RescanPrj : public RescanPrjDir { - Q_OBJECT + TQ_OBJECT public: RescanPrj(const ProjectList &p_prjFileList, const KURL& p_baseURL, const TQRegExp &p_excludeRx, diff --git a/quanta/project/teammembersdlg.h b/quanta/project/teammembersdlg.h index 2e7d900e..f01ed28b 100644 --- a/quanta/project/teammembersdlg.h +++ b/quanta/project/teammembersdlg.h @@ -24,7 +24,7 @@ */ class TeamMembersDlg : public TeamMembersDlgS { -Q_OBJECT +TQ_OBJECT public: TeamMembersDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/project/teammembersdlgs.ui b/quanta/project/teammembersdlgs.ui index de4abff8..4a72e738 100644 --- a/quanta/project/teammembersdlgs.ui +++ b/quanta/project/teammembersdlgs.ui @@ -231,12 +231,12 @@ <tabstop>deleteMemberButton</tabstop> <tabstop>setToYourselfButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotAddMember()</slot> <slot>slotEditMember()</slot> <slot>slotDeleteMember()</slot> <slot>slotSetToYourself()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/quanta/project/uploadprofilespage.ui b/quanta/project/uploadprofilespage.ui index 50e676c0..6806dfab 100644 --- a/quanta/project/uploadprofilespage.ui +++ b/quanta/project/uploadprofilespage.ui @@ -118,9 +118,9 @@ <includes> <include location="local" impldecl="in implementation">uploadprofilespage.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>buttonEditProfiles_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/quanta/quanta.tdevelop b/quanta/quanta.tdevelop index 3d76a479..924e93b2 100644 --- a/quanta/quanta.tdevelop +++ b/quanta/quanta.tdevelop @@ -81,8 +81,8 @@ <ccompilerbinary/> <cxxcompilerbinary/> <f77compilerbinary/> - <cflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT</cflags> - <cxxflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT -DDEBUG_PARSER</cxxflags> + <cflags>-DKDE_NO_COMPAT</cflags> + <cxxflags>-DKDE_NO_COMPAT -DDEBUG_PARSER</cxxflags> <f77flags/> <topsourcedir>/data/development/sources/kde-3.5/tdewebdev</topsourcedir> <cppflags/> @@ -136,7 +136,7 @@ <cxxcompilerbinary/> <f77compilerbinary/> <cflags/> - <cxxflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT</cxxflags> + <cxxflags>-DKDE_NO_COMPAT</cxxflags> <f77flags/> </withoutkafka> <final> @@ -151,8 +151,8 @@ <ccompilerbinary/> <cxxcompilerbinary/> <f77compilerbinary/> - <cflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT</cflags> - <cxxflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT</cxxflags> + <cflags>-DKDE_NO_COMPAT</cflags> + <cxxflags>-DKDE_NO_COMPAT</cxxflags> <f77flags/> </final> </configurations> diff --git a/quanta/quanta_uml.xmi b/quanta/quanta_uml.xmi index a381b6fb..d266e9fa 100644 --- a/quanta/quanta_uml.xmi +++ b/quanta/quanta_uml.xmi @@ -13,7 +13,7 @@ <umlobjects> <UML:Class stereotype="" package="" xmi.id="74" abstract="0" documentation="This should contain a "view" of the document. This is not clearly implemented. The class contains a set of tabs, and each tab can hold one Document object. I think the tab (and such the MDI) handling should go to the QuantaApp class and here only the document view related things should be. Just as the Document/View model requests." name="QuantaView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="86" type="" abstract="0" documentation="" name="QuantaView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="87" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="87" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="88" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="89" type="void" abstract="0" documentation="" name="addWrite" static="0" scope="200" > @@ -61,8 +61,8 @@ <UML:Operation stereotype="" package="" xmi.id="205" type="" abstract="0" documentation="Some initializations goes here." name="QuantaApp" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="206" type="QDomDocument *" abstract="0" documentation="" name="actions" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="207" type="bool" abstract="0" documentation="Returns true if the current DTD does not have any toolbars, or if all of the toolbars are removed or if the "Shov DTD Toolbar" is unchecked." name="allToolbarsHidden" static="0" scope="202" /> - <UML:Operation stereotype="" package="" xmi.id="208" type="QWidget *" abstract="0" documentation="" name="createContainer" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="209" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="208" type="TQWidget *" abstract="0" documentation="" name="createContainer" static="0" scope="200" > + <UML:Parameter stereotype="" package="" xmi.id="209" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="210" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="211" value="" type="const QDomElement &" abstract="0" documentation="" name="element" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="212" value="" type="int &" abstract="0" documentation="" name="id" static="0" scope="200" /> @@ -88,7 +88,7 @@ <UML:Parameter stereotype="" package="" xmi.id="230" value="" type="TQString" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="231" type="void" abstract="0" documentation="" name="loadToolbarForDTD" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="232" value="" type="const QString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="232" value="" type="const TQString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="233" type="TQString" abstract="0" documentation="" name="newFileType" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="234" type="KDockWidget *" abstract="0" documentation="" name="outputDockWidget" static="0" scope="200" /> @@ -100,7 +100,7 @@ <UML:Operation stereotype="" package="" xmi.id="239" type="virtual bool" abstract="0" documentation="" name="queryClose" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="240" type="void" abstract="0" documentation="" name="readOptions" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="241" type="void" abstract="0" documentation="" name="readTagDir" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="242" value="" type="QString &" abstract="0" documentation="" name="dirName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="242" value="" type="TQString &" abstract="0" documentation="" name="dirName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="243" type="uint" abstract="0" documentation="" name="readTagFile" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="244" value="" type="TQString" abstract="0" documentation="" name="fileName" static="0" scope="200" /> @@ -108,13 +108,13 @@ <UML:Parameter stereotype="" package="" xmi.id="246" value="" type="QTagList *" abstract="0" documentation="" name="tagList" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="247" type="void" abstract="0" documentation="" name="removeContainer" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="248" value="" type="QWidget *" abstract="0" documentation="" name="container" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="249" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="248" value="" type="TQWidget *" abstract="0" documentation="" name="container" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="249" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="250" value="" type="QDomElement &" abstract="0" documentation="" name="element" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="251" value="" type="int" abstract="0" documentation="" name="id" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="252" type="void" abstract="0" documentation="" name="removeToolbar" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="253" value="" type="const QString &" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="253" value="" type="const TQString &" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="254" type="void" abstract="0" documentation="" name="saveAsTemplate" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="255" value="" type="bool" abstract="0" documentation="" name="projectTemplate" static="0" scope="200" /> @@ -123,7 +123,7 @@ <UML:Operation stereotype="" package="" xmi.id="257" type="void" abstract="0" documentation="" name="saveModifiedToolbars" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="258" type="void" abstract="0" documentation="" name="saveOptions" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="259" type="KURL" abstract="0" documentation="" name="saveToolBar" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="260" value="" type="const QString &" abstract="0" documentation="" name="toolbarName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="260" value="" type="const TQString &" abstract="0" documentation="" name="toolbarName" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="261" value="" type="const KURL &" abstract="0" documentation="" name="destFile" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="262" type="void" abstract="0" documentation="" name="setAttributes" static="0" scope="202" > @@ -138,7 +138,7 @@ <UML:Parameter stereotype="" package="" xmi.id="269" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="270" type="QPopupMenu *" abstract="0" documentation="" name="toolbarMenu" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="271" value="" type="const QString &" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="271" value="" type="const TQString &" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="272" type="QWidgetStack *" abstract="0" documentation="" name="widgetStackOfHtmlPart" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="273" type="" abstract="0" documentation="" name="~QuantaApp" static="0" scope="200" /> @@ -238,7 +238,7 @@ <UML:Class stereotype="" package="" xmi.id="274" abstract="0" documentation="The document handling class. This is somewhat weird, as the Document class should handle all the document related things. The job is distrivute now between this the QuantaView and the QuantaApp class. This must be clearly seperated... See the operations in order to get a picture what's here." name="QuantaDoc" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="276" type="" abstract="0" documentation="" name="QuantaDoc" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="277" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="277" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="278" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="279" type="void" abstract="0" documentation="" name="changeFileTabName" static="0" scope="200" > @@ -283,25 +283,25 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="307" abstract="0" documentation="Common static functions used everywhere in the code. " name="QuantaCommon" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="308" type="" abstract="0" documentation="" name="QuantaCommon" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="309" type="TQString" abstract="0" documentation="" name="attrCase" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="310" value="" type="const QString" abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="310" value="" type="const TQString" abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="311" type="bool" abstract="0" documentation="" name="checkExactMimeType" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="312" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="313" value="" type="const QString &" abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="313" value="" type="const TQString &" abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="314" type="bool" abstract="0" documentation="" name="checkMimeGroup" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="315" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="316" value="" type="const QString &" abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="316" value="" type="const TQString &" abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="317" type="bool" abstract="0" documentation="" name="checkMimeType" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="318" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="319" value="" type="const QString &" abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="319" value="" type="const TQString &" abstract="0" documentation="" name="type" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="320" type="KURL" abstract="0" documentation="" name="convertToPath" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="321" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="322" type="void" abstract="0" documentation="" name="dirCreationError" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="323" value="" type="QWidget *" abstract="0" documentation="" name="widget" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="323" value="" type="TQWidget *" abstract="0" documentation="" name="widget" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="324" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="325" type="TQString" abstract="0" documentation="" name="getDTDNameFromNickName" static="0" scope="200" > @@ -311,7 +311,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="328" value="" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="329" type="TQString" abstract="0" documentation="" name="i18n2normal" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="330" value="" type="const QString &" abstract="0" documentation="" name="a_str" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="330" value="" type="const TQString &" abstract="0" documentation="" name="a_str" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="331" type="int" abstract="0" documentation="" name="isBetween" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="332" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> @@ -334,7 +334,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="346" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="347" type="TQString" abstract="0" documentation="" name="makeRxCompatible" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="348" value="" type="const QString" abstract="0" documentation="" name="s" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="348" value="" type="const TQString" abstract="0" documentation="" name="s" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="349" type="TDEStandardDirs *" abstract="0" documentation="" name="pluginDirs" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="350" value="" type="const char *" abstract="0" documentation="" name="type" static="0" scope="200" /> @@ -356,7 +356,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="362" value="" type="TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="363" type="TQString" abstract="0" documentation="" name="tagCase" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="364" value="" type="const QString" abstract="0" documentation="" name="tag" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="364" value="" type="const TQString" abstract="0" documentation="" name="tag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="365" type="QTag *" abstract="0" documentation="" name="tagFromDTD" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="366" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> @@ -391,7 +391,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="391" value="" type="const KURL &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="392" type="TQString" abstract="0" documentation="" name="shortName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="393" value="" type="const QString &" abstract="0" documentation="" name="fname" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="393" value="" type="const TQString &" abstract="0" documentation="" name="fname" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="394" type="KURL" abstract="0" documentation="" name="toAbsolute" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="395" value="" type="const KURL &" abstract="0" documentation="" name="urlToConvert" static="0" scope="200" /> @@ -420,13 +420,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="428" value="" type="KTextEditor :: Document *" abstract="0" documentation="" name="doc" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="429" value="" type="Project *" abstract="0" documentation="" name="project" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="430" value="" type="QuantaPluginInterface *" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="431" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="431" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="432" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="433" value="" type="WFlags" abstract="0" documentation="" name="f" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="434" type="void" abstract="0" documentation="" name="changeTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="435" value="" type="Tag *" abstract="0" documentation="" name="tag" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="436" value="" type="QDict < QString > *" abstract="0" documentation="" name="dict" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="436" value="" type="QDict < TQString > *" abstract="0" documentation="" name="dict" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="437" type="void" abstract="0" documentation="" name="checkDirtyStatus" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="438" type="int" abstract="0" documentation="" name="checkOverwrite" static="0" scope="200" > @@ -443,7 +443,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="447" type="DTDStruct *" abstract="0" documentation="" name="defaultDTD" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="448" type="bool" abstract="0" documentation="" name="dirty" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="449" type="bool" abstract="0" documentation="" name="evenQuotes" static="0" scope="202" > - <UML:Parameter stereotype="" package="" xmi.id="450" value="" type="const QString &" abstract="0" documentation="" name="text" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="450" value="" type="const TQString &" abstract="0" documentation="" name="text" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="451" type="TQString" abstract="0" documentation="" name="find" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="452" value="" type="const QRegExp &" abstract="0" documentation="" name="rx" static="0" scope="200" /> @@ -467,7 +467,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="468" value="" type="int &" abstract="0" documentation="" name="feCol" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="469" type="TQString" abstract="0" documentation="" name="findWordRev" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="470" value="" type="const QString &" abstract="0" documentation="" name="textToSearch" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="470" value="" type="const TQString &" abstract="0" documentation="" name="textToSearch" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="471" type="Tag *" abstract="0" documentation="" name="findXMLTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="472" value="" type="int" abstract="0" documentation="" name="line" static="0" scope="200" /> @@ -533,7 +533,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="520" value="" type="DTDStruct *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="521" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="522" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="523" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="523" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="524" type="bool" abstract="0" documentation="" name="scriptCodeCompletion" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="525" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> @@ -556,7 +556,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="538" value="" type="bool" abstract="0" documentation="" name="flag" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="539" type="void" abstract="0" documentation="" name="setParsingDTD" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="540" value="" type="const QString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="540" value="" type="const TQString &" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="541" type="void" abstract="0" documentation="" name="setUntitledUrl" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="542" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -579,7 +579,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="555" value="" type="DTDStruct *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="556" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="557" value="" type="int" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="558" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="558" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="559" type="bool" abstract="0" documentation="" name="xmlCodeCompletion" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="560" value="" type="DTDStruct *" abstract="0" documentation="" name="dtd" static="0" scope="200" /> @@ -676,13 +676,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="631" value="" type="int &" abstract="0" documentation="" name="eCol" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="632" type="bool" abstract="0" documentation="" name="hasAttribute" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="633" value="" type="const QString &" abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="633" value="" type="const TQString &" abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="634" type="bool" abstract="0" documentation="" name="isQuotedAttribute" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="635" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="636" type="void" abstract="0" documentation="" name="parse" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="637" value="" type="const QString &" abstract="0" documentation="" name="p_tagStr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="637" value="" type="const TQString &" abstract="0" documentation="" name="p_tagStr" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="638" value="" type="Document *" abstract="0" documentation="" name="p_write" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="639" type="void" abstract="0" documentation="" name="parseAttr" static="0" scope="202" > @@ -691,7 +691,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="642" value="" type="int &" abstract="0" documentation="" name="col" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="643" type="void" abstract="0" documentation="" name="setStr" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="644" value="" type="const QString &" abstract="0" documentation="" name="p_tagStr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="644" value="" type="const TQString &" abstract="0" documentation="" name="p_tagStr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="645" type="void" abstract="0" documentation="" name="setTagPosition" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="646" value="" type="int" abstract="0" documentation="" name="bLine" static="0" scope="200" /> @@ -737,7 +737,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="675" value="" type="Attribute *" abstract="0" documentation="" name="attr" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="676" type="Attribute *" abstract="0" documentation="" name="attribute" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="677" value="" type="QString &" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="677" value="" type="TQString &" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="678" type="Attribute *" abstract="0" documentation="" name="attributeAt" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="679" value="" type="int" abstract="0" documentation="" name="index" static="0" scope="200" /> @@ -749,10 +749,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="684" type="bool" abstract="0" documentation="" name="isSingle" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="685" type="TQString" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="686" type="void" abstract="0" documentation="" name="setFileName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="687" value="" type="QString &" abstract="0" documentation="" name="fileName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="687" value="" type="TQString &" abstract="0" documentation="" name="fileName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="688" type="void" abstract="0" documentation="" name="setName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="689" value="" type="const QString &" abstract="0" documentation="" name="theName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="689" value="" type="const TQString &" abstract="0" documentation="" name="theName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="690" type="void" abstract="0" documentation="" name="setOptional" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="691" value="" type="bool" abstract="0" documentation="" name="isOptional" static="0" scope="200" /> @@ -839,7 +839,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="747" abstract="0" documentation="Editor for the plugins that manages configuration" name="QuantaPluginEditor" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="749" type="" abstract="0" documentation="" name="QuantaPluginEditor" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="750" value="" type="QWidget *" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="750" value="" type="TQWidget *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="751" value="" type="const char *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="752" type="QDict" abstract="0" documentation="" name="plugins" static="0" scope="200" /> @@ -858,7 +858,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="762" abstract="0" documentation="Dialog to configure a plugin's options" name="QuantaPluginConfig" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="763" type="" abstract="0" documentation="" name="QuantaPluginConfig" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="764" value="" type="QWidget *" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="764" value="" type="TQWidget *" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="765" value="" type="const char *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="766" type="" abstract="0" documentation="" name="~QuantaPluginConfig" static="0" scope="200" /> @@ -866,7 +866,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="767" abstract="0" documentation="This class handles the spellchecking. It should work with all KTextEditor's, not only Kate. This is not a real plugin. The code is based on SpellPlugin for Kate." name="SpellChecker" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="771" type="" abstract="0" documentation="" name="SpellChecker" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="772" value="" type="QObject *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="772" value="" type="TQObject *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="773" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="774" type="void" abstract="0" documentation="" name="locatePosition" static="0" scope="202" > @@ -900,38 +900,38 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="793" abstract="0" documentation="" name="QuantaPlugin" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="805" type="" abstract="0" documentation="" name="QuantaPlugin" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="806" type="" abstract="0" documentation="" name="QuantaPlugin" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="807" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="808" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="809" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="810" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="811" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="812" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="813" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="814" type="virtual QString" abstract="0" documentation="" name="arguments" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="815" type="virtual QString" abstract="0" documentation="" name="fileName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="807" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="808" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="809" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="810" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="811" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="812" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="813" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + </UML:Operation> + <UML:Operation stereotype="" package="" xmi.id="814" type="virtual TQString" abstract="0" documentation="" name="arguments" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="815" type="virtual TQString" abstract="0" documentation="" name="fileName" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="816" type="virtual bool" abstract="0" documentation="" name="isLoaded" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="817" type="virtual bool" abstract="0" documentation="" name="isRunning" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="818" type="virtual bool" abstract="0" documentation="" name="isStandard" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="819" type="virtual bool" abstract="0" documentation="" name="load" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="820" type="virtual QString" abstract="0" documentation="" name="location" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="821" type="virtual QString" abstract="0" documentation="" name="outputWindow" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="822" type="virtual QString" abstract="0" documentation="" name="pluginName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="820" type="virtual TQString" abstract="0" documentation="" name="location" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="821" type="virtual TQString" abstract="0" documentation="" name="outputWindow" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="822" type="virtual TQString" abstract="0" documentation="" name="pluginName" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="823" type="virtual bool" abstract="0" documentation="" name="run" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="824" type="virtual void" abstract="0" documentation="" name="setArguments" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="825" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="825" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="826" type="virtual void" abstract="0" documentation="" name="setFileName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="827" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="827" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="828" type="virtual void" abstract="0" documentation="" name="setLocation" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="829" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="829" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="830" type="virtual void" abstract="0" documentation="" name="setOutputWindow" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="831" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="831" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="832" type="virtual void" abstract="0" documentation="" name="setPluginName" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="833" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="833" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="834" type="virtual void" abstract="0" documentation="" name="setRunning" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="835" value="" type="bool" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -940,21 +940,21 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="837" value="" type="bool" abstract="0" documentation="" name="isStandard" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="838" type="virtual void" abstract="0" documentation="" name="setType" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="839" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="839" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="840" type="virtual bool" abstract="0" documentation="" name="toggle" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="841" type="virtual QString" abstract="0" documentation="" name="type" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="841" type="virtual TQString" abstract="0" documentation="" name="type" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="842" type="virtual bool" abstract="0" documentation="" name="unload" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="843" type="bool" abstract="0" documentation="" name="validatePlugin" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="844" value="" type="QuantaPlugin *" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="845" type="bool" abstract="0" documentation="" name="validatePluginInfo" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="846" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="847" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="848" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="849" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="850" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="851" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="846" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="847" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="848" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="849" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="850" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="851" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="852" type="" abstract="0" documentation="" name="~QuantaPlugin" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="794" value="" type="TDEToggleAction *" abstract="0" documentation="" name="m_action" static="0" scope="200" /> @@ -972,13 +972,13 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="853" abstract="0" documentation="Provides an interface to the installed plugins. " name="QuantaPluginInterface" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="856" type="" abstract="0" documentation="" name="QuantaPluginInterface" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="857" type="TQStringList" abstract="0" documentation="" name="outputWindows" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="858" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="858" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="859" type="virtual QuantaPlugin *" abstract="0" documentation="" name="plugin" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="860" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="860" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="861" type="bool" abstract="0" documentation="" name="pluginAvailable" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="862" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="862" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="863" type="virtual QStringList" abstract="0" documentation="" name="pluginNames" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="864" type="TQStringList" abstract="0" documentation="" name="pluginTypes" static="0" scope="200" /> @@ -1001,12 +1001,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="876" abstract="0" documentation="" name="Project" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="907" type="" abstract="0" documentation="" name="Project" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="908" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="908" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="909" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="910" type="bool" abstract="0" documentation="" name="createEmptyDom" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="911" type="virtual const QString &" abstract="0" documentation="" name="defaultDTD" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="912" type="virtual const QString &" abstract="0" documentation="" name="defaultEncoding" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="911" type="virtual const TQString &" abstract="0" documentation="" name="defaultDTD" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="912" type="virtual const TQString &" abstract="0" documentation="" name="defaultEncoding" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="913" type="bool" abstract="0" documentation="" name="hasProject" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="914" type="void" abstract="0" documentation="" name="insertFile" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="915" value="" type="const KURL &" abstract="0" documentation="" name="nameURL" static="0" scope="200" /> @@ -1017,11 +1017,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="919" type="void" abstract="0" documentation="" name="insertFiles" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="920" value="" type="const KURL &" abstract="0" documentation="" name="pathURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="921" value="" type="const QString &" abstract="0" documentation="" name="mask" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="921" value="" type="const TQString &" abstract="0" documentation="" name="mask" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="922" type="bool" abstract="0" documentation="" name="isModified" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="923" type="void" abstract="0" documentation="" name="loadProjectXML" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="924" type="virtual const QString &" abstract="0" documentation="" name="newFileType" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="924" type="virtual const TQString &" abstract="0" documentation="" name="newFileType" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="925" type="void" abstract="0" documentation="" name="openCurrentView" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="926" type="void" abstract="0" documentation="" name="readConfig" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="927" value="" type="TDEConfig *" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -1030,7 +1030,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="929" value="" type="TDEConfig *" abstract="0" documentation="" name="c" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="930" type="virtual void" abstract="0" documentation="" name="setDefaultDTD" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="931" value="" type="const QString &" abstract="0" documentation="" name="p_defaultDTD" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="931" value="" type="const TQString &" abstract="0" documentation="" name="p_defaultDTD" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="932" type="KURL" abstract="0" documentation="" name="urlWithPrefix" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="933" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> @@ -1074,10 +1074,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="940" type="" abstract="0" documentation="" name="FilesListView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="941" value="" type="TQString" abstract="0" documentation="" name="dir" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="942" value="" type="TQStringList" abstract="0" documentation="" name="topList" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="943" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="943" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="944" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="945" type="virtual QString" abstract="0" documentation="" name="currentFileName" static="0" scope="202" /> + <UML:Operation stereotype="" package="" xmi.id="945" type="virtual TQString" abstract="0" documentation="" name="currentFileName" static="0" scope="202" /> <UML:Operation stereotype="" package="" xmi.id="946" type="void" abstract="0" documentation="" name="loadDir" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="947" value="" type="TQString" abstract="0" documentation="" name="path" static="0" scope="200" /> </UML:Operation> @@ -1094,7 +1094,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="959" type="" abstract="0" documentation="" name="FilesTreeFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="960" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="961" value="" type="const QString &" abstract="0" documentation="" name="p_name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="961" value="" type="const TQString &" abstract="0" documentation="" name="p_name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="962" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="963" type="virtual bool" abstract="0" documentation="" name="acceptDrop" static="0" scope="200" > @@ -1103,9 +1103,9 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="965" type="virtual void" abstract="0" documentation="" name="dropped" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="966" value="" type="QDropEvent *" abstract="0" documentation="" name="e" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="967" type="virtual QString" abstract="0" documentation="" name="fullName" static="0" scope="200" /> + <UML:Operation stereotype="" package="" xmi.id="967" type="virtual TQString" abstract="0" documentation="" name="fullName" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="968" type="void" abstract="0" documentation="" name="init" static="0" scope="202" /> - <UML:Operation stereotype="" package="" xmi.id="969" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="969" type="virtual TQString" abstract="0" documentation="" name="key" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="970" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="971" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> </UML:Operation> @@ -1204,7 +1204,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1043" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1044" type="TQString" abstract="0" documentation="" name="fullName" static="0" scope="200" /> - <UML:Operation stereotype="" package="" xmi.id="1045" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1045" type="virtual TQString" abstract="0" documentation="" name="key" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1046" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1047" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> </UML:Operation> @@ -1228,7 +1228,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1063" type="" abstract="0" documentation="" name="ProjectTreeFolder" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1064" value="" type="QListView *" abstract="0" documentation="" name="parentListView" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1065" value="" type="const QString &" abstract="0" documentation="" name="name" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1065" value="" type="const TQString &" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1066" value="" type="const KURL &" abstract="0" documentation="" name="p_url" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1067" type="bool" abstract="0" documentation="" name="contains" static="0" scope="200" > @@ -1265,10 +1265,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1089" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1091" type="" abstract="0" documentation="" name="DocTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1092" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1092" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1093" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1094" type="QString *" abstract="0" documentation="" name="contextHelp" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1094" type="TQString *" abstract="0" documentation="" name="contextHelp" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1095" value="" type="TQString" abstract="0" documentation="" name="keyword" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1096" type="" abstract="0" documentation="" name="~DocTreeView" static="0" scope="200" /> @@ -1276,7 +1276,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1097" abstract="0" documentation="A tree view used to display a set of files/directories explicitly added to it. It is used in several dialogs, e.g in Project Upload dialog, Rescan Project dialog, add files/folders to project dialogs." name="UploadTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1098" type="" abstract="0" documentation="" name="UploadTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1099" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1099" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1100" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1101" type="UploadTreeFile *" abstract="0" documentation="" name="addItem" static="0" scope="200" > @@ -1295,10 +1295,10 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1111" type="UploadTreeFolder *" abstract="0" documentation="" name="findFolder" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1112" value="" type="UploadTreeFolder *" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1113" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1113" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1114" type="QListViewItem *" abstract="0" documentation="" name="findItem" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1115" value="" type="const QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1115" value="" type="const TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1116" type="void" abstract="0" documentation="" name="invertAll" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1117" value="" type="QListViewItem *" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -1319,7 +1319,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1144" type="" abstract="0" documentation="" name="StructTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1145" value="" type="Parser *" abstract="0" documentation="" name="parser" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1146" value="" type="TDEConfig *" abstract="0" documentation="" name="config" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1147" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1147" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1148" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1149" type="void" abstract="0" documentation="" name="buildTree" static="0" scope="202" > @@ -1336,7 +1336,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1158" value="" type="bool" abstract="0" documentation="" name="open" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1159" type="void" abstract="0" documentation="" name="setParsingDTD" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1160" value="" type="const QString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1160" value="" type="const TQString" abstract="0" documentation="" name="dtdName" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1161" type="virtual void" abstract="0" documentation="" name="showEvent" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1162" value="" type="QShowEvent *" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -1377,7 +1377,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1178" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1179" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> - <UML:Operation stereotype="" package="" xmi.id="1180" type="virtual QString" abstract="0" documentation="" name="key" static="0" scope="200" > + <UML:Operation stereotype="" package="" xmi.id="1180" type="virtual TQString" abstract="0" documentation="" name="key" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1181" value="" type="int" abstract="0" documentation="" name="column" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1182" value="" type="bool" abstract="0" documentation="" name="ascending" static="0" scope="200" /> </UML:Operation> @@ -1392,7 +1392,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1187" abstract="0" documentation="TreeView for templates. As the templates are standard directories, it inherits from FilesTreeView." name="TemplatesTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1195" type="" abstract="0" documentation="" name="TemplatesTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1196" value="" type="const KURL &" abstract="0" documentation="" name="projectBaseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1197" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1197" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1198" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1199" type="void" abstract="0" documentation="" name="contentsDropEvent" static="0" scope="202" > @@ -1421,24 +1421,24 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1211" abstract="0" documentation="TDEListViewItem specific for the structure tree." name="StructTreeTag" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1213" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1214" value="" type="QListView *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1215" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1215" value="" type="const TQString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1216" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1217" value="" type="StructTreeTag *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1218" value="" type="Node *" abstract="0" documentation="" name="a_node" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1219" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1219" value="" type="const TQString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1220" value="" type="QListViewItem *" abstract="0" documentation="" name="after" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1221" type="" abstract="0" documentation="" name="StructTreeTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1222" value="" type="StructTreeTag *" abstract="0" documentation="" name="parent" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1223" value="" type="const QString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1223" value="" type="const TQString" abstract="0" documentation="" name="a_title" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1224" type="" abstract="0" documentation="" name="~StructTreeTag" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1212" value="" type="Node *" abstract="0" documentation="" name="node" static="0" scope="200" /> </UML:Class> <UML:Class stereotype="" package="" xmi.id="1225" abstract="0" documentation="A project specific TDEListView." name="ProjectTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1231" type="" abstract="0" documentation="" name="ProjectTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1232" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1232" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1233" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1234" type="virtual KURL" abstract="0" documentation="" name="currentURL" static="0" scope="202" /> @@ -1459,11 +1459,11 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1241" abstract="0" documentation="Extended FileManage to handle remote and local directory structures in a tree." name="FilesTreeView" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1242" type="" abstract="0" documentation="" name="FilesTreeView" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1243" value="" type="KURL :: List" abstract="0" documentation="" name="topList" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1244" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1244" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1245" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1246" type="" abstract="0" documentation="" name="FilesTreeView" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1247" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1247" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1248" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1249" type="void" abstract="0" documentation="" name="addFileInfoPage" static="0" scope="202" > @@ -1494,7 +1494,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1267" abstract="0" documentation="A treeview which has some common file managing methods. It inherits from TDEListView." name="FileManage" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1272" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1273" type="" abstract="0" documentation="" name="FileManage" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1274" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1274" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1275" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1276" type="virtual KURL" abstract="0" documentation="" name="currentURL" static="0" scope="202" /> @@ -1537,7 +1537,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1326" type="" abstract="0" documentation="" name="ProjectUpload" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1327" value="" type="Project *" abstract="0" documentation="" name="p" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1328" value="" type="const KURL &" abstract="0" documentation="" name="url" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1329" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1329" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1330" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1331" value="" type="bool" abstract="0" documentation="" name="modal" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1332" value="" type="WFlags" abstract="0" documentation="" name="fl" static="0" scope="200" /> @@ -1561,7 +1561,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1340" abstract="0" documentation="Create a new project from tdeio accessible files and folders." name="ProjectNewLocal" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1342" type="" abstract="0" documentation="" name="ProjectNewLocal" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1343" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1343" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1344" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1345" type="virtual void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" > @@ -1574,7 +1574,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1351" type="" abstract="0" documentation="" name="RescanPrj" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1352" value="" type="KURL :: List" abstract="0" documentation="" name="p_prjFileList" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1353" value="" type="const KURL &" abstract="0" documentation="" name="p_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1354" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1354" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1355" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1356" value="" type="bool" abstract="0" documentation="" name="modal" static="0" scope="200" /> </UML:Operation> @@ -1587,7 +1587,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1360" abstract="0" documentation="" name="ProjectNewFinal" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1361" type="" abstract="0" documentation="" name="ProjectNewFinal" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1362" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1362" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1363" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1364" type="void" abstract="0" documentation="" name="setMargin" static="0" scope="200" > @@ -1597,7 +1597,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1367" abstract="0" documentation="Create a new project with the help of wget." name="ProjectNewWeb" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1372" type="" abstract="0" documentation="" name="ProjectNewWeb" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1373" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1373" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1374" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1375" type="virtual void" abstract="0" documentation="" name="resizeEvent" static="0" scope="200" > @@ -1611,7 +1611,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1378" abstract="0" documentation="" name="ProjectNewGeneral" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1379" type="" abstract="0" documentation="" name="ProjectNewGeneral" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1380" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1380" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1381" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1382" type="void" abstract="0" documentation="" name="setMargin" static="0" scope="200" > @@ -1628,16 +1628,16 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Operation stereotype="" package="" xmi.id="1391" type="" abstract="0" documentation="" name="CSSSelectorEditor" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1392" value="" type="TQString" abstract="0" documentation="" name="code" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1393" value="" type="bool" abstract="0" documentation="" name="editSelector" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1394" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1394" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1395" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1396" type="TQString" abstract="0" documentation="" name="code" static="0" scope="200" /> <UML:Operation stereotype="" package="" xmi.id="1397" type="void" abstract="0" documentation="" name="splitValueTRBL" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1398" value="" type="TQString" abstract="0" documentation="" name="value" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1399" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1400" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1401" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1402" value="" type="QString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1399" value="" type="TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1400" value="" type="TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1401" value="" type="TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1402" value="" type="TQString &" abstract="0" documentation="" name="" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1403" type="void" abstract="0" documentation="" name="widgetFromCode" static="0" scope="202" > <UML:Parameter stereotype="" package="" xmi.id="1404" value="" type="TQString" abstract="0" documentation="" name="" static="0" scope="200" /> @@ -1667,8 +1667,8 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Parameter stereotype="" package="" xmi.id="1430" value="" type="KURL" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1431" type="void" abstract="0" documentation="" name="insertAttribute" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1432" value="" type="QString *" abstract="0" documentation="" name="attr" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1433" value="" type="QString *" abstract="0" documentation="" name="value" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1432" value="" type="TQString *" abstract="0" documentation="" name="attr" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1433" value="" type="TQString *" abstract="0" documentation="" name="value" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1434" type="void" abstract="0" documentation="" name="insertTag" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1435" value="" type="Document *" abstract="0" documentation="" name="w" static="0" scope="200" /> @@ -1685,12 +1685,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="1411" value="" type="QPtrList *" abstract="0" documentation="" name="extraPageList" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1412" value="" type="KURL" abstract="0" documentation="" name="m_baseURL" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1413" value="" type="Tag *" abstract="0" documentation="" name="m_tag" static="0" scope="201" /> - <UML:Attribute stereotype="" package="" xmi.id="1414" value="" type="QWidget *" abstract="0" documentation="" name="mainDlg" static="0" scope="200" /> + <UML:Attribute stereotype="" package="" xmi.id="1414" value="" type="TQWidget *" abstract="0" documentation="" name="mainDlg" static="0" scope="200" /> </UML:Class> <UML:Association nameb="" stereotype="" assoctype="dependency" rolea="1407" roleb="307" multia="" multib="" package="" xmi.id="1441" abstract="0" documentation="" name="" static="0" scope="200" namea="" /> <UML:Class stereotype="" package="" xmi.id="1442" abstract="0" documentation="" name="TagImgDlg" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1465" type="" abstract="0" documentation="" name="TagImgDlg" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1466" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1466" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1467" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1468" type="void" abstract="0" documentation="" name="initDialog" static="0" scope="200" /> @@ -1707,7 +1707,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Attribute stereotype="" package="" xmi.id="1452" value="" type="QPushButton *" abstract="0" documentation="" name="buttonOk" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1453" value="" type="QPushButton *" abstract="0" documentation="" name="buttonRecalcImgSize" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1454" value="" type="QComboBox *" abstract="0" documentation="" name="comboAlign" static="0" scope="200" /> - <UML:Attribute stereotype="" package="" xmi.id="1455" value="" type="QImage *" abstract="0" documentation="" name="img" static="0" scope="201" /> + <UML:Attribute stereotype="" package="" xmi.id="1455" value="" type="TQImage *" abstract="0" documentation="" name="img" static="0" scope="201" /> <UML:Attribute stereotype="" package="" xmi.id="1456" value="" type="QLabel *" abstract="0" documentation="" name="labelImgSource" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1457" value="" type="KLineEdit *" abstract="0" documentation="" name="lineAltText" static="0" scope="200" /> <UML:Attribute stereotype="" package="" xmi.id="1458" value="" type="KLineEdit *" abstract="0" documentation="" name="lineHSpace" static="0" scope="200" /> @@ -1721,7 +1721,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1470" abstract="0" documentation="" name="TagQuickTable" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1472" type="" abstract="0" documentation="" name="TagQuickTable" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1473" value="" type="Document *" abstract="0" documentation="" name="write" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1474" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1474" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1475" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1476" type="" abstract="0" documentation="" name="~TagQuickTable" static="0" scope="200" /> @@ -1769,7 +1769,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1512" abstract="0" documentation="" name="CopyTo" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1515" type="" abstract="0" documentation="" name="CopyTo" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1516" value="" type="const KURL &" abstract="0" documentation="" name="dirURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1517" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1517" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1518" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1519" type="KURL" abstract="0" documentation="" name="copy" static="0" scope="200" > @@ -1790,7 +1790,7 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat <UML:Class stereotype="" package="" xmi.id="1530" abstract="0" documentation="" name="TagQuickStart" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1532" type="" abstract="0" documentation="" name="TagQuickStart" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1533" value="" type="const KURL &" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1534" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1534" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1535" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1536" type="" abstract="0" documentation="" name="~TagQuickStart" static="0" scope="200" /> @@ -1798,12 +1798,12 @@ See the operations in order to get a picture what's here." name="QuantaDoc" stat </UML:Class> <UML:Class stereotype="" package="" xmi.id="1537" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > <UML:Operation stereotype="" package="" xmi.id="1542" type="" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > - <UML:Parameter stereotype="" package="" xmi.id="1543" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1543" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1544" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1545" type="" abstract="0" documentation="" name="FileCombo" static="0" scope="200" > <UML:Parameter stereotype="" package="" xmi.id="1546" value="" type="const KURL &" abstract="0" documentation="" name="a_baseURL" static="0" scope="200" /> - <UML:Parameter stereotype="" package="" xmi.id="1547" value="" type="QWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> + <UML:Parameter stereotype="" package="" xmi.id="1547" value="" type="TQWidget *" abstract="0" documentation="" name="parent" static="0" scope="200" /> <UML:Parameter stereotype="" package="" xmi.id="1548" value="" type="const char *" abstract="0" documentation="" name="name" static="0" scope="200" /> </UML:Operation> <UML:Operation stereotype="" package="" xmi.id="1549" type="void" abstract="0" documentation="" name="setBaseURL" static="0" scope="200" > diff --git a/quanta/scripts/CMakeLists.txt b/quanta/scripts/CMakeLists.txt index 03099cac..2d58a86b 100644 --- a/quanta/scripts/CMakeLists.txt +++ b/quanta/scripts/CMakeLists.txt @@ -13,7 +13,7 @@ install( FILES scriptinfo.kmdr.info dwt.pl dwt.kmdr.info tidy.kmdr.info checkxml.kmdr.info meinproc.kmdr.info xmlval.kmdr.info - xsltproc.kmdr.info htmlquickstart.kmdr.info + xsltproc.kmdr.info htmlquickstart.kmdr.info htmlquickstart5.kmdr.info TemplateMagic.pl TemplateMagic.pl.info info.css externalpreview.sh info.xsl externalpreview.sh.info dwt.pl.info @@ -23,7 +23,7 @@ install( FILES install( PROGRAMS scriptinfo.kmdr dwt.kmdr tidy.kmdr checkxml.kmdr meinproc.kmdr xmlval.kmdr xsltproc.kmdr - htmlquickstart.kmdr gubed_install.kmdr + htmlquickstart.kmdr htmlquickstart5.kmdr gubed_install.kmdr listwizard.kmdr picturewizard.kmdr tablewizard.kmdr docbook_table.kmdr DESTINATION ${DATA_INSTALL_DIR}/quanta/scripts ) diff --git a/quanta/scripts/Makefile.am b/quanta/scripts/Makefile.am index 00a74dea..5353f514 100644 --- a/quanta/scripts/Makefile.am +++ b/quanta/scripts/Makefile.am @@ -2,7 +2,7 @@ quantadir = ${quanta_datadir}/scripts quanta_DATA = scriptinfo.kmdr.info dwt.pl dwt.kmdr.info \ tidy.kmdr.info checkxml.kmdr.info meinproc.kmdr.info \ - xmlval.kmdr.info xsltproc.kmdr.info htmlquickstart.kmdr.info \ + xmlval.kmdr.info xsltproc.kmdr.info htmlquickstart.kmdr.info htmlquickstart5.kmdr.info \ TemplateMagic.pl TemplateMagic.pl.info info.css externalpreview.sh \ info.xsl externalpreview.sh.info dwt.pl.info gubed_install.kmdr.info @@ -12,6 +12,6 @@ execquantadir = ${quanta_datadir}/scripts execquanta_SCRIPTS = scriptinfo.kmdr dwt.kmdr tidy.kmdr \ checkxml.kmdr meinproc.kmdr \ xmlval.kmdr xsltproc.kmdr \ - htmlquickstart.kmdr \ + htmlquickstart.kmdr htmlquickstart5.kmdr \ gubed_install.kmdr \ listwizard.kmdr picturewizard.kmdr tablewizard.kmdr docbook_table.kmdr diff --git a/quanta/scripts/htmlquickstart5.kmdr b/quanta/scripts/htmlquickstart5.kmdr new file mode 100755 index 00000000..cc145dea --- /dev/null +++ b/quanta/scripts/htmlquickstart5.kmdr @@ -0,0 +1,997 @@ +<!DOCTYPE UI><UI version="3.0" stdsetdef="1"> +<class>quickStartForm</class> +<widget class="Dialog"> + <property name="name"> + <cstring>quickStartForm</cstring> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>473</width> + <height>577</height> + </rect> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="caption"> + <string>Quick Start</string> + </property> + <property name="populationText"> + <string></string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string></string> + <string>@execBegin +quanta=`dcop quanta-@parentPid` +if [ -z "$quanta" ]; then + quanta=`dcop quanta` + if [ ! -z "$quanta" ]; then + quantadcop=quanta + fi +else + quantadcop=quanta-@parentPid +fi + +if [ ! -z "$quantadcop" ]; then + encoding=`dcop $quantadcop SettingsIf encoding` + dcop @dcopid KommanderIf setSelection ComboMetachar $encoding + dcop @dcopid KommanderIf setChecked CBMetaChar true + dtep=`dcop $quantadcop SettingsIf dtep` + dcop @dcopid KommanderIf setCurrentListItem DTEPselect "$dtep" +fi +@execEnd</string> + <string></string> + </stringlist> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="4"> + <property name="name"> + <cstring>TextLabel1</cstring> + </property> + <property name="font"> + <font> + <family>Sans Serif</family> + <pointsize>12</pointsize> + <bold>1</bold> + </font> + </property> + <property name="text"> + <string>Quanta Plus Kommander Quick Start</string> + </property> + <property name="alignment"> + <set>AlignCenter</set> + </property> + </widget> + <spacer row="2" column="0"> + <property name="name"> + <cstring>Spacer6_2</cstring> + </property> + <property name="orientation"> + <enum>Horizontal</enum> + </property> + <property name="sizeType"> + <enum>Expanding</enum> + </property> + <property name="sizeHint"> + <size> + <width>33</width> + <height>0</height> + </size> + </property> + </spacer> + <widget class="GroupBox" row="1" column="0" rowspan="1" colspan="4"> + <property name="name"> + <cstring>dialogScript</cstring> + </property> + <property name="sizePolicy"> + <sizepolicy> + <hsizetype>5</hsizetype> + <vsizetype>5</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="title"> + <string></string> + </property> + <property name="flat"> + <bool>false</bool> + </property> + <property name="populationText"> + <string></string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>############################# +# Globals + +# The indentation level. We have only +# one level of indentation +PADDING=' ' + +# This sets the DTD var +@DTEPselect + +# set parameters that depend on DTD +if echo $DTD | grep -q xhtml +then + XHTML=true + TAGEND=' />' + HTML='<html xmlns="http://www.w3.org/1999/xhtml">' +else + XHTML=FALSE + TAGEND='>' + HTML='<html>' +fi + +############################## +# Finally generate the page + +@CBDTD +echo $HTML +echo '@CBCVS' +@CBHead + +echo '<body>' +echo '@CBPHPHeader' +echo '@CBPHPFooter' +echo '</body>' +echo '</html>' + +quanta=`dcop quanta-@parentPid` +if [ -z "$quanta" ]; then + quanta=`dcop quanta` + if [ ! -z "$quanta" ]; then + quantadcop=quanta + fi +else + quantadcop=quanta-@parentPid +fi + +if [ ! -z "$quantadcop" ]; then + dcop $quantadcop WindowManagerIf setDtep "@DTEPselect.text" false +fi</string> + </stringlist> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <widget class="TQLabel" row="0" column="0"> + <property name="name"> + <cstring>TextLabel1_2</cstring> + </property> + <property name="text"> + <string>DTD / Schema:</string> + </property> + </widget> + <widget class="GroupBox" row="4" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>GroupBox3</cstring> + </property> + <property name="title"> + <string>Body Area</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string><body> +@CBPHPHeader +@CBPHPFooter +</body></string> + </stringlist> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <widget class="LineEdit" row="0" column="1"> + <property name="name"> + <cstring>phpHeaderFile</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="1" column="1"> + <property name="name"> + <cstring>phpFooterFile</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="1" column="0"> + <property name="name"> + <cstring>CBPHPFooter</cstring> + </property> + <property name="text"> + <string>&PHP footer include:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string><? include_once("@phpFooterFile") ?></string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="0" column="0"> + <property name="name"> + <cstring>CBPHPHeader</cstring> + </property> + <property name="text"> + <string>PHP header include:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string><? include_once("@phpHeaderFile") ?></string> + </stringlist> + </property> + </widget> + </grid> + </widget> + <widget class="CheckBox" row="1" column="0"> + <property name="name"> + <cstring>CBDTD</cstring> + </property> + <property name="text"> + <string>Show &DTD</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string>@DTEPselect +echo "$DTD"</string> + <string>echo "$DTD"</string> + </stringlist> + </property> + </widget> + <widget class="ComboBox" row="0" column="1"> + <item> + <property name="text"> + <string>HTML 5</string> + </property> + </item> + <item> + <property name="text"> + <string>HTML 4.01 Transitional</string> + </property> + </item> + <item> + <property name="text"> + <string>HTML 4.01 Strict</string> + </property> + </item> + <item> + <property name="text"> + <string>HTML 4.01 Frameset</string> + </property> + </item> + <item> + <property name="text"> + <string>XHTML 1.0 Transitional</string> + </property> + </item> + <item> + <property name="text"> + <string>XHTML 1.0 Strict</string> + </property> + </item> + <item> + <property name="text"> + <string>XHTML 1.0 Frameset</string> + </property> + </item> + <item> + <property name="text"> + <string>XHTML 1.0 Basic</string> + </property> + </item> + <item> + <property name="text"> + <string>XHTML 1.1</string> + </property> + </item> + <property name="name"> + <cstring>DTEPselect</cstring> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>################################ +# This script sets the DTD var + + +# The various DTD's + +html5='<!DOCTYPE html>' + +htmltrans='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">' + +strict='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' + +frameset='<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">' + +xhtml1trans='<?xml version="1.0" encoding="@ComboMetachar"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' + +xhtml1strict='<?xml version="1.0" encoding="@ComboMetachar"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' + +xhtml1frameset='<?xml version="1.0" encoding="@ComboMetachar"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">' + +xhtml1basic='<?xml version="1.0" encoding="@ComboMetachar"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">' + +xhtml11='<?xml version="1.0" encoding="@ComboMetachar"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">' + +################################ +# Set the DTD based on user selection + +case "@widgetText" in +"HTML 5" ) + DTD="$html5" +;; +"HTML 4.01 Transitional" ) + DTD="$htmltrans" +;; +"HTML 4.01 Strict" ) + DTD="$strict" +;; +"HTML 4.01 Frameset" ) + DTD="$frameset" +;; +"XHTML 1.0 Transitional" ) + DTD="$xhtml1trans" +;; +"XHTML 1.0 Strict" ) + DTD="$xhtml1strict" +;; +"XHTML 1.0 Frameset" ) + DTD="$xhtml1frameset" +;; +"XHTML 1.0 Basic" ) + DTD="$xhtml1basic" +;; +"XHTML 1.1" ) + DTD="$xhtml11" +;; +* ) + echo "No Match" +;; +esac +</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="2" column="0"> + <property name="name"> + <cstring>CBHead</cstring> + </property> + <property name="text"> + <string>Head &area</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo '<head>' +@LETitle +@CBBasedir +@CBMetaQuanta +@CBMetaAuthor +@CBMetaChar +@CBMetaKeywords +@CBStyle +@CBStyleArea +@CBJavascript +echo '</head>'</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="1" column="1"> + <property name="name"> + <cstring>CBCVS</cstring> + </property> + <property name="text"> + <string>CVS tag &in comment</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string><!-- $Id$ --></string> + </stringlist> + </property> + </widget> + <widget class="GroupBox" row="3" column="0" rowspan="1" colspan="2"> + <property name="name"> + <cstring>GroupBox2</cstring> + </property> + <property name="title"> + <string></string> + </property> + <property name="populationText"> + <string></string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string></string> + </stringlist> + </property> + <grid> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <widget class="CheckBox" row="2" column="0"> + <property name="name"> + <cstring>CBMetaAuthor</cstring> + </property> + <property name="text"> + <string>&Meta author:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<meta name=\"AUTHOR\" content=\"@LEMetaAuthor\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="3" column="0"> + <property name="name"> + <cstring>CBMetaChar</cstring> + </property> + <property name="text"> + <string>Meta character set:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<meta http-equiv=\"Content-Type\" content=\"text/html; charset=@ComboMetachar\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="7" column="0"> + <property name="name"> + <cstring>CBStyleArea</cstring> + </property> + <property name="text"> + <string>St&yle area</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<style type=\"text/css\">" +if [ $XHTML = true ]; then + echo "$PADDING/* <![CDATA[ */" + echo "$PADDING" + echo "$PADDING/* ]]> */" +fi +echo "$PADDING</style>"</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="1" column="1"> + <property name="name"> + <cstring>LEBasedir</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="2" column="1"> + <property name="name"> + <cstring>LEMetaAuthor</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="ComboBox" row="3" column="1"> + <item> + <property name="text"> + <string>iso-8859-1</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-2</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-3</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-4</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-5</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-6</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-7</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-8</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-8i</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-9</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-10</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-11</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-12</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-13</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-14</string> + </property> + </item> + <item> + <property name="text"> + <string>iso-8859-15</string> + </property> + </item> + <item> + <property name="text"> + <string>utf-8</string> + </property> + </item> + <item> + <property name="text"> + <string>utf-16</string> + </property> + </item> + <item> + <property name="text"> + <string>koi8-r</string> + </property> + </item> + <item> + <property name="text"> + <string>koi8-u</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1250</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1251</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1252</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1253</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1254</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1255</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1256</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1257</string> + </property> + </item> + <item> + <property name="text"> + <string>windows-1258</string> + </property> + </item> + <property name="name"> + <cstring>ComboMetachar</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="4" column="1"> + <property name="name"> + <cstring>LEMetaKeywords</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + <property name="toolTip" stdset="0"> + <string>limit to 8, separate with commas</string> + </property> + </widget> + <widget class="CheckBox" row="1" column="0"> + <property name="name"> + <cstring>CBBasedir</cstring> + </property> + <property name="text"> + <string>&Base directory:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<base href=\"@LEBasedir\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="6" column="0"> + <property name="name"> + <cstring>CBMetaQuanta</cstring> + </property> + <property name="text"> + <string>Meta &Quanta</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<meta name=\"GENERATOR\" content=\"Quanta Plus\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="4" column="0"> + <property name="name"> + <cstring>CBMetaKeywords</cstring> + </property> + <property name="text"> + <string>Meta &keywords:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo -n "$PADDING<meta name=\"KEYWORDS\" content=\"" +echo -n '@LEMetaKeywords' +echo "\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="CheckBox" row="5" column="0"> + <property name="name"> + <cstring>CBStyle</cstring> + </property> + <property name="text"> + <string>Li&nked style sheet:</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>echo "$PADDING<link rel=\"stylesheet\" type=\"text/css\" href=\"@cssFile\"$TAGEND"</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="5" column="1"> + <property name="name"> + <cstring>cssFile</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@widgetText</string> + </stringlist> + </property> + </widget> + <widget class="LineEdit" row="0" column="1"> + <property name="name"> + <cstring>LETitle</cstring> + </property> + <property name="text"> + <string></string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>echo "$PADDING<title>@widgetText</title>"</string> + </stringlist> + </property> + </widget> + <widget class="TQLabel" row="0" column="0"> + <property name="name"> + <cstring>TextLabel2</cstring> + </property> + <property name="text"> + <string>Title:</string> + </property> + </widget> + <widget class="CheckBox" row="7" column="1"> + <property name="name"> + <cstring>CBJavascript</cstring> + </property> + <property name="text"> + <string>&JavaScript area</string> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@null</string> + <string></string> + <string>if echo $DTD | grep -q strict +then + echo "$PADDING<script type=\"text/javascript\">" +else + echo "$PADDING<script language=\"javascript\" type=\"text/javascript\">" +fi + + +if [ $XHTML = true ]; then + echo "$PADDING/* <![CDATA[ */" + echo "$PADDING" + echo "$PADDING/* ]]> */" +else + echo "$PADDING// <!--" + echo "$PADDING" + echo "$PADDING// -->" +fi + +echo "$PADDING</script>"</string> + </stringlist> + </property> + </widget> + </grid> + </widget> + </grid> + </widget> + <widget class="CloseButton" row="2" column="3"> + <property name="name"> + <cstring>CloseButton1_2</cstring> + </property> + <property name="text"> + <string>&Cancel</string> + </property> + <property name="flat"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string></string> + </stringlist> + </property> + <property name="writeStdout"> + <bool>true</bool> + </property> + </widget> + <widget class="CloseButton" row="2" column="1"> + <property name="name"> + <cstring>CloseButton1</cstring> + </property> + <property name="text"> + <string>&OK</string> + </property> + <property name="flat"> + <bool>false</bool> + </property> + <property name="associations" stdset="0"> + <stringlist> + <string>@dialogScript +</string> + </stringlist> + </property> + <property name="writeStdout"> + <bool>true</bool> + </property> + </widget> + </grid> +</widget> +<connections> + <connection> + <sender>CBBasedir</sender> + <signal>toggled(bool)</signal> + <receiver>LEBasedir</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBMetaAuthor</sender> + <signal>toggled(bool)</signal> + <receiver>LEMetaAuthor</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBMetaKeywords</sender> + <signal>toggled(bool)</signal> + <receiver>LEMetaKeywords</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBMetaChar</sender> + <signal>toggled(bool)</signal> + <receiver>ComboMetachar</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBStyle</sender> + <signal>toggled(bool)</signal> + <receiver>cssFile</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBHead</sender> + <signal>toggled(bool)</signal> + <receiver>GroupBox2</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBPHPHeader</sender> + <signal>toggled(bool)</signal> + <receiver>phpHeaderFile</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>CBPHPFooter</sender> + <signal>toggled(bool)</signal> + <receiver>phpFooterFile</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>quickStartForm</sender> + <signal>widgetOpened()</signal> + <receiver>GroupBox2</receiver> + <slot>populate()</slot> + </connection> +</connections> +<tabstops> + <tabstop>DTEPselect</tabstop> + <tabstop>CBDTD</tabstop> + <tabstop>CBCVS</tabstop> + <tabstop>CBHead</tabstop> + <tabstop>LETitle</tabstop> + <tabstop>CBBasedir</tabstop> + <tabstop>LEBasedir</tabstop> + <tabstop>CBMetaAuthor</tabstop> + <tabstop>LEMetaAuthor</tabstop> + <tabstop>CBMetaChar</tabstop> + <tabstop>ComboMetachar</tabstop> + <tabstop>CBMetaKeywords</tabstop> + <tabstop>LEMetaKeywords</tabstop> + <tabstop>CBStyle</tabstop> + <tabstop>cssFile</tabstop> + <tabstop>CBMetaQuanta</tabstop> + <tabstop>CBStyleArea</tabstop> + <tabstop>CBJavascript</tabstop> + <tabstop>CBPHPHeader</tabstop> + <tabstop>phpHeaderFile</tabstop> + <tabstop>CBPHPFooter</tabstop> + <tabstop>phpFooterFile</tabstop> + <tabstop>CloseButton1</tabstop> + <tabstop>CloseButton1_2</tabstop> +</tabstops> +<layoutdefaults spacing="6" margin="11"/> +</UI> diff --git a/quanta/scripts/htmlquickstart5.kmdr.info b/quanta/scripts/htmlquickstart5.kmdr.info new file mode 100644 index 00000000..2602167a --- /dev/null +++ b/quanta/scripts/htmlquickstart5.kmdr.info @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE QuantaScriptInfo> +<INFO> +<options editor="kmdr-editor" interpreter="kmdr-executor -c quanta" /> +<name>htmlquickstart5</name> +<author>Alexis Puente Montiel</author> +<email>miscelaneanatural@yahoo.es</email> +<website>http://quanta.sf.net/</website> +<version>1.1</version> +<license>GPL</license> +<about>Enjoy!</about> +</INFO> diff --git a/quanta/scripts/tidy.kmdr b/quanta/scripts/tidy.kmdr index 2ba267f7..e536d82a 100644 --- a/quanta/scripts/tidy.kmdr +++ b/quanta/scripts/tidy.kmdr @@ -1069,9 +1069,9 @@ fi </connection> <connection> <sender>ExecButton2</sender> - <signal>widgetTextChanged(const QString&)</signal> + <signal>widgetTextChanged(const TQString&)</signal> <receiver>GtidyPath</receiver> - <slot>setWidgetText(const QString&)</slot> + <slot>setWidgetText(const TQString&)</slot> </connection> </connections> <layoutdefaults spacing="6" margin="11"/> diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp index c5530dae..49b3d195 100644 --- a/quanta/src/document.cpp +++ b/quanta/src/document.cpp @@ -200,25 +200,25 @@ Document::Document(KTextEditor::Document *doc, //path of the backup copy file of the document m_backupPathValue = TQString(); - connect( m_doc, TQT_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)), - this, TQT_SLOT(slotCharactersInserted(int ,int ,const TQString&)) ); + connect( m_doc, TQ_SIGNAL(charactersInteractivelyInserted (int ,int ,const TQString&)), + this, TQ_SLOT(slotCharactersInserted(int ,int ,const TQString&)) ); - connect( m_view, TQT_SIGNAL(completionAborted()), - this, TQT_SLOT( slotCompletionAborted()) ); + connect( m_view, TQ_SIGNAL(completionAborted()), + this, TQ_SLOT( slotCompletionAborted()) ); - connect( m_view, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), - this, TQT_SLOT( slotCompletionDone(KTextEditor::CompletionEntry)) ); + connect( m_view, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), + this, TQ_SLOT( slotCompletionDone(KTextEditor::CompletionEntry)) ); - connect( m_view, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString *)), - this, TQT_SLOT( slotFilterCompletion(KTextEditor::CompletionEntry*,TQString *)) ); - connect( m_doc, TQT_SIGNAL(textChanged()), TQT_SLOT(slotTextChanged())); + connect( m_view, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString *)), + this, TQ_SLOT( slotFilterCompletion(KTextEditor::CompletionEntry*,TQString *)) ); + connect( m_doc, TQ_SIGNAL(textChanged()), TQ_SLOT(slotTextChanged())); - connect(m_view, TQT_SIGNAL(gotFocus(Kate::View*)), TQT_SIGNAL(editorGotFocus())); + connect(m_view, TQ_SIGNAL(gotFocus(Kate::View*)), TQ_SIGNAL(editorGotFocus())); - connect(fileWatcher, TQT_SIGNAL(dirty(const TQString&)), TQT_SLOT(slotFileDirty(const TQString&))); + connect(fileWatcher, TQ_SIGNAL(dirty(const TQString&)), TQ_SLOT(slotFileDirty(const TQString&))); -// connect(m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(slotMarksChanged())); - connect(m_doc, TQT_SIGNAL(markChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction)), this, TQT_SLOT(slotMarkChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction))); +// connect(m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(slotMarksChanged())); + connect(m_doc, TQ_SIGNAL(markChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction)), this, TQ_SLOT(slotMarkChanged(KTextEditor::Mark, KTextEditor::MarkInterfaceExtension::MarkChangeAction))); } @@ -725,7 +725,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) /* if (completion.type == "charCompletion") { m_lastCompletionList = getCharacterCompletions(completion.userdata); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedShowCodeCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedShowCodeCompletion())); } else*/ if (completion.type == "attribute") { @@ -736,7 +736,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) if (tag) { m_lastCompletionList = getAttributeValueCompletions(tag->name(), completion.text); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedShowCodeCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedShowCodeCompletion())); } } } else @@ -755,7 +755,7 @@ void Document::slotCompletionDone( KTextEditor::CompletionEntry completion ) { m_lastLine = line; m_lastCol = col - 1; - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedScriptAutoCompletion())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedScriptAutoCompletion())); } } } @@ -859,7 +859,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri m_replaceLine = line; m_replaceCol = column; m_replaceStr = QuantaCommon::encodedChar(string[0].unicode()); - TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReplaceChar())); return; } } @@ -872,7 +872,7 @@ void Document::slotCharactersInserted(int line, int column, const TQString& stri m_replaceLine = line; m_replaceCol = column; m_replaceStr = QuantaCommon::encodedChar(c); - TQTimer::singleShot(0, this, TQT_SLOT(slotReplaceChar())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReplaceChar())); return; } } @@ -2236,7 +2236,7 @@ void Document::checkDirtyStatus() const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } @@ -2252,7 +2252,7 @@ void Document::checkDirtyStatus() const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); md5sum = context.hexDigest(); kdDebug(24000) << "MD5 sum of current doc: " << m_md5sum << endl; kdDebug(24000) << "MD5 sum of doc on disc : " << md5sum << endl; @@ -2323,7 +2323,7 @@ bool Document::saveAs(const KURL& url) const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } @@ -2367,7 +2367,7 @@ void Document::slotTextChanged() { kdDebug(24000) << "Delayed text changed called." << endl; //delay the handling, otherwise we may get wrong values for (line,column) - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedTextChanged())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedTextChanged())); delayedTextChangedEnabled = false; } } @@ -2378,7 +2378,7 @@ void Document::slotDelayedTextChanged(bool forced) { kdDebug(24000) << "Reparsing delayed!" << endl; parser->setParsingNeeded(true); - TQTimer::singleShot(1000, this, TQT_SLOT(slotDelayedTextChanged())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotDelayedTextChanged())); reparseEnabled = false; delayedTextChangedEnabled = false; return; @@ -2872,8 +2872,8 @@ void Document::open(const KURL &url, const TQString &encoding) m_encoding = encoding; m_codec = TQTextCodec::codecForName(m_encoding.ascii()); } - connect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - connect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + connect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + connect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); if (!openURL(url)) slotOpeningFailed(TQString()); if (!url.isLocalFile()) @@ -2897,8 +2897,8 @@ void Document::slotOpeningCompleted() m_modifTime = TQFileInfo(u.path()).lastModified(); // kdDebug(24000) << "addFile[Document::open]: " << u.path() << endl; } - disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + disconnect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + disconnect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); m_dirty = false; m_view->setFocus(); processDTD(); @@ -2911,8 +2911,8 @@ void Document::slotOpeningFailed(const TQString &errorMessage) Q_UNUSED(errorMessage); //TODO: append the error message to our own error message if (!url().isLocalFile()) tqApp->exit_loop(); - disconnect(m_doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotOpeningCompleted())); - disconnect(m_doc, TQT_SIGNAL(canceled(const TQString&)), this, TQT_SLOT(slotOpeningFailed(const TQString&))); + disconnect(m_doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotOpeningCompleted())); + disconnect(m_doc, TQ_SIGNAL(canceled(const TQString&)), this, TQ_SLOT(slotOpeningFailed(const TQString&))); emit openingFailed(url()); } @@ -3115,7 +3115,7 @@ void Document::setAnnotationText(uint line, const TQString& text) markIf->removeMark(line, KTextEditor::MarkInterface::markType08); } else { - m_annotations.insert(line, tqMakePair(text, TQString(""))); + m_annotations.insert(line, qMakePair(text, TQString(""))); if (markIf) markIf->setMark(line, KTextEditor::MarkInterface::markType08); uint line, column; @@ -3147,7 +3147,7 @@ void Document::setAnnotationText(uint line, const TQString& text) s.prepend(commentBegin + " "); s.append(" " + commentEnd + "\n"); insertText(s, true, true); - emit showAnnotation(line, "", tqMakePair(text, TQString(""))); + emit showAnnotation(line, "", qMakePair(text, TQString(""))); } } @@ -3181,7 +3181,7 @@ bool Document::openURL(const KURL& url) const char* c = ""; KMD5 context(c); context.reset(); - context.update(*TQT_TQIODEVICE(&f)); + context.update(f); m_md5sum = context.hexDigest(); f.close(); } diff --git a/quanta/src/document.h b/quanta/src/document.h index 9d8de77d..e6f0fff1 100644 --- a/quanta/src/document.h +++ b/quanta/src/document.h @@ -67,7 +67,7 @@ namespace KTextEditor } class Document : public TQWidget{ - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp index 737a3a00..bf257a0c 100644 --- a/quanta/src/dtds.cpp +++ b/quanta/src/dtds.cpp @@ -59,9 +59,9 @@ const TQString m_rcFilename("description.rc"); DTDs::DTDs(TQObject *parent) :TQObject(parent) { - connect(this, TQT_SIGNAL(hideSplash()), parent, TQT_SLOT(slotHideSplash())); - connect(this, TQT_SIGNAL(enableIdleTimer(bool)), parent, TQT_SLOT(slotEnableIdleTimer(bool))); - connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&))); + connect(this, TQ_SIGNAL(hideSplash()), parent, TQ_SLOT(slotHideSplash())); + connect(this, TQ_SIGNAL(enableIdleTimer(bool)), parent, TQ_SLOT(slotEnableIdleTimer(bool))); + connect(this, TQ_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQ_SLOT(slotLoadToolbarForDTD(const TQString&))); // kdDebug(24000) << "dtds::dtds" << endl; m_dict = new TQDict<DTDStruct>(119, false); //optimized for max 119 DTD. This should be enough. m_dict->setAutoDelete(true); diff --git a/quanta/src/dtds.h b/quanta/src/dtds.h index e1329b24..76c224d6 100644 --- a/quanta/src/dtds.h +++ b/quanta/src/dtds.h @@ -48,7 +48,7 @@ struct DTDStruct; */ class DTDs : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/kqapp.cpp b/quanta/src/kqapp.cpp index fc826178..8bd35024 100644 --- a/quanta/src/kqapp.cpp +++ b/quanta/src/kqapp.cpp @@ -93,8 +93,8 @@ KQApplication::KQApplication() { sp = new KSplashScreen(UserIcon(SPLASH_PICTURE)); sp->show(); - connect(quantaApp, TQT_SIGNAL(showSplash(bool)), sp, TQT_SLOT(setShown(bool))); - TQTimer::singleShot(10*1000, this, TQT_SLOT(slotSplashTimeout())); + connect(quantaApp, TQ_SIGNAL(showSplash(bool)), sp, TQ_SLOT(setShown(bool))); + TQTimer::singleShot(10*1000, this, TQ_SLOT(slotSplashTimeout())); } setMainWidget(quantaApp); slotInit(); @@ -164,8 +164,8 @@ int KQUniqueApplication::newInstance() { sp = new KSplashScreen(UserIcon(SPLASH_PICTURE)); sp->show(); - connect(quantaApp, TQT_SIGNAL(showSplash(bool)), sp, TQT_SLOT(setShown(bool))); - TQTimer::singleShot(10*1000, this, TQT_SLOT(slotSplashTimeout())); + connect(quantaApp, TQ_SIGNAL(showSplash(bool)), sp, TQ_SLOT(setShown(bool))); + TQTimer::singleShot(10*1000, this, TQ_SLOT(slotSplashTimeout())); } setMainWidget(quantaApp); slotInit(); diff --git a/quanta/src/kqapp.h b/quanta/src/kqapp.h index c99c152b..625bdaf6 100644 --- a/quanta/src/kqapp.h +++ b/quanta/src/kqapp.h @@ -27,7 +27,7 @@ class KSplashScreen; class KSplash : public TQFrame { - Q_OBJECT + TQ_OBJECT public: @@ -51,7 +51,7 @@ class KQApplicationPrivate class KQApplication : public TDEApplication, KQApplicationPrivate { - Q_OBJECT + TQ_OBJECT public: @@ -64,7 +64,7 @@ class KQApplication : public TDEApplication, KQApplicationPrivate class KQUniqueApplication : public KUniqueApplication, KQApplicationPrivate { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp index ada70492..46a098df 100644 --- a/quanta/src/quanta.cpp +++ b/quanta/src/quanta.cpp @@ -210,7 +210,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( m_quantaInit = new QuantaInit(this); dcopSettings = new DCOPSettings; dcopQuanta = new DCOPQuanta; - DTDs::ref(TQT_TQOBJECT(this)); + DTDs::ref(this); quantaStarted = true; tempFileList.setAutoDelete(true); m_toolbarList.setAutoDelete(true); @@ -219,7 +219,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( currentToolbarDTD = TQString(); m_config=kapp->config(); idleTimer = new TQTimer(this); - connect(idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotIdleTimerExpired())); + connect(idleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotIdleTimerExpired())); m_idleTimerEnabled = true; qConfig.globalDataDir = TDEGlobal::dirs()->findResourceDir("data",resourceDir + "toolbar/quantalogo.png"); @@ -230,7 +230,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( kdWarning() << i18n("Quanta data files were not found.") << endl; kdWarning() << i18n("You may have forgotten to run \"make install\", or your TDEDIR, TDEDIRS or PATH are not set correctly.") << endl; kdWarning() << "***************************************************************************" << endl; - TQTimer::singleShot(20, kapp, TQT_SLOT(quit())); + TQTimer::singleShot(20, kapp, TQ_SLOT(quit())); return; } qConfig.enableDTDToolbar = true; @@ -243,10 +243,10 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( m_partManager = new KParts::PartManager(this); // When the manager says the active part changes, // the builder updates (recreates) the GUI - connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )), - this, TQT_SLOT(slotActivePartChanged(KParts::Part * ))); - connect(this, TQT_SIGNAL(dockWidgetHasUndocked(KDockWidget *)), this, TQT_SLOT(slotDockWidgetHasUndocked(KDockWidget *))); - connect(tabWidget(), TQT_SIGNAL(initiateDrag(TQWidget *)), this, TQT_SLOT(slotTabDragged(TQWidget*))); + connect(m_partManager, TQ_SIGNAL(activePartChanged(KParts::Part * )), + this, TQ_SLOT(slotActivePartChanged(KParts::Part * ))); + connect(this, TQ_SIGNAL(dockWidgetHasUndocked(KDockWidget *)), this, TQ_SLOT(slotDockWidgetHasUndocked(KDockWidget *))); + connect(tabWidget(), TQ_SIGNAL(initiateDrag(TQWidget *)), this, TQ_SLOT(slotTabDragged(TQWidget*))); m_oldKTextEditor = 0L; m_previewToolView = 0L; @@ -262,7 +262,7 @@ QuantaApp::QuantaApp(int mdiMode) : DCOPObject("WindowManagerIf"), KMdiMainFrm( m_parserEnabled = true; cursorLine = 0; cursorCol = 0; - emit eventHappened("quanta_start", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString()); + emit eventHappened("quanta_start", TQDateTime::currentDateTime().toString(TQt::ISODate), TQString()); setAcceptDrops(true); tabWidget()->installEventFilter(this); } @@ -280,9 +280,9 @@ QuantaApp::~QuantaApp() m_newScriptStuff = 0L; delete m_newDTEPStuff; m_newDocStuff = 0L; - // disconnect(m_htmlPart, TQT_SIGNAL(destroyed(TQObject *))); - // disconnect(m_htmlPartDoc, TQT_SIGNAL(destroyed(TQObject *))); - disconnect(this, TQT_SIGNAL(lastChildViewClosed()), ViewManager::ref(), TQT_SLOT(slotLastViewClosed())); + // disconnect(m_htmlPart, TQ_SIGNAL(destroyed(TQObject *))); + // disconnect(m_htmlPartDoc, TQ_SIGNAL(destroyed(TQObject *))); + disconnect(this, TQ_SIGNAL(lastChildViewClosed()), ViewManager::ref(), TQ_SLOT(slotLastViewClosed())); //kdDebug(24000) << "QuantaApp::~QuantaApp" << endl; #ifdef ENABLE_CVSSERVICE delete CVSService::ref(); @@ -1081,7 +1081,7 @@ void QuantaApp::slotConfigureToolbars(const TQString& defaultToolbar) } } - connect(dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotNewToolbarConfig())); + connect(dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(slotNewToolbarConfig())); dlg->exec(); delete dlg; TQPopupMenu *menu = 0L; @@ -1389,8 +1389,8 @@ void QuantaApp::slotShowPreviewWidget(bool show) if (!m_previewToolView) { m_previewToolView= addToolWindow(m_htmlPart->view(), prevDockPosition(m_htmlPart->view(), KDockWidget::DockBottom), getMainDockWidget()); - connect(m_previewToolView->wrapperWidget(), TQT_SIGNAL(iMBeingClosed -()), this, TQT_SLOT(slotPreviewBeingClosed())); + connect(m_previewToolView->wrapperWidget(), TQ_SIGNAL(iMBeingClosed +()), this, TQ_SLOT(slotPreviewBeingClosed())); } m_htmlPart->view()->show(); m_previewToolView->show(); @@ -1794,7 +1794,7 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl if ( element.tagName().lower() == "toolbar" && !tabname.isEmpty()) { //avoid TQToolBar warning in the log - TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); + TQtMsgHandler oldHandler = qInstallMsgHandler( silenceTQToolBar ); ToolbarTabWidget *toolbarTab = ToolbarTabWidget::ref(); TQWidget *w = new TQWidget(toolbarTab, TQString("ToolbarHoldingWidget" + element.attribute("name")).ascii()); QuantaToolBar *tb = new QuantaToolBar(w, element.attribute("name").ascii(), true, true); @@ -1817,12 +1817,12 @@ TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomEl kdDebug(24000) << "toolbarTab->tabHeight() " << toolbarTab->tabHeight() << endl; */ toolbarTab->insertTab(tb, tabname, idStr); - tqInstallMsgHandler( oldHandler ); + qInstallMsgHandler( oldHandler ); - connect(tb, TQT_SIGNAL(removeAction(const TQString&, const TQString&)), - TQT_SLOT(slotRemoveAction(const TQString&, const TQString&))); - connect(tb, TQT_SIGNAL(editAction(const TQString&)), - TQT_SLOT(slotEditAction(const TQString&))); + connect(tb, TQ_SIGNAL(removeAction(const TQString&, const TQString&)), + TQ_SLOT(slotRemoveAction(const TQString&, const TQString&))); + connect(tb, TQ_SIGNAL(editAction(const TQString&)), + TQ_SLOT(slotEditAction(const TQString&))); return tb; } @@ -3694,7 +3694,7 @@ void QuantaApp::slotDownloadDoc() if (!m_newDocStuff) { m_newDocStuff = new QNewDocStuff("quanta documentation", this); - connect(m_newDocStuff, TQT_SIGNAL(installFinished()), dTab, TQT_SLOT(slotRefreshTree())); + connect(m_newDocStuff, TQ_SIGNAL(installFinished()), dTab, TQ_SLOT(slotRefreshTree())); } m_newDocStuff->downloadResource(); } @@ -4047,7 +4047,7 @@ void QuantaApp::slotReloadStructTreeView(bool groupOnly) n->next->tag->beginPos(l, c); else n->tag->endPos(l, c); - commentTag->write()->addAnnotation(l, tqMakePair(text, receiver)); + commentTag->write()->addAnnotation(l, qMakePair(text, receiver)); } } node = node->nextSibling(); @@ -4145,7 +4145,7 @@ bool QuantaApp::queryClose() { saveOptions(); // kdDebug(24000) << "Quanta will exit" << endl; - emit eventHappened("quanta_exit", TQDateTime::currentDateTime().toString(Qt::ISODate), TQString()); + emit eventHappened("quanta_exit", TQDateTime::currentDateTime().toString(TQt::ISODate), TQString()); } else slotFileNew(); return canExit; @@ -4771,7 +4771,7 @@ void QuantaApp::slotViewInKFM() } if ( !w->isUntitled() ) { - TDEProcess *show = new TDEProcess(TQT_TQOBJECT(this)); + TDEProcess *show = new TDEProcess(this); KURL url = Project::ref()->urlWithPrefix(w->url()); *show << "kfmclient" << "newTab" << url.url(); show->start( TDEProcess::DontCare ); @@ -4805,7 +4805,7 @@ void QuantaApp::slotViewInLynx() } if ( !w->isUntitled() ) { - TDEProcess *show = new TDEProcess(TQT_TQOBJECT(this)); + TDEProcess *show = new TDEProcess(this); KURL url = Project::ref()->urlWithPrefix(w->url()); *show << "konsole" << "--nohist" @@ -5092,8 +5092,8 @@ void QuantaApp::initTabWidget(bool closeButtonsOnly) { tab->setTabReorderingEnabled(true); tab->setTabPosition(TQTabWidget::Bottom); - connect(tab, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), ViewManager::ref(), TQT_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & ) ) ); - connect(tab, TQT_SIGNAL(initiateTabMove(int, int)), this, TQT_SLOT(slotTabAboutToMove(int, int))); connect(tab, TQT_SIGNAL(movedTab(int, int)), this, TQT_SLOT(slotTabMoved(int, int))); setTabWidgetVisibility(KMdi::AlwaysShowTabs); + connect(tab, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & ) ), ViewManager::ref(), TQ_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & ) ) ); + connect(tab, TQ_SIGNAL(initiateTabMove(int, int)), this, TQ_SLOT(slotTabAboutToMove(int, int))); connect(tab, TQ_SIGNAL(movedTab(int, int)), this, TQ_SLOT(slotTabMoved(int, int))); setTabWidgetVisibility(KMdi::AlwaysShowTabs); } } if (!closeButtonsOnly) @@ -5267,10 +5267,10 @@ void QuantaApp::createPreviewPart() m_htmlPart->view()->setIcon(UserIcon("preview")); m_htmlPart->view()->setCaption(i18n("Preview")); slotNewPart(m_htmlPart, false); - connect(m_htmlPart, TQT_SIGNAL(previewHasFocus(bool)), this, TQT_SLOT(slotPreviewHasFocus(bool))); - connect(m_htmlPart, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(slotHTMLPartDeleted(TQObject *))); - connect(m_htmlPart, TQT_SIGNAL(openFile(const KURL&, const TQString&, bool)), this, TQT_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); - connect(m_htmlPart, TQT_SIGNAL(showPreview(bool)), this, TQT_SLOT(slotShowPreviewWidget(bool))); + connect(m_htmlPart, TQ_SIGNAL(previewHasFocus(bool)), this, TQ_SLOT(slotPreviewHasFocus(bool))); + connect(m_htmlPart, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(slotHTMLPartDeleted(TQObject *))); + connect(m_htmlPart, TQ_SIGNAL(openFile(const KURL&, const TQString&, bool)), this, TQ_SLOT(slotFileOpen(const KURL&, const TQString&, bool))); + connect(m_htmlPart, TQ_SIGNAL(showPreview(bool)), this, TQ_SLOT(slotShowPreviewWidget(bool))); } @@ -5281,7 +5281,7 @@ void QuantaApp::createDocPart() m_htmlPartDoc->view()->setIcon(SmallIcon("contents")); m_htmlPartDoc->view()->setCaption(i18n("Documentation")); slotNewPart(m_htmlPartDoc, false); - connect(m_htmlPartDoc, TQT_SIGNAL(destroyed(TQObject *)), this, TQT_SLOT(slotHTMLPartDeleted(TQObject *))); + connect(m_htmlPartDoc, TQ_SIGNAL(destroyed(TQObject *)), this, TQ_SLOT(slotHTMLPartDeleted(TQObject *))); } void QuantaApp::insertTagActionPoolItem(TQString const& action_item) @@ -5320,14 +5320,14 @@ void QuantaApp::slotTabMoved(int from, int to) KMdiChildView *view = m_pDocumentViews->at(from); m_pDocumentViews->remove(from); m_pDocumentViews->insert(to, view); - connect(this, TQT_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQT_SLOT(slotViewActivated(KMdiChildView*))); + connect(this, TQ_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQ_SLOT(slotViewActivated(KMdiChildView*))); } void QuantaApp::slotTabAboutToMove(int from, int to) { Q_UNUSED(from); Q_UNUSED(to); - disconnect(this, TQT_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQT_SLOT(slotViewActivated(KMdiChildView*))); + disconnect(this, TQ_SIGNAL(viewActivated (KMdiChildView *)), ViewManager::ref(), TQ_SLOT(slotViewActivated(KMdiChildView*))); } TQString QuantaApp::currentURL() const diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h index 942195de..0124c9fc 100644 --- a/quanta/src/quanta.h +++ b/quanta/src/quanta.h @@ -111,7 +111,7 @@ struct ToolbarEntry; */ class QuantaApp : public KMdiMainFrm, public DCOPWindowManagerIf { - Q_OBJECT + TQ_OBJECT friend class QuantaInit; diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp index 62931561..42e72e38 100644 --- a/quanta/src/quanta_init.cpp +++ b/quanta/src/quanta_init.cpp @@ -123,7 +123,7 @@ QuantaInit::QuantaInit(QuantaApp * quantaApp) : TQObject() { m_quanta = quantaApp; - connect(this, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); + connect(this, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); } QuantaInit::~QuantaInit() @@ -174,12 +174,12 @@ void QuantaInit::initQuanta() readAbbreviations(); // Initialize debugger - m_quanta->m_debugger = new DebuggerManager(TQT_TQOBJECT(m_quanta)); - connect(Project::ref(), TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->m_debugger, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(Project::ref(), TQT_SIGNAL(eventHappened(const TQString &, const TQString &, const TQString &)), - m_quanta->m_debugger, TQT_SLOT(slotHandleEvent(const TQString &, const TQString &, const TQString &))); - connect(m_quanta->m_debugger, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); + m_quanta->m_debugger = new DebuggerManager(m_quanta); + connect(Project::ref(), TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->m_debugger, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(Project::ref(), TQ_SIGNAL(eventHappened(const TQString &, const TQString &, const TQString &)), + m_quanta->m_debugger, TQ_SLOT(slotHandleEvent(const TQString &, const TQString &, const TQString &))); + connect(m_quanta->m_debugger, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); //m_quanta->KDockMainWindow::createGUI( TQString(), false /* conserveMemory */ ); m_quanta->createShellGUI(true); @@ -213,7 +213,7 @@ void QuantaInit::initQuanta() if (mdiMode == KMdi::ToplevelMode) { m_quanta->switchToChildframeMode(); - TQTimer::singleShot(0, TQT_TQOBJECT(m_quanta), TQT_SLOT(switchToToplevelMode())); + TQTimer::singleShot(0, m_quanta, TQ_SLOT(switchToToplevelMode())); } // Always hide debugger toolbar at this point @@ -257,19 +257,19 @@ void QuantaInit::initQuanta() toolviewMenu->plug(m_quanta->windowMenu()); TQPopupMenu *toolbarsMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("toolbars_load", m_quanta); - connect(toolbarsMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotBuildPrjToolbarsMenu())); + connect(toolbarsMenu, TQ_SIGNAL(aboutToShow()), m_quanta, TQ_SLOT(slotBuildPrjToolbarsMenu())); TQPopupMenu *contextMenu = (TQPopupMenu*)(m_quanta->guiFactory())->container("popup_editor", m_quanta); - connect(contextMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotContextMenuAboutToShow())); + connect(contextMenu, TQ_SIGNAL(aboutToShow()), m_quanta, TQ_SLOT(slotContextMenuAboutToShow())); - connect(m_quanta->m_messageOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_problemOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_annotationOutput->currentFileAnnotations(), TQT_SIGNAL(clicked(const TQString&, int, int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); - connect(m_quanta->m_annotationOutput, TQT_SIGNAL(clicked(const TQString&, int, int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_messageOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_problemOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_annotationOutput->currentFileAnnotations(), TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_quanta->m_annotationOutput, TQ_SIGNAL(clicked(const TQString&, int, int)), + m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); m_quanta->slotFileNew(); m_quanta->slotNewStatus(); @@ -283,12 +283,12 @@ void QuantaInit::initQuanta() qConfig.backupDirPath = TDEGlobal::instance()->dirs()->saveLocation("data", resourceDir + "backups/"); m_quanta->autosaveTimer = new TQTimer(m_quanta); - connect(m_quanta->autosaveTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAutosaveTimer())); + connect(m_quanta->autosaveTimer, TQ_SIGNAL(timeout()), m_quanta, TQ_SLOT(slotAutosaveTimer())); m_quanta->autosaveTimer->start(qConfig.autosaveInterval * 60000, false); - connect(m_quanta->m_doc, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); - connect(parser, TQT_SIGNAL(rebuildStructureTree(bool)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReloadStructTreeView(bool))); + connect(m_quanta->m_doc, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); + connect(parser, TQ_SIGNAL(rebuildStructureTree(bool)), + m_quanta, TQ_SLOT(slotReloadStructTreeView(bool))); // Read list of characters TQFile file(locate("appdata","chars")); @@ -319,7 +319,7 @@ void QuantaInit::initQuanta() ViewManager::ref()->activeDocument()->view()->setFocus(); m_quanta->refreshTimer = new TQTimer(m_quanta); - connect(m_quanta->refreshTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReparse())); + connect(m_quanta->refreshTimer, TQ_SIGNAL(timeout()), m_quanta, TQ_SLOT(slotReparse())); m_quanta->refreshTimer->start( qConfig.refreshFrequency*1000, false ); //update the structure tree every 5 seconds if (qConfig.instantUpdate || qConfig.refreshFrequency == 0) { @@ -337,8 +337,8 @@ void QuantaInit::initToolBars() void QuantaInit::initStatusBar() { m_quanta->statusbarTimer = new TQTimer(m_quanta); - connect(m_quanta->statusbarTimer,TQT_SIGNAL(timeout()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(statusBarTimeout())); + connect(m_quanta->statusbarTimer,TQ_SIGNAL(timeout()), + m_quanta, TQ_SLOT(statusBarTimeout())); progressBar = new KProgress(m_quanta->statusBar()); progressBar->setTextEnabled(false); @@ -360,111 +360,111 @@ void QuantaInit::initStatusBar() void QuantaInit::initDocument() { m_quanta->m_doc = new QuantaDoc(0L); - connect(m_quanta->m_doc, TQT_SIGNAL(newStatus()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus())); + connect(m_quanta->m_doc, TQ_SIGNAL(newStatus()), + m_quanta, TQ_SLOT(slotNewStatus())); } void QuantaInit::initProject() { Project *m_project = Project::ref(m_quanta); - connect(m_project, TQT_SIGNAL(getTreeStatus(TQStringList *)), - pTab, TQT_SLOT(slotGetTreeStatus(TQStringList *))); - connect(m_project, TQT_SIGNAL(loadToolbarFile(const KURL &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL &))); - connect(m_project, TQT_SIGNAL(getUserToolbarFiles(KURL::List *)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetUserToolbarFiles(KURL::List *))); - connect(m_project, TQT_SIGNAL(openFiles(const KURL::List &, const TQString&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen(const KURL::List &, const TQString&))); - connect(m_project, TQT_SIGNAL(openFile(const KURL &, const TQString&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen(const KURL &, const TQString&))); - connect(m_project, TQT_SIGNAL(closeFile(const KURL &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileClose(const KURL &))); - connect(m_project, TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), - pTab, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); - connect(m_project, TQT_SIGNAL(closeFiles()), ViewManager::ref(), TQT_SLOT(closeAll())); - connect(m_project, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - - connect(m_quanta->fTab, TQT_SIGNAL(insertDirInProject(const KURL&)), - m_project, TQT_SLOT(slotAddDirectory(const KURL&))); - - connect(m_quanta->fTab, TQT_SIGNAL(insertFileInProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - - connect(TemplatesTreeView::ref(), TQT_SIGNAL(insertDirInProject(const KURL&)), - m_project, TQT_SLOT(slotAddDirectory(const KURL&))); - - connect(TemplatesTreeView::ref(), TQT_SIGNAL(insertFileInProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - connect(TemplatesTreeView::ref(), TQT_SIGNAL(downloadTemplate()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadTemplate())); - connect(TemplatesTreeView::ref(), TQT_SIGNAL(uploadTemplate(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadTemplate(const TQString&))); + connect(m_project, TQ_SIGNAL(getTreeStatus(TQStringList *)), + pTab, TQ_SLOT(slotGetTreeStatus(TQStringList *))); + connect(m_project, TQ_SIGNAL(loadToolbarFile(const KURL &)), + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL &))); + connect(m_project, TQ_SIGNAL(getUserToolbarFiles(KURL::List *)), + m_quanta, TQ_SLOT(slotGetUserToolbarFiles(KURL::List *))); + connect(m_project, TQ_SIGNAL(openFiles(const KURL::List &, const TQString&)), + m_quanta, TQ_SLOT(slotFileOpen(const KURL::List &, const TQString&))); + connect(m_project, TQ_SIGNAL(openFile(const KURL &, const TQString&)), + m_quanta, TQ_SLOT(slotFileOpen(const KURL &, const TQString&))); + connect(m_project, TQ_SIGNAL(closeFile(const KURL &)), + m_quanta, TQ_SLOT(slotFileClose(const KURL &))); + connect(m_project, TQ_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), + pTab, TQ_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); + connect(m_project, TQ_SIGNAL(closeFiles()), ViewManager::ref(), TQ_SLOT(closeAll())); + connect(m_project, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + + connect(m_quanta->fTab, TQ_SIGNAL(insertDirInProject(const KURL&)), + m_project, TQ_SLOT(slotAddDirectory(const KURL&))); + + connect(m_quanta->fTab, TQ_SIGNAL(insertFileInProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + + connect(TemplatesTreeView::ref(), TQ_SIGNAL(insertDirInProject(const KURL&)), + m_project, TQ_SLOT(slotAddDirectory(const KURL&))); + + connect(TemplatesTreeView::ref(), TQ_SIGNAL(insertFileInProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + connect(TemplatesTreeView::ref(), TQ_SIGNAL(downloadTemplate()), + m_quanta, TQ_SLOT(slotDownloadTemplate())); + connect(TemplatesTreeView::ref(), TQ_SIGNAL(uploadTemplate(const TQString&)), m_quanta, TQ_SLOT(slotUploadTemplate(const TQString&))); // inform project if something was renamed - connect(pTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - connect(m_quanta->fTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - connect(tTab, TQT_SIGNAL(renamed(const KURL&, const KURL&)), - m_project, TQT_SLOT(slotRenamed(const KURL&, const KURL&))); - - connect(pTab, TQT_SIGNAL(insertToProject(const KURL&)), - m_project, TQT_SLOT(slotInsertFile(const KURL&))); - connect(pTab, TQT_SIGNAL(removeFromProject(const KURL&)), - m_project, TQT_SLOT(slotRemove(const KURL&))); - connect(pTab, TQT_SIGNAL(uploadSingleURL(const KURL&, const TQString&, bool, bool)), - m_project, TQT_SLOT(slotUploadURL(const KURL&, const TQString&, bool, bool))); - connect(pTab, TQT_SIGNAL(rescanProjectDir()), m_project, TQT_SLOT(slotRescanPrjDir())); - connect(pTab, TQT_SIGNAL(showProjectOptions()), m_project, TQT_SLOT(slotOptions())); - connect(pTab, TQT_SIGNAL(uploadProject()), m_project, TQT_SLOT(slotUpload())); - - connect(m_quanta->dTab, TQT_SIGNAL(reloadProjectDocs()), m_project, TQT_SLOT(slotReloadProjectDocs())); - connect(m_project, TQT_SIGNAL(reloadProjectDocs()), m_quanta->dTab, TQT_SLOT(slotReloadProjectDocs())); - connect(m_project, TQT_SIGNAL(addProjectDoc(const KURL&)), m_quanta->dTab, TQT_SLOT(slotAddProjectDoc(const KURL&))); - - connect(m_project, TQT_SIGNAL(enableMessageWidget()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowMessagesView())); - - connect(m_project, TQT_SIGNAL(messages(const TQString&)), - m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&))); - - connect(m_project, TQT_SIGNAL(newStatus()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotNewStatus())); - - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - TemplatesTreeView::ref(), TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - pTab, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->fTab, TQT_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); - connect(m_project, TQT_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), - m_quanta->annotationOutput(), TQT_SLOT(updateAnnotations())); - - connect(pTab, TQT_SIGNAL(changeFileDescription(const KURL&, const TQString&)), - m_project, TQT_SLOT(slotFileDescChanged(const KURL&, const TQString&))); - connect(pTab, TQT_SIGNAL(changeUploadStatus(const KURL&, int)), - m_project, TQT_SLOT(slotUploadStatusChanged(const KURL&, int))); - connect(pTab, TQT_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)), - m_project, TQT_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool))); - - connect(m_project, TQT_SIGNAL(hideSplash()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); - - connect(m_project, TQT_SIGNAL(statusMsg(const TQString &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(pTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + connect(m_quanta->fTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + connect(tTab, TQ_SIGNAL(renamed(const KURL&, const KURL&)), + m_project, TQ_SLOT(slotRenamed(const KURL&, const KURL&))); + + connect(pTab, TQ_SIGNAL(insertToProject(const KURL&)), + m_project, TQ_SLOT(slotInsertFile(const KURL&))); + connect(pTab, TQ_SIGNAL(removeFromProject(const KURL&)), + m_project, TQ_SLOT(slotRemove(const KURL&))); + connect(pTab, TQ_SIGNAL(uploadSingleURL(const KURL&, const TQString&, bool, bool)), + m_project, TQ_SLOT(slotUploadURL(const KURL&, const TQString&, bool, bool))); + connect(pTab, TQ_SIGNAL(rescanProjectDir()), m_project, TQ_SLOT(slotRescanPrjDir())); + connect(pTab, TQ_SIGNAL(showProjectOptions()), m_project, TQ_SLOT(slotOptions())); + connect(pTab, TQ_SIGNAL(uploadProject()), m_project, TQ_SLOT(slotUpload())); + + connect(m_quanta->dTab, TQ_SIGNAL(reloadProjectDocs()), m_project, TQ_SLOT(slotReloadProjectDocs())); + connect(m_project, TQ_SIGNAL(reloadProjectDocs()), m_quanta->dTab, TQ_SLOT(slotReloadProjectDocs())); + connect(m_project, TQ_SIGNAL(addProjectDoc(const KURL&)), m_quanta->dTab, TQ_SLOT(slotAddProjectDoc(const KURL&))); + + connect(m_project, TQ_SIGNAL(enableMessageWidget()), + m_quanta, TQ_SLOT(slotShowMessagesView())); + + connect(m_project, TQ_SIGNAL(messages(const TQString&)), + m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&))); + + connect(m_project, TQ_SIGNAL(newStatus()), + m_quanta, TQ_SLOT(slotNewStatus())); + + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + TemplatesTreeView::ref(), TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + pTab, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->fTab, TQ_SLOT(slotNewProjectLoaded(const TQString &, const KURL &, const KURL &))); + connect(m_project, TQ_SIGNAL(newProjectLoaded(const TQString &, const KURL &, const KURL &)), + m_quanta->annotationOutput(), TQ_SLOT(updateAnnotations())); + + connect(pTab, TQ_SIGNAL(changeFileDescription(const KURL&, const TQString&)), + m_project, TQ_SLOT(slotFileDescChanged(const KURL&, const TQString&))); + connect(pTab, TQ_SIGNAL(changeUploadStatus(const KURL&, int)), + m_project, TQ_SLOT(slotUploadStatusChanged(const KURL&, int))); + connect(pTab, TQ_SIGNAL(changeDocumentFolderStatus(const KURL&, bool)), + m_project, TQ_SLOT(slotChangeDocumentFolderStatus(const KURL&, bool))); + + connect(m_project, TQ_SIGNAL(hideSplash()), m_quanta, TQ_SLOT(slotHideSplash())); + + connect(m_project, TQ_SIGNAL(statusMsg(const TQString &)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); } void QuantaInit::initView() { - ViewManager *m_viewManager = ViewManager::ref(TQT_TQOBJECT(m_quanta)); - connect(m_quanta, TQT_SIGNAL(viewActivated (KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(m_quanta, TQT_SIGNAL(lastChildViewClosed()), m_viewManager, TQT_SLOT(slotLastViewClosed())); -// connect(m_quanta, TQT_SIGNAL(viewDeactivated(KMdiChildView *)), m_viewManager, TQT_SLOT(slotViewDeactivated(KMdiChildView*))); + ViewManager *m_viewManager = ViewManager::ref(m_quanta); + connect(m_quanta, TQ_SIGNAL(viewActivated (KMdiChildView *)), m_viewManager, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(m_quanta, TQ_SIGNAL(lastChildViewClosed()), m_viewManager, TQ_SLOT(slotLastViewClosed())); +// connect(m_quanta, TQ_SIGNAL(viewDeactivated(KMdiChildView *)), m_viewManager, TQ_SLOT(slotViewDeactivated(KMdiChildView*))); KafkaDocument *m_kafkaDocument = KafkaDocument::ref(0, 0, "KafkaPart"); m_kafkaDocument->getKafkaWidget()->view()->setMinimumHeight(50); m_kafkaDocument->readConfig(quantaApp->config()); loadVPLConfig(); ToolbarTabWidget *toolBarTab = ToolbarTabWidget::ref(quantaApp); - connect(toolBarTab, TQT_SIGNAL(iconTextModeChanged()), quantaApp, TQT_SLOT(slotRefreshActiveWindow())); + connect(toolBarTab, TQ_SIGNAL(iconTextModeChanged()), quantaApp, TQ_SLOT(slotRefreshActiveWindow())); //set the toolview and close button style before the GUI is created m_config->setGroup("General Options"); @@ -485,72 +485,72 @@ void QuantaInit::initView() m_quanta->scriptTab = new ScriptTreeView(m_quanta, "Scripts"); m_quanta->m_messageOutput = new MessageOutput(m_quanta, "Messages"); - m_quanta->m_messageOutput->setFocusPolicy(TQ_NoFocus); + m_quanta->m_messageOutput->setFocusPolicy(TQWidget::NoFocus); m_quanta->m_messageOutput->showMessage(i18n("Message Window...")); - connect(m_quanta, TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool))); - connect(m_quanta, TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear())); + connect(m_quanta, TQ_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&, bool))); + connect(m_quanta, TQ_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQ_SLOT(clear())); m_quanta->m_problemOutput = new MessageOutput(m_quanta, "Problems"); - m_quanta->m_problemOutput->setFocusPolicy(TQ_NoFocus); + m_quanta->m_problemOutput->setFocusPolicy(TQWidget::NoFocus); m_quanta->m_annotationOutput = new AnnotationOutput(m_quanta, "Annotations"); - m_quanta->m_annotationOutput->setFocusPolicy(TQ_NoFocus); + m_quanta->m_annotationOutput->setFocusPolicy(TQWidget::NoFocus); m_quanta->createPreviewPart(); m_quanta->createDocPart(); - connect(m_quanta, TQT_SIGNAL(reloadAllTrees()), - m_quanta->fTab, TQT_SLOT(slotReloadAllTrees())); - - connect(pTab, TQT_SIGNAL(loadToolbarFile (const KURL&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(viewActivated(const KURL&)), - pTab, TQT_SLOT(slotViewActivated(const KURL&))); - - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - pTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - tTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - m_quanta->scriptTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(m_viewManager, TQT_SIGNAL(documentClosed(const KURL&)), - m_quanta->fTab, TQT_SLOT(slotDocumentClosed(const KURL&))); - - connect(tTab, TQT_SIGNAL(insertFile (const KURL &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertFile(const KURL &))); - - connect(m_quanta->scriptTab, TQT_SIGNAL(openFileInPreview(const KURL &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileInPreview(const KURL &))); - connect(m_quanta->scriptTab, TQT_SIGNAL(showPreviewWidget(bool)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowPreviewWidget(bool))); - connect(m_quanta->scriptTab, TQT_SIGNAL(assignActionToScript(const KURL &, const TQString&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAssignActionToScript(const KURL &, const TQString&))); - connect(m_quanta->scriptTab, TQT_SIGNAL(downloadScript()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadScript())); - connect(m_quanta->scriptTab, TQT_SIGNAL(uploadScript(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadScript(const TQString&))); - connect(m_quanta->dTab, TQT_SIGNAL(downloadDoc()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadDoc())); - - connect(m_quanta->m_htmlPart, TQT_SIGNAL(onURL(const TQString&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString&))); - connect(m_quanta->m_htmlPartDoc, TQT_SIGNAL(onURL(const TQString&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString&))); - - connect(sTab, TQT_SIGNAL(newCursorPosition(int,int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(setCursorPosition(int,int))); - connect(sTab, TQT_SIGNAL(selectArea(int,int,int,int)), TQT_TQOBJECT(m_quanta), TQT_SLOT( selectArea(int,int,int,int))); - connect(sTab, TQT_SIGNAL(selectTagArea(Node*)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSelectTagArea(Node*))); - connect(sTab, TQT_SIGNAL(needReparse()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotForceReparse())); - connect(sTab, TQT_SIGNAL(showGroupsForDTEP(const TQString&, bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowGroupsForDTEP(const TQString&, bool))); - connect(sTab, TQT_SIGNAL(openFile(const KURL &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT (slotFileOpen(const KURL &))); - connect(sTab, TQT_SIGNAL(openImage (const KURL&)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotImageOpen(const KURL&))); - connect(sTab, TQT_SIGNAL(showProblemMessage(const TQString&)), - m_quanta->m_problemOutput, TQT_SLOT(showMessage(const TQString&))); - connect(sTab, TQT_SIGNAL(clearProblemOutput()), - m_quanta->m_problemOutput, TQT_SLOT(clear())); - connect(parser, TQT_SIGNAL(nodeTreeChanged()), sTab, TQT_SLOT(slotNodeTreeChanged())); - - connect(m_quanta->dTab, TQT_SIGNAL(openURL(const TQString&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(openDoc(const TQString&))); - - connect(m_viewManager, TQT_SIGNAL(dragInsert(TQDropEvent *)), tTab, TQT_SLOT(slotDragInsert(TQDropEvent *))); + connect(m_quanta, TQ_SIGNAL(reloadAllTrees()), + m_quanta->fTab, TQ_SLOT(slotReloadAllTrees())); + + connect(pTab, TQ_SIGNAL(loadToolbarFile (const KURL&)), + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(viewActivated(const KURL&)), + pTab, TQ_SLOT(slotViewActivated(const KURL&))); + + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + pTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + tTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + m_quanta->scriptTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(m_viewManager, TQ_SIGNAL(documentClosed(const KURL&)), + m_quanta->fTab, TQ_SLOT(slotDocumentClosed(const KURL&))); + + connect(tTab, TQ_SIGNAL(insertFile (const KURL &)), + m_quanta, TQ_SLOT(slotInsertFile(const KURL &))); + + connect(m_quanta->scriptTab, TQ_SIGNAL(openFileInPreview(const KURL &)), + m_quanta, TQ_SLOT(slotOpenFileInPreview(const KURL &))); + connect(m_quanta->scriptTab, TQ_SIGNAL(showPreviewWidget(bool)), + m_quanta, TQ_SLOT(slotShowPreviewWidget(bool))); + connect(m_quanta->scriptTab, TQ_SIGNAL(assignActionToScript(const KURL &, const TQString&)), + m_quanta, TQ_SLOT(slotAssignActionToScript(const KURL &, const TQString&))); + connect(m_quanta->scriptTab, TQ_SIGNAL(downloadScript()), m_quanta, TQ_SLOT(slotDownloadScript())); + connect(m_quanta->scriptTab, TQ_SIGNAL(uploadScript(const TQString&)), m_quanta, TQ_SLOT(slotUploadScript(const TQString&))); + connect(m_quanta->dTab, TQ_SIGNAL(downloadDoc()), m_quanta, TQ_SLOT(slotDownloadDoc())); + + connect(m_quanta->m_htmlPart, TQ_SIGNAL(onURL(const TQString&)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString&))); + connect(m_quanta->m_htmlPartDoc, TQ_SIGNAL(onURL(const TQString&)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString&))); + + connect(sTab, TQ_SIGNAL(newCursorPosition(int,int)), m_quanta, TQ_SLOT(setCursorPosition(int,int))); + connect(sTab, TQ_SIGNAL(selectArea(int,int,int,int)), m_quanta, TQ_SLOT( selectArea(int,int,int,int))); + connect(sTab, TQ_SIGNAL(selectTagArea(Node*)), m_quanta, TQ_SLOT(slotSelectTagArea(Node*))); + connect(sTab, TQ_SIGNAL(needReparse()), m_quanta, TQ_SLOT(slotForceReparse())); + connect(sTab, TQ_SIGNAL(showGroupsForDTEP(const TQString&, bool)), m_quanta, TQ_SLOT(slotShowGroupsForDTEP(const TQString&, bool))); + connect(sTab, TQ_SIGNAL(openFile(const KURL &)), + m_quanta, TQ_SLOT (slotFileOpen(const KURL &))); + connect(sTab, TQ_SIGNAL(openImage (const KURL&)), + m_quanta, TQ_SLOT(slotImageOpen(const KURL&))); + connect(sTab, TQ_SIGNAL(showProblemMessage(const TQString&)), + m_quanta->m_problemOutput, TQ_SLOT(showMessage(const TQString&))); + connect(sTab, TQ_SIGNAL(clearProblemOutput()), + m_quanta->m_problemOutput, TQ_SLOT(clear())); + connect(parser, TQ_SIGNAL(nodeTreeChanged()), sTab, TQ_SLOT(slotNodeTreeChanged())); + + connect(m_quanta->dTab, TQ_SIGNAL(openURL(const TQString&)), m_quanta, TQ_SLOT(openDoc(const TQString&))); + + connect(m_viewManager, TQ_SIGNAL(dragInsert(TQDropEvent *)), tTab, TQ_SLOT(slotDragInsert(TQDropEvent *))); qConfig.windowLayout = "Default"; } @@ -710,75 +710,75 @@ void QuantaInit::loadInitialProject(const TQString& url) void QuantaInit::initActions() { TDEActionCollection *ac = m_quanta->actionCollection(); - new TDEAction(i18n("Annotate..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAnnotate()),ac, "annotate"); + new TDEAction(i18n("Annotate..."), 0, m_quanta, TQ_SLOT(slotAnnotate()),ac, "annotate"); m_quanta->editTagAction = new TDEAction( i18n( "&Edit Current Tag..." ), CTRL+Key_E, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditCurrentTag() ), - TQT_TQOBJECT(ac), "edit_current_tag" ); + m_quanta, TQ_SLOT( slotEditCurrentTag() ), + ac, "edit_current_tag" ); m_quanta->selectTagAreaAction = new TDEAction( i18n( "&Select Current Tag Area" ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotSelectTagArea() ), - TQT_TQOBJECT(ac), "select_tag_area" ); + m_quanta, TQ_SLOT( slotSelectTagArea() ), + ac, "select_tag_area" ); new TDEAction( i18n( "E&xpand Abbreviation" ), CTRL+SHIFT+Key_J, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotExpandAbbreviation() ), - TQT_TQOBJECT(ac), "expand_abbreviation" ); + m_quanta, TQ_SLOT( slotExpandAbbreviation() ), + ac, "expand_abbreviation" ); - new TDEAction(i18n("&Report Bug..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotReportBug()), TQT_TQOBJECT(ac), "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta + new TDEAction(i18n("&Report Bug..."), 0, m_quanta, TQ_SLOT(slotReportBug()), ac, "help_reportbug"); //needed, because quanta_be bugs should be reported for quanta //Kate actions //Edit menu - KStdAction::undo(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUndo()), ac); - KStdAction::redo(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRedo()), ac); - KStdAction::cut(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCut()), ac); - KStdAction::copy(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCopy()), ac) ; - KStdAction::pasteText(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPaste()), ac); + KStdAction::undo(m_quanta, TQ_SLOT(slotUndo()), ac); + KStdAction::redo(m_quanta, TQ_SLOT(slotRedo()), ac); + KStdAction::cut(m_quanta, TQ_SLOT(slotCut()), ac); + KStdAction::copy(m_quanta, TQ_SLOT(slotCopy()), ac) ; + KStdAction::pasteText(m_quanta, TQ_SLOT(slotPaste()), ac); //help - (void) new TDEAction(i18n("Ti&p of the Day"), "idea", "", TQT_TQOBJECT(m_quanta), - TQT_SLOT(slotHelpTip()), TQT_TQOBJECT(ac), "help_tip"); + (void) new TDEAction(i18n("Ti&p of the Day"), "idea", "", m_quanta, + TQ_SLOT(slotHelpTip()), ac, "help_tip"); // File actions // - KStdAction::openNew( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileNew() ), ac); - KStdAction::open ( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileOpen() ), ac, "file_open"); - (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQT_SLOT(slotCloseOtherTabs()), TQT_TQOBJECT(ac), "close_other_tabs"); + KStdAction::openNew( m_quanta, TQ_SLOT( slotFileNew() ), ac); + KStdAction::open ( m_quanta, TQ_SLOT( slotFileOpen() ), ac, "file_open"); + (void) new TDEAction(i18n("Close Other Tabs"), 0, ViewManager::ref(), TQ_SLOT(slotCloseOtherTabs()), ac, "close_other_tabs"); - m_quanta->fileRecent = KStdAction::openRecent(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpenRecent(const KURL&)), + m_quanta->fileRecent = KStdAction::openRecent(m_quanta, TQ_SLOT(slotFileOpenRecent(const KURL&)), ac, "file_open_recent"); m_quanta->fileRecent->setToolTip(i18n("Open / Open Recent")); - connect(m_quanta->fileRecent, TQT_SIGNAL(activated()), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotFileOpen())); + connect(m_quanta->fileRecent, TQ_SIGNAL(activated()), m_quanta, TQ_SLOT(slotFileOpen())); - (void) new TDEAction( i18n( "Close All" ), 0, TQT_TQOBJECT(m_quanta), - TQT_SLOT( slotFileCloseAll() ), - TQT_TQOBJECT(ac), "file_close_all" ); + (void) new TDEAction( i18n( "Close All" ), 0, m_quanta, + TQ_SLOT( slotFileCloseAll() ), + ac, "file_close_all" ); - m_quanta->saveAction = KStdAction::save(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSave() ), ac); + m_quanta->saveAction = KStdAction::save(m_quanta, TQ_SLOT( slotFileSave() ), ac); - KStdAction::saveAs( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAs() ), ac ); + KStdAction::saveAs( m_quanta, TQ_SLOT( slotFileSaveAs() ), ac ); m_quanta->saveAllAction = new TDEAction( i18n( "Save All..." ), "save_all", SHIFT+TDEStdAccel::shortcut(TDEStdAccel::Save).keyCodeQt(), - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAll() ), - TQT_TQOBJECT(ac), "file_save_all" ); - (void) new TDEAction(i18n("Reloa&d"), "document-revert", SHIFT+Key_F5, TQT_TQOBJECT(m_quanta), - TQT_SLOT(slotFileReload()), TQT_TQOBJECT(ac), "file_reload"); + m_quanta, TQ_SLOT( slotFileSaveAll() ), + ac, "file_save_all" ); + (void) new TDEAction(i18n("Reloa&d"), "document-revert", SHIFT+Key_F5, m_quanta, + TQ_SLOT(slotFileReload()), ac, "file_reload"); // (void) new TDEAction(i18n("Reload All "), 0, 0, m_quanta, -// TQT_SLOT(slotFileReloadAll()), TQT_TQOBJECT(ac), "file_reload_all"); +// TQ_SLOT(slotFileReloadAll()), ac, "file_reload_all"); (void) new TDEAction( i18n( "Save as Local Template..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveAsLocalTemplate() ), - TQT_TQOBJECT(ac), "save_local_template" ); + m_quanta, TQ_SLOT( slotFileSaveAsLocalTemplate() ), + ac, "save_local_template" ); (void) new TDEAction( i18n( "Save Selection to Local Template File..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileSaveSelectionAsLocalTemplate() ), - TQT_TQOBJECT(ac), "save_selection_local_template" ); + m_quanta, TQ_SLOT( slotFileSaveSelectionAsLocalTemplate() ), + ac, "save_selection_local_template" ); - KStdAction::quit( TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFileQuit() ), ac ); + KStdAction::quit( m_quanta, TQ_SLOT( slotFileQuit() ), ac ); // Edit actions (void) new TDEAction( i18n( "Find in Files..." ), SmallIcon("filefind"), CTRL+ALT+Key_F, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditFindInFiles() ), - TQT_TQOBJECT(ac), "find_in_files" ); + m_quanta, TQ_SLOT( slotEditFindInFiles() ), + ac, "find_in_files" ); TDEAction* aux = TagActionManager::self()->actionCollection()->action("apply_source_indentation"); aux->setEnabled(false); @@ -787,78 +787,78 @@ void QuantaInit::initActions() // Tool actions (void) new TDEAction( i18n( "&Context Help..." ), CTRL+Key_H, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotContextHelp() ), - TQT_TQOBJECT(ac), "context_help" ); + m_quanta, TQ_SLOT( slotContextHelp() ), + ac, "context_help" ); (void) new TDEAction( i18n( "Tag &Attributes..." ), ALT+Key_Down, - m_quanta->m_doc, TQT_SLOT( slotAttribPopup() ), - TQT_TQOBJECT(ac), "tag_attributes" ); + m_quanta->m_doc, TQ_SLOT( slotAttribPopup() ), + ac, "tag_attributes" ); (void) new TDEAction( i18n( "&Change the DTD..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotChangeDTD() ), - TQT_TQOBJECT(ac), "change_dtd" ); + m_quanta, TQ_SLOT( slotChangeDTD() ), + ac, "change_dtd" ); (void) new TDEAction( i18n( "&Edit DTD Settings..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEditDTD() ), - TQT_TQOBJECT(ac), "edit_dtd" ); + m_quanta, TQ_SLOT( slotEditDTD() ), + ac, "edit_dtd" ); (void) new TDEAction( i18n( "&Load && Convert DTD..." ), 0, - DTDs::ref(), TQT_SLOT( slotLoadDTD() ), - TQT_TQOBJECT(ac), "load_dtd" ); + DTDs::ref(), TQ_SLOT( slotLoadDTD() ), + ac, "load_dtd" ); (void) new TDEAction( i18n( "Load DTD E&ntities..." ), 0, - DTDs::ref(), TQT_SLOT( slotLoadEntities() ), - TQT_TQOBJECT(ac), "load_entities" ); + DTDs::ref(), TQ_SLOT( slotLoadEntities() ), + ac, "load_entities" ); (void) new TDEAction( i18n( "Load DTD &Package (DTEP)..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotLoadDTEP() ), - TQT_TQOBJECT(ac), "load_dtep" ); + m_quanta, TQ_SLOT( slotLoadDTEP() ), + ac, "load_dtep" ); (void) new TDEAction( i18n( "Send DTD Package (DTEP) in E&mail..." ), "mail-send", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotEmailDTEP() ), - TQT_TQOBJECT(ac), "send_dtep" ); + m_quanta, TQ_SLOT( slotEmailDTEP() ), + ac, "send_dtep" ); (void) new TDEAction( i18n( "&Download DTD Package (DTEP)..." ), "network", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDownloadDTEP() ), - TQT_TQOBJECT(ac), "download_dtep" ); + m_quanta, TQ_SLOT( slotDownloadDTEP() ), + ac, "download_dtep" ); (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), "network", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ), - TQT_TQOBJECT(ac), "upload_dtep" ); + m_quanta, TQ_SLOT( slotUploadDTEP() ), + ac, "upload_dtep" ); /* (void) new TDEAction( i18n( "&Upload DTD Package (DTEP)..." ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotUploadDTEP() ), - TQT_TQOBJECT(ac), "send_dtep" ); + m_quanta, TQ_SLOT( slotUploadDTEP() ), + ac, "send_dtep" ); */ (void) new TDEAction( i18n( "&Document Properties" ), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotDocumentProperties() ), - TQT_TQOBJECT(ac), "tools_document_properties" ); + m_quanta, TQ_SLOT( slotDocumentProperties() ), + ac, "tools_document_properties" ); (void) new TDEAction ( i18n ("F&ormat XML Code"), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotCodeFormatting() ), - TQT_TQOBJECT(ac), "tools_code_formatting"); + m_quanta, TQ_SLOT( slotCodeFormatting() ), + ac, "tools_code_formatting"); (void) new TDEAction( i18n( "&Convert Tag && Attribute Case..."), 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotConvertCase()), - TQT_TQOBJECT(ac), "tools_change_case"); + m_quanta, TQ_SLOT(slotConvertCase()), + ac, "tools_change_case"); // View actions m_quanta->showSourceAction = new TDEToggleAction( i18n( "&Source Editor"), UserIcon ("view_text"), ALT+Key_F9, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowSourceEditor()), - TQT_TQOBJECT(ac), "show_quanta_editor"); + m_quanta, TQ_SLOT( slotShowSourceEditor()), + ac, "show_quanta_editor"); m_quanta->showSourceAction->setExclusiveGroup("view"); m_quanta->showVPLAction = new TDEToggleAction( i18n( "&VPL Editor"), UserIcon ("vpl"), CTRL+SHIFT+Key_F9, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLOnly() ), - TQT_TQOBJECT(ac), "show_kafka_view"); + m_quanta, TQ_SLOT( slotShowVPLOnly() ), + ac, "show_kafka_view"); m_quanta->showVPLAction->setExclusiveGroup("view"); m_quanta->showVPLSourceAction = new TDEToggleAction( i18n("VPL && So&urce Editors"), UserIcon ("vpl_text"), Key_F9, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotShowVPLAndSourceEditor() ), - TQT_TQOBJECT(ac), "show_kafka_and_quanta"); + m_quanta, TQ_SLOT( slotShowVPLAndSourceEditor() ), + ac, "show_kafka_and_quanta"); m_quanta->showVPLSourceAction->setExclusiveGroup("view"); /**kafkaSelectAction = new TDESelectAction(i18n("Main &View"), 0, ac,"show_kafka"); TQStringList list2; @@ -866,73 +866,73 @@ void QuantaInit::initActions() list2.append(i18n("&VPL Editor (experimental)")); list2.append(i18n("&Both Editors")); kafkaSelectAction->setItems(list2); - connect(kafkaSelectAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowKafkaPartl(int)));*/ + connect(kafkaSelectAction, TQ_SIGNAL(activated(int)), m_quanta, TQ_SLOT(slotShowKafkaPartl(int)));*/ (void) new TDEAction( i18n( "&Reload Preview" ), "reload", TDEStdAccel::shortcut(TDEStdAccel::Reload).keyCodeQt(), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRepaintPreview()), - TQT_TQOBJECT(ac), "reload" ); + m_quanta, TQ_SLOT(slotRepaintPreview()), + ac, "reload" ); (void) new TDEAction( i18n( "&Previous File" ), "1leftarrow", TDEStdAccel::back(), - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ), - TQT_TQOBJECT(ac), "previous_file" ); + m_quanta, TQ_SLOT( slotBack() ), + ac, "previous_file" ); (void) new TDEAction( i18n( "&Next File" ), "1rightarrow", TDEStdAccel::forward(), - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ), - TQT_TQOBJECT(ac), "next_file" ); + m_quanta, TQ_SLOT( slotForward() ), + ac, "next_file" ); // Options actions // (void) new TDEAction( i18n( "Configure &Actions..." ), UserIcon("ball"),0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureActions() ), - TQT_TQOBJECT(ac), "configure_actions" ); + m_quanta, TQ_SLOT( slotOptionsConfigureActions() ), + ac, "configure_actions" ); - KStdAction::showMenubar(TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowMenuBar()), ac, "options_show_menubar"); - KStdAction::keyBindings(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts"); - KStdAction::configureToolbars(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars"); - KStdAction::preferences(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotOptions() ), ac, "general_options"); - new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotPreviewOptions()), TQT_TQOBJECT(ac), "preview_options"); + KStdAction::showMenubar(m_quanta, TQ_SLOT(slotShowMenuBar()), ac, "options_show_menubar"); + KStdAction::keyBindings(m_quanta, TQ_SLOT( slotOptionsConfigureKeys() ), ac, "configure_shortcuts"); + KStdAction::configureToolbars(m_quanta, TQ_SLOT( slotOptionsConfigureToolbars() ), ac, "options_configure_toolbars"); + KStdAction::preferences(m_quanta, TQ_SLOT( slotOptions() ), ac, "general_options"); + new TDEAction(i18n("Configure Pre&view..."), SmallIcon("konqueror"), 0, m_quanta, TQ_SLOT(slotPreviewOptions()), ac, "preview_options"); // Toolbars actions m_quanta->projectToolbarFiles = new TDERecentFilesAction(i18n("Load &Project Toolbar"),0, - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbarFile(const KURL&)), - TQT_TQOBJECT(ac), "toolbars_load_project"); - - new TDEAction(i18n("Load &Global Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadGlobalToolbar()), TQT_TQOBJECT(ac), "toolbars_load_global"); - new TDEAction(i18n("Load &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotLoadToolbar()), TQT_TQOBJECT(ac), "toolbars_load_user"); - new TDEAction(i18n("Save as &Local Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveLocalToolbar()), TQT_TQOBJECT(ac), "toolbars_save_local"); - new TDEAction(i18n("Save as &Project Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSaveProjectToolbar()), TQT_TQOBJECT(ac), "toolbars_save_project"); - new TDEAction(i18n("&New User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotAddToolbar()), TQT_TQOBJECT(ac), "toolbars_add"); - new TDEAction(i18n("&Remove User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRemoveToolbar()), TQT_TQOBJECT(ac), "toolbars_remove"); - new TDEAction(i18n("Re&name User Toolbar..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotRenameToolbar()), TQT_TQOBJECT(ac), "toolbars_rename"); - new TDEAction(i18n("Send Toolbar in E&mail..."), "mail-send", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSendToolbar()), TQT_TQOBJECT(ac), "toolbars_send"); - new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadToolbar()), TQT_TQOBJECT(ac), "toolbars_upload" ); - new TDEAction(i18n("&Download Toolbar..." ), "network", 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDownloadToolbar()), TQT_TQOBJECT(ac), "toolbars_download" ); - - TDEToggleAction *toggle = new TDEToggleAction( i18n("Smart Tag Insertion"), 0, TQT_TQOBJECT(ac), "smart_tag_insertion"); - connect(toggle, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotSmartTagInsertion())); - - m_quanta->showDTDToolbar=new TDEToggleAction(i18n("Show DTD Toolbar"), 0, TQT_TQOBJECT(ac), "view_dtd_toolbar"); - - connect(m_quanta->showDTDToolbar, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotToggleDTDToolbar(bool))); + m_quanta, TQ_SLOT(slotLoadToolbarFile(const KURL&)), + ac, "toolbars_load_project"); + + new TDEAction(i18n("Load &Global Toolbar..."), 0, m_quanta, TQ_SLOT(slotLoadGlobalToolbar()), ac, "toolbars_load_global"); + new TDEAction(i18n("Load &Local Toolbar..."), 0, m_quanta, TQ_SLOT(slotLoadToolbar()), ac, "toolbars_load_user"); + new TDEAction(i18n("Save as &Local Toolbar..."), 0, m_quanta, TQ_SLOT(slotSaveLocalToolbar()), ac, "toolbars_save_local"); + new TDEAction(i18n("Save as &Project Toolbar..."), 0, m_quanta, TQ_SLOT(slotSaveProjectToolbar()), ac, "toolbars_save_project"); + new TDEAction(i18n("&New User Toolbar..."), 0, m_quanta, TQ_SLOT(slotAddToolbar()), ac, "toolbars_add"); + new TDEAction(i18n("&Remove User Toolbar..."), 0, m_quanta, TQ_SLOT(slotRemoveToolbar()), ac, "toolbars_remove"); + new TDEAction(i18n("Re&name User Toolbar..."), 0, m_quanta, TQ_SLOT(slotRenameToolbar()), ac, "toolbars_rename"); + new TDEAction(i18n("Send Toolbar in E&mail..."), "mail-send", 0, m_quanta, TQ_SLOT(slotSendToolbar()), ac, "toolbars_send"); + new TDEAction(i18n("&Upload Toolbar..." ), "network", 0, m_quanta, TQ_SLOT(slotUploadToolbar()), ac, "toolbars_upload" ); + new TDEAction(i18n("&Download Toolbar..." ), "network", 0, m_quanta, TQ_SLOT(slotDownloadToolbar()), ac, "toolbars_download" ); + + TDEToggleAction *toggle = new TDEToggleAction( i18n("Smart Tag Insertion"), 0, ac, "smart_tag_insertion"); + connect(toggle, TQ_SIGNAL(toggled(bool)), m_quanta, TQ_SLOT(slotSmartTagInsertion())); + + m_quanta->showDTDToolbar=new TDEToggleAction(i18n("Show DTD Toolbar"), 0, ac, "view_dtd_toolbar"); + + connect(m_quanta->showDTDToolbar, TQ_SIGNAL(toggled(bool)), m_quanta, TQ_SLOT(slotToggleDTDToolbar(bool))); m_quanta->showDTDToolbar->setCheckedState(i18n("Hide DTD Toolbar")); new TDEAction(i18n("Complete Text"), CTRL+Key_Space, - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletion()), ac,"show_completion"); + m_quanta, TQ_SLOT(slotShowCompletion()), ac,"show_completion"); new TDEAction(i18n("Completion Hints"), CTRL+SHIFT+Key_Space, - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowCompletionHint()), ac,"show_completion_hint"); + m_quanta, TQ_SLOT(slotShowCompletionHint()), ac,"show_completion_hint"); - KStdAction::back(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotBack() ), ac, "w_back"); - KStdAction::forward(TQT_TQOBJECT(m_quanta), TQT_SLOT( slotForward() ), ac, "w_forward"); + KStdAction::back(m_quanta, TQ_SLOT( slotBack() ), ac, "w_back"); + KStdAction::forward(m_quanta, TQ_SLOT( slotForward() ), ac, "w_forward"); - new TDEAction(i18n("Open File: none"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotOpenFileUnderCursor()), TQT_TQOBJECT(ac), "open_file_under_cursor"); - new TDEAction(i18n("Upload..."), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadFile()), TQT_TQOBJECT(ac), "upload_file"); - new TDEAction(i18n("Delete File"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotDeleteFile()), TQT_TQOBJECT(ac), "delete_file"); + new TDEAction(i18n("Open File: none"), 0, m_quanta, TQ_SLOT(slotOpenFileUnderCursor()), ac, "open_file_under_cursor"); + new TDEAction(i18n("Upload..."), 0, m_quanta, TQ_SLOT(slotUploadFile()), ac, "upload_file"); + new TDEAction(i18n("Delete File"), 0, m_quanta, TQ_SLOT(slotDeleteFile()), ac, "delete_file"); TQString ss = i18n("Upload Opened Project Files..."); -/* new TDEAction(i18n("Upload Opened Project Files"), 0, TQT_TQOBJECT(m_quanta), TQT_SLOT(slotUploadOpenedFiles()), TQT_TQOBJECT(ac), "upload_opened_files"); */ +/* new TDEAction(i18n("Upload Opened Project Files"), 0, m_quanta, TQ_SLOT(slotUploadOpenedFiles()), ac, "upload_opened_files"); */ TQString error; int el, ec; @@ -993,17 +993,17 @@ void QuantaInit::initActions() // create the preview action m_quanta->showPreviewAction = new TDEToolBarPopupAction( i18n( "&Preview" ), "preview", Key_F6, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotToggleShowPreview() ), - TQT_TQOBJECT(ac), "show_preview" ); + m_quanta, TQ_SLOT( slotToggleShowPreview() ), + ac, "show_preview" ); TDEAction *act = new TDEAction( i18n( "Preview Without Frames" ), "", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotShowNoFramesPreview()), - TQT_TQOBJECT(ac), "show_preview_no_frames" ); + m_quanta, TQ_SLOT(slotShowNoFramesPreview()), + ac, "show_preview_no_frames" ); act->plug(m_quanta->showPreviewAction->popupMenu()); act = new TDEAction( i18n( "View with &Konqueror" ), "konqueror", Key_F12, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInKFM() ), - TQT_TQOBJECT(ac), "view_with_konqueror" ); + m_quanta, TQ_SLOT( slotViewInKFM() ), + ac, "view_with_konqueror" ); act->plug(m_quanta->showPreviewAction->popupMenu()); @@ -1024,62 +1024,62 @@ void QuantaInit::initActions() act->plug(m_quanta->showPreviewAction->popupMenu()); act = new TDEAction( i18n( "View with L&ynx" ), "terminal", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotViewInLynx() ), - TQT_TQOBJECT(ac), "view_with_lynx" ); + m_quanta, TQ_SLOT( slotViewInLynx() ), + ac, "view_with_lynx" ); act->plug(m_quanta->showPreviewAction->popupMenu()); (void) new TDEAction( i18n( "Table Editor..." ), "quick_table", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagEditTable() ), - TQT_TQOBJECT(ac), "tag_edit_table" ); + m_quanta, TQ_SLOT( slotTagEditTable() ), + ac, "tag_edit_table" ); (void) new TDEAction( i18n( "Quick List..." ), "quick_list", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagQuickList() ), - TQT_TQOBJECT(ac), "tag_quick_list" ); + m_quanta, TQ_SLOT( slotTagQuickList() ), + ac, "tag_quick_list" ); (void) new TDEAction( i18n( "Color..." ), "colorize", CTRL+SHIFT+Key_C, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagColor() ), - TQT_TQOBJECT(ac), "tag_color" ); + m_quanta, TQ_SLOT( slotTagColor() ), + ac, "tag_color" ); (void) new TDEAction( i18n( "Email..." ), "tag_mail", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMail() ), - TQT_TQOBJECT(ac), "tag_mail" ); + m_quanta, TQ_SLOT( slotTagMail() ), + ac, "tag_mail" ); (void) new TDEAction( i18n( "Misc. Tag..." ), "tag_misc", CTRL+SHIFT+Key_T, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotTagMisc() ), - TQT_TQOBJECT(ac), "tag_misc" ); + m_quanta, TQ_SLOT( slotTagMisc() ), + ac, "tag_misc" ); (void) new TDEAction( i18n( "Frame Wizard..." ), "frame", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotFrameWizard() ), - TQT_TQOBJECT(ac), "tag_frame_wizard" ); + m_quanta, TQ_SLOT( slotFrameWizard() ), + ac, "tag_frame_wizard" ); (void) new TDEAction( i18n( "Paste &HTML Quoted" ), "edit-paste", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteHTMLQuoted() ), - TQT_TQOBJECT(ac), "edit_paste_html_quoted" ); + m_quanta, TQ_SLOT( slotPasteHTMLQuoted() ), + ac, "edit_paste_html_quoted" ); (void) new TDEAction( i18n( "Paste &URL Encoded" ), "edit-paste", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotPasteURLEncoded() ), - TQT_TQOBJECT(ac), "edit_paste_url_encoded" ); + m_quanta, TQ_SLOT( slotPasteURLEncoded() ), + ac, "edit_paste_url_encoded" ); (void) new TDEAction( i18n( "Insert CSS..." ),"css", 0, - TQT_TQOBJECT(m_quanta), TQT_SLOT( slotInsertCSS() ), - TQT_TQOBJECT(ac), "insert_css" ); + m_quanta, TQ_SLOT( slotInsertCSS() ), + ac, "insert_css" ); // special-character combo TDEAction* char_action = new TDEAction( i18n( "Insert Special Character" ), "charset", 0, - TQT_TQOBJECT(ac), "insert_char" ); - connect( char_action, TQT_SIGNAL(activated()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotInsertChar()) ); + ac, "insert_char" ); + connect( char_action, TQ_SIGNAL(activated()), + m_quanta, TQ_SLOT(slotInsertChar()) ); - connect(m_quanta, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - connect(m_quanta->doc(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - connect(ViewManager::ref(), TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(TQT_TQOBJECT(m_quanta)), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(m_quanta, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(m_quanta->doc(), TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(ViewManager::ref(), TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(m_quanta), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); - QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(TQT_TQOBJECT(m_quanta))); + QuantaBookmarks *m_bookmarks = new QuantaBookmarks(ViewManager::ref(m_quanta)); m_bookmarks->createActions(ac); - connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), TQT_TQOBJECT(m_quanta), TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_bookmarks, TQ_SIGNAL(gotoFileAndLine(const TQString&, int, int)), m_quanta, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); } /** Initialize the plugin architecture. */ @@ -1089,10 +1089,10 @@ void QuantaInit::initPlugins() m_quanta->m_pluginInterface = QuantaPluginInterface::ref(m_quanta); - connect(m_quanta->m_pluginInterface, TQT_SIGNAL(hideSplash()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotHideSplash())); - connect(m_quanta->m_pluginInterface, TQT_SIGNAL(statusMsg(const TQString &)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(m_quanta->m_pluginInterface, TQ_SIGNAL(hideSplash()), + m_quanta, TQ_SLOT(slotHideSplash())); + connect(m_quanta->m_pluginInterface, TQ_SIGNAL(statusMsg(const TQString &)), + m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); m_quanta->m_pluginInterface->readConfig(); if (!m_quanta->m_pluginInterface->pluginAvailable("TDEFileReplace")) @@ -1276,12 +1276,12 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) TDEProcess *execCommand = new TDEProcess(); *(execCommand) << TQStringList::split(" ",cmd); - connect(execCommand, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); - connect(execCommand, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(execCommand, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + m_quanta, TQ_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect(execCommand, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), + m_quanta, TQ_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect(execCommand, TQ_SIGNAL(processExited(TDEProcess*)), + m_quanta, TQ_SLOT(slotProcessExited(TDEProcess*))); if (!execCommand->start(TDEProcess::NotifyOnExit,TDEProcess::All)) { @@ -1291,8 +1291,8 @@ void QuantaInit::recoverCrashed(TQStringList& recoveredFileNameList) { //To avoid lock-ups, start a timer. TQTimer *timer = new TQTimer(m_quanta); - connect(timer, TQT_SIGNAL(timeout()), - TQT_TQOBJECT(m_quanta), TQT_SLOT(slotProcessTimeout())); + connect(timer, TQ_SIGNAL(timeout()), + m_quanta, TQ_SLOT(slotProcessTimeout())); timer->start(180*1000, true); QExtFileInfo internalFileInfo; m_quanta->m_loopStarted = true; @@ -1487,10 +1487,10 @@ void QuantaInit::checkRuntimeDependencies() } else { CVSService::ref(m_quanta->actionCollection())->setAppId(appId); - connect(CVSService::ref(), TQT_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQT_SLOT(clear())); - connect(CVSService::ref(), TQT_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQT_SLOT(showMessage(const TQString&, bool))); - connect(CVSService::ref(), TQT_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&))); - //connect(CVSService::ref(), TQT_SIGNAL(statusMsg(const TQString &)), TQT_TQOBJECT(m_quanta), TQT_SLOT(slotStatusMsg(const TQString & ))); + connect(CVSService::ref(), TQ_SIGNAL(clearMessages()), m_quanta->m_messageOutput, TQ_SLOT(clear())); + connect(CVSService::ref(), TQ_SIGNAL(showMessage(const TQString&, bool)), m_quanta->m_messageOutput, TQ_SLOT(showMessage(const TQString&, bool))); + connect(CVSService::ref(), TQ_SIGNAL(commandExecuted(const TQString&, const TQStringList&)), m_quanta, TQ_SLOT(slotCVSCommandExecuted(const TQString&, const TQStringList&))); + //connect(CVSService::ref(), TQ_SIGNAL(statusMsg(const TQString &)), m_quanta, TQ_SLOT(slotStatusMsg(const TQString & ))); m_quanta->fTab->plugCVSMenu(); pTab->plugCVSMenu(); } diff --git a/quanta/src/quanta_init.h b/quanta/src/quanta_init.h index 06e4cf07..5fec827e 100644 --- a/quanta/src/quanta_init.h +++ b/quanta/src/quanta_init.h @@ -41,7 +41,7 @@ class TDEConfig; */ class QuantaInit : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp index 354cb464..b77e2341 100644 --- a/quanta/src/quantadoc.cpp +++ b/quanta/src/quantadoc.cpp @@ -82,7 +82,7 @@ QuantaDoc::QuantaDoc(TQWidget *parent, const char *name) : TQObject(parent, name attribMenu = new TDEPopupMenu(); attribMenu->insertTitle(i18n("Tag")); - connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( attribMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); } QuantaDoc::~QuantaDoc() @@ -175,10 +175,10 @@ void QuantaDoc::openDocument(const KURL& urlToOpen, const TQString &a_encoding, { if (encoding.isEmpty()) encoding = quantaApp->defaultEncoding(); - w->disconnect(TQT_SIGNAL(openingFailed(const KURL&))); - connect(w, TQT_SIGNAL(openingFailed(const KURL&)), this, TQT_SLOT(slotOpeningFailed(const KURL&))); - w->disconnect(TQT_SIGNAL(openingCompleted(const KURL&))); - connect(w, TQT_SIGNAL(openingCompleted(const KURL&)), this, TQT_SLOT(slotOpeningCompleted(const KURL&))); + w->disconnect(TQ_SIGNAL(openingFailed(const KURL&))); + connect(w, TQ_SIGNAL(openingFailed(const KURL&)), this, TQ_SLOT(slotOpeningFailed(const KURL&))); + w->disconnect(TQ_SIGNAL(openingCompleted(const KURL&))); + connect(w, TQ_SIGNAL(openingCompleted(const KURL&)), this, TQ_SLOT(slotOpeningCompleted(const KURL&))); w->open(url, encoding); quantaApp->setTitle(url.prettyURL(0, KURL::StripFileProtocol)); } @@ -302,7 +302,7 @@ void QuantaDoc::slotAttribPopup() popUpMenu->setItemEnabled( menuId , false ); } } - connect( popUpMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( popUpMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); attribMenu->insertItem(*it, popUpMenu); } @@ -367,7 +367,7 @@ void QuantaDoc::slotInsertAttrib( int id ) delete attribMenu; attribMenu = new TDEPopupMenu(); attribMenu->insertTitle(i18n("Tag")); - connect( attribMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInsertAttrib(int))); + connect( attribMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInsertAttrib(int))); } } diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h index f2bb84d8..3f9d0b95 100644 --- a/quanta/src/quantadoc.h +++ b/quanta/src/quantadoc.h @@ -27,7 +27,7 @@ class KURL; class QuantaDoc : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp index 6d3ef86f..8e867d9a 100644 --- a/quanta/src/quantaview.cpp +++ b/quanta/src/quantaview.cpp @@ -86,8 +86,8 @@ QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &capti { setMDICaption(caption); //Connect the VPL update timers - connect(&m_sourceUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(sourceUpdateTimerTimeout())); - connect(&m_VPLUpdateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(VPLUpdateTimerTimeout())); + connect(&m_sourceUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(sourceUpdateTimerTimeout())); + connect(&m_VPLUpdateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(VPLUpdateTimerTimeout())); //create the source and VPL holding widgets m_documentArea = new TQWidget(this); @@ -95,10 +95,10 @@ QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &capti //get the reference to the user toolbar holding widget ToolbarTabWidget *m_toolbarTab = ToolbarTabWidget::ref(); m_toolbarTab->reparent(this, 0, TQPoint(), true); - m_toolbarTab ->setFocusPolicy( TQ_NoFocus ); + m_toolbarTab ->setFocusPolicy( TQWidget::NoFocus ); //create a splitter to separate the VPL and document area - m_splitter = new TQSplitter(Qt::Vertical, this); + m_splitter = new TQSplitter(TQt::Vertical, this); //place the widgets in a grid m_viewLayout = new TQGridLayout(this, 2, 0); m_viewLayout->setRowStretch(0, 0); @@ -186,18 +186,18 @@ void QuantaView::addDocument(Document *document) if (!document) return; m_document = document; - connect(m_document, TQT_SIGNAL(editorGotFocus()), this, TQT_SLOT(slotSourceGetFocus())); - connect(m_document->view(), TQT_SIGNAL(cursorPositionChanged()), this, TQT_SIGNAL(cursorPositionChanged())); + connect(m_document, TQ_SIGNAL(editorGotFocus()), this, TQ_SLOT(slotSourceGetFocus())); + connect(m_document->view(), TQ_SIGNAL(cursorPositionChanged()), this, TQ_SIGNAL(cursorPositionChanged())); m_kafkaDocument = KafkaDocument::ref(); - connect(m_kafkaDocument->getKafkaWidget(), TQT_SIGNAL(hasFocus(bool)), - this, TQT_SLOT(slotVPLGetFocus(bool))); - connect(m_kafkaDocument, TQT_SIGNAL(newCursorPosition(int,int)), - this, TQT_SLOT(slotSetCursorPositionInSource(int, int))); - connect(m_kafkaDocument, TQT_SIGNAL(loadingError(Node *)), - this, TQT_SLOT(slotVPLLoadingError(Node *))); + connect(m_kafkaDocument->getKafkaWidget(), TQ_SIGNAL(hasFocus(bool)), + this, TQ_SLOT(slotVPLGetFocus(bool))); + connect(m_kafkaDocument, TQ_SIGNAL(newCursorPosition(int,int)), + this, TQ_SLOT(slotSetCursorPositionInSource(int, int))); + connect(m_kafkaDocument, TQ_SIGNAL(loadingError(Node *)), + this, TQ_SLOT(slotVPLLoadingError(Node *))); m_kafkaReloadingEnabled = true; m_quantaReloadingEnabled = true; @@ -1134,8 +1134,8 @@ bool QuantaView::saveDocument(const KURL& url) { KTextEditor::Document *doc = m_document->doc(); m_eventLoopStarted = false; - connect(doc, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotSavingFailed(const TQString &))); - connect(doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSavingCompleted())); + connect(doc, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotSavingFailed(const TQString &))); + connect(doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSavingCompleted())); m_saveResult = m_document->saveAs(url); if (m_saveResult) { @@ -1144,8 +1144,8 @@ bool QuantaView::saveDocument(const KURL& url) m_eventLoopStarted = true; internalFileInfo.enter_loop(); } - disconnect(doc, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotSavingFailed(const TQString &))); - disconnect(doc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSavingCompleted())); + disconnect(doc, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(slotSavingFailed(const TQString &))); + disconnect(doc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSavingCompleted())); if (!m_saveResult) //there was an error while saving { if (oldURL.isLocalFile()) diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h index 1f59de19..2b8b30dd 100644 --- a/quanta/src/quantaview.h +++ b/quanta/src/quantaview.h @@ -63,7 +63,7 @@ class Node; * @version KDevelop version 0.4 code generation */ class QuantaView : public KMdiChildView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp index 92e502a2..2e70966b 100644 --- a/quanta/src/viewmanager.cpp +++ b/quanta/src/viewmanager.cpp @@ -71,20 +71,20 @@ ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent, m_lastActiveEditorView = 0L; m_documentationView = 0L; m_tabPopup = new TDEPopupMenu(quantaApp); - m_tabPopup->insertItem(SmallIcon("window-close"), i18n("&Close"), this, TQT_SLOT(slotCloseView())); - m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQT_SLOT(slotCloseOtherTabs())); - m_tabPopup->insertItem(i18n("Close &All"), this, TQT_SLOT(closeAll())); - m_tabPopup->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReloadFile()), 0, RELOAD_ID); - m_tabPopup->insertItem(SmallIcon("go-up"), i18n("&Upload File"), this, TQT_SLOT(slotUploadFile()), 0, UPLOAD_ID); - m_tabPopup->insertItem(SmallIcon("edit-delete"), i18n("&Delete File"), this, TQT_SLOT(slotDeleteFile()), 0, DELETE_ID); + m_tabPopup->insertItem(SmallIcon("window-close"), i18n("&Close"), this, TQ_SLOT(slotCloseView())); + m_tabPopup->insertItem(i18n("Close &Other Tabs"), this, TQ_SLOT(slotCloseOtherTabs())); + m_tabPopup->insertItem(i18n("Close &All"), this, TQ_SLOT(closeAll())); + m_tabPopup->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReloadFile()), 0, RELOAD_ID); + m_tabPopup->insertItem(SmallIcon("go-up"), i18n("&Upload File"), this, TQ_SLOT(slotUploadFile()), 0, UPLOAD_ID); + m_tabPopup->insertItem(SmallIcon("edit-delete"), i18n("&Delete File"), this, TQ_SLOT(slotDeleteFile()), 0, DELETE_ID); m_tabPopup->insertSeparator(); m_fileListPopup = new TDEPopupMenu(quantaApp); - connect(m_fileListPopup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotFileListPopupAboutToShow())); - connect(m_fileListPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFileListPopupItemActivated(int))); + connect(m_fileListPopup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotFileListPopupAboutToShow())); + connect(m_fileListPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFileListPopupItemActivated(int))); m_bookmarks = new QuantaBookmarks(this, QuantaBookmarks::Position, true); m_bookmarksMenu = new TDEPopupMenu(quantaApp); m_bookmarks->setBookmarksMenu(m_bookmarksMenu); - connect(m_bookmarks, TQT_SIGNAL(gotoFileAndLine(const TQString&, int, int)), quantaApp, TQT_SLOT(gotoFileAndLine(const TQString&, int, int))); + connect(m_bookmarks, TQ_SIGNAL(gotoFileAndLine(const TQString&, int, int)), quantaApp, TQ_SLOT(gotoFileAndLine(const TQString&, int, int))); m_bookmarksMenuId = m_tabPopup->insertItem(SmallIconSet("bookmark"), i18n("&Bookmarks"), m_bookmarksMenu); m_tabPopup->insertItem(i18n("&Switch To"), m_fileListPopup); m_contextView = 0L; @@ -96,14 +96,14 @@ QuantaView* ViewManager::createView(const TQString &caption) { QuantaView *view = new QuantaView(quantaApp, "", caption); quantaApp->addWindow(view); - connect(view, TQT_SIGNAL(cursorPositionChanged()), quantaApp, TQT_SLOT(slotNewLineColumn())); - connect(view, TQT_SIGNAL(title(const TQString &)), quantaApp, TQT_SLOT(slotNewLineColumn())); - connect(view, TQT_SIGNAL(dragInsert(TQDropEvent*)), this, TQT_SIGNAL(dragInsert(TQDropEvent *))); - connect(view, TQT_SIGNAL(hidePreview()), quantaApp, TQT_SLOT(slotChangePreviewStatus())); - disconnect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 ); - connect(view, TQT_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQT_SLOT(slotCloseRequest(KMdiChildView*))); - connect(view, TQT_SIGNAL(documentClosed(const KURL&)), this, TQT_SLOT(slotDocumentClosed(const KURL&))); - connect(view, TQT_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQT_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); + connect(view, TQ_SIGNAL(cursorPositionChanged()), quantaApp, TQ_SLOT(slotNewLineColumn())); + connect(view, TQ_SIGNAL(title(const TQString &)), quantaApp, TQ_SLOT(slotNewLineColumn())); + connect(view, TQ_SIGNAL(dragInsert(TQDropEvent*)), this, TQ_SIGNAL(dragInsert(TQDropEvent *))); + connect(view, TQ_SIGNAL(hidePreview()), quantaApp, TQ_SLOT(slotChangePreviewStatus())); + disconnect(view, TQ_SIGNAL(childWindowCloseRequest( KMdiChildView *)), 0, 0 ); + connect(view, TQ_SIGNAL(childWindowCloseRequest( KMdiChildView*)), this, TQ_SLOT(slotCloseRequest(KMdiChildView*))); + connect(view, TQ_SIGNAL(documentClosed(const KURL&)), this, TQ_SLOT(slotDocumentClosed(const KURL&))); + connect(view, TQ_SIGNAL(eventHappened(const TQString&, const TQString&, const TQString& )), QPEvents::ref(), TQ_SLOT(slotEventHappened(const TQString&, const TQString&, const TQString& ))); return view; } @@ -122,10 +122,10 @@ void ViewManager::createNewDocument() "KTextEditor::Document" ); #else - KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(view), "KTextEditor::Document"); + KTextEditor::Document *doc = KTextEditor::createDocument ("libkatepart", view, "KTextEditor::Document"); #endif Document *w = new Document(doc, 0L); - connect(w, TQT_SIGNAL(showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQT_SLOT(insertAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&))); + connect(w, TQ_SIGNAL(showAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&)), quantaApp->annotationOutput(), TQ_SLOT(insertAnnotation(uint, const TQString&, const TQPair<TQString, TQString>&))); TQString encoding = quantaApp->defaultEncoding(); KTextEditor::EncodingInterface* encodingIf = dynamic_cast<KTextEditor::EncodingInterface*>(doc); if (encodingIf) @@ -134,7 +134,7 @@ void ViewManager::createNewDocument() KTextEditor::View * v = w->view(); //[MB02] connect all kate views for drag and drop - connect(w->view(), TQT_SIGNAL(dropEventPass(TQDropEvent *)), this, TQT_SIGNAL(dragInsert(TQDropEvent *))); + connect(w->view(), TQ_SIGNAL(dropEventPass(TQDropEvent *)), this, TQ_SIGNAL(dragInsert(TQDropEvent *))); w->setUntitledUrl( fname ); KTextEditor::PopupMenuInterface* popupIf = dynamic_cast<KTextEditor::PopupMenuInterface*>(w->view()); @@ -142,8 +142,8 @@ void ViewManager::createNewDocument() popupIf->installPopup((TQPopupMenu *)quantaApp->factory()->container("popup_editor", quantaApp)); quantaApp->setFocusProxy(w->view()); - w->view()->setFocusPolicy(TQ_WheelFocus); - connect( v, TQT_SIGNAL(newStatus()), quantaApp, TQT_SLOT(slotNewStatus())); + w->view()->setFocusPolicy(TQWidget::WheelFocus); + connect( v, TQ_SIGNAL(newStatus()), quantaApp, TQ_SLOT(slotNewStatus())); quantaApp->slotNewPart(doc, true); // register new part in partmanager and make active view->addDocument(w); @@ -186,7 +186,7 @@ bool ViewManager::removeView(QuantaView *view, bool force, bool createNew) if (view == activeView()) ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false); if (!createNew) - disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + disconnect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); quantaApp->closeWindow(view); if (createNew) { @@ -195,7 +195,7 @@ bool ViewManager::removeView(QuantaView *view, bool force, bool createNew) quantaApp->slotFileNew(); } } else - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); return true; } } @@ -484,8 +484,8 @@ bool ViewManager::closeAll(bool createNew) return false; //save aborted } } - disconnect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - disconnect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + disconnect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + disconnect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); ToolbarTabWidget::ref()->reparent(0L, 0, TQPoint(), false); for (childIt = children.begin(); childIt != children.end(); ++childIt) @@ -512,8 +512,8 @@ bool ViewManager::closeAll(bool createNew) } else { //actually this code should be never executed - connect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); view->activated(); emit filesClosed(false); return false; @@ -527,8 +527,8 @@ bool ViewManager::closeAll(bool createNew) } } } - connect(quantaApp, TQT_SIGNAL(viewActivated (KMdiChildView *)), this, TQT_SLOT(slotViewActivated(KMdiChildView*))); - connect(quantaApp, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastViewClosed())); + connect(quantaApp, TQ_SIGNAL(viewActivated (KMdiChildView *)), this, TQ_SLOT(slotViewActivated(KMdiChildView*))); + connect(quantaApp, TQ_SIGNAL(lastChildViewClosed()), this, TQ_SLOT(slotLastViewClosed())); if (createNew) { createNewDocument(); diff --git a/quanta/src/viewmanager.h b/quanta/src/viewmanager.h index 1fc3d642..63fd8527 100644 --- a/quanta/src/viewmanager.h +++ b/quanta/src/viewmanager.h @@ -31,7 +31,7 @@ class KMdiChildView; class ViewManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Returns a reference to the viewmanager object */ diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp index 3a3a7029..e8929f84 100644 --- a/quanta/treeviews/basetreeview.cpp +++ b/quanta/treeviews/basetreeview.cpp @@ -303,32 +303,32 @@ BaseTreeView::BaseTreeView(TQWidget *parent, const char *name) setLineWidth(2); setFullWidth(true); setShowSortIndicator(true); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); setShowFolderOpenPixmap(false); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotReturnPressed(TQListViewItem *))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotReturnPressed(TQListViewItem *))); - connect(this, TQT_SIGNAL(dropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)), - this, TQT_SLOT(slotDropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&))); + connect(this, TQ_SIGNAL(dropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&)), + this, TQ_SLOT(slotDropped(TQWidget *, TQDropEvent *, KURL::List&, KURL&))); - connect(this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int )), - this, TQT_SLOT(slotRenameItem(TQListViewItem*, const TQString &, int ))); + connect(this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int )), + this, TQ_SLOT(slotRenameItem(TQListViewItem*, const TQString &, int ))); - connect(this, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(openFile(const KURL &)), - quantaApp, TQT_SLOT(slotFileOpen(const KURL &))); + connect(this, TQ_SIGNAL(openFile(const KURL &)), + quantaApp, TQ_SLOT(slotFileOpen(const KURL &))); - connect(this, TQT_SIGNAL(openImage(const KURL &)), - quantaApp, TQT_SLOT(slotImageOpen(const KURL &))); + connect(this, TQ_SIGNAL(openImage(const KURL &)), + quantaApp, TQ_SLOT(slotImageOpen(const KURL &))); - connect(this, TQT_SIGNAL(closeFile(const KURL &)), - quantaApp, TQT_SLOT(slotFileClose(const KURL &))); + connect(this, TQ_SIGNAL(closeFile(const KURL &)), + quantaApp, TQ_SLOT(slotFileClose(const KURL &))); - connect(this, TQT_SIGNAL(insertTag(const KURL &, DirInfo)), - quantaApp, TQT_SLOT(slotInsertTag(const KURL &, DirInfo))); + connect(this, TQ_SIGNAL(insertTag(const KURL &, DirInfo)), + quantaApp, TQ_SLOT(slotInsertTag(const KURL &, DirInfo))); } @@ -554,7 +554,7 @@ void BaseTreeView::slotOpenWith() void BaseTreeView::slotOpenWithApplication() { - KService::Ptr ptr = KService::serviceByDesktopPath(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name()); + KService::Ptr ptr = KService::serviceByDesktopPath(sender()->name()); if (ptr) { KURL::List list; @@ -606,7 +606,7 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position) for (it = offers.begin(); it != offers.end(); ++it) { TDEAction *action = new TDEAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName((*it)->desktopEntryPath()).data()); - connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(slotOpenWithApplication())); + connect(action, TQ_SIGNAL(activated()), this, TQ_SLOT(slotOpenWithApplication())); action->plug(m_openWithMenu); m_openWithActions.append(action); } @@ -621,13 +621,13 @@ void BaseTreeView::insertOpenWithMenu(TDEPopupMenu *menu, int position) int id = m_openWithMenu->insertItem(TDEGlobal::iconLoader()->loadIconSet(it2.current()->icon(),TDEIcon::Small), it2.current()->name()); m_pluginIds[id] = it2.current(); } - connect(m_openWithMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOpenWithActivated(int))); + connect(m_openWithMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOpenWithActivated(int))); m_openWithMenu->insertSeparator(); } - m_openWithMenu->insertItem(i18n("&Other..."), this, TQT_SLOT(slotOpenWith())); + m_openWithMenu->insertItem(i18n("&Other..."), this, TQ_SLOT(slotOpenWith())); m_openWithMenuId = menu->insertItem(i18n("Open &With"), m_openWithMenu, -1, position); } else - m_openWithMenuId = menu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith()), 0, -1, position); + m_openWithMenuId = menu->insertItem(i18n("Open &With..."), this, TQ_SLOT(slotOpenWith()), 0, -1, position); } void BaseTreeView::slotInsertTag() @@ -740,7 +740,7 @@ void BaseTreeView::slotProperties() { fileInfoDlg = addFileInfoPage(propDlg); } - connect(propDlg, TQT_SIGNAL( applied() ), this, TQT_SLOT( slotPropertiesApplied()) ); + connect(propDlg, TQ_SIGNAL( applied() ), this, TQ_SLOT( slotPropertiesApplied()) ); propDlg->exec(); } @@ -915,11 +915,11 @@ void BaseTreeView::slotDropped (TQWidget *, TQDropEvent * /*e*/, KURL::List& fil if (!job) return; - connect(job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotJobFinished(TDEIO::Job *) ) ); + connect(job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotJobFinished(TDEIO::Job *) ) ); progressBar->setTotalSteps(100); - connect(job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long)), - this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long))); + connect(job, TQ_SIGNAL(percent( TDEIO::Job *, unsigned long)), + this, TQ_SLOT(slotPercent( TDEIO::Job *, unsigned long))); } diff --git a/quanta/treeviews/basetreeview.h b/quanta/treeviews/basetreeview.h index 64401101..690113f2 100644 --- a/quanta/treeviews/basetreeview.h +++ b/quanta/treeviews/basetreeview.h @@ -83,7 +83,7 @@ public: * @author Jens Herden <jens@kdewebdev.org> */ class BaseTreeBranch : public KFileTreeBranch { - Q_OBJECT + TQ_OBJECT public: @@ -133,7 +133,7 @@ public: * */ class BaseTreeView : public KFileTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp index 9b9e7d14..a379b512 100644 --- a/quanta/treeviews/doctreeview.cpp +++ b/quanta/treeviews/doctreeview.cpp @@ -54,17 +54,17 @@ DocTreeView::DocTreeView(TQWidget *parent, const char *name ) projectDocFolder = new TDEListViewItem(this, i18n("Project Documentation")); projectDocFolder->setOpen(true); slotRefreshTree(); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); - connect(this, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *)) ); - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem *)), TQT_SLOT(clickItem(TQListViewItem *))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *))); + connect(this, TQ_SIGNAL(executed(TQListViewItem *)), TQ_SLOT(clickItem(TQListViewItem *)) ); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem *)), TQ_SLOT(clickItem(TQListViewItem *))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotDoubleClicked(TQListViewItem *))); m_contextMenu = new TDEPopupMenu(this); - m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQT_SLOT(slotReloadProjectDocs())); - m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQT_SIGNAL(downloadDoc())); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + m_menuReload = m_contextMenu->insertItem(i18n("&Reload"), this, TQ_SLOT(slotReloadProjectDocs())); + m_contextMenu->insertItem(SmallIcon("network"), i18n("&Download Documentation..."), this, TQ_SIGNAL(downloadDoc())); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); } diff --git a/quanta/treeviews/doctreeview.h b/quanta/treeviews/doctreeview.h index 6e963de2..c9f5d66c 100644 --- a/quanta/treeviews/doctreeview.h +++ b/quanta/treeviews/doctreeview.h @@ -34,7 +34,7 @@ class TDEPopupMenu; */ class DocTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DocTreeView(TQWidget *parent=0, const char *name=0); diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp index 444bbc0c..1884cc1b 100644 --- a/quanta/treeviews/filestreeview.cpp +++ b/quanta/treeviews/filestreeview.cpp @@ -87,49 +87,49 @@ FilesTreeView::FilesTreeView(TDEConfig *config, TQWidget *parent, const char *na m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQ_SLOT(slotInsertTag())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); - createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); - createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); + createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQ_SLOT(slotCreateFolder())); + createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQ_SLOT(slotCreateFile())); m_folderMenu = new TDEPopupMenu(); - m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder())); - m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQT_SLOT(slotAddToTop())); - m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate())); + m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("New Top &Folder..."), this, TQ_SLOT(slotNewTopFolder())); + m_menuTop = m_folderMenu->insertItem(i18n("&Add Folder to Top"), this, TQ_SLOT(slotAddToTop())); + m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQ_SLOT(slotCreateSiteTemplate())); m_folderMenu->insertItem(SmallIcon("application-x-zerosize"), i18n("&Create New"), createNewMenu); m_folderMenu->insertSeparator(); - m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQT_SLOT(slotChangeAlias())); - m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_menuChangeAlias = m_folderMenu->insertItem(i18n("&Change Alias..."), this, TQ_SLOT(slotChangeAlias())); + m_menuFolderRename = m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_emptyMenu = new TDEPopupMenu(); - m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQT_SLOT(slotNewTopFolder()), 0, -1 , 0); + m_emptyMenu->insertItem(i18n("New Top &Folder..."), this, TQ_SLOT(slotNewTopFolder()), 0, -1 , 0); addColumn(i18n("Files Tree"), -1); addColumn(""); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); // generate top list of directories for (uint i = 0; i < topURLList.count(); i++) diff --git a/quanta/treeviews/filestreeview.h b/quanta/treeviews/filestreeview.h index 1cee782b..d8adabba 100644 --- a/quanta/treeviews/filestreeview.h +++ b/quanta/treeviews/filestreeview.h @@ -32,7 +32,7 @@ class KURL; class FilesTreeView : public BaseTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/newtemplatedirdlg.cpp b/quanta/treeviews/newtemplatedirdlg.cpp index 48fd6b5e..2ccc770c 100644 --- a/quanta/treeviews/newtemplatedirdlg.cpp +++ b/quanta/treeviews/newtemplatedirdlg.cpp @@ -20,8 +20,8 @@ NewTemplateDirDlg::NewTemplateDirDlg(TQWidget *parent, const char *name ) : TemplateDirForm(parent,name) { setCaption(name); - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); } NewTemplateDirDlg::~NewTemplateDirDlg() diff --git a/quanta/treeviews/newtemplatedirdlg.h b/quanta/treeviews/newtemplatedirdlg.h index 0f6ae128..81485d7c 100644 --- a/quanta/treeviews/newtemplatedirdlg.h +++ b/quanta/treeviews/newtemplatedirdlg.h @@ -24,7 +24,7 @@ */ class NewTemplateDirDlg : public TemplateDirForm { - Q_OBJECT + TQ_OBJECT public: NewTemplateDirDlg(TQWidget *parent=0, const char *name=0); diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp index c07a7183..886bd511 100644 --- a/quanta/treeviews/projecttreeview.cpp +++ b/quanta/treeviews/projecttreeview.cpp @@ -122,62 +122,62 @@ ProjectTreeView::ProjectTreeView(TQWidget *parent, const char *name ) m_projectDir->root()->setEnabled(false); m_uploadStatusMenu = new TDEPopupMenu(this); - m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQT_SLOT(slotAlwaysUpload())); - m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQT_SLOT(slotNeverUpload())); - m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQT_SLOT(slotConfirmUpload())); - connect(m_uploadStatusMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotUploadMenuAboutToShow())); + m_alwaysUploadId = m_uploadStatusMenu->insertItem(i18n("&When Modified"), this, TQ_SLOT(slotAlwaysUpload())); + m_neverUploadId = m_uploadStatusMenu->insertItem(i18n("&Never"), this, TQ_SLOT(slotNeverUpload())); + m_confirmUploadId = m_uploadStatusMenu->insertItem(i18n("&Confirm"), this, TQ_SLOT(slotConfirmUpload())); + connect(m_uploadStatusMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotUploadMenuAboutToShow())); m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQT_SLOT(slotOpen())); - m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQT_SLOT(slotLoadToolbar())); - m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQT_SLOT(slotInsertTag())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this, TQ_SLOT(slotOpen())); + m_openInQuantaId = m_fileMenu->insertItem(i18n("Load Toolbar"), this, TQ_SLOT(slotLoadToolbar())); + m_fileMenu->insertItem(i18n("Insert &Tag"), this, TQ_SLOT(slotInsertTag())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQT_SLOT(slotUploadSingleURL())); - m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQT_SLOT(slotQuickUploadURL())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Upload File..."), this, TQ_SLOT(slotUploadSingleURL())); + m_fileMenu->insertItem(SmallIcon("go-up"), i18n("&Quick File Upload"), this, TQ_SLOT(slotQuickUploadURL())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_fileMenu->insertItem( i18n("&Remove From Project"), this, TQ_SLOT(slotRemoveFromProject(int))); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); m_fileMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); TDEPopupMenu *createNewMenu = new TDEPopupMenu(this); - createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQT_SLOT(slotCreateFolder())); - createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQT_SLOT(slotCreateFile())); + createNewMenu->insertItem(SmallIcon("folder-new"), i18n("F&older..."), this, TQ_SLOT(slotCreateFolder())); + createNewMenu->insertItem(SmallIcon("text-x-generic"), i18n("&File..."), this, TQ_SLOT(slotCreateFile())); m_folderMenu = new TDEPopupMenu(this); m_folderMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQT_SLOT(slotUploadSingleURL())); - m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQT_SLOT(slotQuickUploadURL())); - m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQT_SLOT(slotCreateSiteTemplate())); - m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); - m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQT_SLOT(slotRemoveFromProject(int))); - m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Folder..."), this, TQ_SLOT(slotUploadSingleURL())); + m_folderMenu->insertItem(SmallIcon("go-up"), i18n("&Quick Folder Upload"), this, TQ_SLOT(slotQuickUploadURL())); + m_folderMenu->insertItem(i18n("Create Site &Template..."), this, TQ_SLOT(slotCreateSiteTemplate())); + m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); + m_folderMenu->insertItem(i18n("&Remove From Project"), this, TQ_SLOT(slotRemoveFromProject(int))); + m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQT_SLOT(slotChangeDocumentFolderStatus())); + m_setDocumentRootId = m_folderMenu->insertItem(i18n("Document-&Base Folder"), this, TQ_SLOT(slotChangeDocumentFolderStatus())); m_folderMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_projectMenu = new TDEPopupMenu(this); m_projectMenu->insertItem(SmallIconSet("document-new"), i18n("&Create New"), createNewMenu); m_projectMenu->insertSeparator(); - m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQT_SLOT(slotUploadProject())); - m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQT_SLOT(slotRescan())); - m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQT_SLOT(slotOptions())); - m_projectMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_projectMenu->insertItem(SmallIcon("go-up"), i18n("&Upload Project..."), this, TQ_SLOT(slotUploadProject())); + m_projectMenu->insertItem(SmallIcon("reload"), i18n("Re&scan Project Folder..."), this, TQ_SLOT(slotRescan())); + m_projectMenu->insertItem(SmallIcon("configure"), i18n("Project &Properties"), this, TQ_SLOT(slotOptions())); + m_projectMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_projectMenu->insertSeparator(); m_projectMenu->insertItem(i18n("Upload &Status"), m_uploadStatusMenu); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); restoreLayout(kapp->config(), className()); // the restored size of the first column might be too large for the current content @@ -212,8 +212,8 @@ KFileTreeBranch* ProjectTreeView::newBranch(const KURL& url) setRootIsDecorated(false); } - connect(m_projectDir, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), - this, TQT_SLOT(slotPopulateFinished(KFileTreeViewItem*))); + connect(m_projectDir, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), + this, TQ_SLOT(slotPopulateFinished(KFileTreeViewItem*))); addBranch(m_projectDir); m_projectDir->urlList = m_projectFiles; // set list for filter if (!m_projectName.isEmpty()) diff --git a/quanta/treeviews/projecttreeview.h b/quanta/treeviews/projecttreeview.h index d8c65cbd..6d39edae 100644 --- a/quanta/treeviews/projecttreeview.h +++ b/quanta/treeviews/projecttreeview.h @@ -51,7 +51,7 @@ public: class ProjectTreeView : public BaseTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp index 78dbd78e..de2e3430 100644 --- a/quanta/treeviews/scripttreeview.cpp +++ b/quanta/treeviews/scripttreeview.cpp @@ -84,23 +84,23 @@ ScriptTreeView::ScriptTreeView(TQWidget *parent, const char *name ) m_localDir->excludeFilterRx.setPattern(excludeString); m_fileMenu = new TDEPopupMenu(this); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQT_SLOT(slotProperties())); - m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQT_SLOT(slotRun())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Description"), this, TQ_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("system-run"), i18n("&Run Script"), this, TQ_SLOT(slotRun())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(i18n("&Edit Script"), this, TQT_SLOT(slotEditScript())); - m_fileMenu->insertItem(i18n("Edit in &Quanta"), this, TQT_SLOT(slotEditInQuanta())); - m_fileMenu->insertItem(i18n("Edi&t Description"), this, TQT_SLOT(slotEditDescription())); + m_fileMenu->insertItem(i18n("&Edit Script"), this, TQ_SLOT(slotEditScript())); + m_fileMenu->insertItem(i18n("Edit in &Quanta"), this, TQ_SLOT(slotEditInQuanta())); + m_fileMenu->insertItem(i18n("Edi&t Description"), this, TQ_SLOT(slotEditDescription())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(UserIcon("ball"), i18n("&Assign Action"), this, TQT_SLOT(slotAssignAction())); - m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("&Send in Email..."), this, TQT_SLOT(slotSendScriptInMail())); - m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQT_SLOT(slotUploadScript())); + m_fileMenu->insertItem(UserIcon("ball"), i18n("&Assign Action"), this, TQ_SLOT(slotAssignAction())); + m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("&Send in Email..."), this, TQ_SLOT(slotSendScriptInMail())); + m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Script..."), this, TQ_SLOT(slotUploadScript())); m_folderMenu = new TDEPopupMenu(this); - m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQT_SIGNAL(downloadScript())); + m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Script..."), this, TQ_SIGNAL(downloadScript())); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); restoreLayout( kapp->config(), className() ); // the restored size of the first column might be too large for the current content diff --git a/quanta/treeviews/scripttreeview.h b/quanta/treeviews/scripttreeview.h index 88f0e4cb..589f165d 100644 --- a/quanta/treeviews/scripttreeview.h +++ b/quanta/treeviews/scripttreeview.h @@ -40,7 +40,7 @@ * @author Andras Mantia <amantia@kde.org> */ class ScriptTreeView : public BaseTreeView { - Q_OBJECT + TQ_OBJECT diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp index 922ea03a..5f9a9747 100644 --- a/quanta/treeviews/servertreeview.cpp +++ b/quanta/treeviews/servertreeview.cpp @@ -100,37 +100,37 @@ ServerTreeView::ServerTreeView(TDEConfig *config, TQWidget *parent, const KURL & m_fileMenu = new TDEPopupMenu(); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(i18n("Open &With..."), this, TQT_SLOT(slotOpenWith())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(i18n("Open &With..."), this, TQ_SLOT(slotOpenWith())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); -// m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); - m_fileMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); +// m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); + m_fileMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_folderMenu = new TDEPopupMenu(); -// m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); - m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQT_SLOT(slotStartRename())); +// m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_menuDel = m_folderMenu->insertItem( SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); + m_renameId = m_folderMenu->insertItem(i18n("Re&name"), this, TQ_SLOT(slotStartRename())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); addColumn(i18n("Upload Tree"), -1); addColumn(""); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(Project::ref(), TQT_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), - this, TQT_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(Project::ref(), TQ_SIGNAL(reloadTree(ProjectList *, bool, const TQStringList &)), + this, TQ_SLOT(slotReloadTree(ProjectList *, bool, const TQStringList &))); restoreLayout(m_config, "UploadTreeView"); // a fixed name only for the tooltip configuration // the restored size of the first column might be too large for the current content diff --git a/quanta/treeviews/servertreeview.h b/quanta/treeviews/servertreeview.h index 94ab33fe..2fc9b66f 100644 --- a/quanta/treeviews/servertreeview.h +++ b/quanta/treeviews/servertreeview.h @@ -58,7 +58,7 @@ public: class ServerTreeView : public BaseTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp index feb56bc9..a03f13a3 100644 --- a/quanta/treeviews/structtreeview.cpp +++ b/quanta/treeviews/structtreeview.cpp @@ -83,7 +83,7 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name ) setLineWidth( 2 ); addColumn( i18n("Name"), -1 ); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); dtdMenu = new TDEPopupMenu(this); @@ -95,43 +95,43 @@ StructTreeView::StructTreeView(TQWidget *parent, const char *name ) dtdMenu->insertItem(dtdList[i], i, -1); } - connect(dtdMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDTDChanged(int))); + connect(dtdMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDTDChanged(int))); - connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), - TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); + connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)), + TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*))); emptyAreaMenu = new TDEPopupMenu(this); emptyAreaMenu->insertItem(i18n("Show Groups For"), dtdMenu); - emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"), this, TQT_SLOT(slotReparseMenuItem())); + emptyAreaMenu->insertItem(SmallIcon("reload"), i18n("&Reparse"), this, TQ_SLOT(slotReparseMenuItem())); popupMenu = new TDEPopupMenu(this); popupMenu -> insertItem( i18n("Show Groups For"), dtdMenu); popupMenu -> insertSeparator(); - popupMenu -> insertItem( i18n("Select Tag Area"), this ,TQT_SLOT(slotSelectTag())); - popupMenu -> insertItem( i18n("Go to End of Tag"), this ,TQT_SLOT(slotGotoClosingTag())); - openFileMenuId = popupMenu -> insertItem( i18n("Open File"), this ,TQT_SLOT(slotOpenFile())); + popupMenu -> insertItem( i18n("Select Tag Area"), this ,TQ_SLOT(slotSelectTag())); + popupMenu -> insertItem( i18n("Go to End of Tag"), this ,TQ_SLOT(slotGotoClosingTag())); + openFileMenuId = popupMenu -> insertItem( i18n("Open File"), this ,TQ_SLOT(slotOpenFile())); popupMenu -> insertSeparator(); - popupMenu -> insertItem( i18n("Open Subtrees"), this ,TQT_SLOT(slotOpenSubTree())); - popupMenu -> insertItem( i18n("Close Subtrees"),this ,TQT_SLOT(slotCloseSubTree())); + popupMenu -> insertItem( i18n("Open Subtrees"), this ,TQ_SLOT(slotOpenSubTree())); + popupMenu -> insertItem( i18n("Close Subtrees"),this ,TQ_SLOT(slotCloseSubTree())); popupMenu -> insertSeparator(); #if 0 - popupMenu -> insertItem( i18n("Remove"),this ,TQT_SLOT(slotRemoveTags())); + popupMenu -> insertItem( i18n("Remove"),this ,TQ_SLOT(slotRemoveTags())); popupMenu -> insertSeparator(); #endif - popupMenu -> insertItem( SmallIcon("reload"), i18n("&Reparse"), this ,TQT_SLOT(slotReparseMenuItem())); - followCursorId = popupMenu -> insertItem( i18n("Follow Cursor"), this ,TQT_SLOT(changeFollowCursor())); + popupMenu -> insertItem( SmallIcon("reload"), i18n("&Reparse"), this ,TQ_SLOT(slotReparseMenuItem())); + followCursorId = popupMenu -> insertItem( i18n("Follow Cursor"), this ,TQ_SLOT(changeFollowCursor())); popupMenu -> setItemChecked ( followCursorId, followCursor() ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (slotMouseClicked(int, TQListViewItem*, const TQPoint&, int))); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotDoubleClicked(TQListViewItem *))); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotDoubleClicked(TQListViewItem *))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem *)), TQT_SLOT(slotExpanded(TQListViewItem *))); - connect(this, TQT_SIGNAL(collapsed(TQListViewItem *)), TQT_SLOT(slotCollapsed(TQListViewItem *))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem *)), TQ_SLOT(slotExpanded(TQListViewItem *))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem *)), TQ_SLOT(slotCollapsed(TQListViewItem *))); write = 0L; timer = new TQTime(); @@ -489,7 +489,7 @@ void StructTreeView::slotMouseClicked(int button, TQListViewItem *item, const TQ setSelected(item, true); - if (button == Qt::RightButton) + if (button == TQt::RightButton) { if (dynamic_cast<StructTreeTag*>(item)) { @@ -499,7 +499,7 @@ void StructTreeView::slotMouseClicked(int button, TQListViewItem *item, const TQ return; } - if (button == Qt::LeftButton) + if (button == TQt::LeftButton) { if (handleLBM == i18n("Find Tag && Open Tree")) setOpen(item, !isOpen(item)); @@ -516,7 +516,7 @@ void StructTreeView::slotMouseClicked(int button, TQListViewItem *item, const TQ slotGotoTag(item); } - if (button == Qt::MidButton) + if (button == TQt::MidButton) { if (handleMBM == i18n("nothing")) return; @@ -537,7 +537,7 @@ void StructTreeView::slotMouseClicked(int button, TQListViewItem *item, const TQ setSelected(item, true); } } else - if (button == Qt::RightButton) + if (button == TQt::RightButton) emptyAreaMenu->popup(point); } @@ -866,7 +866,7 @@ void StructTreeView::startDrag() void StructTreeView::contentsMousePressEvent(TQMouseEvent* e) { - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) { TQPoint p = contentsToViewport(e->pos()); m_draggedItem = itemAt(p); diff --git a/quanta/treeviews/structtreeview.h b/quanta/treeviews/structtreeview.h index 2a0f8ed4..94d8c12f 100644 --- a/quanta/treeviews/structtreeview.h +++ b/quanta/treeviews/structtreeview.h @@ -39,7 +39,7 @@ class Document; struct DTDStruct; class StructTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp index 556a2823..e42754c9 100644 --- a/quanta/treeviews/tagattributeitems.cpp +++ b/quanta/treeviews/tagattributeitems.cpp @@ -133,12 +133,12 @@ void ParentItem::showList(bool show) if (show) { comboBox->show(); - TQObject::connect(comboBox, TQT_SIGNAL(activated(int)), m_listView, TQT_SLOT(slotParentSelected(int))); + TQObject::connect(comboBox, TQ_SIGNAL(activated(int)), m_listView, TQ_SLOT(slotParentSelected(int))); } else { comboBox->hide(); - TQObject::disconnect(comboBox, TQT_SIGNAL(activated(int)), m_listView, TQT_SLOT(slotParentSelected(int))); + TQObject::disconnect(comboBox, TQ_SIGNAL(activated(int)), m_listView, TQ_SLOT(slotParentSelected(int))); } } @@ -156,7 +156,7 @@ AttributeItem::AttributeItem(EditableTree* listView, TQListViewItem* parent, con m_listView = listView; lin = new TQLineEdit( m_listView->viewport() ); lin2 = new TQLineEdit( m_listView->viewport() ); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -169,7 +169,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons lin2 = new TQLineEdit( m_listView->viewport() ); lin2->setText(title); lin->setText(title2); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -183,7 +183,7 @@ AttributeItem::AttributeItem(EditableTree *listView, const TQString& title, cons lin2 = new TQLineEdit( m_listView->viewport() ); lin2->setText(title); lin->setText(title2); - TQObject::connect( lin, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( lin, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); lin->hide(); lin2->hide(); } @@ -292,7 +292,7 @@ AttributeBoolItem::AttributeBoolItem(TagAttributeTree* listView, TQListViewItem* combo->insertItem((static_cast<TagAttributeTree *>(m_listView))->node()->tag->dtd()->booleanTrue); combo->insertItem((static_cast<TagAttributeTree *>(m_listView))->node()->tag->dtd()->booleanFalse); combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeBoolItem::~AttributeBoolItem() @@ -331,7 +331,7 @@ AttributeUrlItem::AttributeUrlItem(TagAttributeTree* listView, TQListViewItem* p urlRequester = new KURLRequester( m_listView->viewport() ); urlRequester->setMode(KFile::File | KFile::ExistingOnly ); urlRequester->hide(); - TQObject::connect( urlRequester, TQT_SIGNAL( returnPressed() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( urlRequester, TQ_SIGNAL( returnPressed() ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeUrlItem::~AttributeUrlItem() @@ -409,7 +409,7 @@ AttributeListItem::AttributeListItem(EditableTree* listView, TQListViewItem* par combo->setEditable(true); } combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeListItem::~AttributeListItem() @@ -462,7 +462,7 @@ AttributeColorItem::AttributeColorItem(EditableTree* listView, TQListViewItem* p combo = new KColorCombo( m_listView->viewport() ); combo->setEditable(true); combo->hide(); - TQObject::connect( combo, TQT_SIGNAL( activated(int) ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( combo, TQ_SIGNAL( activated(int) ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeColorItem::~AttributeColorItem() @@ -508,7 +508,7 @@ AttributeStyleItem::AttributeStyleItem(EditableTree* listView, TQListViewItem* p //combo->setEditable(true); m_se->hide(); - TQObject::connect( m_se->button(), TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( editorContentChanged() ) ); + TQObject::connect( m_se->button(), TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( editorContentChanged() ) ); } AttributeStyleItem::~AttributeStyleItem() diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp index e8d0bbfc..4d74e548 100644 --- a/quanta/treeviews/tagattributetree.cpp +++ b/quanta/treeviews/tagattributetree.cpp @@ -104,10 +104,10 @@ DualEditableTree::DualEditableTree(TQWidget *parent, const char *name) : EditableTree(parent, name) { curCol = 0; - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); this->installEventFilter(this); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int ))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT(itemClicked(TQListViewItem *, const TQPoint &, int ))); } DualEditableTree::~DualEditableTree() @@ -128,7 +128,7 @@ bool DualEditableTree::eventFilter(TQObject *object, TQEvent *event) if(event->type() == TQEvent::KeyPress && m_editable) { - TQKeyEvent *keyevent = TQT_TQKEYEVENT(event); + TQKeyEvent *keyevent = static_cast<TQKeyEvent*>(event); switch(keyevent->key()) { case Key_Left: @@ -223,7 +223,7 @@ TagAttributeTree::TagAttributeTree(TQWidget *parent, const char *name) setSorting(-1); setFrameStyle( Panel | Sunken ); setLineWidth( 2 ); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); addColumn(i18n("Attribute Name")); addColumn(i18n("Value")); setResizeMode(TQListView::LastColumn); @@ -367,8 +367,8 @@ void TagAttributeTree::setCurrentNode(Node *node) } } - connect(this, TQT_SIGNAL(collapsed(TQListViewItem*)), TQT_SLOT(slotCollapsed(TQListViewItem*))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem*)), TQT_SLOT(slotExpanded(TQListViewItem*))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem*)), TQ_SLOT(slotCollapsed(TQListViewItem*))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem*)), TQ_SLOT(slotExpanded(TQListViewItem*))); } void TagAttributeTree::editorContentChanged() @@ -423,7 +423,7 @@ void TagAttributeTree::slotParentSelected(int index) if (m_parentItem) { m_newNode = m_parentItem->node(index); - TQTimer::singleShot(0, this, TQT_SLOT(slotDelayedSetCurrentNode())); + TQTimer::singleShot(0, this, TQ_SLOT(slotDelayedSetCurrentNode())); } } @@ -481,9 +481,9 @@ EnhancedTagAttributeTree::EnhancedTagAttributeTree(TQWidget *parent, const char widgetLayout->addWidget( deleteAll, 0, 3 ); clearWState( WState_Polished ); - connect(attrTree, TQT_SIGNAL(newNodeSelected(Node *)), this, TQT_SLOT(NodeSelected(Node *))); - connect(deleteTag, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteNode())); - connect(deleteAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSubTree())); + connect(attrTree, TQ_SIGNAL(newNodeSelected(Node *)), this, TQ_SLOT(NodeSelected(Node *))); + connect(deleteTag, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteNode())); + connect(deleteAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSubTree())); } EnhancedTagAttributeTree::~EnhancedTagAttributeTree() diff --git a/quanta/treeviews/tagattributetree.h b/quanta/treeviews/tagattributetree.h index 1ecae329..2cf6001e 100644 --- a/quanta/treeviews/tagattributetree.h +++ b/quanta/treeviews/tagattributetree.h @@ -32,7 +32,7 @@ class KPushButton; class TQGridLayout; class EditableTree : public TDEListView { -Q_OBJECT +TQ_OBJECT public: @@ -55,7 +55,7 @@ protected: class DualEditableTree : public EditableTree { - Q_OBJECT + TQ_OBJECT public: DualEditableTree(TQWidget *parent = 0, const char *name = 0); @@ -82,7 +82,7 @@ private: }; class TagAttributeTree : public EditableTree { - Q_OBJECT + TQ_OBJECT public: @@ -115,7 +115,7 @@ private: //An enhanced TagAttributeTree with the tag name and buttons to delete the tag. class EnhancedTagAttributeTree : public TQWidget { -Q_OBJECT +TQ_OBJECT public: EnhancedTagAttributeTree(TQWidget *parent = 0, const char *name = 0); diff --git a/quanta/treeviews/templatedirform.ui b/quanta/treeviews/templatedirform.ui index b1b80b41..d3574847 100644 --- a/quanta/treeviews/templatedirform.ui +++ b/quanta/treeviews/templatedirform.ui @@ -160,9 +160,9 @@ <tabstop>buttonOk</tabstop> <tabstop>buttonCancel</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>okBtn_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp index 2fa9b7e1..463a56e4 100644 --- a/quanta/treeviews/templatestreeview.cpp +++ b/quanta/treeviews/templatestreeview.cpp @@ -143,35 +143,35 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name ) m_fileMenu = new TDEPopupMenu(this); - m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQT_SLOT(slotInsert())); - m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQT_SLOT(slotOpen())); - m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail())); - m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate())); - m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertInProject())); - m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQT_SLOT(slotClose())); + m_openId = m_fileMenu->insertItem(i18n("Open"), this ,TQ_SLOT(slotInsert())); + m_fileMenu->insertItem(SmallIcon("document-open"), i18n("&Open"), this ,TQ_SLOT(slotOpen())); + m_fileMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQ_SLOT(slotSendInMail())); + m_fileMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQ_SLOT(slotUploadTemplate())); + m_insertFileInProject = m_fileMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertInProject())); + m_menuClose = m_fileMenu->insertItem(SmallIcon("window-close"), i18n("Clos&e"), this, TQ_SLOT(slotClose())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_fileMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_fileMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_fileMenu->insertSeparator(); - m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); + m_fileMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); m_folderMenu = new TDEPopupMenu(this); - m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQT_SLOT(slotNewDir())); - m_folderMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQT_SLOT(slotSendInMail())); - m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQT_SLOT(slotUploadTemplate())); - m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate())); - m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQT_SLOT(slotInsertDirInProject())); + m_folderMenu->insertItem(SmallIcon("folder-new"), i18n("&New Folder..."), this, TQ_SLOT(slotNewDir())); + m_folderMenu->insertItem(SmallIcon("mail-send"), i18n("Send in E&mail..."), this, TQ_SLOT(slotSendInMail())); + m_folderMenu->insertItem(SmallIcon("network"), i18n("&Upload Template..."), this, TQ_SLOT(slotUploadTemplate())); + m_downloadMenuId = m_folderMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQ_SIGNAL(downloadTemplate())); + m_insertFolderInProject = m_folderMenu->insertItem(i18n("&Insert in Project..."), this, TQ_SLOT(slotInsertDirInProject())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQT_SLOT(slotCopy())); - m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQT_SLOT(slotPaste())); - m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQT_SLOT(slotDelete())); + m_folderMenu->insertItem(SmallIcon("edit-copy"), i18n("&Copy"), this, TQ_SLOT(slotCopy())); + m_menuPasteFolder = m_folderMenu->insertItem(SmallIcon("edit-paste"), i18n("&Paste"), this, TQ_SLOT(slotPaste())); + m_deleteMenuId = m_folderMenu->insertItem(SmallIcon("edit-delete"), i18n("&Delete"), this, TQ_SLOT(slotDelete())); m_folderMenu->insertSeparator(); - m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQT_SLOT(slotProperties())); - m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQT_SLOT(slotReload())); + m_folderMenu->insertItem(SmallIcon("application-vnd.tde.info"), i18n("&Properties"), this, TQ_SLOT(slotProperties())); + m_reloadMenuId = m_folderMenu->insertItem(SmallIcon("document-revert"), i18n("&Reload"), this, TQ_SLOT(slotReload())); m_emptyAreaMenu = new TDEPopupMenu(this); - m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQT_SIGNAL(downloadTemplate())); + m_emptyAreaMenu->insertItem(SmallIcon("network"), i18n("&Download Template..."), this, TQ_SIGNAL(downloadTemplate())); addColumn(i18n("Templates"), -1); addColumn(i18n("Group"), -1); @@ -182,11 +182,11 @@ TemplatesTreeView::TemplatesTreeView(TDEMainWindow *parent, const char *name ) localURL.setPath(locateLocal("data", resourceDir + "templates/")); newBranch(localURL); - connect(this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(slotMenu(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(this, TQT_SIGNAL(open(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect(this, TQ_SIGNAL(open(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); setAcceptDrops(true); setSelectionMode(TQListView::Single); @@ -629,7 +629,7 @@ void TemplatesTreeView::slotProperties() } topLayout->addWidget( m_quantaProperties ); - connect( propDlg, TQT_SIGNAL( applied() ), this , TQT_SLOT( slotPropertiesApplied()) ); + connect( propDlg, TQ_SIGNAL( applied() ), this , TQ_SLOT( slotPropertiesApplied()) ); TQString name = url.path() + TMPL; TDEConfig config(name); @@ -862,7 +862,7 @@ void TemplatesTreeView::slotPaste() if ( ! currentKFileTreeViewItem()->isDir() ) url.setFileName(""); // don't paste on files but in dirs TDEIO::Job *job = TDEIO::copy( list, url); - connect( job, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); } } @@ -880,11 +880,11 @@ void TemplatesTreeView::slotDelete() if ( KMessageBox::warningContinueCancel(this, msg, TQString(), KStdGuiItem::del()) == KMessageBox::Continue ) { TDEIO::Job *job = TDEIO::del(url); - connect( job, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); url.setFileName(url.fileName()+ TMPL); if ( TQFileInfo(url.path()).exists() ) { TDEIO::Job *job2 = TDEIO::del(url); - connect( job2, TQT_SIGNAL( result( TDEIO::Job *) ), this , TQT_SLOT( slotJobFinished( TDEIO::Job *) ) ); + connect( job2, TQ_SIGNAL( result( TDEIO::Job *) ), this , TQ_SLOT( slotJobFinished( TDEIO::Job *) ) ); }; } } diff --git a/quanta/treeviews/templatestreeview.h b/quanta/treeviews/templatestreeview.h index 22fd3535..697240e9 100644 --- a/quanta/treeviews/templatestreeview.h +++ b/quanta/treeviews/templatestreeview.h @@ -38,7 +38,7 @@ public: class TemplatesTreeView : public BaseTreeView { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp index 7780f8aa..da77840e 100644 --- a/quanta/treeviews/uploadtreeview.cpp +++ b/quanta/treeviews/uploadtreeview.cpp @@ -37,13 +37,13 @@ UploadTreeView::UploadTreeView( TQWidget *parent, const char *name ) : addColumn( i18n("Size") ); addColumn( i18n("Date") ); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); - connect( this, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectFile())); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotSelectFile(TQListViewItem *))); + connect( this, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectFile())); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotSelectFile(TQListViewItem *))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int )), TQT_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int ))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int )), TQ_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int ))); } UploadTreeView::~UploadTreeView() diff --git a/quanta/treeviews/uploadtreeview.h b/quanta/treeviews/uploadtreeview.h index f8a58e80..9a21b18a 100644 --- a/quanta/treeviews/uploadtreeview.h +++ b/quanta/treeviews/uploadtreeview.h @@ -30,7 +30,7 @@ class KFileItem; */ class UploadTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: UploadTreeView( TQWidget *parent, const char *name=0L ); diff --git a/quanta/utility/myprocess.h b/quanta/utility/myprocess.h index a80a199c..bb12d2fe 100644 --- a/quanta/utility/myprocess.h +++ b/quanta/utility/myprocess.h @@ -20,7 +20,7 @@ class MyProcess:public TDEProcess { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/utility/newstuff.cpp b/quanta/utility/newstuff.cpp index a00e9c75..56d5027d 100644 --- a/quanta/utility/newstuff.cpp +++ b/quanta/utility/newstuff.cpp @@ -56,7 +56,7 @@ void QNewDTEPStuff::installResource() QNewToolbarStuff::QNewToolbarStuff(const TQString &type, TQWidget *parentWidget) :TDENewStuffSecure(type, parentWidget) { - connect(this, TQT_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQT_SLOT(slotLoadToolbarFile(const KURL&))); + connect(this, TQ_SIGNAL(loadToolbarFile(const KURL&)), parentWidget, TQ_SLOT(slotLoadToolbarFile(const KURL&))); } @@ -83,7 +83,7 @@ void QNewToolbarStuff::installResource() QNewTemplateStuff::QNewTemplateStuff(const TQString &type, TQWidget *parentWidget) :TDENewStuffSecure(type, parentWidget) { - connect(this, TQT_SIGNAL(openFile(const KURL&)), parentWidget, TQT_SLOT(slotFileOpen(const KURL&))); + connect(this, TQ_SIGNAL(openFile(const KURL&)), parentWidget, TQ_SLOT(slotFileOpen(const KURL&))); } diff --git a/quanta/utility/newstuff.h b/quanta/utility/newstuff.h index c35be15b..929734d6 100644 --- a/quanta/utility/newstuff.h +++ b/quanta/utility/newstuff.h @@ -31,7 +31,7 @@ class KURL; class QNewDTEPStuff: public TDENewStuffSecure { - Q_OBJECT + TQ_OBJECT public: @@ -50,7 +50,7 @@ Makes possible downloading and installing a Toolbar resource files from a server */ class QNewToolbarStuff: public TDENewStuffSecure { - Q_OBJECT + TQ_OBJECT public: @@ -71,7 +71,7 @@ Makes possible downloading and installing a template resource files from a serve */ class QNewTemplateStuff: public TDENewStuffSecure { - Q_OBJECT + TQ_OBJECT public: @@ -92,7 +92,7 @@ Makes possible downloading and installing a script resource files from a server. */ class QNewScriptStuff: public TDENewStuffSecure { - Q_OBJECT + TQ_OBJECT public: @@ -111,7 +111,7 @@ Makes possible downloading and installing a documentation resource files from a */ class QNewDocStuff: public TDENewStuffSecure { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp index 8a8dfa26..87ec17d9 100644 --- a/quanta/utility/qpevents.cpp +++ b/quanta/utility/qpevents.cpp @@ -294,7 +294,7 @@ bool QPEvents::handleEvent(const EventAction& ev) TQTextStream stream(&file); stream.setEncoding(TQTextStream::UnicodeUTF8); //Note: the log text should not be translated. - TQString s = TQDateTime::currentDateTime().toString(Qt::ISODate) + ": "; + TQString s = TQDateTime::currentDateTime().toString(TQt::ISODate) + ": "; s.append( "Event : " + m_eventName + " : "); s.append( "Action: " + ev.action + " : "); if (ev.arguments[1] == "full") diff --git a/quanta/utility/qpevents.h b/quanta/utility/qpevents.h index 6b3638ae..4c65c359 100644 --- a/quanta/utility/qpevents.h +++ b/quanta/utility/qpevents.h @@ -52,7 +52,7 @@ typedef TQMap<TQString, TQValueList<EventAction> > EventActions; class QPEvents : public TQObject { -Q_OBJECT +TQ_OBJECT public: static QPEvents* const ref(TQObject *parent = 0L) diff --git a/quanta/utility/quantabookmarks.cpp b/quanta/utility/quantabookmarks.cpp index 203c80df..87e953fb 100644 --- a/quanta/utility/quantabookmarks.cpp +++ b/quanta/utility/quantabookmarks.cpp @@ -86,33 +86,33 @@ void QuantaBookmarks::init(TDEActionCollection* ac) { m_bookmarkToggle = new TDEToggleAction( i18n("Set &Bookmark"), "bookmark", CTRL+Key_B, - this, TQT_SLOT(toggleBookmark()), + this, TQ_SLOT(toggleBookmark()), ac, "bookmarks_toggle" ); m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it.")); m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") ); m_bookmarkClear = new TDEAction( i18n("Clear &All Bookmarks"), 0, - this, TQT_SLOT(clearBookmarks()), + this, TQ_SLOT(clearBookmarks()), ac, "bookmarks_clear"); m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document.")); m_goNext = new TDEAction( i18n("Next Bookmark"), "go-next", ALT + Key_PageDown, - this, TQT_SLOT(goNext()), + this, TQ_SLOT(goNext()), ac, "bookmarks_next"); m_goNext->setWhatsThis(i18n("Go to the next bookmark.")); m_goPrevious = new TDEAction( i18n("Previous Bookmark"), "go-previous", ALT + Key_PageUp, - this, TQT_SLOT(goPrevious()), + this, TQ_SLOT(goPrevious()), ac, "bookmarks_previous"); m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark.")); //connect the aboutToShow() and aboutToHide() signals with //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(bookmarkMenuAboutToShow())); - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(bookmarkMenuAboutToHide()) ); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(bookmarkMenuAboutToShow())); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(bookmarkMenuAboutToHide()) ); marksChanged (); } @@ -234,7 +234,7 @@ int QuantaBookmarks::insertBookmarks(TQPopupMenu& menu, Document *doc, bool inse if ( next || prev ) menu.insertSeparator( idx ); } - connect(&menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(gotoLineNumber(int))); + connect(&menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(gotoLineNumber(int))); } return insertedItems; } @@ -361,10 +361,10 @@ void QuantaBookmarks::gotoLineNumber(int line) Document *doc = m_doc; if (!doc) doc = m_viewManager->activeDocument(); - TQObject *s = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + TQObject *s = const_cast<TQObject*>(sender()); for (uint i = 0; i < m_othersMenuList.count(); i++) { - if (TQT_BASE_OBJECT(s) == TQT_BASE_OBJECT(m_othersMenuList[i])) + if (s == m_othersMenuList[i]) { doc = m_others[i]; break; diff --git a/quanta/utility/quantabookmarks.h b/quanta/utility/quantabookmarks.h index 532e45c9..c1e4bb99 100644 --- a/quanta/utility/quantabookmarks.h +++ b/quanta/utility/quantabookmarks.h @@ -42,7 +42,7 @@ class TQMenuData; class QuantaBookmarks : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp index 1ea54048..71eb0e41 100644 --- a/quanta/utility/tagaction.cpp +++ b/quanta/utility/tagaction.cpp @@ -93,15 +93,15 @@ TagAction::TagAction( TQDomElement *element, TDEMainWindow *parentMainWindow, bo m_file = 0L; loopStarted = false; #if TDE_VERSION >= TDE_MAKE_VERSION(3,4,0) - connect(this, TQT_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), - TQT_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState))); + connect(this, TQ_SIGNAL(activated(TDEAction::ActivationReason, TQt::ButtonState)), + TQ_SLOT(slotActionActivated(TDEAction::ActivationReason, TQt::ButtonState))); #else - connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActionActivated())); + connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActionActivated())); #endif - connect(this, TQT_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQT_SIGNAL(showMessage(const TQString&, bool))); - connect(this, TQT_SIGNAL(clearMessages()), m_parentMainWindow, TQT_SIGNAL(clearMessages())); - connect(this, TQT_SIGNAL(showMessagesView()), m_parentMainWindow, TQT_SLOT(slotShowMessagesView())); - connect(this, TQT_SIGNAL(createNewFile()), m_parentMainWindow, TQT_SLOT(slotFileNew())); + connect(this, TQ_SIGNAL(showMessage(const TQString&, bool)), m_parentMainWindow, TQ_SIGNAL(showMessage(const TQString&, bool))); + connect(this, TQ_SIGNAL(clearMessages()), m_parentMainWindow, TQ_SIGNAL(clearMessages())); + connect(this, TQ_SIGNAL(showMessagesView()), m_parentMainWindow, TQ_SLOT(slotShowMessagesView())); + connect(this, TQ_SIGNAL(createNewFile()), m_parentMainWindow, TQ_SLOT(slotFileNew())); } TagAction::~TagAction() @@ -434,12 +434,12 @@ bool TagAction::slotActionActivated(TDEAction::ActivationReason reason, TQt::But firstOutput = true; firstError = true; - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this, - TQT_SLOT( slotProcessExited(TDEProcess*))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptError(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess*)), this, + TQ_SLOT( slotProcessExited(TDEProcess*))); @@ -688,12 +688,12 @@ bool TagAction::slotActionActivated() firstOutput = true; firstError = true; - connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, - TQT_SLOT( slotGetScriptError(TDEProcess*,char*,int))); - connect( proc, TQT_SIGNAL(processExited( TDEProcess*)), this, - TQT_SLOT( slotProcessExited(TDEProcess*))); + connect( proc, TQ_SIGNAL(receivedStdout( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptOutput(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(receivedStderr( TDEProcess*,char*,int)), this, + TQ_SLOT( slotGetScriptError(TDEProcess*,char*,int))); + connect( proc, TQ_SIGNAL(processExited( TDEProcess*)), this, + TQ_SLOT( slotProcessExited(TDEProcess*))); @@ -991,7 +991,7 @@ void TagAction::execute(bool blocking) { //To avoid lock-ups, start a timer. timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); timer->start(180*1000, true); QExtFileInfo internalFileInfo; loopStarted = true; diff --git a/quanta/utility/tagaction.h b/quanta/utility/tagaction.h index eeff1560..783665e3 100644 --- a/quanta/utility/tagaction.h +++ b/quanta/utility/tagaction.h @@ -46,7 +46,7 @@ class NodeSelection; class TagAction : public TDEToggleAction { - Q_OBJECT + TQ_OBJECT public: diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp index 116832e9..72c764ea 100644 --- a/quanta/utility/tagactionset.cpp +++ b/quanta/utility/tagactionset.cpp @@ -102,17 +102,17 @@ void TagActionSet::initActions(TQWidget* /*parent*/) const char *actionName = "apply_source_indentation"; new TDEAction(i18n("Apply Source Indentation"), 0, this, - TQT_SLOT(slotApplySourceIndentation()), + TQ_SLOT(slotApplySourceIndentation()), ac, actionName); actionName = "copy_div_element"; new TDEAction(i18n("Copy DIV Area"), 0, this, - TQT_SLOT(slotCopyDivElement()), + TQ_SLOT(slotCopyDivElement()), ac, actionName); actionName = "cut_div_element"; new TDEAction(i18n("Cut DIV Area"), 0, this, - TQT_SLOT(slotCutDivElement()), + TQ_SLOT(slotCutDivElement()), ac, actionName); } @@ -281,7 +281,7 @@ void TableTagActionSet::initActionMenus(TQWidget* widget) { Q_ASSERT(!m_tableActionMenu_0); - m_tableActionMenu_0 = new TDEActionMenu(i18n("Table..."), TQT_TQOBJECT(widget)); + m_tableActionMenu_0 = new TDEActionMenu(i18n("Table..."), widget); m_insertActionMenu_1 = new TDEActionMenu(i18n("Insert..."), m_tableActionMenu_0); m_removeActionMenu_1 = new TDEActionMenu(i18n("Remove..."), m_tableActionMenu_0); } @@ -299,31 +299,31 @@ void TableTagActionSet::initActions(TQWidget* parent) const char *actionName = "insert_table"; //m_actionNames += actionName; new TDEAction(i18n("Table..."), 0, this, - TQT_SLOT(slotInsertTable()), + TQ_SLOT(slotInsertTable()), ac, actionName); actionName = "insert_row_above"; //m_actionNames += actionName; new TDEAction(i18n("Row Above"), 0, this, - TQT_SLOT(slotInsertRowAbove()), + TQ_SLOT(slotInsertRowAbove()), ac, actionName); actionName = "insert_row_below"; //m_actionNames += actionName; new TDEAction(i18n("Row Below"), 0, this, - TQT_SLOT(slotInsertRowBelow()), + TQ_SLOT(slotInsertRowBelow()), ac, actionName); actionName = "insert_column_left"; //m_actionNames += actionName; new TDEAction(i18n("Column Left"), 0, this, - TQT_SLOT(slotInsertColumnLeft()), + TQ_SLOT(slotInsertColumnLeft()), ac, actionName); actionName = "insert_column_right"; //m_actionNames += actionName; new TDEAction(i18n("Column Right"), 0, this, - TQT_SLOT(slotInsertColumnRight()), + TQ_SLOT(slotInsertColumnRight()), ac, actionName); // Remove___________________________________________________________________________ @@ -331,31 +331,31 @@ void TableTagActionSet::initActions(TQWidget* parent) actionName = "remove_table"; //m_actionNames += actionName; new TDEAction(i18n("Table"), 0, this, - TQT_SLOT(slotRemoveTable()), + TQ_SLOT(slotRemoveTable()), ac, actionName); actionName = "remove_rows"; //m_actionNames += actionName; new TDEAction(i18n("Row(s)"), 0, this, - TQT_SLOT(slotRemoveRows()), + TQ_SLOT(slotRemoveRows()), ac, actionName); actionName = "remove_columns"; //m_actionNames += actionName; new TDEAction(i18n("Column(s)"), 0, this, - TQT_SLOT(slotRemoveColumns()), + TQ_SLOT(slotRemoveColumns()), ac, actionName); actionName = "remove_cells"; //m_actionNames += actionName; new TDEAction(i18n("Cell(s)"), 0, this, - TQT_SLOT(slotRemoveCells()), + TQ_SLOT(slotRemoveCells()), ac, actionName); actionName = "remove_cells_content"; //m_actionNames += actionName; new TDEAction(i18n("Cell(s) Content"), 0, this, - TQT_SLOT(slotRemoveCellsContent()), + TQ_SLOT(slotRemoveCellsContent()), ac, actionName); // Merge___________________________________________________________________________ @@ -363,7 +363,7 @@ void TableTagActionSet::initActions(TQWidget* parent) actionName = "merge_selected_cells"; //m_actionNames += actionName; new TDEAction(i18n("Merge Selected Cells"), 0, this, - TQT_SLOT(slotMergeSelectedCells()), + TQ_SLOT(slotMergeSelectedCells()), ac, actionName); } diff --git a/quanta/utility/tagactionset.h b/quanta/utility/tagactionset.h index 9e056543..7ecc6d1a 100644 --- a/quanta/utility/tagactionset.h +++ b/quanta/utility/tagactionset.h @@ -37,7 +37,7 @@ class NodeModifsSet; */ class TagActionSetAbstract : public TQObject { - Q_OBJECT + TQ_OBJECT public: TagActionSetAbstract(TQObject *parent = 0, const char *name = 0); @@ -66,7 +66,7 @@ private: class TagActionSet : public TagActionSetAbstract { - Q_OBJECT + TQ_OBJECT public: TagActionSet(TQObject *parent = 0, const char *name = 0); @@ -95,7 +95,7 @@ private: class TableTagActionSet : public TagActionSetAbstract { - Q_OBJECT + TQ_OBJECT public: TableTagActionSet(TQObject *parent = 0, const char *name = 0); diff --git a/quanta/utility/toolbartabwidget.cpp b/quanta/utility/toolbartabwidget.cpp index 26765eee..e23145e3 100644 --- a/quanta/utility/toolbartabwidget.cpp +++ b/quanta/utility/toolbartabwidget.cpp @@ -43,23 +43,23 @@ ToolbarTabWidget::ToolbarTabWidget(TQWidget * parent, const char * name, WFlags { m_popupMenu = new TDEPopupMenu(this); m_popupMenu->insertTitle(i18n("Toolbar Menu"), 1); - m_popupMenu->insertItem(i18n("New Action..."), parent, TQT_SLOT(slotNewAction())); + m_popupMenu->insertItem(i18n("New Action..."), parent, TQ_SLOT(slotNewAction())); m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQT_SLOT(slotAddToolbar())); - m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQT_SLOT(slotRemoveToolbar())); - m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQT_SLOT(slotRenameToolbar())); - m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQT_SLOT(slotEditToolbar())); + m_popupMenu->insertItem(i18n("New Toolbar..."), parent, TQ_SLOT(slotAddToolbar())); + m_popupMenu->insertItem(i18n("Remove Toolbar"), this, TQ_SLOT(slotRemoveToolbar())); + m_popupMenu->insertItem(i18n("Rename Toolbar..."), this, TQ_SLOT(slotRenameToolbar())); + m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), this, TQ_SLOT(slotEditToolbar())); - connect(this, TQT_SIGNAL(removeToolbar(const TQString&)), - parent, TQT_SLOT(slotRemoveToolbar(const TQString&))); - connect(this, TQT_SIGNAL(renameToolbar(const TQString&)), - parent, TQT_SLOT(slotRenameToolbar(const TQString&))); - connect(this, TQT_SIGNAL(editToolbar(const TQString&)), - parent, TQT_SLOT(slotConfigureToolbars(const TQString&))); - connect(this, TQT_SIGNAL(newAction()), - parent, TQT_SLOT(slotNewAction())); - connect(this, TQT_SIGNAL(addToolbar()), - parent, TQT_SLOT(slotAddToolbar())); + connect(this, TQ_SIGNAL(removeToolbar(const TQString&)), + parent, TQ_SLOT(slotRemoveToolbar(const TQString&))); + connect(this, TQ_SIGNAL(renameToolbar(const TQString&)), + parent, TQ_SLOT(slotRenameToolbar(const TQString&))); + connect(this, TQ_SIGNAL(editToolbar(const TQString&)), + parent, TQ_SLOT(slotConfigureToolbars(const TQString&))); + connect(this, TQ_SIGNAL(newAction()), + parent, TQ_SLOT(slotNewAction())); + connect(this, TQ_SIGNAL(addToolbar()), + parent, TQ_SLOT(slotAddToolbar())); TDEAcceleratorManager::setNoAccel(this); } @@ -157,7 +157,7 @@ void ToolbarTabWidget::slotEditToolbar() void ToolbarTabWidget::mousePressEvent ( TQMouseEvent * e ) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { TQPoint p = e->globalPos(); TQTab *tab = 0L; @@ -235,8 +235,8 @@ QuantaToolBar::QuantaToolBar(TQWidget *parent, const char *name, bool honor_styl m_iconTextMenu->insertItem(i18n("Text Only"), 1); m_iconTextMenu->insertItem(i18n("Text Alongside Icons"), 2); m_iconTextMenu->insertItem(i18n("Text Under Icons"), 3); - connect(m_iconTextMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotIconTextChanged(int))); - connect(m_iconTextMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotIconTextMenuAboutToShow())); + connect(m_iconTextMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotIconTextChanged(int))); + connect(m_iconTextMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotIconTextMenuAboutToShow())); setIconText(ToolbarTabWidget::ref()->iconText(), false); } @@ -296,7 +296,7 @@ void QuantaToolBar::slotIconTextChanged(int id) void QuantaToolBar::mousePressEvent(TQMouseEvent *e) { - if (e->button() == Qt::RightButton) + if (e->button() == TQt::RightButton) { m_popupMenu->clear(); TQPoint p = e->globalPos(); @@ -306,29 +306,29 @@ void QuantaToolBar::mousePressEvent(TQMouseEvent *e) m_toolbarTab->tabUnderMouseLabel = m_toolbarTab->label(m_toolbarTab->currentPageIndex()); m_popupMenu->insertTitle(i18n("Toolbar Menu") + " - " + i18n(m_toolbarTab->tabUnderMouseLabel.utf8())); - m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQT_SIGNAL(newAction())); + m_popupMenu->insertItem(i18n("New Action..."), m_toolbarTab, TQ_SIGNAL(newAction())); TQObjectList* childrenList = queryList("TDEToolBarButton"); for (uint i = 0; i < childrenList->count(); i++) { - TDEToolBarButton *w = static_cast<TDEToolBarButton*>(TQT_TQWIDGET(childrenList->at(i))); + TDEToolBarButton *w = static_cast<TDEToolBarButton*>(childrenList->at(i)); TQPoint p1 = w->parentWidget()->mapToGlobal(w->pos()); TQPoint p2 = TQPoint(p1.x() + w->width(), p1.y()+w->height()); if (TQRect(p1, p2).contains(p)) { currentActionName = w->textLabel(); TQString actionName = currentActionName; - m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQT_SLOT(slotRemoveAction())); - m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQT_SLOT(slotEditAction())); + m_popupMenu->insertItem(i18n("Remove Action - %1").arg(actionName.replace('&',"&&")), this, TQ_SLOT(slotRemoveAction())); + m_popupMenu->insertItem(i18n("Edit Action - %1").arg(actionName), this, TQ_SLOT(slotEditAction())); break; } } m_popupMenu->insertSeparator(); - m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQT_SIGNAL(addToolbar())); - m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQT_SLOT(slotRemoveToolbar())); - m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQT_SLOT(slotRenameToolbar())); + m_popupMenu->insertItem(i18n("New Toolbar..."), m_toolbarTab, TQ_SIGNAL(addToolbar())); + m_popupMenu->insertItem(i18n("Remove Toolbar"), m_toolbarTab, TQ_SLOT(slotRemoveToolbar())); + m_popupMenu->insertItem(i18n("Rename Toolbar..."), m_toolbarTab, TQ_SLOT(slotRenameToolbar())); m_popupMenu->insertSeparator(); m_popupMenu->insertItem( i18n("Text Position"), m_iconTextMenu); - m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQT_SLOT(slotEditToolbar())); + m_popupMenu->insertItem(SmallIconSet("configure_toolbars"), i18n("Configure Toolbars..."), m_toolbarTab, TQ_SLOT(slotEditToolbar())); } m_popupMenu->popup(p); } diff --git a/quanta/utility/toolbartabwidget.h b/quanta/utility/toolbartabwidget.h index a8ce9ecc..3536ca83 100644 --- a/quanta/utility/toolbartabwidget.h +++ b/quanta/utility/toolbartabwidget.h @@ -26,7 +26,7 @@ class TDEToolBar; class ToolbarTabWidget: public TQTabWidget { - Q_OBJECT + TQ_OBJECT public: TQWidgetStack *m_widgetStack; @@ -84,7 +84,7 @@ private: class QuantaToolBar: public TDEToolBar { - Q_OBJECT + TQ_OBJECT public: diff --git a/translations/desktop_files/kimagemapeditor-desktops/it.po b/translations/desktop_files/kimagemapeditor-desktops/it.po index 64f11dcf..128411ac 100644 --- a/translations/desktop_files/kimagemapeditor-desktops/it.po +++ b/translations/desktop_files/kimagemapeditor-desktops/it.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-15 23:54+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-05-08 17:57+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/kimagemapeditor-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.12.1\n" #. Name #: kimagemapeditor.desktop:2 kimagemapeditorpart.desktop:2 -#, fuzzy msgid "KImageMapEditor" -msgstr "Editor per le mappe di immagini HTML" +msgstr "KImageMapEditor" #. GenericName #: kimagemapeditor.desktop:4 diff --git a/translations/desktop_files/kimagemapeditor-desktops/ru.po b/translations/desktop_files/kimagemapeditor-desktops/ru.po index 3cf81eb3..1080a0a9 100644 --- a/translations/desktop_files/kimagemapeditor-desktops/ru.po +++ b/translations/desktop_files/kimagemapeditor-desktops/ru.po @@ -1,31 +1,32 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-15 23:54+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-17 17:55+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/kimagemapeditor-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kimagemapeditor.desktop:2 kimagemapeditorpart.desktop:2 msgid "KImageMapEditor" -msgstr "" +msgstr "KImageMapEditor" #. GenericName #: kimagemapeditor.desktop:4 -#, fuzzy msgid "HTML Image Map Editor" -msgstr "Редактор HTML imagemap" +msgstr "Редактор карт изображений HTML" #. Comment #: kimagemapeditorpart.desktop:4 diff --git a/translations/desktop_files/klinkstatus-desktops/it.po b/translations/desktop_files/klinkstatus-desktops/it.po index ae2abac6..99a9b7a2 100644 --- a/translations/desktop_files/klinkstatus-desktops/it.po +++ b/translations/desktop_files/klinkstatus-desktops/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-15 23:55+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-05-13 06:21+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/klinkstatus-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.12.2\n" #. Name #: klinkstatus.desktop:2 msgid "KLinkStatus" -msgstr "" +msgstr "KLinkStatus" #. GenericName #: klinkstatus.desktop:4 @@ -29,4 +30,4 @@ msgstr "Controllo dei collegamenti" #. Name #: klinkstatus_part.desktop:2 msgid "KLinkStatusPart" -msgstr "" +msgstr "KLinkStatusPart" diff --git a/translations/desktop_files/klinkstatus-desktops/ru.po b/translations/desktop_files/klinkstatus-desktops/ru.po index 7491b9aa..693cecb4 100644 --- a/translations/desktop_files/klinkstatus-desktops/ru.po +++ b/translations/desktop_files/klinkstatus-desktops/ru.po @@ -1,26 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-15 23:55+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-03-29 02:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/klinkstatus-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: klinkstatus.desktop:2 -#, fuzzy msgid "KLinkStatus" -msgstr "Компонент KLinkStatus" +msgstr "KLinkStatus" #. GenericName #: klinkstatus.desktop:4 diff --git a/translations/desktop_files/kommander-desktops/it.po b/translations/desktop_files/kommander-desktops/it.po index 475a2d9c..6e7224e6 100644 --- a/translations/desktop_files/kommander-desktops/it.po +++ b/translations/desktop_files/kommander-desktops/it.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-15 23:55+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-05-13 06:21+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/kommander-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.12.2\n" #. Name #: editor/kmdr-editor.desktop:2 @@ -39,14 +40,13 @@ msgstr "Esecutore per maschere di Kommander" #. Name #: part/kommander_part.desktop:2 -#, fuzzy msgid "KommanderPart" -msgstr "Editor Kommander" +msgstr "KommanderPart" #. Name #: widgets/widgets.desktop:2 msgid "Widgets" -msgstr "" +msgstr "Oggetti" #. Comment #: x-kommander.desktop:2 diff --git a/translations/desktop_files/kxsldbg-desktops/it.po b/translations/desktop_files/kxsldbg-desktops/it.po index 24812aeb..1c079958 100644 --- a/translations/desktop_files/kxsldbg-desktops/it.po +++ b/translations/desktop_files/kxsldbg-desktops/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-15 23:56+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-05-13 06:21+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/kxsldbg-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.12.2\n" #. Name #: kxsldbg.desktop:2 msgid "KXSLDbg" -msgstr "" +msgstr "KXSLDbg" #. GenericName #: kxsldbg.desktop:4 @@ -29,9 +30,9 @@ msgstr "Debugger per XSLT" #. Name #: kxsldbgpart/kxsldbg_part.desktop:2 msgid "KXsldbgPart" -msgstr "" +msgstr "KXsldbgPart" #. Name #: xsldbg.desktop:2 msgid "XSLDbg" -msgstr "" +msgstr "XSLDbg" diff --git a/translations/desktop_files/kxsldbg-desktops/ru.po b/translations/desktop_files/kxsldbg-desktops/ru.po index fdd1cb61..5c2d522a 100644 --- a/translations/desktop_files/kxsldbg-desktops/ru.po +++ b/translations/desktop_files/kxsldbg-desktops/ru.po @@ -1,25 +1,27 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-03-15 23:56+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-12 22:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/kxsldbg-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kxsldbg.desktop:2 msgid "KXSLDbg" -msgstr "" +msgstr "KXSLDbg" #. GenericName #: kxsldbg.desktop:4 @@ -29,9 +31,9 @@ msgstr "Отладчик XSLT" #. Name #: kxsldbgpart/kxsldbg_part.desktop:2 msgid "KXsldbgPart" -msgstr "" +msgstr "KXsldbgPart" #. Name #: xsldbg.desktop:2 msgid "XSLDbg" -msgstr "" +msgstr "XSLDbg" diff --git a/translations/desktop_files/quanta-desktops/it.po b/translations/desktop_files/quanta-desktops/it.po index aeb376d7..e5615a74 100644 --- a/translations/desktop_files/quanta-desktops/it.po +++ b/translations/desktop_files/quanta-desktops/it.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Michele Calgaro <michele.calgaro@yahoo.it>, 2022. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:25+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2022-05-13 06:21+0000\n" +"Last-Translator: Michele Calgaro <michele.calgaro@yahoo.it>\n" +"Language-Team: Italian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/quanta-desktop-files/it/>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.12.2\n" #. Name #: components/debugger/dbgp/quantadebuggerdbgp.desktop:2 msgid "DBGp" -msgstr "" +msgstr "DBGp" #. Comment #: components/debugger/dbgp/quantadebuggerdbgp.desktop:4 @@ -29,7 +30,7 @@ msgstr "Plugin di degub DBGp, vedi http://xdebug.org" #. Name #: components/debugger/gubed/quantadebuggergubed.desktop:2 msgid "Gubed" -msgstr "" +msgstr "Gubed" #. Comment #: components/debugger/gubed/quantadebuggergubed.desktop:4 @@ -52,9 +53,8 @@ msgstr "Parte browser configura TDEHTML" #. Name #: src/quanta.desktop:2 -#, fuzzy msgid "Quanta Plus" -msgstr "Progetto Quanta" +msgstr "Quanta Plus" #. GenericName #. Comment @@ -68,7 +68,7 @@ msgstr "Ambiente per lo sviluppo Web" #. Name #: src/quanta_be.desktop:2 msgid "Quanta Plus BE" -msgstr "" +msgstr "Quanta Plus BE" #. Comment #: src/x-webprj.desktop:2 diff --git a/translations/desktop_files/quanta-desktops/ru.po b/translations/desktop_files/quanta-desktops/ru.po index a6ca8e93..38b1f3d7 100644 --- a/translations/desktop_files/quanta-desktops/ru.po +++ b/translations/desktop_files/quanta-desktops/ru.po @@ -1,35 +1,37 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:25+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-04-12 22:45+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdewebdev/quanta-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: components/debugger/dbgp/quantadebuggerdbgp.desktop:2 msgid "DBGp" -msgstr "" +msgstr "DBGp" #. Comment #: components/debugger/dbgp/quantadebuggerdbgp.desktop:4 msgid "DBGp debugger plugin, see http://xdebug.org" -msgstr "Модуль для отладчика DBGp, http://xdebug.org" +msgstr "Модуль отладчика DBGp, см. http://xdebug.org" #. Name #: components/debugger/gubed/quantadebuggergubed.desktop:2 msgid "Gubed" -msgstr "" +msgstr "Gubed" #. Comment #: components/debugger/gubed/quantadebuggergubed.desktop:4 @@ -52,9 +54,8 @@ msgstr "Настроить компонент просмтра TDEHTML" #. Name #: src/quanta.desktop:2 -#, fuzzy msgid "Quanta Plus" -msgstr "Проект Quanta" +msgstr "Quanta Plus" #. GenericName #. Comment @@ -63,12 +64,12 @@ msgstr "Проект Quanta" #: src/quanta.desktop:4 src/quanta.desktop:6 src/quanta_be.desktop:4 #: src/quanta_be.desktop:6 msgid "Web Development Environment" -msgstr "Среда web-разработки" +msgstr "Среда веб-разработки" #. Name #: src/quanta_be.desktop:2 msgid "Quanta Plus BE" -msgstr "" +msgstr "Quanta Plus BE" #. Comment #: src/x-webprj.desktop:2 |
