diff options
848 files changed, 4980 insertions, 8662 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 55c88087..94a14dd0 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.1 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# diff --git a/CMakeLists.txt b/CMakeLists.txt index 907e18cd..e51713e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,11 @@ ############################################ -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 @@ -32,11 +36,6 @@ include( TDEMacros ) enable_testing( ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### setup install paths include( TDESetupPaths ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 0e0d3958..0df464b2 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -123,6 +123,7 @@ endif( BUILD_KIG AND WITH_KIG_PYTHON_SCRIPTING ) ##### check for headers check_include_file( stdint.h HAVE_STDINT_H ) +check_include_file( ieeefp.h HAVE_IEEEFP_H ) ##### check for TIMEZONE_IS_INT diff --git a/admin b/admin -Subproject a9e0c7eb508ebea59f1fc26d4a6858c4b6feea3 +Subproject 4185112a621d8c5bc88984b117f434c9560e2cc diff --git a/blinken/src/Makefile.am b/blinken/src/Makefile.am index d6a19815..2bee35a6 100644 --- a/blinken/src/Makefile.am +++ b/blinken/src/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = blinken INCLUDES = $(all_includes) -blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor blinken_LDADD = $(LIB_TDEUI) $(LIB_TDEIO) $(artslib) blinken_SOURCES = main.cpp blinken.cpp artsplayer.cpp blinkengame.cpp number.cpp highscoredialog.cpp counter.cpp fontutils.cpp fontchecker.cpp button.cpp settings.kcfgc diff --git a/blinken/src/artsplayer.cpp b/blinken/src/artsplayer.cpp index a83890f9..91391e56 100644 --- a/blinken/src/artsplayer.cpp +++ b/blinken/src/artsplayer.cpp @@ -15,7 +15,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #endif -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "artsplayer.h" #include "settings.h" @@ -23,7 +23,7 @@ artsPlayer::artsPlayer() : m_playobj(0) { m_endChecker = new TQTimer(this); - connect(m_endChecker, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkEnded())); + connect(m_endChecker, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkEnded())); #ifndef WITHOUT_ARTS m_dispatcher = new KArtsDispatcher; diff --git a/blinken/src/artsplayer.h b/blinken/src/artsplayer.h index 9fa7ece7..7bb4ed21 100644 --- a/blinken/src/artsplayer.h +++ b/blinken/src/artsplayer.h @@ -36,7 +36,7 @@ class TQTimer; class artsPlayer : public TQObject { -Q_OBJECT +TQ_OBJECT public: artsPlayer(); diff --git a/blinken/src/blinken.cpp b/blinken/src/blinken.cpp index 4322e9b6..3b97c561 100644 --- a/blinken/src/blinken.cpp +++ b/blinken/src/blinken.cpp @@ -20,7 +20,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "blinken.h" #include "button.h" @@ -65,13 +65,13 @@ blinken::blinken() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overHighs show(); m_unhighlighter = new TQTimer(this); - connect(m_unhighlighter, TQT_SIGNAL(timeout()), this, TQT_SLOT(unhighlight())); + connect(m_unhighlighter, TQ_SIGNAL(timeout()), this, TQ_SLOT(unhighlight())); - connect(&m_game, TQT_SIGNAL(gameEnded()), this, TQT_SLOT(checkHS())); - connect(&m_game, TQT_SIGNAL(phaseChanged()), this, TQT_SLOT(update())); - connect(&m_game, TQT_SIGNAL(highlight(blinkenGame::color, bool)), this, TQT_SLOT(highlight(blinkenGame::color, bool))); + connect(&m_game, TQ_SIGNAL(gameEnded()), this, TQ_SLOT(checkHS())); + connect(&m_game, TQ_SIGNAL(phaseChanged()), this, TQ_SLOT(update())); + connect(&m_game, TQ_SIGNAL(highlight(blinkenGame::color, bool)), this, TQ_SLOT(highlight(blinkenGame::color, bool))); - m_helpMenu = new KHelpMenu(this, kapp->aboutData()); + m_helpMenu = new KHelpMenu(this, tdeApp->aboutData()); for (int i = 0; i < 3; i++) m_overLevels[i] = false; @@ -150,7 +150,7 @@ void blinken::paintEvent(TQPaintEvent *) p.drawLine(169, 250, 469, 250); // draw the two squares of the options - p.setPen(TQPen(m_fontColor, 2, Qt::SolidLine, Qt::SquareCap, Qt::MiterJoin)); + p.setPen(TQPen(m_fontColor, 2, TQt::SolidLine, TQt::SquareCap, TQt::MiterJoin)); m_soundRect = TQRect(181, 209, 25, 25); m_fontRect = TQRect(432, 209, 25, 25); @@ -301,7 +301,7 @@ void blinken::mousePressEvent(TQMouseEvent *e) blinkenSettings::writeConfig(); update(); } - else if (m_overQuit) kapp->quit(); + else if (m_overQuit) tdeApp->quit(); else if (m_overAboutBlinken || m_overCentralLetters) m_helpMenu -> aboutApplication(); else if (m_overAboutKDE) m_helpMenu -> aboutKDE(); else if (m_overManual) m_helpMenu -> appHelpActivated(); diff --git a/blinken/src/blinken.h b/blinken/src/blinken.h index 84fd3cfe..029288af 100644 --- a/blinken/src/blinken.h +++ b/blinken/src/blinken.h @@ -24,7 +24,7 @@ class highScoreDialog; class blinken : public TQWidget { -Q_OBJECT +TQ_OBJECT public: blinken(); diff --git a/blinken/src/blinkengame.cpp b/blinken/src/blinkengame.cpp index 20284a69..6a5f51ae 100644 --- a/blinken/src/blinkengame.cpp +++ b/blinken/src/blinkengame.cpp @@ -20,7 +20,7 @@ blinkenGame::blinkenGame() : m_phase(starting) { m_artsPlayer = new artsPlayer; m_waitTimer = new TQTimer(this); - connect(m_waitTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(waiting())); + connect(m_waitTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(waiting())); } blinkenGame::~blinkenGame() @@ -114,8 +114,8 @@ void blinkenGame::nextSound() void blinkenGame::soundEnded() { - TQTimer::singleShot(100, this, TQT_SLOT(nextSound())); - TQTimer::singleShot(50, this, TQT_SLOT(unhighlight())); + TQTimer::singleShot(100, this, TQ_SLOT(nextSound())); + TQTimer::singleShot(50, this, TQ_SLOT(unhighlight())); } void blinkenGame::unhighlight() @@ -135,7 +135,7 @@ void blinkenGame::waiting() } else m_sequence.append(generateColor()); - connect(m_artsPlayer, TQT_SIGNAL(ended()), this, TQT_SLOT(soundEnded())); + connect(m_artsPlayer, TQ_SIGNAL(ended()), this, TQ_SLOT(soundEnded())); m_nextColor = m_sequence.begin(); soundEnded(); } @@ -156,7 +156,7 @@ blinkenGame::color blinkenGame::generateColor() // make the compiler happy :-D color c = none; - r = 1 + (int)(4.0 * kapp -> random() / (RAND_MAX + 1.0)); + r = 1 + (int)(4.0 * tdeApp -> random() / (RAND_MAX + 1.0)); switch(r) { case 1: diff --git a/blinken/src/blinkengame.h b/blinken/src/blinkengame.h index 5cee510b..561e6c7d 100644 --- a/blinken/src/blinkengame.h +++ b/blinken/src/blinkengame.h @@ -19,7 +19,7 @@ class artsPlayer; class blinkenGame : public TQObject { -Q_OBJECT +TQ_OBJECT public: blinkenGame(); diff --git a/blinken/src/button.cpp b/blinken/src/button.cpp index 584feeb3..e36d2e19 100644 --- a/blinken/src/button.cpp +++ b/blinken/src/button.cpp @@ -10,14 +10,14 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include "button.h" button::button(blinkenGame::color c) : m_selected(false), m_color(c) { - TDEConfig *kc = kapp->config(); + TDEConfig *kc = tdeApp->config(); kc->setGroup("General"); TQString cs = getColorString(); TQString pixmap = TQString("images/%1h.png").arg(cs); @@ -58,7 +58,7 @@ void button::setShortcut(int key) m_key = key; m_selected = false; - TDEConfig *kc = kapp->config(); + TDEConfig *kc = tdeApp->config(); kc->setGroup("General"); kc->writeEntry(getColorString(), key); kc->sync(); diff --git a/blinken/src/highscoredialog.cpp b/blinken/src/highscoredialog.cpp index 8e994f0d..f3a54835 100644 --- a/blinken/src/highscoredialog.cpp +++ b/blinken/src/highscoredialog.cpp @@ -130,13 +130,13 @@ highScoreDialog::highScoreDialog(TQWidget *parent) : KDialogBase(parent, 0, true m_tw = new myTabWidget(this); setMainWidget(m_tw); - TDEConfig *cfg = kapp -> config(); + TDEConfig *cfg = tdeApp -> config(); for (int i = 1; i <= 3; i++) { cfg -> setGroup(TQString("Level%1").arg(i)); for (int j = 1; j <= 5; j++) { - m_scores[i-1].append(tqMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(j)))); + m_scores[i-1].append(qMakePair(cfg->readNumEntry(TQString("Score%1").arg(j)), cfg->readEntry(TQString("Name%1").arg(j)))); } } @@ -166,10 +166,10 @@ void highScoreDialog::addScore(int level, int score, const TQString &name) if (it != itEnd) { - m_scores[level].insert(it, tqMakePair(score, name)); + m_scores[level].insert(it, qMakePair(score, name)); m_scores[level].remove(--m_scores[level].end()); - TDEConfig *cfg = kapp -> config(); + TDEConfig *cfg = tdeApp -> config(); cfg -> setGroup(TQString("Level%1").arg(level + 1)); int j; for (it = m_scores[level].begin(), j = 1; it != m_scores[level].end(); ++it, j++) diff --git a/blinken/src/main.cpp b/blinken/src/main.cpp index c013c752..3589cd58 100644 --- a/blinken/src/main.cpp +++ b/blinken/src/main.cpp @@ -10,8 +10,8 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include "fontchecker.h" #include "blinken.h" @@ -24,7 +24,7 @@ int main(int argc, char *argv[]) about.addCredit("Steve Jordi", I18N_NOOP("GPL'ed his 'Steve' font so that we could use it"), "steve@sjordi.com"); TDECmdLineArgs::init(argc, argv, &about); TDEApplication app; - app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); TQFont f("Steve", 12, TQFont::Normal, true); if (!fontChecker::checkInstalled(f, locate("appdata", "fonts/steve.ttf"))) diff --git a/config.h.cmake b/config.h.cmake index 8c61c4b8..894ea305 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,7 +1,7 @@ #define VERSION "@VERSION@" // Defined if you have fvisibility and fvisibility-inlines-hidden support. -#cmakedefine __KDE_HAVE_GCC_VISIBILITY 1 +#cmakedefine __TDE_HAVE_GCC_VISIBILITY 1 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -36,3 +36,6 @@ // Defined to 1 if timezone is available as a variable #cmakedefine TIMEZONE_IS_INT 1 + +// Defined to 1 if you have <ieeefp.h> header file. +#cmakedefine HAVE_IEEEFP_H 1 diff --git a/doc/kalzium/index.docbook b/doc/kalzium/index.docbook index 2bef5de2..d2a49f21 100644 --- a/doc/kalzium/index.docbook +++ b/doc/kalzium/index.docbook @@ -1,6 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -<!ENTITY kappname "&kalzium;"><!-- replace kapp here --> +<!ENTITY kappname "&kalzium;"><!-- replace tdeApp here --> <!ENTITY package "tdeedu"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"><!-- change language only here --> diff --git a/doc/kgeography/index.docbook b/doc/kgeography/index.docbook index 12ed2a55..3675d2eb 100644 --- a/doc/kgeography/index.docbook +++ b/doc/kgeography/index.docbook @@ -263,7 +263,7 @@ Guess the flag of a division: a province name is given and you must find the cor </para> </chapter> -<chapter id="using-kapp"> +<chapter id="using-tdeApp"> <title>Using &kgeography;</title> <para> @@ -284,7 +284,7 @@ Guess the flag of a division: a province name is given and you must find the cor </para> -<sect1 id="kapp-features"> +<sect1 id="tdeApp-features"> <title>More &kgeography; features</title> <para>Another feature of &kgeography; is the possibility of zoom on a map. @@ -444,7 +444,7 @@ Also include any keys that have a special function but have no equivalent in the menus or toolbars. This may not be necessary for small apps or apps with no tool or menu bars. --> -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>The main &kgeography; window</title> <sect2> @@ -613,7 +613,7 @@ Documentation Copyright © 2005 &Anne-Marie.Mahfouf; <email>&Anne-Marie.Mahf <appendix id="installation"> <title>Installation</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>How to obtain &kgeography;</title> <!-- This first entity contains boiler plate for applications that are diff --git a/doc/kstars/dcop.docbook b/doc/kstars/dcop.docbook index b17539bf..00c8f7e9 100644 --- a/doc/kstars/dcop.docbook +++ b/doc/kstars/dcop.docbook @@ -28,7 +28,7 @@ functions: <itemizedlist> <listitem><para><function> -lookTowards( const QString direction )</function>: +lookTowards( const TQString direction )</function>: Point the display focus in a direction specified by the argument. This can be the name of any object in the sky, or one of the following directional words or abbreviations: zenith (or z), north (n), @@ -72,7 +72,7 @@ Pause for t seconds before continuing with subsequent script commands. </para></listitem> <listitem><para><function> -waitForKey( const QString k )</function>: +waitForKey( const TQString k )</function>: Halt the script execution until the user presses the specified key. At this point, you cannot specify combination keystrokes (such as <keycombo action="simul">&Ctrl;<keycap>C</keycap></keycombo>); just use @@ -86,7 +86,7 @@ Toggle whether tracking mode is engaged. </para></listitem> <listitem><para><function> -changeViewOption( const QString option, const QString value )</function>: +changeViewOption( const TQString option, const TQString value )</function>: Adjust a view option. There are dozens and dozens of options available; basically everything you can change in the <guilabel>Configure &kstars; Window</guilabel> can be changed here as well. The first argument is @@ -98,8 +98,8 @@ gracefully. </para></listitem> <listitem><para><function> -setGeoLocation( const QString city, const QString province, -const QString country )</function>: +setGeoLocation( const TQString city, const TQString province, +const TQString country )</function>: Change the observing location to the specified city. If no city matching the argument strings is found, then nothing happens. </para></listitem> diff --git a/doc/kstars/scriptbuilder.docbook b/doc/kstars/scriptbuilder.docbook index f439e662..9b5d59da 100644 --- a/doc/kstars/scriptbuilder.docbook +++ b/doc/kstars/scriptbuilder.docbook @@ -180,20 +180,20 @@ Script</guimenuitem> item in the <guimenu>File</guimenu> menu. <orderedlist> <listitem><para>Generic Device Functions: Functions to establish/shutdown devices..etc.</para> <itemizedlist> - <listitem><para><function>startINDI (QString deviceName, bool useLocal)</function> : Establish an INDI service either as local or server.</para></listitem> - <listitem><para><function>shutdownINDI (QString deviceName)</function> : Shutdown the INDI service.</para></listitem> - <listitem><para><function>switchINDI(QString deviceName, bool turnOn)</function> : Connect or Disconnect an INDI device.</para></listitem> - <listitem><para><function>setINDIPort(QString deviceName, QString port)</function> : Set the device's connection port.</para></listitem> - <listitem><para><function>setINDIAction(QString deviceName, QString action)</function> : Activate an INDI action. The action can be any <emphasis>element</emphasis> of a <emphasis>switch property</emphasis></para></listitem> - <listitem><para><function>waitForINDIAction(QString deviceName, QString action)</function> : Pause script execution until the specified action <emphasis>property</emphasis> returns with OK status.</para></listitem> + <listitem><para><function>startINDI (TQString deviceName, bool useLocal)</function> : Establish an INDI service either as local or server.</para></listitem> + <listitem><para><function>shutdownINDI (TQString deviceName)</function> : Shutdown the INDI service.</para></listitem> + <listitem><para><function>switchINDI(TQString deviceName, bool turnOn)</function> : Connect or Disconnect an INDI device.</para></listitem> + <listitem><para><function>setINDIPort(TQString deviceName, TQString port)</function> : Set the device's connection port.</para></listitem> + <listitem><para><function>setINDIAction(TQString deviceName, TQString action)</function> : Activate an INDI action. The action can be any <emphasis>element</emphasis> of a <emphasis>switch property</emphasis></para></listitem> + <listitem><para><function>waitForINDIAction(TQString deviceName, TQString action)</function> : Pause script execution until the specified action <emphasis>property</emphasis> returns with OK status.</para></listitem> </itemizedlist> </listitem> <listitem><para>Telescope Functions: Functions to control the telescope motion and status.</para> <itemizedlist> - <listitem><para><function>setINDIScopeAction(QString deviceName, QString action)</function> : Set the telescope mode or action. Available options are SLEW, TRACK, SYNC, PARK, and ABORT.</para></listitem> - <listitem><para><function>setINDITargetCoord(QString deviceName, double RA, double DEC)</function> : Set the telescope JNow target coordinates to <emphasis>RA</emphasis> and <emphasis>DEC</emphasis>.</para></listitem> - <listitem><para><function>setINDITargetName(QString deviceName, QString objectName)</function> : Set the telescope JNow target coordinates to the coordinates of <emphasis>objectName</emphasis>. KStars will lookup the object name in its database and will fetch RA and Dec once found.</para></listitem> - <listitem><para><function>setINDIGeoLocation(QString deviceName, double + <listitem><para><function>setINDIScopeAction(TQString deviceName, TQString action)</function> : Set the telescope mode or action. Available options are SLEW, TRACK, SYNC, PARK, and ABORT.</para></listitem> + <listitem><para><function>setINDITargetCoord(TQString deviceName, double RA, double DEC)</function> : Set the telescope JNow target coordinates to <emphasis>RA</emphasis> and <emphasis>DEC</emphasis>.</para></listitem> + <listitem><para><function>setINDITargetName(TQString deviceName, TQString objectName)</function> : Set the telescope JNow target coordinates to the coordinates of <emphasis>objectName</emphasis>. KStars will lookup the object name in its database and will fetch RA and Dec once found.</para></listitem> + <listitem><para><function>setINDIGeoLocation(TQString deviceName, double longitude, double latitude)</function> : Set the telescope geographical location to the longitude and latitude as specified. The longitude is measured from Greenwich, UK, to the East. However, while it is common to use negative @@ -203,26 +203,26 @@ degrees to get the value that INDI expects. For example, Calgary, Canada coordinates in &kstars; are longitude: -114 04 58; latitude: 51 02 58. So INDI's would need longitude = 360 - 114.083 = 245.917 degrees.</para></listitem> - <listitem><para><function>setINDIUTC(QString ddeviceName, QString UTCDateTime)</function> : Set the telescope UTC Date and Time in ISO 8601 format. The format is YYYY-MM-DDTHH:MM:SS (e.g. 2004-07-12T22:05:32).</para></listitem> + <listitem><para><function>setINDIUTC(TQString ddeviceName, TQString UTCDateTime)</function> : Set the telescope UTC Date and Time in ISO 8601 format. The format is YYYY-MM-DDTHH:MM:SS (e.g. 2004-07-12T22:05:32).</para></listitem> </itemizedlist> </listitem> <listitem><para>Camera/CCD Functions: Functions to control the camera/CCD properties and status.</para> <itemizedlist> - <listitem><para><function>setINDICCDTemp(QString deviceName, int temp)</function> : Set the CCD chip target temperature in degrees celsius.</para></listitem> - <listitem><para><function>setINDIFrameType(QString deviceName, QString type)</function> : Set the CCD frame type. Available options are FRAME_LIGHT, FRAME_BIAS, FRAME_DARK, and FRAME_FLAT.</para></listitem> - <listitem><para><function>startINDIExposure(QString deviceName, int timeout)</function> : Start the CCD/Camera exposure for the duration specified by <emphasis>timeout</emphasis> in seconds.</para></listitem> + <listitem><para><function>setINDICCDTemp(TQString deviceName, int temp)</function> : Set the CCD chip target temperature in degrees celsius.</para></listitem> + <listitem><para><function>setINDIFrameType(TQString deviceName, TQString type)</function> : Set the CCD frame type. Available options are FRAME_LIGHT, FRAME_BIAS, FRAME_DARK, and FRAME_FLAT.</para></listitem> + <listitem><para><function>startINDIExposure(TQString deviceName, int timeout)</function> : Start the CCD/Camera exposure for the duration specified by <emphasis>timeout</emphasis> in seconds.</para></listitem> </itemizedlist> </listitem> <listitem><para>Focuser Functions: Functions to control the focuser motion and status.</para> <itemizedlist> - <listitem><para><function>setINDIFocusSpeed(QString deviceName, QString action)</function> : Set the focuser speed. Available options are FOCUS_HALT, FOCUS_SLOW, FOCUS_MEDIUM, and FOCUS_FAST.</para></listitem> - <listitem><para><function>setINDIFocusTimeout(QString deviceName, int timeout)</function> : Set the duration in seconds for any subsequent startINDIFocus operations.</para></listitem> - <listitem><para><function>startINDIFocus(QString deviceName, int focusDir)</function> : Move the focuser either inward (focusDir = 0) or outward (focusDir = 1). The speed and duration of this operation is set by the <function>setINDIFocusSpeed()</function> and <function>setINDIFocusTimeout()</function> functions.</para></listitem> + <listitem><para><function>setINDIFocusSpeed(TQString deviceName, TQString action)</function> : Set the focuser speed. Available options are FOCUS_HALT, FOCUS_SLOW, FOCUS_MEDIUM, and FOCUS_FAST.</para></listitem> + <listitem><para><function>setINDIFocusTimeout(TQString deviceName, int timeout)</function> : Set the duration in seconds for any subsequent startINDIFocus operations.</para></listitem> + <listitem><para><function>startINDIFocus(TQString deviceName, int focusDir)</function> : Move the focuser either inward (focusDir = 0) or outward (focusDir = 1). The speed and duration of this operation is set by the <function>setINDIFocusSpeed()</function> and <function>setINDIFocusTimeout()</function> functions.</para></listitem> </itemizedlist> </listitem> <listitem><para>Filter Functions: Functions to control the filter position.</para> <itemizedlist> - <listitem><para><function>setINDIFilterNum(QString deviceName, int filter_num)</function> : Change the filter position to <varname>filter_num</varname>. The user can assign aliases to filter numbers in the <guimenuitem>Configure INDI</guimenuitem> dialog box under the <guimenu>Devices</guimenu> menu (e.g. Filter 1 = Red, Filter 2 = Green..etc).</para></listitem> + <listitem><para><function>setINDIFilterNum(TQString deviceName, int filter_num)</function> : Change the filter position to <varname>filter_num</varname>. The user can assign aliases to filter numbers in the <guimenuitem>Configure INDI</guimenuitem> dialog box under the <guimenu>Devices</guimenu> menu (e.g. Filter 1 = Red, Filter 2 = Green..etc).</para></listitem> </itemizedlist> </listitem> diff --git a/doc/ktouch/index.docbook b/doc/ktouch/index.docbook index 9b61f5a4..ffad20c4 100644 --- a/doc/ktouch/index.docbook +++ b/doc/ktouch/index.docbook @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!ENTITY ktouch "<application>KTouch</application>"> - <!ENTITY kappname "&ktouch;"><!-- replace kapp here --> + <!ENTITY kappname "&ktouch;"><!-- replace tdeApp here --> <!ENTITY package "tdeedu"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"><!-- change language only here --> diff --git a/doc/kvoctrain/index.docbook b/doc/kvoctrain/index.docbook index ce20e5b8..fcd05746 100644 --- a/doc/kvoctrain/index.docbook +++ b/doc/kvoctrain/index.docbook @@ -2192,7 +2192,7 @@ The International Phonetic Association</ulink></para></listitem> <chapter id="commands"> <title>Command Reference</title> -<sect1 id="kapp-mainwindow"> +<sect1 id="tdeApp-mainwindow"> <title>The Main &kvoctrain; Window</title> <sect2 id="file-menu"> diff --git a/doc/man/blinken/CMakeLists.txt b/doc/man/blinken/CMakeLists.txt index 9b8f71ca..c31d797e 100644 --- a/doc/man/blinken/CMakeLists.txt +++ b/doc/man/blinken/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES blinken.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/indi/CMakeLists.txt b/doc/man/indi/CMakeLists.txt index 451eb394..db77bed1 100644 --- a/doc/man/indi/CMakeLists.txt +++ b/doc/man/indi/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES celestrongps.1 indiserver.1 diff --git a/doc/man/kalzium/CMakeLists.txt b/doc/man/kalzium/CMakeLists.txt index 937a8237..5092dd78 100644 --- a/doc/man/kalzium/CMakeLists.txt +++ b/doc/man/kalzium/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kalzium.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kanagram/CMakeLists.txt b/doc/man/kanagram/CMakeLists.txt index ef8290d9..e84da74b 100644 --- a/doc/man/kanagram/CMakeLists.txt +++ b/doc/man/kanagram/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kanagram.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kbruch/CMakeLists.txt b/doc/man/kbruch/CMakeLists.txt index 315b557f..57939ff0 100644 --- a/doc/man/kbruch/CMakeLists.txt +++ b/doc/man/kbruch/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kbruch.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/keduca/CMakeLists.txt b/doc/man/keduca/CMakeLists.txt index 3a78fe2d..42e55f99 100644 --- a/doc/man/keduca/CMakeLists.txt +++ b/doc/man/keduca/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES keduca.1 keducabuilder.1 keduca-shrinker.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kgeography/CMakeLists.txt b/doc/man/kgeography/CMakeLists.txt index 9d7f9033..c0f83b98 100644 --- a/doc/man/kgeography/CMakeLists.txt +++ b/doc/man/kgeography/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kgeography.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/khangman/CMakeLists.txt b/doc/man/khangman/CMakeLists.txt index 7b589ffa..6a7977dd 100644 --- a/doc/man/khangman/CMakeLists.txt +++ b/doc/man/khangman/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES khangman.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kig/CMakeLists.txt b/doc/man/kig/CMakeLists.txt index 2fc853a2..04ce747f 100644 --- a/doc/man/kig/CMakeLists.txt +++ b/doc/man/kig/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kig.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kiten/CMakeLists.txt b/doc/man/kiten/CMakeLists.txt index 7b7866e5..aa558304 100644 --- a/doc/man/kiten/CMakeLists.txt +++ b/doc/man/kiten/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kiten.1 kitengen.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/klatin/CMakeLists.txt b/doc/man/klatin/CMakeLists.txt index 11a6862c..62496645 100644 --- a/doc/man/klatin/CMakeLists.txt +++ b/doc/man/klatin/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES klatin.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/klettres/CMakeLists.txt b/doc/man/klettres/CMakeLists.txt index 76b03538..9b52a67b 100644 --- a/doc/man/klettres/CMakeLists.txt +++ b/doc/man/klettres/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES klettres.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kmplot/CMakeLists.txt b/doc/man/kmplot/CMakeLists.txt index 8ae09555..035083c9 100644 --- a/doc/man/kmplot/CMakeLists.txt +++ b/doc/man/kmplot/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kmplot.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kpercentage/CMakeLists.txt b/doc/man/kpercentage/CMakeLists.txt index ca578f95..d0d98a44 100644 --- a/doc/man/kpercentage/CMakeLists.txt +++ b/doc/man/kpercentage/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kpercentage.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kstars/CMakeLists.txt b/doc/man/kstars/CMakeLists.txt index d169cb9b..6edbec64 100644 --- a/doc/man/kstars/CMakeLists.txt +++ b/doc/man/kstars/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kstars.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/ktouch/CMakeLists.txt b/doc/man/ktouch/CMakeLists.txt index 5f042bb3..8e5f1a3e 100644 --- a/doc/man/ktouch/CMakeLists.txt +++ b/doc/man/ktouch/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES ktouch.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kturtle/CMakeLists.txt b/doc/man/kturtle/CMakeLists.txt index 6f15fe8f..e816f11e 100644 --- a/doc/man/kturtle/CMakeLists.txt +++ b/doc/man/kturtle/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kturtle.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kverbos/CMakeLists.txt b/doc/man/kverbos/CMakeLists.txt index 82fab51c..0f583fe3 100644 --- a/doc/man/kverbos/CMakeLists.txt +++ b/doc/man/kverbos/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kverbos.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kvoctrain/CMakeLists.txt b/doc/man/kvoctrain/CMakeLists.txt index acc3225d..4c29eaf6 100644 --- a/doc/man/kvoctrain/CMakeLists.txt +++ b/doc/man/kvoctrain/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kvoctrain.1 langen2kvtml.1 spotlight2kvtml.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kwordquiz/CMakeLists.txt b/doc/man/kwordquiz/CMakeLists.txt index a5e33e4c..3b15ad16 100644 --- a/doc/man/kwordquiz/CMakeLists.txt +++ b/doc/man/kwordquiz/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES kwordquiz.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/libtdeedu/CMakeLists.txt b/doc/man/libtdeedu/CMakeLists.txt index fb1f2c0a..334af03e 100644 --- a/doc/man/libtdeedu/CMakeLists.txt +++ b/doc/man/libtdeedu/CMakeLists.txt @@ -1,4 +1,4 @@ -INSTALL( +install( FILES test_extdate.1 test_extdatepicker.1 DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/kalzium/ConfigureChecks.cmake b/kalzium/ConfigureChecks.cmake index bb1da003..88ba0ed6 100644 --- a/kalzium/ConfigureChecks.cmake +++ b/kalzium/ConfigureChecks.cmake @@ -72,4 +72,70 @@ if( WITH_OCAML_SOLVER ) message( STATUS "Search for facile - found" ) endif( ) + + if( NOT DEFINED HAVE_NUMS ) + message( STATUS "Search for nums" ) + + if( NOT DEFINED NUMS_LIBRARIES ) + find_library( NUMS_LIBRARY + NAMES nums.a + HINTS ${OCAML_BASEDIR} + PATH_SUFFIXES num ocaml/num + ) + if( NUMS_LIBRARY ) + set( NUMS_LIBRARIES ${NUMS_LIBRARY} ) + endif() + endif( ) + + if( NOT DEFINED NUMS_INCLUDE_DIR ) + find_path( NUMS_INCLUDE_DIR + NAMES num.cmi + HINTS ${OCAML_BASEDIR} + PATH_SUFFIXES nums lib/ocaml/nums + ) + endif( ) + + if( NUMS_LIBRARIES AND NUMS_INCLUDE_DIR ) + set( HAVE_NUMS 1 CACHE INTERNAL "Enable build with ocaml/nums" ) + message( STATUS "Search for nums - found" ) + else() + message( STATUS "Search for nums - not found" ) + endif() + endif( ) + + + if( NOT DEFINED HAVE_ZARITH ) + message( STATUS "Search for zarith" ) + + if( NOT DEFINED ZARITH_LIBRARIES ) + find_library( ZARITH_LIBRARY + NAMES zarith.a + HINTS ${OCAML_BASEDIR} + PATH_SUFFIXES zarith ocaml/zarith + ) + if( ZARITH_LIBRARY ) + set( ZARITH_LIBRARIES ${ZARITH_LIBRARY} ) + endif() + endif( ) + + if( NOT DEFINED ZARITH_INCLUDE_DIR ) + find_path( ZARITH_INCLUDE_DIR + NAMES z.cmi + HINTS ${OCAML_BASEDIR} + PATH_SUFFIXES zarith lib/ocaml/zarith + ) + endif( ) + + if( ZARITH_LIBRARIES AND ZARITH_INCLUDE_DIR ) + set( HAVE_ZARITH 1 CACHE INTERNAL "Enable build with ocaml/zarith" ) + message( STATUS "Search for zarith - found" ) + else() + message( STATUS "Search for zarith - not found" ) + endif() + endif( ) + + if( (NOT HAVE_NUMS) AND (NOT HAVE_ZARITH) ) + tde_message_fatal( "Facile requires nums or zarith, but neither is found on your system" ) + endif() + endif( WITH_OCAML_SOLVER ) diff --git a/kalzium/src/CMakeLists.txt b/kalzium/src/CMakeLists.txt index 5a91842b..ee4f437b 100644 --- a/kalzium/src/CMakeLists.txt +++ b/kalzium/src/CMakeLists.txt @@ -20,7 +20,7 @@ link_directories( ) if( WITH_OCAML_SOLVER ) - set( OCAML_LIBRARIES asmrun nums m ${CMAKE_DL_LIBS} ) + set( OCAML_LIBRARIES asmrun m ${NUMS_LIBRARIES} ${ZARITH_LIBRARIES} ${CMAKE_DL_LIBS} ) set( OCAML_SOLVER ${CMAKE_CURRENT_BINARY_DIR}/solver/modwrap.o ${CMAKE_CURRENT_BINARY_DIR}/solver/solver.o diff --git a/kalzium/src/Makefile.am b/kalzium/src/Makefile.am index d781491e..1667d5b7 100644 --- a/kalzium/src/Makefile.am +++ b/kalzium/src/Makefile.am @@ -79,7 +79,7 @@ rcui_DATA = kalziumui.rc KDE_ICON = AUTO # the library search path. -kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor #this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar messages-old: rc.cpp diff --git a/kalzium/src/detailedgraphicaloverview.h b/kalzium/src/detailedgraphicaloverview.h index b0844802..4b616baa 100644 --- a/kalzium/src/detailedgraphicaloverview.h +++ b/kalzium/src/detailedgraphicaloverview.h @@ -27,7 +27,7 @@ class Element; */ class DetailedGraphicalOverview : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/detailinfodlg.cpp b/kalzium/src/detailinfodlg.cpp index 97dd76e6..ff1e3e10 100644 --- a/kalzium/src/detailinfodlg.cpp +++ b/kalzium/src/detailinfodlg.cpp @@ -23,7 +23,7 @@ #include <kiconloader.h> #include <tdehtml_part.h> #include <tdehtmlview.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeactioncollection.h> #include <kcombobox.h> #include <tdeapplication.h> @@ -66,7 +66,7 @@ DetailedInfoDlg::DetailedInfoDlg( Element *el , TQWidget *parent, const char *na createContent(); m_actionCollection = new TDEActionCollection(this); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), m_actionCollection); + KStdAction::quit(this, TQ_SLOT(slotClose()), m_actionCollection); setButtonTip( User2, i18n( "Goes to the previous element" ) ); setButtonTip( User1, i18n( "Goes to the next element" ) ); @@ -96,7 +96,7 @@ TDEHTMLPart* DetailedInfoDlg::addHTMLTab( const TQString& title, const TQString& TQFrame *frame = addPage(title, icontext, BarIcon(iconname)); TQVBoxLayout *layout = new TQVBoxLayout( frame ); layout->setMargin( 0 ); - TDEHTMLPart *w = new TDEHTMLPart( frame, "html-part", TQT_TQOBJECT(frame) ); + TDEHTMLPart *w = new TDEHTMLPart( frame, "html-part", frame ); layout->addWidget( w->view() ); return w; @@ -389,7 +389,7 @@ void DetailedInfoDlg::reloadContent() if ( TQFile::exists( picpath ) ) { TQImage img( picpath, "JPEG" ); - img = img.smoothScale ( 400, 400, TQ_ScaleMin ); + img = img.smoothScale ( 400, 400, TQImage::ScaleMin ); TQPixmap pic; pic.convertFromImage( img ); piclabel->setPixmap( pic ); @@ -456,8 +456,8 @@ void DetailedInfoDlg::slotHelp() break; } - if ( kapp ) - kapp->invokeHelp ( chapter, "kalzium" ); + if ( tdeApp ) + tdeApp->invokeHelp ( chapter, "kalzium" ); } void DetailedInfoDlg::wheelEvent( TQWheelEvent *ev ) diff --git a/kalzium/src/detailinfodlg.h b/kalzium/src/detailinfodlg.h index 18494746..8abf1d4b 100644 --- a/kalzium/src/detailinfodlg.h +++ b/kalzium/src/detailinfodlg.h @@ -38,7 +38,7 @@ class TDEHTMLPart; */ class DetailedInfoDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/element.cpp b/kalzium/src/element.cpp index 14dea1a1..80a8c5b8 100644 --- a/kalzium/src/element.cpp +++ b/kalzium/src/element.cpp @@ -35,7 +35,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> Element::Element() { diff --git a/kalzium/src/elementdataviewer.cpp b/kalzium/src/elementdataviewer.cpp index 500f9354..e3897d2b 100644 --- a/kalzium/src/elementdataviewer.cpp +++ b/kalzium/src/elementdataviewer.cpp @@ -69,15 +69,15 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name ) setButtonText( User1, i18n("&Plot") ); m_actionCollection = new TDEActionCollection(this); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), m_actionCollection); + KStdAction::quit(this, TQ_SLOT(slotClose()), m_actionCollection); - connect ( m_pPlotSetupWidget->KCB_y, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT( drawPlot()) ); + connect ( m_pPlotSetupWidget->KCB_y, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT( drawPlot()) ); - connect ( m_pPlotSetupWidget->connectPoints, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( drawPlot()) ); - connect ( m_pPlotSetupWidget->showNames, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( drawPlot()) ); + connect ( m_pPlotSetupWidget->connectPoints, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( drawPlot()) ); + connect ( m_pPlotSetupWidget->showNames, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( drawPlot()) ); // Draw the plot so that the user doesn't have to press the "Plot" // button to seee anything. @@ -87,8 +87,8 @@ ElementDataViewer::ElementDataViewer( TQWidget *parent, const char* name ) void ElementDataViewer::slotHelp() { emit helpClicked(); - if ( kapp ) - kapp->invokeHelp ( "plot_data", "kalzium" ); + if ( tdeApp ) + tdeApp->invokeHelp ( "plot_data", "kalzium" ); } // Reimplement slotUser1 from KDialogBase @@ -294,7 +294,6 @@ void ElementDataViewer::drawPlot() /* * reserve the memory for the KPlotObjects */ - //TODO QT4 replace TQMemArray with TQVector TQMemArray<KPlotObject*> dataPoint(num); TQMemArray<KPlotObject*> dataPointLabel(num); diff --git a/kalzium/src/elementdataviewer.h b/kalzium/src/elementdataviewer.h index 0b73b582..818976e8 100644 --- a/kalzium/src/elementdataviewer.h +++ b/kalzium/src/elementdataviewer.h @@ -95,7 +95,7 @@ class AxisData */ class ElementDataViewer : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/eqchemview.cpp b/kalzium/src/eqchemview.cpp index 19d1469a..c2d8a95b 100644 --- a/kalzium/src/eqchemview.cpp +++ b/kalzium/src/eqchemview.cpp @@ -63,7 +63,7 @@ eqchemView::eqchemView(TQWidget *parent) : TQWidget(parent) m_eqclear->setIconSet( TDEGlobal::instance()->iconLoader()->loadIconSet("locationbar_erase", TDEIcon::NoGroup, 22 /*TDEIcon::SizeSmallMedium*/) ); - connect(m_eqclear, TQT_SIGNAL(clicked()), m_eqedit, TQT_SLOT(clear()) ); + connect(m_eqclear, TQ_SIGNAL(clicked()), m_eqedit, TQ_SLOT(clear()) ); } eqchemView::~eqchemView() @@ -113,8 +113,8 @@ EQChemDialog::EQChemDialog( TQWidget *parent ) void EQChemDialog::slotHelp() { emit helpClicked(); - if ( kapp ) - kapp->invokeHelp ( "eq_solver", "kalzium" ); + if ( tdeApp ) + tdeApp->invokeHelp ( "eq_solver", "kalzium" ); } #include "eqchemview.moc" diff --git a/kalzium/src/eqchemview.h b/kalzium/src/eqchemview.h index a492a318..3048198c 100644 --- a/kalzium/src/eqchemview.h +++ b/kalzium/src/eqchemview.h @@ -42,7 +42,7 @@ class KPushButton; */ class eqchemView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -85,7 +85,7 @@ private: */ class EQChemDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/eqresult.cpp b/kalzium/src/eqresult.cpp index 1f3f44bf..5308cf66 100644 --- a/kalzium/src/eqresult.cpp +++ b/kalzium/src/eqresult.cpp @@ -111,7 +111,7 @@ void EqResult::add(const TQString & question, const TQString & answer) new QuestionItem( this, question, bgcolor ); new AnswerItem( this, question, answer, bgcolor ); - TQTimer::singleShot( 100, this, TQT_SLOT( scrollToEnd() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( scrollToEnd() ) ); } void EqResult::scrollToEnd() diff --git a/kalzium/src/eqresult.h b/kalzium/src/eqresult.h index d868c766..b1e3d3cc 100644 --- a/kalzium/src/eqresult.h +++ b/kalzium/src/eqresult.h @@ -71,7 +71,7 @@ class AnswerItem : public TQListBoxItem */ class EqResult : public TQListBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/kalzium.cpp b/kalzium/src/kalzium.cpp index e7393ec0..a1bbae10 100644 --- a/kalzium/src/kalzium.cpp +++ b/kalzium/src/kalzium.cpp @@ -46,7 +46,7 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <kstatusbar.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdialogbase.h> #include <knuminput.h> @@ -74,8 +74,8 @@ Kalzium::Kalzium() m_infoDialog = 0; m_toolboxCurrent = 0; - connect( m_PerodicTableView, TQT_SIGNAL( ElementClicked( int ) ), TQT_TQOBJECT(this), TQT_SLOT( openInformationDialog( int ) )); - connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotStatusbar( int ) )); + connect( m_PerodicTableView, TQ_SIGNAL( ElementClicked( int ) ), this, TQ_SLOT( openInformationDialog( int ) )); + connect( m_PerodicTableView, TQ_SIGNAL( MouseOver( int ) ), this, TQ_SLOT( slotStatusbar( int ) )); // layouting setCentralWidget( centralWidget ); @@ -107,14 +107,14 @@ Kalzium::Kalzium() void Kalzium::setupActions() { - m_actionNoScheme = new TDEToggleAction(i18n("&No Color Scheme"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme"); + m_actionNoScheme = new TDEToggleAction(i18n("&No Color Scheme"), 0, this, TQ_SLOT(slotNoLook()), actionCollection(), "view_look_noscheme"); // the actions for the color schemes - m_actionGroups = new TDEToggleAction(i18n("Show &Groups"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookGroups()), actionCollection(), "view_look_groups"); - m_actionBlocks = new TDEToggleAction(i18n("Show &Blocks"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks"); - m_actionAcid = new TDEToggleAction(i18n("Show &Acid Behavior"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid"); - m_actionFamily = new TDEToggleAction(i18n("Show &Family"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookFamily()), actionCollection(), "view_look_family"); - m_actionCrystal = new TDEToggleAction(i18n("Show &Crystal Structures"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal"); + m_actionGroups = new TDEToggleAction(i18n("Show &Groups"), 0, this, TQ_SLOT(slotLookGroups()), actionCollection(), "view_look_groups"); + m_actionBlocks = new TDEToggleAction(i18n("Show &Blocks"), 0, this, TQ_SLOT(slotLookBlocks()), actionCollection(), "view_look_blocks"); + m_actionAcid = new TDEToggleAction(i18n("Show &Acid Behavior"), 0, this, TQ_SLOT(slotLookAcidBehavior()), actionCollection(), "view_look_acid"); + m_actionFamily = new TDEToggleAction(i18n("Show &Family"), 0, this, TQ_SLOT(slotLookFamily()), actionCollection(), "view_look_family"); + m_actionCrystal = new TDEToggleAction(i18n("Show &Crystal Structures"), 0, this, TQ_SLOT(slotLookCrystal()), actionCollection(), "view_look_crystal"); //the actions for switching PerodicTableView TQStringList gradientlist; @@ -127,9 +127,9 @@ void Kalzium::setupActions() gradientlist.append(i18n("Melting Point")); gradientlist.append(i18n("Electronegativity")); gradientlist.append(i18n("Electron Affinity")); - gradient_action = new TDESelectAction(i18n("&Gradient"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_look_gradmenu"); + gradient_action = new TDESelectAction(i18n("&Gradient"), 0, this, 0, actionCollection(), "view_look_gradmenu"); gradient_action->setItems(gradientlist); - connect (gradient_action, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSwitchtoGradient(int))); + connect (gradient_action, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSwitchtoGradient(int))); // the actions for switching PerodicTableView TQStringList numlist; @@ -137,28 +137,28 @@ void Kalzium::setupActions() numlist.append(i18n("Show &IUPAC")); numlist.append(i18n("Show &CAS")); numlist.append(i18n("Show &Old IUPAC")); - numeration_action = new TDESelectAction (i18n("&Numeration"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "view_numerationtype"); + numeration_action = new TDESelectAction (i18n("&Numeration"), 0, this, 0, actionCollection(), "view_numerationtype"); numeration_action->setItems(numlist); numeration_action->setCurrentItem(Prefs::numeration()); - connect (numeration_action, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotSwitchtoNumeration(int))); + connect (numeration_action, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSwitchtoNumeration(int))); - m_SidebarAction = new TDEAction(i18n("Show &Sidebar"), "sidebar", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar"); + m_SidebarAction = new TDEAction(i18n("Show &Sidebar"), "sidebar", 0, this, TQ_SLOT(slotShowHideSidebar()), actionCollection(), "view_sidebar"); #ifdef HAVE_FACILE - m_EQSolverAction = new TDEAction(i18n("&Equation Solver..."), "eqchem", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver"); + m_EQSolverAction = new TDEAction(i18n("&Equation Solver..."), "eqchem", 0, this, TQ_SLOT(slotShowEQSolver()), actionCollection(), "tools_eqsolver"); #endif // tools actions - m_pPlotAction = new TDEAction(i18n("&Plot Data..."), "plot", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPlotData()), actionCollection(), "tools_plotdata"); - m_pGlossaryAction = new TDEAction(i18n("&Glossary..."), "glossary", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGlossary()), actionCollection(), "tools_glossary"); + m_pPlotAction = new TDEAction(i18n("&Plot Data..."), "plot", 0, this, TQ_SLOT(slotPlotData()), actionCollection(), "tools_plotdata"); + m_pGlossaryAction = new TDEAction(i18n("&Glossary..."), "glossary", 0, this, TQ_SLOT(slotGlossary()), actionCollection(), "tools_glossary"); // other period view options - m_pLegendAction = new TDEAction(i18n("Show &Legend"), "legend", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowLegend()), actionCollection(), "view_legend"); - m_pTooltipAction = new TDEAction(i18n("Show &Tooltip"), "tooltip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip"); + m_pLegendAction = new TDEAction(i18n("Show &Legend"), "legend", 0, this, TQ_SLOT(slotShowLegend()), actionCollection(), "view_legend"); + m_pTooltipAction = new TDEAction(i18n("Show &Tooltip"), "tooltip", 0, this, TQ_SLOT(slotEnableTooltips()), actionCollection(), "view_tooltip"); // the standard actions - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showSettingsDialog()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()),actionCollection() ); + KStdAction::preferences(this, TQ_SLOT(showSettingsDialog()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT (closeAllWindows()),actionCollection() ); slotShowScheme( Prefs::colorschemebox() ); slotSwitchtoNumeration( Prefs::numeration() ); @@ -213,7 +213,7 @@ void Kalzium::setupSidebars() lay->activate(); m_detailWidget = new DetailedGraphicalOverview( fake, "DetailedGraphicalOverview" ); m_detailWidget->setMinimumSize( 200, m_detailWidget->minimumSize().height() ); - connect( m_PerodicTableView, TQT_SIGNAL( MouseOver( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectedNumber( int ) )); + connect( m_PerodicTableView, TQ_SIGNAL( MouseOver( int ) ), this, TQ_SLOT( slotSelectedNumber( int ) )); lay->addWidget( m_detailWidget ); lay->addItem( new TQSpacerItem( 10, 10, TQSizePolicy::Fixed, TQSizePolicy::MinimumExpanding ) ); m_toolbox->addItem( fake, SmallIcon( "overview" ), i18n( "Overview" ) ); @@ -222,26 +222,26 @@ void Kalzium::setupSidebars() m_toolbox->addItem( m_calcWidget, SmallIcon( "calculate" ), i18n( "Calculate" ) ); m_timeWidget = new TimeWidgetIMPL( this, "TimeWidget" ); - connect( m_timeWidget->time_slider, TQT_SIGNAL( valueChanged( int ) ), - m_PerodicTableView, TQT_SLOT( setDate( int ) ) ); - connect( m_timeWidget->time_slider, TQT_SIGNAL( valueChanged( int ) ), - m_timeWidget, TQT_SLOT( slotChanged( int ) ) ); - connect( m_timeWidget->Number1, TQT_SIGNAL( valueChanged( int ) ), - m_timeWidget, TQT_SLOT( slotChanged( int ) ) ); + connect( m_timeWidget->time_slider, TQ_SIGNAL( valueChanged( int ) ), + m_PerodicTableView, TQ_SLOT( setDate( int ) ) ); + connect( m_timeWidget->time_slider, TQ_SIGNAL( valueChanged( int ) ), + m_timeWidget, TQ_SLOT( slotChanged( int ) ) ); + connect( m_timeWidget->Number1, TQ_SIGNAL( valueChanged( int ) ), + m_timeWidget, TQ_SLOT( slotChanged( int ) ) ); m_toolbox->addItem( m_timeWidget, SmallIcon( "timeline" ), i18n( "Timeline" ) ); m_somWidget = new SOMWidgetIMPL( this, "somWidget" ); - connect( m_somWidget->temp_slider, TQT_SIGNAL( valueChanged( int ) ), - m_PerodicTableView, TQT_SLOT( setTemperature( int ) ) ); + connect( m_somWidget->temp_slider, TQ_SIGNAL( valueChanged( int ) ), + m_PerodicTableView, TQ_SLOT( setTemperature( int ) ) ); m_toolbox->addItem( m_somWidget, SmallIcon( "statematter" ), i18n( "State of Matter" ) ); - connect( m_toolbox, TQT_SIGNAL( currentChanged( int ) ), TQT_TQOBJECT(this), TQT_SLOT( slotToolboxCurrentChanged( int ) ) ); + connect( m_toolbox, TQ_SIGNAL( currentChanged( int ) ), this, TQ_SLOT( slotToolboxCurrentChanged( int ) ) ); moveDockWindow( m_dockWin, DockLeft ); setDockEnabled( /*m_dockWin, */DockTop, false ); setDockEnabled( /*m_dockWin, */DockBottom, false ); m_dockWin->hide(); - connect( m_dockWin, TQT_SIGNAL(visibilityChanged(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotSidebarVisibilityChanged(bool))); + connect( m_dockWin, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SLOT(slotSidebarVisibilityChanged(bool))); } @@ -263,7 +263,7 @@ void Kalzium::slotShowEQSolver() eqsolver->setMinimumSize( 600,400 ); vbox->addWidget( eqsolver ); - connect(dlg, TQT_SIGNAL(applyClicked()), eqsolver, TQT_SLOT(compute())); + connect(dlg, TQ_SIGNAL(applyClicked()), eqsolver, TQ_SLOT(compute())); dlg->show(); #endif } @@ -398,8 +398,8 @@ void Kalzium::showSettingsDialog() //TDEConfigDialog didn't find an instance of this dialog, so lets create it : TDEConfigDialog *dialog = new TDEConfigDialog(this,"settings", Prefs::self()); - connect( dialog, TQT_SIGNAL( settingsChanged() ), this , TQT_SLOT( slotUpdateSettings() ) ); - connect( dialog, TQT_SIGNAL( settingsChanged() ), m_somWidget, TQT_SLOT( reloadUnits() ) ); + connect( dialog, TQ_SIGNAL( settingsChanged() ), this , TQ_SLOT( slotUpdateSettings() ) ); + connect( dialog, TQ_SIGNAL( settingsChanged() ), m_somWidget, TQ_SLOT( reloadUnits() ) ); dialog->addPage( new setColors( 0, "colors_page"), i18n("Colors"), "colorize"); dialog->addPage( new setupUnits( 0, "units_page"), i18n("Units"), "gear"); dialog->addPage( new setupMisc( 0, "miscpage" ), i18n( "Miscellaneous" ), "misc" ); @@ -440,10 +440,10 @@ void Kalzium::openInformationDialog( int number ) this, "detailedDlg" ); // Remove the selection when this dialog finishes or hides. - connect(m_infoDialog, TQT_SIGNAL(hidden()), - m_PerodicTableView, TQT_SLOT(unSelect())); - connect(m_infoDialog, TQT_SIGNAL(elementChanged(int)), - m_PerodicTableView, TQT_SLOT(selectElement(int))); + connect(m_infoDialog, TQ_SIGNAL(hidden()), + m_PerodicTableView, TQ_SLOT(unSelect())); + connect(m_infoDialog, TQ_SIGNAL(elementChanged(int)), + m_PerodicTableView, TQ_SLOT(selectElement(int))); } m_infoDialog->show(); } diff --git a/kalzium/src/kalzium.h b/kalzium/src/kalzium.h index 3184b555..ee849eb3 100644 --- a/kalzium/src/kalzium.h +++ b/kalzium/src/kalzium.h @@ -45,7 +45,7 @@ class GlossaryDialog; */ class Kalzium : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kalzium/src/kalziumdataobject.cpp b/kalzium/src/kalziumdataobject.cpp index 1e4f93e3..8f7d6f1c 100644 --- a/kalzium/src/kalziumdataobject.cpp +++ b/kalzium/src/kalziumdataobject.cpp @@ -30,7 +30,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> KalziumDataObject* KalziumDataObject::instance() @@ -51,7 +51,7 @@ KalziumDataObject::KalziumDataObject() if (!layoutFile.exists()) { kdDebug() << "data.xml not found, exiting" << endl; - kapp->exit(0); + tdeApp->exit(0); return; } diff --git a/kalzium/src/kalziumtip.cpp b/kalzium/src/kalziumtip.cpp index e78cb0ef..c15130ab 100644 --- a/kalzium/src/kalziumtip.cpp +++ b/kalzium/src/kalziumtip.cpp @@ -36,11 +36,11 @@ #include <tdeglobal.h> #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWidget( parent, name, f ) { - setFocusPolicy(TQ_NoFocus); //the widget don't get the keyboard focus + setFocusPolicy(TQWidget::NoFocus); //the widget don't get the keyboard focus setBackgroundMode(NoBackground); // widget has no background resize(0,0); hide(); //initailly hide it @@ -48,14 +48,14 @@ KalziumTip::KalziumTip( TQWidget * parent, const char * name, WFlags f ) : TQWid m_noElemIcon = TDEGlobal::iconLoader()->loadIcon( "orbits", TDEIcon::NoGroup, 64 ); setMouseTracking(true); // receice mouse move events - connect(&m_frameTimer, TQT_SIGNAL(timeout()), TQT_SLOT(internalUpdate())); + connect(&m_frameTimer, TQ_SIGNAL(timeout()), TQ_SLOT(internalUpdate())); } void KalziumTip::showTip( TQPoint mouse, Element* element, int visibleWidth, int visibleHeight ) { TQWidget *p = 0; if ( dynamic_cast<TQWidget*>( parent() ) ) - p = TQT_TQWIDGET( parent() ); + p = static_cast<TQWidget*>( parent() ); if ( p ) { @@ -293,7 +293,7 @@ void KalziumTip::loadIcon() if ( !iconpath.isEmpty() ) { TQImage img ( iconpath, "JPEG" ); - img = img.smoothScale ( 128, 128, TQ_ScaleMin ); + img = img.smoothScale ( 128, 128, TQImage::ScaleMin ); m_icon.convertFromImage( img ); } diff --git a/kalzium/src/kalziumtip.h b/kalzium/src/kalziumtip.h index c819e32b..521bb312 100644 --- a/kalzium/src/kalziumtip.h +++ b/kalzium/src/kalziumtip.h @@ -39,7 +39,7 @@ class TQTimer; */ class KalziumTip : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/molcalcwidget.h b/kalzium/src/molcalcwidget.h index 9314eb4f..59b486cc 100644 --- a/kalzium/src/molcalcwidget.h +++ b/kalzium/src/molcalcwidget.h @@ -40,7 +40,7 @@ class MoleculeParser; */ class MolcalcWidget : public MolcalcWidgetBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kalzium/src/molcalcwidgetbase.ui b/kalzium/src/molcalcwidgetbase.ui index 79a6074e..71dde981 100644 --- a/kalzium/src/molcalcwidgetbase.ui +++ b/kalzium/src/molcalcwidgetbase.ui @@ -124,9 +124,9 @@ <slot>slotCalcButtonClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotCalcButtonClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kalzium/src/orbitswidget.h b/kalzium/src/orbitswidget.h index 1b7c1efd..0e7eb36b 100644 --- a/kalzium/src/orbitswidget.h +++ b/kalzium/src/orbitswidget.h @@ -28,7 +28,7 @@ */ class OrbitsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/periodictableview.cpp b/kalzium/src/periodictableview.cpp index d1e20339..4218c3a2 100644 --- a/kalzium/src/periodictableview.cpp +++ b/kalzium/src/periodictableview.cpp @@ -51,17 +51,17 @@ PerodicTableView::PerodicTableView(TQWidget *parent, const char *name) unSelect(); #if 0 - connect( this, TQT_SIGNAL( tableClicked( TQPoint ) ), - this, TQT_SLOT( selectPoint( TQPoint ) ) ); + connect( this, TQ_SIGNAL( tableClicked( TQPoint ) ), + this, TQ_SLOT( selectPoint( TQPoint ) ) ); #endif - connect( this, TQT_SIGNAL( ToolTip( int ) ), - this, TQT_SLOT( slotToolTip( int ) ) ); + connect( this, TQ_SIGNAL( ToolTip( int ) ), + this, TQ_SLOT( slotToolTip( int ) ) ); - connect( &HoverTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotTransientLabel() ) ); + connect( &HoverTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotTransientLabel() ) ); - connect( &MouseoverTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotMouseover() ) ); + connect( &MouseoverTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotMouseover() ) ); setMouseTracking( true ); @@ -172,7 +172,7 @@ void PerodicTableView::slotToolTip( int number ) TQWidget *p = 0; if ( dynamic_cast<TQWidget*>( parent() ) ) - p = TQT_TQWIDGET( parent() ); + p = static_cast<TQWidget*>( parent() ); if( p ) m_kalziumTip->showTip( mapFromGlobal(TQCursor::pos()), @@ -417,7 +417,7 @@ void PerodicTableView::paintCurrentSelection() p.begin(table); TQPen pen; - pen.setStyle( Qt::DotLine ); + pen.setStyle( TQt::DotLine ); pen.setWidth( 4 ); pen.setColor( TQt::blue ); p.setPen( pen ); diff --git a/kalzium/src/periodictableview.h b/kalzium/src/periodictableview.h index 3ceb5888..5bbb909f 100644 --- a/kalzium/src/periodictableview.h +++ b/kalzium/src/periodictableview.h @@ -40,7 +40,7 @@ class KalziumTip; */ class PerodicTableView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/plotwidget.h b/kalzium/src/plotwidget.h index 9f4142d9..edf3bb26 100644 --- a/kalzium/src/plotwidget.h +++ b/kalzium/src/plotwidget.h @@ -23,7 +23,7 @@ */ class PlotWidget : public KPlotWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/solver/modwrap.c b/kalzium/src/solver/modwrap.c index 0ab5359e..e51ea3c5 100644 --- a/kalzium/src/solver/modwrap.c +++ b/kalzium/src/solver/modwrap.c @@ -21,8 +21,9 @@ #include <stdio.h> #include <string.h> -#include <caml/mlvalues.h> +#include <caml/alloc.h> #include <caml/callback.h> +#include <caml/mlvalues.h> char* solve_equation(const char * eq) { @@ -32,6 +33,6 @@ char* solve_equation(const char * eq) solve_equation_closure = caml_named_value("solve_equation"); } - return strdup(String_val(callback(*solve_equation_closure, copy_string(eq)) )); + return strdup(String_val(caml_callback(*solve_equation_closure, caml_copy_string(eq)) )); } diff --git a/kalzium/src/somwidget_impl.cpp b/kalzium/src/somwidget_impl.cpp index 93ae5838..dd6ac6bc 100644 --- a/kalzium/src/somwidget_impl.cpp +++ b/kalzium/src/somwidget_impl.cpp @@ -45,12 +45,12 @@ SOMWidgetIMPL::SOMWidgetIMPL( TQWidget *parent, const char* name ) m_htmlEnd = "</qt>"; m_prevUnit = Prefs::temperature(); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( spinValueChanged( double ) ) ); - connect( temp_slider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( sliderValueChanged( int ) ) ); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( setNewTemp( double ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( spinValueChanged( double ) ) ); + connect( temp_slider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( sliderValueChanged( int ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( setNewTemp( double ) ) ); reloadUnits(); } @@ -71,40 +71,40 @@ kdDebug() << "min: " << Number1->minValue() << " - max: " << Number1->maxValue() void SOMWidgetIMPL::sliderValueChanged( int temp ) { // TODO check if in TQt4 the RangeControl emits the signal again - disconnect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( spinValueChanged( double ) ) ); - disconnect( temp_slider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( sliderValueChanged( int ) ) ); - disconnect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( setNewTemp( double ) ) ); + disconnect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( spinValueChanged( double ) ) ); + disconnect( temp_slider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( sliderValueChanged( int ) ) ); + disconnect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( setNewTemp( double ) ) ); double newvalue = TempUnit::convert( (double)temp, (int)TempUnit::Kelvin, Prefs::temperature() ); Number1->setValue( newvalue ); setNewTemp( newvalue ); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( spinValueChanged( double ) ) ); - connect( temp_slider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( sliderValueChanged( int ) ) ); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( setNewTemp( double ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( spinValueChanged( double ) ) ); + connect( temp_slider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( sliderValueChanged( int ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( setNewTemp( double ) ) ); } void SOMWidgetIMPL::spinValueChanged( double temp ) { - disconnect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( spinValueChanged( double ) ) ); - disconnect( temp_slider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( sliderValueChanged( int ) ) ); - disconnect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( setNewTemp( double ) ) ); + disconnect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( spinValueChanged( double ) ) ); + disconnect( temp_slider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( sliderValueChanged( int ) ) ); + disconnect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( setNewTemp( double ) ) ); int newvalue = (int)TempUnit::convert( temp, Prefs::temperature(), (int)TempUnit::Kelvin ); temp_slider->setValue( newvalue ); setNewTemp( temp ); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( spinValueChanged( double ) ) ); - connect( temp_slider, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( sliderValueChanged( int ) ) ); - connect( Number1, TQT_SIGNAL( valueChanged( double ) ), - this, TQT_SLOT( setNewTemp( double ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( spinValueChanged( double ) ) ); + connect( temp_slider, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( sliderValueChanged( int ) ) ); + connect( Number1, TQ_SIGNAL( valueChanged( double ) ), + this, TQ_SLOT( setNewTemp( double ) ) ); } void SOMWidgetIMPL::setNewTemp( double newtemp ) diff --git a/kalzium/src/somwidget_impl.h b/kalzium/src/somwidget_impl.h index f66a5708..62f7070f 100644 --- a/kalzium/src/somwidget_impl.h +++ b/kalzium/src/somwidget_impl.h @@ -28,7 +28,7 @@ class Element; */ class SOMWidgetIMPL : public SOMWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/spectrumview.ui b/kalzium/src/spectrumview.ui index 25071379..5d846bdc 100644 --- a/kalzium/src/spectrumview.ui +++ b/kalzium/src/spectrumview.ui @@ -213,9 +213,9 @@ <slot>slotExportAsImage()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">slotExportAsImage()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">spectrumwidget.h</include> diff --git a/kalzium/src/spectrumviewimpl.h b/kalzium/src/spectrumviewimpl.h index eff0510c..1b3d2b3b 100644 --- a/kalzium/src/spectrumviewimpl.h +++ b/kalzium/src/spectrumviewimpl.h @@ -22,7 +22,7 @@ */ class SpectrumViewImpl : public SpectrumView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/spectrumwidget.cpp b/kalzium/src/spectrumwidget.cpp index 88355a1c..66bfce27 100644 --- a/kalzium/src/spectrumwidget.cpp +++ b/kalzium/src/spectrumwidget.cpp @@ -320,9 +320,9 @@ void SpectrumWidget::mouseMoveEvent( TQMouseEvent *e ) void SpectrumWidget::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) m_LMBPointPress = e->pos(); - if ( e->button() == Qt::RightButton ) + if ( e->button() == TQt::RightButton ) slotZoomOut(); //FIXME //the tooltip is not really working. Better to not have it @@ -391,7 +391,7 @@ void SpectrumWidget::drawTooltip( TQPainter *p ) void SpectrumWidget::mouseReleaseEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { int left = (int)Wavelength( ( double )m_LMBPointPress.x()/width() ); int right = (int)Wavelength( ( double )e->pos().x()/width() ); diff --git a/kalzium/src/spectrumwidget.h b/kalzium/src/spectrumwidget.h index 4af92561..57b66f10 100644 --- a/kalzium/src/spectrumwidget.h +++ b/kalzium/src/spectrumwidget.h @@ -33,7 +33,7 @@ */ class SpectrumWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kalzium/src/timewidget_impl.h b/kalzium/src/timewidget_impl.h index 6db713e5..99627c07 100644 --- a/kalzium/src/timewidget_impl.h +++ b/kalzium/src/timewidget_impl.h @@ -21,7 +21,7 @@ */ class TimeWidgetIMPL : public TimeWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kanagram/images/appicon.png b/kanagram/images/appicon.png Binary files differindex b8374378..ce2aa8d7 100644 --- a/kanagram/images/appicon.png +++ b/kanagram/images/appicon.png diff --git a/kanagram/images/appiconover.png b/kanagram/images/appiconover.png Binary files differindex 0e67fa42..aad15c8c 100644 --- a/kanagram/images/appiconover.png +++ b/kanagram/images/appiconover.png diff --git a/kanagram/images/kicon.png b/kanagram/images/kicon.png Binary files differindex c34c434e..996ca9e5 100644 --- a/kanagram/images/kicon.png +++ b/kanagram/images/kicon.png diff --git a/kanagram/images/kiconover.png b/kanagram/images/kiconover.png Binary files differindex cc85b305..d25d8b5b 100644 --- a/kanagram/images/kiconover.png +++ b/kanagram/images/kiconover.png diff --git a/kanagram/src/Makefile.am b/kanagram/src/Makefile.am index 76bd52cd..d41eb7a4 100644 --- a/kanagram/src/Makefile.am +++ b/kanagram/src/Makefile.am @@ -28,7 +28,7 @@ bin_PROGRAMS = kanagram # the application source, library search path, and link libraries kanagram_SOURCES = main.cpp kanagram.cpp kanagramgame.cpp fontutils.cpp kanagramsettings.kcfgc mainsettingswidget.ui vocabsettingswidget.ui vocabeditwidget.ui mainsettings.cpp vocabsettings.cpp vocabedit.cpp keduvocdocument.cpp keduvocexpression.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp leitnerbox.cpp leitnersystem.cpp multiplechoice.cpp grammarmanager.cpp leitnersystemview.cpp newstuffwidget.ui newstuffdialog.cpp newstuff.cpp -kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kanagram_LDADD = $(LIB_TDEUI) $(LIB_TDENEWSTUFF) $(LIB_TDEIO) $(artslib) kde_kcfg_DATA=kanagram.kcfg diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp index 9b826f43..38cf5cca 100644 --- a/kanagram/src/kanagram.cpp +++ b/kanagram/src/kanagram.cpp @@ -40,7 +40,7 @@ using namespace std; #include <tdelocale.h> #include <tdemessagebox.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfigdialog.h> #include <tdeconfigskeleton.h> #include <krandomsequence.h> @@ -113,15 +113,15 @@ Kanagram::Kanagram() : TQWidget(0, 0, WStaticContents | WNoAutoErase), m_overNex m_hintTimer = new TQTimer(this); - m_helpMenu = new KHelpMenu(this, kapp->aboutData()); + m_helpMenu = new KHelpMenu(this, tdeApp->aboutData()); m_inputBox = new TQLineEdit(this); m_inputBox->setGeometry(TQRect(52, 427, 273, 29)); m_inputBox->setFrame(false); - connect(m_inputBox, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(checkWord())); - connect(m_hintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(hideHint())); - connect(m_inputBox, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(update())); + connect(m_inputBox, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(checkWord())); + connect(m_hintTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(hideHint())); + connect(m_inputBox, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(update())); TQFont f = TQFont(); f.setPointSize(17); @@ -393,7 +393,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) if(m_quitRect.contains(e->pos())) { - kapp->quit(); + tdeApp->quit(); } if(m_revealRect.contains(e->pos())) @@ -432,7 +432,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) if(m_switcherRect.contains(e->pos()) || m_arrowRect.contains(e->pos())) { - if(!(e->button() == Qt::RightButton)) + if(!(e->button() == TQt::RightButton)) m_game->nextVocab(); else m_game->previousVocab(); @@ -451,7 +451,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) { if(m_hintHideTime) { - m_hintTimer->start(m_hintHideTime * 1000, TRUE); + m_hintTimer->start(m_hintHideTime * 1000, true); } m_showHint = true; randomHintImage(); @@ -465,7 +465,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) { if(m_useSounds) play("right.ogg"); m_inputBox->setPaletteBackgroundColor(TQColor(0, 255, 0)); - TQTimer::singleShot(1000, this, TQT_SLOT(resetInputBox())); + TQTimer::singleShot(1000, this, TQ_SLOT(resetInputBox())); m_inputBox->clear(); hideHint(); m_game->nextAnagram(); @@ -475,7 +475,7 @@ void Kanagram::mousePressEvent(TQMouseEvent *e) { if(m_useSounds) play("wrong.ogg"); m_inputBox->setPaletteBackgroundColor(TQColor(255, 0, 0)); - TQTimer::singleShot(1000, this, TQT_SLOT(resetInputBox())); + TQTimer::singleShot(1000, this, TQ_SLOT(resetInputBox())); m_inputBox->clear(); update(); } @@ -723,7 +723,7 @@ void Kanagram::drawTextNew(TQPainter &p, const TQString &text, int textAlign, in void Kanagram::checkWord() { TQPoint p = m_upRect.topLeft() + TQPoint( 1, 1 ); - TQMouseEvent *e = new TQMouseEvent( TQEvent::MouseButtonPress, p, Qt::LeftButton, Qt::NoButton ); + TQMouseEvent *e = new TQMouseEvent( TQEvent::MouseButtonPress, p, TQt::LeftButton, TQt::NoButton ); mousePressEvent(e); } @@ -744,8 +744,8 @@ void Kanagram::showSettings() m_vocabSettings = new VocabSettings( configDialog ); configDialog->addPage( m_vocabSettings, i18n("Vocabularies"), "edit" ); configDialog->addPage( new NewStuff( configDialog ), i18n("New Stuff"), "knewstuff" ); - connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings())); - connect(configDialog, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(refreshVocabularies())); + connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings())); + connect(configDialog, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(refreshVocabularies())); configDialog->exec(); delete configDialog; } diff --git a/kanagram/src/kanagram.h b/kanagram/src/kanagram.h index 2587e62f..7eb732b8 100644 --- a/kanagram/src/kanagram.h +++ b/kanagram/src/kanagram.h @@ -56,7 +56,7 @@ class VocabSettings; class Kanagram : public TQWidget { -Q_OBJECT +TQ_OBJECT public: Kanagram(); diff --git a/kanagram/src/kanagramgame.h b/kanagram/src/kanagramgame.h index ffaa95da..d85aecf4 100644 --- a/kanagram/src/kanagramgame.h +++ b/kanagram/src/kanagramgame.h @@ -23,14 +23,14 @@ #include <tqobject.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <krandomsequence.h> class TQWidget; class KanagramGame : public TQObject { -Q_OBJECT +TQ_OBJECT public: KanagramGame(TQWidget *parent); diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp index 046ad56e..7f8c04c0 100644 --- a/kanagram/src/keduvocdocument.cpp +++ b/kanagram/src/keduvocdocument.cpp @@ -99,7 +99,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) if (!url.isEmpty()) doc_url = url; - // TODO EPT connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) ); + // TODO EPT connect( this, TQ_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQ_SLOT(slotProgress(KEduVocDocument*,int)) ); TQString tmpfile; if (TDEIO::NetAccess::download( url, tmpfile, 0 )) @@ -165,7 +165,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) TQString format = i18n("Could not load \"%1\"\nDo you want to try again?"); TQString msg = format.arg(url.path()); int result = KMessageBox::warningContinueCancel(0, msg, - kapp->makeStdCaption(i18n("I/O Failure")), + tdeApp->makeStdCaption(i18n("I/O Failure")), i18n("&Retry")); if ( result == KMessageBox::Cancel ) { Init(); @@ -182,7 +182,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/) bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType ft, const TQString & generator) { -// connect( this, TQT_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQT_SLOT(slotProgress(KEduVocDocument*,int)) ); +// connect( this, TQ_SIGNAL(progressChanged(KEduVocDocument*,int)), parent, TQ_SLOT(slotProgress(KEduVocDocument*,int)) ); KURL tmp (url); @@ -255,7 +255,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f TQString format = i18n("Could not save \"%1\"\nDo you want to try again?"); TQString msg = format.arg(tmp.path()); int result = KMessageBox::warningContinueCancel(0, msg, - kapp->makeStdCaption(i18n("I/O Failure")), + tdeApp->makeStdCaption(i18n("I/O Failure")), i18n("&Retry")); if ( result == KMessageBox::Cancel ) return false; } @@ -463,7 +463,7 @@ void KEduVocDocument::setSizeHint (int idx, const int width) } -class eraseTrans : public unary_function<KEduVocExpression, void> +class eraseTrans : public function<void(KEduVocExpression)> { public: @@ -507,7 +507,7 @@ void KEduVocDocument::setOriginalIdent (const TQString &id) } -class sortByOrg : public binary_function<KEduVocExpression, KEduVocExpression, bool> +class sortByOrg : public function<bool(KEduVocExpression, KEduVocExpression)> { public: @@ -531,7 +531,7 @@ public: class sortByLessonAndOrg_alpha - : public binary_function<KEduVocExpression, KEduVocExpression, bool> + : public function<bool(KEduVocExpression, KEduVocExpression)> { public: @@ -564,7 +564,7 @@ public: class sortByLessonAndOrg_index - : public binary_function<KEduVocExpression, KEduVocExpression, bool> + : public function<bool(KEduVocExpression, KEduVocExpression)> { public: @@ -594,7 +594,7 @@ public: }; -class sortByTrans : public binary_function<KEduVocExpression, KEduVocExpression, bool> +class sortByTrans : public function<bool(KEduVocExpression, KEduVocExpression)> { public: @@ -727,7 +727,7 @@ LeitnerSystem* KEduVocDocument::getLeitnerSystem() } -class resetAll : public unary_function<KEduVocExpression, void> +class resetAll : public function<void(KEduVocExpression)> { public: @@ -755,7 +755,7 @@ public: }; -class resetOne : public unary_function<KEduVocExpression, void> +class resetOne : public function<void(KEduVocExpression)> { public: diff --git a/kanagram/src/keduvocdocument.h b/kanagram/src/keduvocdocument.h index b5ef5fff..ff43a816 100644 --- a/kanagram/src/keduvocdocument.h +++ b/kanagram/src/keduvocdocument.h @@ -251,7 +251,7 @@ class LeitnerSystem; class KEduVocDocument : public TQObject { - Q_OBJECT + TQ_OBJECT friend class KEduVocKvtmlWriter; friend class KEduVocKvtmlReader; diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp index 34c31ca7..ed0939bf 100644 --- a/kanagram/src/keduvockvtmlreader.cpp +++ b/kanagram/src/keduvockvtmlreader.cpp @@ -1678,7 +1678,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem) ); TQString msg = format.arg(elem); TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Unknown Element")); + TQString s = tdeApp->makeStdCaption(i18n("Unknown Element")); KMessageBox::sorry(0, ln+msg, s); TQApplication::restoreOverrideCursor(); } @@ -1686,7 +1686,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem) void KEduVocKvtmlReader::domError(const TQString &text ) { TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Error")); + TQString s = tdeApp->makeStdCaption(i18n("Error")); TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path()); TQString msg = text; KMessageBox::error(0, ln+msg, s); diff --git a/kanagram/src/leitnersystemview.h b/kanagram/src/leitnersystemview.h index 32dcab00..88cca85e 100644 --- a/kanagram/src/leitnersystemview.h +++ b/kanagram/src/leitnersystemview.h @@ -24,7 +24,7 @@ class LeitnerSystem; class LeitnerSystemView : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kanagram/src/main.cpp b/kanagram/src/main.cpp index 75481435..416ff515 100644 --- a/kanagram/src/main.cpp +++ b/kanagram/src/main.cpp @@ -21,8 +21,8 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include "kanagram.h" #include "kanagramsettings.h" @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) about.addCredit("Artemiy Pavlov", I18N_NOOP("Sound effects"), 0, "http://artemiolabs.com"); TDECmdLineArgs::init(argc, argv, &about); TDEApplication app; - app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); KanagramSettings::setJustGotFont(false); TQFont f("squeaky chalk sound"); diff --git a/kanagram/src/mainsettings.cpp b/kanagram/src/mainsettings.cpp index 8307bb1d..a712cd35 100644 --- a/kanagram/src/mainsettings.cpp +++ b/kanagram/src/mainsettings.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <tdeconfig.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfigdialog.h> #include <tdemessagebox.h> #include <tdeio/netaccess.h> @@ -39,8 +39,8 @@ MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent) { m_parent = (TDEConfigDialog*)parent; - connect(parent, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotChangeTranslation())); - connect(cboxTranslation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotUpdateParent())); + connect(parent, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotChangeTranslation())); + connect(cboxTranslation, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotUpdateParent())); setupTranslations(); @@ -73,7 +73,7 @@ MainSettings::MainSettings(TQWidget *parent) : MainSettingsWidget(parent) if (!TQFontInfo(f).exactMatch()) { kcfg_useStandardFonts->setEnabled(false); - connect(getFontsButton, TQT_SIGNAL(pressed()), this, TQT_SLOT(getAndInstallFont())); + connect(getFontsButton, TQ_SIGNAL(pressed()), this, TQ_SLOT(getAndInstallFont())); } else { diff --git a/kanagram/src/mainsettings.h b/kanagram/src/mainsettings.h index 2ee07649..db077726 100644 --- a/kanagram/src/mainsettings.h +++ b/kanagram/src/mainsettings.h @@ -29,7 +29,7 @@ class TDEConfigDialog; class MainSettings : public MainSettingsWidget { -Q_OBJECT +TQ_OBJECT public: MainSettings(TQWidget *parent); diff --git a/kanagram/src/mainsettingswidget.ui b/kanagram/src/mainsettingswidget.ui index 285d6d64..121548cb 100644 --- a/kanagram/src/mainsettingswidget.ui +++ b/kanagram/src/mainsettingswidget.ui @@ -127,9 +127,6 @@ <property name="text"> <string>Use standard fonts</string> </property> - <property name="accel"> - <string></string> - </property> <property name="whatsThis" stdset="0"> <string>Uses a standard font for the chalkboard/interface.</string> </property> diff --git a/kanagram/src/newstuff.cpp b/kanagram/src/newstuff.cpp index 7293775d..c17cbea2 100644 --- a/kanagram/src/newstuff.cpp +++ b/kanagram/src/newstuff.cpp @@ -13,7 +13,7 @@ NewStuff::NewStuff(TQWidget *parent) : NewStuffWidget(parent) { - connect(btnGetNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewVocabs())); + connect(btnGetNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewVocabs())); } NewStuff::~NewStuff() diff --git a/kanagram/src/newstuff.h b/kanagram/src/newstuff.h index cf58730d..ac880af3 100644 --- a/kanagram/src/newstuff.h +++ b/kanagram/src/newstuff.h @@ -5,7 +5,7 @@ class NewStuff : public NewStuffWidget { -Q_OBJECT +TQ_OBJECT public: NewStuff(TQWidget *parent); diff --git a/kanagram/src/newstuffdialog.cpp b/kanagram/src/newstuffdialog.cpp index ac8d1d70..6c516c2e 100644 --- a/kanagram/src/newstuffdialog.cpp +++ b/kanagram/src/newstuffdialog.cpp @@ -5,7 +5,7 @@ #include <tdelocale.h> #include <tdeio/netaccess.h> #include <kurl.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kanagramsettings.h" diff --git a/kanagram/src/vocabedit.cpp b/kanagram/src/vocabedit.cpp index b36a3454..4aaf42f7 100644 --- a/kanagram/src/vocabedit.cpp +++ b/kanagram/src/vocabedit.cpp @@ -28,7 +28,7 @@ #include <tqstring.h> #include <tqvaluevector.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <kurl.h> #include <kdebug.h> @@ -46,7 +46,7 @@ VocabEdit::VocabEdit(TQWidget *parent, TQString fileName) : VocabEditWidget(pare if(fileName != "") { m_fileName = fileName; - KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this)); + KEduVocDocument *doc = new KEduVocDocument(this); doc->open(KURL(m_fileName), false); for(int i = 0; i < doc->numEntries(); i++) { @@ -58,20 +58,20 @@ VocabEdit::VocabEdit(TQWidget *parent, TQString fileName) : VocabEditWidget(pare txtDescription->setText(doc->getDocRemark()); } - connect(btnSave, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave())); - connect(btnNewWord, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewWord())); - connect(btnRemoveWord, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveWord())); - connect(btnClose, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClose())); + connect(btnSave, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave())); + connect(btnNewWord, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewWord())); + connect(btnRemoveWord, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveWord())); + connect(btnClose, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClose())); - connect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &))); - connect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &))); + connect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &))); + connect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &))); //Connect the name and description boxes to a general textChanged slot, so that we can keep track of //whether they've been changed or not - connect(txtVocabName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &))); - connect(txtDescription, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotTextChanged(const TQString &))); + connect(txtVocabName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &))); + connect(txtDescription, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotTextChanged(const TQString &))); - connect(lboxWords, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(lboxWords, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); //Has anything in the dialog changed? m_textChanged = false; @@ -83,7 +83,7 @@ VocabEdit::~VocabEdit() void VocabEdit::slotSave() { - KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this)); + KEduVocDocument *doc = new KEduVocDocument(this); doc->setTitle(txtVocabName->text()); doc->setDocRemark(txtDescription->text()); for(uint i = 0; i < m_vocabList.size(); i++) @@ -100,7 +100,7 @@ void VocabEdit::slotSave() { fileName = m_fileName; } - doc->saveAs(TQT_TQOBJECT(this), KURL(fileName), KEduVocDocument::automatic, "kanagram"); + doc->saveAs(this, KURL(fileName), KEduVocDocument::automatic, "kanagram"); VocabSettings *settings = (VocabSettings*)this->parentWidget(); settings->refreshView(); @@ -140,15 +140,15 @@ void VocabEdit::slotNewWord() void VocabEdit::slotSelectionChanged() { //A little hack to make things work right - disconnect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &))); - disconnect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &))); + disconnect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &))); + disconnect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &))); if(lboxWords->currentItem() >= 0) { txtWord->setText(m_vocabList[lboxWords->currentItem()].getOriginal()); txtHint->setText(m_vocabList[lboxWords->currentItem()].getRemark(0)); } - connect(txtWord, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWordTextChanged(const TQString &))); - connect(txtHint, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotHintTextChanged(const TQString &))); + connect(txtWord, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWordTextChanged(const TQString &))); + connect(txtHint, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotHintTextChanged(const TQString &))); } void VocabEdit::slotWordTextChanged(const TQString &changes) diff --git a/kanagram/src/vocabedit.h b/kanagram/src/vocabedit.h index 99935801..4b82bda4 100644 --- a/kanagram/src/vocabedit.h +++ b/kanagram/src/vocabedit.h @@ -31,7 +31,7 @@ class KEduVocExpression; class VocabEdit : public VocabEditWidget { -Q_OBJECT +TQ_OBJECT public: VocabEdit(TQWidget *parent); diff --git a/kanagram/src/vocabsettings.cpp b/kanagram/src/vocabsettings.cpp index 77b21966..9834847c 100644 --- a/kanagram/src/vocabsettings.cpp +++ b/kanagram/src/vocabsettings.cpp @@ -4,7 +4,7 @@ #include <tqpushbutton.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqstringlist.h> #include <tqlistview.h> #include <tqvaluevector.h> @@ -18,10 +18,10 @@ VocabSettings::VocabSettings(TQWidget *parent) : VocabSettingsWidget(parent) { - connect(btnCreateNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCreateNew())); - connect(btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit())); - connect(btnDelete, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelete())); - connect(lviewVocab, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem *))); + connect(btnCreateNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCreateNew())); + connect(btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit())); + connect(btnDelete, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelete())); + connect(lviewVocab, TQ_SIGNAL(selectionChanged(TQListViewItem *)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem *))); refreshView(); } @@ -37,7 +37,7 @@ void VocabSettings::refreshView() m_fileList = TDEGlobal::dirs()->findAllResources("appdata", "data/" + KanagramSettings::dataLanguage() + "/" + "*.kvtml"); for(uint i = 0; i < m_fileList.size(); i++) { - KEduVocDocument *doc = new KEduVocDocument(TQT_TQOBJECT(this)); + KEduVocDocument *doc = new KEduVocDocument(this); doc->open(KURL(m_fileList[i]), false); TQListViewItem *item = new TQListViewItem(lviewVocab, 0); item->setText( 0, doc->getTitle() ); diff --git a/kanagram/src/vocabsettings.h b/kanagram/src/vocabsettings.h index 1ea1529c..cf101831 100644 --- a/kanagram/src/vocabsettings.h +++ b/kanagram/src/vocabsettings.h @@ -5,7 +5,7 @@ class VocabSettings : public VocabSettingsWidget { -Q_OBJECT +TQ_OBJECT public: VocabSettings(TQWidget *parent); diff --git a/kanagram/src/vocabsettingswidget.ui b/kanagram/src/vocabsettingswidget.ui index 6ef70fd1..7e28a1cd 100644 --- a/kanagram/src/vocabsettingswidget.ui +++ b/kanagram/src/vocabsettingswidget.ui @@ -110,8 +110,8 @@ </widget> </grid> </widget> -<Q_SLOTS> +<slots> <slot>createNew()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbruch/src/Makefile.am b/kbruch/src/Makefile.am index 6459bbf1..b088487e 100644 --- a/kbruch/src/Makefile.am +++ b/kbruch/src/Makefile.am @@ -4,7 +4,7 @@ kbruch_COMPILE_FIRST = version.h kbruch_SOURCES = exercisebase.cpp taskvieweroptionsbase.ui task.cpp ratio.cpp taskview.cpp statisticsview.cpp primenumber.cpp kbruch.cpp mainqtwidget.cpp taskwidget.cpp fractionbasewidget.cpp resultwidget.cpp exercisecompare.cpp ratiowidget.cpp rationalwidget.cpp exerciseconvert.cpp exercisefactorize.cpp factorizedwidget.cpp settingsclass.kcfgc kbruch_LDADD = $(LIB_TDEUI) # the library search path. -kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui diff --git a/kbruch/src/exercisebase.h b/kbruch/src/exercisebase.h index 459f0d7d..224622a5 100644 --- a/kbruch/src/exercisebase.h +++ b/kbruch/src/exercisebase.h @@ -35,7 +35,7 @@ * */ class ExerciseBase : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/exercisecompare.cpp b/kbruch/src/exercisecompare.cpp index b98d5c78..b5a94b84 100644 --- a/kbruch/src/exercisecompare.cpp +++ b/kbruch/src/exercisecompare.cpp @@ -86,7 +86,7 @@ ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name): m_signButtonState = lessThen; taskLineHBoxLayout->addWidget(m_signButton); - TQObject::connect(m_signButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSignButtonClicked())); + TQObject::connect(m_signButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSignButtonClicked())); TQToolTip::add(m_signButton, i18n("Click on this button to change the comparison sign.")); // spacer @@ -124,7 +124,7 @@ ExerciseCompare::ExerciseCompare(TQWidget * parent, const char * name): m_checkButton->setDefault(true); // is the default button of the dialog TQToolTip::add(m_checkButton, i18n("Click on this button to check your result.")); lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight); - TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked())); + TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked())); // that the user can start typing without moving the focus m_signButton->setFocus(); diff --git a/kbruch/src/exercisecompare.h b/kbruch/src/exercisecompare.h index 54e81138..a282721d 100644 --- a/kbruch/src/exercisecompare.h +++ b/kbruch/src/exercisecompare.h @@ -44,7 +44,7 @@ class TQVBoxLayout; * */ class ExerciseCompare : public ExerciseBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/exerciseconvert.cpp b/kbruch/src/exerciseconvert.cpp index ec7db1e7..2e3fb808 100644 --- a/kbruch/src/exerciseconvert.cpp +++ b/kbruch/src/exerciseconvert.cpp @@ -158,7 +158,7 @@ ExerciseConvert::ExerciseConvert(TQWidget * parent, const char * name): m_checkButton->setDefault(true); // is the default button of the dialog TQToolTip::add(m_checkButton, i18n("Click on this button to check your result. The button will not work if you have not entered a result yet.")); lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight); - TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked())); + TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked())); // that the user can start typing without moving the focus numer_edit->setFocus(); diff --git a/kbruch/src/exerciseconvert.h b/kbruch/src/exerciseconvert.h index 777eff76..7bca7962 100644 --- a/kbruch/src/exerciseconvert.h +++ b/kbruch/src/exerciseconvert.h @@ -42,7 +42,7 @@ class TQVBoxLayout; * */ class ExerciseConvert : public ExerciseBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/exercisefactorize.cpp b/kbruch/src/exercisefactorize.cpp index e971e12f..8eb43a9a 100644 --- a/kbruch/src/exercisefactorize.cpp +++ b/kbruch/src/exercisefactorize.cpp @@ -126,14 +126,14 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name): m_factor13Button->setText( i18n( "13" ) ); m_factor17Button->setText( i18n( "17" ) ); m_factor19Button->setText( i18n( "19" ) ); - TQObject::connect(m_factor2Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor2ButtonClicked())); - TQObject::connect(m_factor3Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor3ButtonClicked())); - TQObject::connect(m_factor5Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor5ButtonClicked())); - TQObject::connect(m_factor7Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor7ButtonClicked())); - TQObject::connect(m_factor11Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor11ButtonClicked())); - TQObject::connect(m_factor13Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor13ButtonClicked())); - TQObject::connect(m_factor17Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor17ButtonClicked())); - TQObject::connect(m_factor19Button, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFactor19ButtonClicked())); + TQObject::connect(m_factor2Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor2ButtonClicked())); + TQObject::connect(m_factor3Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor3ButtonClicked())); + TQObject::connect(m_factor5Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor5ButtonClicked())); + TQObject::connect(m_factor7Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor7ButtonClicked())); + TQObject::connect(m_factor11Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor11ButtonClicked())); + TQObject::connect(m_factor13Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor13ButtonClicked())); + TQObject::connect(m_factor17Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor17ButtonClicked())); + TQObject::connect(m_factor19Button, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFactor19ButtonClicked())); // add tooltips to the factor buttons TQToolTip::add(m_factor2Button, i18n("Add prime factor 2.")); @@ -148,13 +148,13 @@ ExerciseFactorize::ExerciseFactorize(TQWidget * parent, const char * name): // the remove last factor button m_removeLastFactorButton->setText( i18n( "&Remove Last Factor" ) ); m_removeLastFactorButton->setEnabled(false); - TQObject::connect(m_removeLastFactorButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveLastFactorButtonClicked())); + TQObject::connect(m_removeLastFactorButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveLastFactorButtonClicked())); TQToolTip::add(m_removeLastFactorButton, i18n("Removes the last entered prime factor.")); // the check task button m_checkButton->setText( i18n( "&Check Task" ) ); TQToolTip::add(m_checkButton, i18n("Click on this button to check your result. The button will not work if you have not entered a result yet.")); - TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked())); + TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked())); m_checkButton->setDefault(true); // is the default button of the dialog // that the user can start choosing the prime factors diff --git a/kbruch/src/exercisefactorize.h b/kbruch/src/exercisefactorize.h index 716104fd..14c9ac8e 100644 --- a/kbruch/src/exercisefactorize.h +++ b/kbruch/src/exercisefactorize.h @@ -59,7 +59,7 @@ const uint possibleTasks[numberPossibleTasks] = {4, 6, 8, 9, 10, 12, 14, 15, 16, * */ class ExerciseFactorize : public ExerciseBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/factorizedwidget.h b/kbruch/src/factorizedwidget.h index 8311a38e..dc605ce5 100644 --- a/kbruch/src/factorizedwidget.h +++ b/kbruch/src/factorizedwidget.h @@ -34,7 +34,7 @@ typedef TQValueList<uint> uintList; * \author Sebastian Stein */ class FactorizedWidget : public FractionBaseWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/fractionbasewidget.h b/kbruch/src/fractionbasewidget.h index 1d6a3976..3f042e4b 100644 --- a/kbruch/src/fractionbasewidget.h +++ b/kbruch/src/fractionbasewidget.h @@ -35,7 +35,7 @@ * \author Sebastian Stein */ class FractionBaseWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/kbruch.kcfg b/kbruch/src/kbruch.kcfg index ae13463d..f767e2a1 100644 --- a/kbruch/src/kbruch.kcfg +++ b/kbruch/src/kbruch.kcfg @@ -53,17 +53,17 @@ <entry name="numberColor" type="Color"> <label>Color of the numbers in the task view</label> <whatsthis>Color of the numbers in the task view</whatsthis> - <default code="true">Qt::darkGreen</default> + <default code="true">TQt::darkGreen</default> </entry> <entry name="operationColor" type="Color"> <label>Color of the operation signs in the task view</label> <whatsthis>Color of the operation signs in the task view</whatsthis> - <default code="true">Qt::blue</default> + <default code="true">TQt::blue</default> </entry> <entry name="fractionBarColor" type="Color"> <label>Color of the fraction bars in the task view</label> <whatsthis>Color of the fraction bars in the task view</whatsthis> - <default code="true">Qt::red</default> + <default code="true">TQt::red</default> </entry> <entry type="Font" key="taskFont"> <label>Font used for the task view</label> diff --git a/kbruch/src/mainqtwidget.cpp b/kbruch/src/mainqtwidget.cpp index 1b54e990..3c44c4bf 100644 --- a/kbruch/src/mainqtwidget.cpp +++ b/kbruch/src/mainqtwidget.cpp @@ -62,7 +62,7 @@ MainQtWidget::MainQtWidget() // we split the main view into 2 parts, one for the tasks, one for the // statistics - TQSplitter* splitter = new TQSplitter(Qt::Horizontal, this,TQSPLITTER_OBJECT_NAME_STRING); + TQSplitter* splitter = new TQSplitter(TQt::Horizontal, this,"TQSplitter"); setCentralWidget(splitter); // the iconlist, where the user can choose the different exercises @@ -94,18 +94,18 @@ MainQtWidget::MainQtWidget() splitter->setResizeMode(m_statview, TQSplitter::FollowSizeHint); // we must change the status of the menubar before another page is shown - TQObject::connect(m_exercises, TQT_SIGNAL(aboutToShowPage(TQWidget *)), this, TQT_SLOT(slotAboutToShowPage(TQWidget *))); + TQObject::connect(m_exercises, TQ_SIGNAL(aboutToShowPage(TQWidget *)), this, TQ_SLOT(slotAboutToShowPage(TQWidget *))); // connect signals of the exercises and StatisticView, so that StatisticView // gets informed about how the user solved a given task (wrong or correct) - TQObject::connect(m_taskview, TQT_SIGNAL(signalTaskSolvedCorrect()), m_statview, TQT_SLOT(addCorrect())); - TQObject::connect(m_taskview, TQT_SIGNAL(signalTaskSolvedWrong()), m_statview, TQT_SLOT(addWrong())); - TQObject::connect(m_exerciseCompare, TQT_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQT_SLOT(addCorrect())); - TQObject::connect(m_exerciseCompare, TQT_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQT_SLOT(addWrong())); - TQObject::connect(m_exerciseConvert, TQT_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQT_SLOT(addCorrect())); - TQObject::connect(m_exerciseConvert, TQT_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQT_SLOT(addWrong())); - TQObject::connect(m_exerciseFactorize, TQT_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQT_SLOT(addCorrect())); - TQObject::connect(m_exerciseFactorize, TQT_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQT_SLOT(addWrong())); + TQObject::connect(m_taskview, TQ_SIGNAL(signalTaskSolvedCorrect()), m_statview, TQ_SLOT(addCorrect())); + TQObject::connect(m_taskview, TQ_SIGNAL(signalTaskSolvedWrong()), m_statview, TQ_SLOT(addWrong())); + TQObject::connect(m_exerciseCompare, TQ_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQ_SLOT(addCorrect())); + TQObject::connect(m_exerciseCompare, TQ_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQ_SLOT(addWrong())); + TQObject::connect(m_exerciseConvert, TQ_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQ_SLOT(addCorrect())); + TQObject::connect(m_exerciseConvert, TQ_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQ_SLOT(addWrong())); + TQObject::connect(m_exerciseFactorize, TQ_SIGNAL(signalExerciseSolvedCorrect()), m_statview, TQ_SLOT(addCorrect())); + TQObject::connect(m_exerciseFactorize, TQ_SIGNAL(signalExerciseSolvedWrong()), m_statview, TQ_SLOT(addWrong())); #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3) #else @@ -155,19 +155,19 @@ void MainQtWidget::setupActions() { // new task action m_NewTaskAction = new TDEAction(i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), - TQT_TQOBJECT(this), TQT_SLOT(NewTask()), + this, TQ_SLOT(NewTask()), actionCollection(), "NewTask"); // quit action - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); // - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotPrefs() ), actionCollection()); + KStdAction::preferences(this, TQ_SLOT( slotPrefs() ), actionCollection()); // a label just describing the Number of terms ComboBox m_NrOfTermsLabel = new TQLabel(i18n("Terms:"), 0, "tde toolbar widget"); m_NrOfTermsLabelAction = new KWidgetAction(m_NrOfTermsLabel, i18n("Terms:"), ALT+Key_E, - TQT_TQOBJECT(this), TQT_SLOT(NrOfTermsBoxSlot()), + this, TQ_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsLabelAction"); // the ComboBox holding possible values for term number @@ -179,15 +179,15 @@ void MainQtWidget::setupActions() m_NrOfTermsBox->setCurrentItem(m_nrRatios - 2); TQToolTip::add( m_NrOfTermsBox, i18n( "The number of terms you want" ) ); TQWhatsThis::add( m_NrOfTermsBox, i18n( "Choose the number of terms (2, 3, 4 or 5) you want for calculating fractions." ) ); - m_NrOfTermsBoxAction = new KWidgetAction(m_NrOfTermsBox, i18n("Number of Terms"), ALT+Key_E, TQT_TQOBJECT(this), TQT_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsBoxAction"); + m_NrOfTermsBoxAction = new KWidgetAction(m_NrOfTermsBox, i18n("Number of Terms"), ALT+Key_E, this, TQ_SLOT(NrOfTermsBoxSlot()), actionCollection(), "NrOfTermsBoxAction"); // now connect the ComboBox's signal textChanged() to the slot function - TQObject::connect(m_NrOfTermsBox, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(NrOfTermsBoxSlot())); + TQObject::connect(m_NrOfTermsBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(NrOfTermsBoxSlot())); // a label just describing the max. main denominator ComboBox m_MaxMainDenominatorLabel = new TQLabel(i18n("Max. main denominator:"), 0, "tde toolbar widget"); m_MaxMainDenominatorLabelAction = new KWidgetAction(m_MaxMainDenominatorLabel, i18n("Max. main denominator:"), ALT+Key_D, - TQT_TQOBJECT(this), TQT_SLOT(MaxMainDenominatorBoxSlot()), + this, TQ_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorLabelAction"); // the ComboBox holding possible values for the max. main denominator @@ -209,16 +209,16 @@ void MainQtWidget::setupActions() case 50 : m_MaxMainDenominatorBox->setCurrentItem(3); break; } - m_MaxMainDenominatorBoxAction = new KWidgetAction(m_MaxMainDenominatorBox, i18n("Maximal Main Denominator"), ALT+Key_D, TQT_TQOBJECT(this), TQT_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorBoxAction"); + m_MaxMainDenominatorBoxAction = new KWidgetAction(m_MaxMainDenominatorBox, i18n("Maximal Main Denominator"), ALT+Key_D, this, TQ_SLOT(MaxMainDenominatorBoxSlot()), actionCollection(), "MaxMainDenominatorBoxAction"); // now connect the ComboBox's signal textChanged() to the slot function - TQObject::connect(m_MaxMainDenominatorBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(MaxMainDenominatorBoxSlot())); + TQObject::connect(m_MaxMainDenominatorBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(MaxMainDenominatorBoxSlot())); // a label just describing the operation ComboBox m_OperationLabel = new TQLabel(i18n("Operations:"), 0, "tde toolbar widget"); m_OperationLabelAction = new KWidgetAction(m_OperationLabel, i18n("Operations:"), ALT+Key_O, - TQT_TQOBJECT(this), TQT_SLOT(OperationBoxSlot()), + this, TQ_SLOT(OperationBoxSlot()), actionCollection(), "OperationLabelAction"); // the ComboBox holding possible combinations for operations @@ -236,10 +236,10 @@ void MainQtWidget::setupActions() } TQToolTip::add( m_OperationBox, i18n( "The operations you want" ) ); TQWhatsThis::add( m_OperationBox, i18n( "Choose the type of operations you want for calculating fractions: Addition/Substraction, Multiplication/Division or All Operations Mixed. If you choose All Operations Mixed, the program will randomly choose addition, substraction, multiplication and/or division." ) ); - m_OperationBoxAction = new KWidgetAction(m_OperationBox, i18n("Operations:"), ALT+Key_O, TQT_TQOBJECT(this), TQT_SLOT(OperationBoxSlot()), actionCollection(), "OperationBoxAction"); + m_OperationBoxAction = new KWidgetAction(m_OperationBox, i18n("Operations:"), ALT+Key_O, this, TQ_SLOT(OperationBoxSlot()), actionCollection(), "OperationBoxAction"); // now connect the ComboBox's signal textChanged() to the slot function - TQObject::connect(m_OperationBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(OperationBoxSlot())); + TQObject::connect(m_OperationBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(OperationBoxSlot())); #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3) if (!initialGeometrySet()) @@ -428,12 +428,12 @@ void MainQtWidget::slotPrefs() // User edited the configuration - update your local copies of the // configuration data - connect(configDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplySettings()) ); + connect(configDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplySettings()) ); configDialog->show(); /* SettingsDialog * dlg = new SettingsDialog(this); - connect(dlg, TQT_SIGNAL(configChanged()), this, TQT_SLOT(slotApplySettings())); + connect(dlg, TQ_SIGNAL(configChanged()), this, TQ_SLOT(slotApplySettings())); dlg->exec(); diff --git a/kbruch/src/mainqtwidget.h b/kbruch/src/mainqtwidget.h index 4b58000c..4ddab9fa 100644 --- a/kbruch/src/mainqtwidget.h +++ b/kbruch/src/mainqtwidget.h @@ -39,7 +39,7 @@ class TaskView; **/ class MainQtWidget : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/ratio.cpp b/kbruch/src/ratio.cpp index 0ba1e1c4..48827288 100644 --- a/kbruch/src/ratio.cpp +++ b/kbruch/src/ratio.cpp @@ -186,7 +186,7 @@ ratio ratio::operator=(int dummy) return *this; } -/* check, if the ratios are equivalent; -1/2 == 1/-2 -> TRUE */ +/* check, if the ratios are equivalent; -1/2 == 1/-2 -> true */ bool ratio::operator==(ratio right) { signed short orig_sign = 1, right_sign = 1; diff --git a/kbruch/src/rationalwidget.h b/kbruch/src/rationalwidget.h index 46f85221..9cdccefd 100644 --- a/kbruch/src/rationalwidget.h +++ b/kbruch/src/rationalwidget.h @@ -33,7 +33,7 @@ class TQString; * \author Sebastian Stein */ class RationalWidget : public FractionBaseWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/ratiowidget.h b/kbruch/src/ratiowidget.h index 7ac10017..5319e47b 100644 --- a/kbruch/src/ratiowidget.h +++ b/kbruch/src/ratiowidget.h @@ -32,7 +32,7 @@ * \author Sebastian Stein */ class RatioWidget : public FractionBaseWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/resultwidget.h b/kbruch/src/resultwidget.h index 609f6bc2..e321da97 100644 --- a/kbruch/src/resultwidget.h +++ b/kbruch/src/resultwidget.h @@ -32,7 +32,7 @@ * \author Sebastian Stein */ class ResultWidget : public FractionBaseWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/statisticsview.cpp b/kbruch/src/statisticsview.cpp index f60b0787..6ac23ca5 100644 --- a/kbruch/src/statisticsview.cpp +++ b/kbruch/src/statisticsview.cpp @@ -117,7 +117,7 @@ StatisticsView::StatisticsView(TQWidget * parent, const char * name): /* the Reset button */ buttonLayout = new TQHBoxLayout(layout1); resetBtn = new TQPushButton(i18n("&Reset"), this); - TQObject::connect(resetBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetStatistics())); + TQObject::connect(resetBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetStatistics())); buttonLayout->addWidget(resetBtn); TQToolTip::add(resetBtn, i18n("Press the button to reset the statistics.")); TQSpacerItem* spacer = new TQSpacerItem(0,0); diff --git a/kbruch/src/statisticsview.h b/kbruch/src/statisticsview.h index b334e6d7..7156496b 100644 --- a/kbruch/src/statisticsview.h +++ b/kbruch/src/statisticsview.h @@ -36,7 +36,7 @@ class TQGridLayout; class StatisticsView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/task.cpp b/kbruch/src/task.cpp index 50cd2f28..1ebd13e9 100644 --- a/kbruch/src/task.cpp +++ b/kbruch/src/task.cpp @@ -45,18 +45,18 @@ task::~task() * can be customized by the given parameters: * pmax_md: maximum main denominator * pnr_ratios: number of ratios -> pnr_ratios - 1 operations - * padd_sub: if TRUE + and - are allowed operations - * pmul_div: if TRUE * and / are allowed operations */ + * padd_sub: if true + and - are allowed operations + * pmul_div: if true * and / are allowed operations */ void task::create_task(unsigned int pmax_md, short pnr_ratios, - short padd_sub, short pmul_div) + bool padd_sub, bool pmul_div) { unsigned short max_product_length = 0; int main_denominator = 1; /* we say that if add/sub and mul/div are not allowed we want a task * for add/sub only */ - if (padd_sub == NO && pmul_div == NO) - padd_sub = YES; + if (!padd_sub && !pmul_div) + padd_sub = true; do { @@ -395,9 +395,9 @@ unsigned short task::make_operation(short padd_sub, short pmul_div, ShortArray::iterator op_pointer; /* we need this to generate the fitting operations */ - if (padd_sub == YES) + if (padd_sub) operations += 2; - if (pmul_div == YES) + if (pmul_div) operations += 2; /* clear the old operations */ @@ -409,7 +409,7 @@ unsigned short task::make_operation(short padd_sub, short pmul_div, /* if we only wanted mul/div, operations was 2; but we want values * for the operations with 2 and 3 so we have to add 2 */ - if (padd_sub == NO && pmul_div == YES) + if (!padd_sub && pmul_div) { /* loop through all operations and add 2, so that the operations * are interpreted as mul/div and not add/sub */ @@ -418,7 +418,7 @@ unsigned short task::make_operation(short padd_sub, short pmul_div, *op_pointer += 2; } - if (pmul_div == YES) + if (pmul_div) { short flag_counter = 0; @@ -453,13 +453,13 @@ unsigned short task::make_operation(short padd_sub, short pmul_div, max_product_length++; } else - { /* if (pmul_div == YES) */ + { /* if (pmul_div) */ /* a task is given only with add/sub ops; so we want a max. * of pnr_ratios / 2 + 1 prime factors, but at least */ max_product_length = (unsigned short) (float(pnr_ratios) / 2) + 1; if (max_product_length < 2) max_product_length = 2; - } /* if (pmul_div == YES) */ + } /* if (pmul_div) */ return max_product_length; } @@ -580,7 +580,7 @@ void task::make_denominators(int main_denominator, short pmax_md, /* if the ratio is connected to a mul or div operation, we have to do some * extra work and regenerate the denominators */ - if (pmul_div == YES) + if (pmul_div) { /* lets loop through all ratios and check, if there is a mul/div * after the ratio */ @@ -697,7 +697,7 @@ void task::make_denominators(int main_denominator, short pmax_md, } ratio_pointer++; } - } /* if (pmul_div == YES) */ + } /* if (pmul_div) */ return; } diff --git a/kbruch/src/task.h b/kbruch/src/task.h index 57c80b86..806e11b9 100644 --- a/kbruch/src/task.h +++ b/kbruch/src/task.h @@ -23,10 +23,6 @@ #include <vector> -/** important for add_sub and mul_div */ -#define YES 1 -#define NO 0 - /** important for op_vector */ #define ADD 0 #define SUB 1 @@ -73,7 +69,7 @@ public: /** automatically generate a new task with the given parameters */ void create_task(unsigned int pmax_md = 10, short pnr_ratios = 2, - short padd_sub = YES, short pmul_div = NO); + bool padd_sub = true, bool pmul_div = false); /** set ratio n */ void set_ratio_n(unsigned short number = 0, int numerator = 0, diff --git a/kbruch/src/taskview.cpp b/kbruch/src/taskview.cpp index 1c0b1a25..d1b05b01 100644 --- a/kbruch/src/taskview.cpp +++ b/kbruch/src/taskview.cpp @@ -153,7 +153,7 @@ TaskView::TaskView(TQWidget * parent, const char * name, bool padd_sub, m_checkButton->setDefault(true); // is the default button of the dialog TQToolTip::add(m_checkButton, i18n("Click on this button to check your result. The button will not work if you have not entered a result yet.")); lowerHBox->addWidget(m_checkButton, 1, TQt::AlignRight); - TQObject::connect(m_checkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCheckButtonClicked())); + TQObject::connect(m_checkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCheckButtonClicked())); // that the user can start typing without moving the focus numer_edit->setFocus(); diff --git a/kbruch/src/taskview.h b/kbruch/src/taskview.h index d0a4c61c..882eb61f 100644 --- a/kbruch/src/taskview.h +++ b/kbruch/src/taskview.h @@ -50,7 +50,7 @@ class TQFrame; * */ class TaskView : public ExerciseBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/src/taskwidget.h b/kbruch/src/taskwidget.h index 117acff3..1644ca87 100644 --- a/kbruch/src/taskwidget.h +++ b/kbruch/src/taskwidget.h @@ -27,10 +27,6 @@ #include <tqwidget.h> -/** important for add_sub and mul_div */ -#define YES 1 -#define NO 0 - /** important for op_vector */ #define ADD 0 #define SUB 1 @@ -42,7 +38,7 @@ * \author Sebastian Stein */ class TaskWidget : public FractionBaseWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kbruch/testcases/Makefile.am b/kbruch/testcases/Makefile.am index b2389856..5f4f8094 100644 --- a/kbruch/testcases/Makefile.am +++ b/kbruch/testcases/Makefile.am @@ -5,7 +5,7 @@ kbruch_test_SOURCES = task.cpp ratio.cpp ratio_test.cpp primenumber.cpp primenum kbruch_test_LDADD = -lboost_unit_test_framework-gcc $(LIB_TDEUI) # the library search path. -kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor EXTRA_DIST = primenumber.cpp primenumber.h ratio.cpp ratio.h task.cpp task.h primenumber_test.cpp ratio_test.cpp kbruch_test.cpp diff --git a/keduca/keduca/Makefile.am b/keduca/keduca/Makefile.am index efc38114..f7a44483 100644 --- a/keduca/keduca/Makefile.am +++ b/keduca/keduca/Makefile.am @@ -4,7 +4,7 @@ INCLUDES= -I../libkeduca $(all_includes) # The binary program keduca bin_PROGRAMS = keduca keduca_LDFLAGS = $(all_libraries) -keduca_LDADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) ../libkeduca/libkeduca.la +keduca_LDADD = $(LIB_TDEFILE) $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) ../libkeduca/libkeduca.la keduca_SOURCES = main.cpp keduca.cpp # Convenience library @@ -17,7 +17,7 @@ keduca_SOURCES = main.cpp keduca.cpp # The KParts Component kde_module_LTLIBRARIES = libkeducapart.la -libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) +libkeducapart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) libkeducapart_la_LIBADD = ../libkeduca/libkeduca.la $(LIB_TDEPARTS) libkeducapart_la_SOURCES = keduca_part.cpp tderadioeduca.cpp kquestion.cpp \ kgroupeduca.cpp keducaview.cpp keducaprefs.cpp \ diff --git a/keduca/keduca/kcheckeduca.cpp b/keduca/keduca/kcheckeduca.cpp index 051a8c3e..6274de73 100644 --- a/keduca/keduca/kcheckeduca.cpp +++ b/keduca/keduca/kcheckeduca.cpp @@ -80,6 +80,6 @@ void KCheckEduca::drawButtonLabel( TQPainter *p){ br.setBottom( br.bottom()+2); br = br.intersect( TQRect(0,0,rw, rh+yo ) ); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); + style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); } } diff --git a/keduca/keduca/kcheckeduca.h b/keduca/keduca/kcheckeduca.h index 7766113e..88f3a3ca 100644 --- a/keduca/keduca/kcheckeduca.h +++ b/keduca/keduca/kcheckeduca.h @@ -27,7 +27,7 @@ */ class KCheckEduca : public TQCheckBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index ed021225..d410abd9 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -22,7 +22,7 @@ #include <tdeapplication.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <kdebug.h> @@ -36,7 +36,7 @@ Keduca::Keduca( TQWidget* parent, const char *name, WFlags f ) setXMLFile( "keducaui.rc" ); _part = KParts::ComponentFactory::createPartInstanceFromLibrary< KParts::ReadOnlyPart > - ( "libkeducapart", this, name, TQT_TQOBJECT(this), "KEducaPart" ); + ( "libkeducapart", this, name, this, "KEducaPart" ); if ( _part ) { @@ -63,12 +63,12 @@ Keduca::~Keduca() void Keduca::setupActions() { - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() ); - (void)new TDEAction( i18n( "Open &Gallery..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), + KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection() ); + (void)new TDEAction( i18n( "Open &Gallery..." ), 0, 0, this, TQ_SLOT( slotGallery() ), actionCollection(), "open_gallery" ); - _recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &) ), + _recentFiles = KStdAction::openRecent(this, TQ_SLOT ( slotFileOpenURL(const KURL &) ), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT( quit() ), actionCollection()); } void Keduca::slotFileOpen() @@ -92,7 +92,7 @@ void Keduca::slotFileOpenURL( const KURL &url ) bool Keduca::queryClose() { configWrite(); - return( TRUE ); + return( true ); } void Keduca::configRead() diff --git a/keduca/keduca/keduca.h b/keduca/keduca/keduca.h index 6687db4d..e296c201 100644 --- a/keduca/keduca/keduca.h +++ b/keduca/keduca/keduca.h @@ -33,7 +33,7 @@ This will execute the Test/Examen as defined by the KEduca Document. */ class Keduca : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index 21bb99fb..333c02d5 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -71,7 +71,7 @@ bool KEducaPart::openFile() void KEducaPart::setupActions() { - KStdAction::preferences( this, TQT_SLOT( slotConfigure() ), actionCollection(), "configure" ); + KStdAction::preferences( this, TQ_SLOT( slotConfigure() ), actionCollection(), "configure" ); } void KEducaPart::slotConfigure() @@ -83,7 +83,7 @@ void KEducaPart::slotConfigure() ConfigDialogBase *confDlg = new ConfigDialogBase( 0, "ConfigDialogBase" ); dialog->addPage( confDlg, i18n("General"), "keduca" ); - connect( dialog, TQT_SIGNAL( settingsChanged() ), TQT_SLOT( updateConfiguration() ) ); + connect( dialog, TQ_SIGNAL( settingsChanged() ), TQ_SLOT( updateConfiguration() ) ); dialog->show(); } diff --git a/keduca/keduca/keduca_part.h b/keduca/keduca/keduca_part.h index e165f52e..549bb870 100644 --- a/keduca/keduca/keduca_part.h +++ b/keduca/keduca/keduca_part.h @@ -35,7 +35,7 @@ class TDEAboutData; */ class KEducaPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: /* diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index c8f3ce0d..425ccf80 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -44,7 +44,7 @@ void KEducaPrefs::setPageGeneral() TQButtonGroup *buttonGroup1 = new TQButtonGroup( mainFrame, "ButtonGroup1" ); buttonGroup1->setTitle( i18n( "General" ) ); - buttonGroup1->setColumnLayout(0, Qt::Vertical ); + buttonGroup1->setColumnLayout(0, TQt::Vertical ); buttonGroup1->layout()->setSpacing( 0 ); buttonGroup1->layout()->setMargin( 0 ); TQVBoxLayout *buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() ); @@ -62,7 +62,7 @@ void KEducaPrefs::setPageGeneral() TQGroupBox *GroupBox1 = new TQGroupBox( mainFrame, "GroupBox7" ); GroupBox1->setTitle( i18n( "Order" ) ); - GroupBox1->setColumnLayout(0, Qt::Vertical ); + GroupBox1->setColumnLayout(0, TQt::Vertical ); GroupBox1->layout()->setSpacing( 0 ); GroupBox1->layout()->setMargin( 0 ); TQVBoxLayout *GroupBox1Layout = new TQVBoxLayout( GroupBox1->layout() ); diff --git a/keduca/keduca/keducaprefs.h b/keduca/keduca/keducaprefs.h index 5f545994..94feebff 100644 --- a/keduca/keduca/keducaprefs.h +++ b/keduca/keduca/keducaprefs.h @@ -28,7 +28,7 @@ */ class KEducaPrefs : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index a5e5c22b..3a3657c6 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -25,7 +25,7 @@ #include <stdlib.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdefiledialog.h> #include <kpushbutton.h> @@ -69,17 +69,17 @@ void KEducaView::init() _viewInfo = new TQTextEdit( _infoWidget ); _viewInfo->setReadOnly( true ); _buttonStartTest = new KPushButton( i18n( "&Start Test" ), _infoWidget ); - connect( _buttonStartTest, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonNext() ) ); + connect( _buttonStartTest, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonNext() ) ); addWidget( _infoWidget, 1 ); // Question Widget _questionWidget = new TQVBox( this, "questionWidget" ); - _split = new TQSplitter( Qt::Vertical, _questionWidget ); + _split = new TQSplitter( TQt::Vertical, _questionWidget ); _questionText = new KQuestion( _split, "kquestion" ); _buttonGroup = new KGroupEduca( _split, "ButtonGroup" ); _buttonGroup->setRadioButtonExclusive( true ); _buttonNext = new KPushButton( i18n( "&Next >>" ), _questionWidget, "ButtonNext" ); - connect( _buttonNext, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonNext() ) ); + connect( _buttonNext, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonNext() ) ); addWidget( _questionWidget, 2 ); // Results Widget @@ -87,14 +87,14 @@ void KEducaView::init() _viewResults = new TQTextEdit( _resultsWidget ); _viewResults->setReadOnly( true ); _buttonSave = new KPushButton( i18n( "&Save Results..." ), _resultsWidget ); - connect( _buttonSave, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonSave() ) ); + connect( _buttonSave, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonSave() ) ); /* FIXME: This is a hack * The results widget can be shown only in the end of the test (when you should be shown the * option to save the results) or at the middle of the test, after each question (when there should * be a "Next" button). */ _buttonResultsNext = new KPushButton( i18n( "&Next >>" ), _resultsWidget ); - connect( _buttonResultsNext, TQT_SIGNAL( clicked() ), TQT_SLOT( slotButtonNext() ) ); + connect( _buttonResultsNext, TQ_SIGNAL( clicked() ), TQ_SLOT( slotButtonNext() ) ); _buttonResultsNext->hide(); addWidget( _resultsWidget, 3 ); @@ -275,8 +275,8 @@ void KEducaView::showRecord() if (!_timeoutTimer) { _timeoutTimer = new TQTimer(this); - connect(_timeoutTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(questionTimedOut())); + connect(_timeoutTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(questionTimedOut())); } _timeoutTimer->start(1000*timeout); _questionText->countdown(timeout); diff --git a/keduca/keduca/keducaview.h b/keduca/keduca/keducaview.h index fec720cd..9e31ff70 100644 --- a/keduca/keduca/keducaview.h +++ b/keduca/keduca/keducaview.h @@ -42,7 +42,7 @@ class KGroupEduca; class KEducaView : public TQWidgetStack { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/kgroupeduca.h b/keduca/keduca/kgroupeduca.h index 05ff761b..c90830ec 100644 --- a/keduca/keduca/kgroupeduca.h +++ b/keduca/keduca/kgroupeduca.h @@ -26,7 +26,7 @@ *@author Javier Campos Morales */ class KGroupEduca : public TQVButtonGroup { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/kquestion.cpp b/keduca/keduca/kquestion.cpp index 46a8322f..aa5ff7f4 100644 --- a/keduca/keduca/kquestion.cpp +++ b/keduca/keduca/kquestion.cpp @@ -47,7 +47,7 @@ void KQuestion::initGUI() TQVBox *picBox = new TQVBox( this ); _picture = new TQLabel( picBox, "PixmapLabel1" ); - _picture->setScaledContents( FALSE ); + _picture->setScaledContents( false ); _picture->setPalette( TQPalette( TQt::white ) ); _countdownWidget = new KProgress( picBox ); @@ -84,8 +84,8 @@ void KQuestion::countdown(int starttime) if (!_countdownTimer) { _countdownTimer = new TQTimer(this); - connect(_countdownTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(countDownOne())); + connect(_countdownTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(countDownOne())); } _countdownTimer->start(1000); // make one step less than time passes by in seconds diff --git a/keduca/keduca/kquestion.h b/keduca/keduca/kquestion.h index 01ecfce7..d7f9e8bb 100644 --- a/keduca/keduca/kquestion.h +++ b/keduca/keduca/kquestion.h @@ -32,7 +32,7 @@ class KProgress; */ class KQuestion : public TQHBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keduca/tderadioeduca.cpp b/keduca/keduca/tderadioeduca.cpp index 4dde0d17..080b46d0 100644 --- a/keduca/keduca/tderadioeduca.cpp +++ b/keduca/keduca/tderadioeduca.cpp @@ -78,6 +78,6 @@ void TDERadioEduca::drawButtonLabel( TQPainter *p) br.setTop( br.top()-2 ); br.setBottom( br.bottom()+2); br = br.intersect( TQRect(0,0,rw, rh+yo ) ); - style().tqdrawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); + style().drawPrimitive( TQStyle::PE_FocusRect, p, br, colorGroup()); } } diff --git a/keduca/keduca/tderadioeduca.h b/keduca/keduca/tderadioeduca.h index 27af9c13..73049b36 100644 --- a/keduca/keduca/tderadioeduca.h +++ b/keduca/keduca/tderadioeduca.h @@ -26,7 +26,7 @@ *@author Javier Campos Morales */ class TDERadioEduca : public TQRadioButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keducabuilder/Makefile.am b/keduca/keducabuilder/Makefile.am index b3978ca9..60002c00 100644 --- a/keduca/keducabuilder/Makefile.am +++ b/keduca/keducabuilder/Makefile.am @@ -23,7 +23,7 @@ INCLUDES= -I../libkeduca $(all_includes) METASOURCES = AUTO # the library search path. -keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDEs XML GUI builing diff --git a/keduca/keducabuilder/kcontroladdedit.h b/keduca/keducabuilder/kcontroladdedit.h index 21e1fc94..acf5c884 100644 --- a/keduca/keducabuilder/kcontroladdedit.h +++ b/keduca/keducabuilder/kcontroladdedit.h @@ -34,7 +34,7 @@ class TQListViewItem; */ class KControlAddEdit : public KControlAddEditBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keducabuilder/kcontroladdeditbase.ui b/keduca/keducabuilder/kcontroladdeditbase.ui index 18c65770..33778d22 100644 --- a/keduca/keducabuilder/kcontroladdeditbase.ui +++ b/keduca/keducabuilder/kcontroladdeditbase.ui @@ -850,7 +850,7 @@ <tabstop>_questionTip</tabstop> <tabstop>_questionExplain</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot access="private" specifier="pure virtual">slotAddAnswer()</slot> <slot access="private" specifier="pure virtual">slotRemoveAnswer()</slot> <slot access="private" specifier="pure virtual">slotMoveUpAnswer()</slot> @@ -859,7 +859,7 @@ <slot access="private" specifier="pure virtual">slotQuestionTypeChanged(int index)</slot> <slot access="private" specifier="pure virtual">slotDataChanged()</slot> <slot access="private" specifier="pure virtual">slotAnswerSelected(TQListViewItem *)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <forwards> <forward>class TQListViewItem;</forward> diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index 197a552f..5d74b399 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -19,8 +19,8 @@ #include "kcontrolheader.moc" #include <tdelocale.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <klineedit.h> #include <kcombobox.h> @@ -81,7 +81,7 @@ void KControlHeader::init() TQGroupBox *GroupBox7 = new TQGroupBox( mainView, "GroupBox7" ); GroupBox7->setTitle( i18n( "Description" ) ); - GroupBox7->setColumnLayout(0, Qt::Vertical ); + GroupBox7->setColumnLayout(0, TQt::Vertical ); GroupBox7->layout()->setSpacing( 0 ); GroupBox7->layout()->setMargin( 0 ); TQVBoxLayout *GroupBox7Layout = new TQVBoxLayout( GroupBox7->layout() ); @@ -103,7 +103,7 @@ void KControlHeader::init() Layout12->setSpacing( 6 ); Layout12->setMargin( 0 ); - _headerType = new KComboBox( FALSE, GroupBox7, "_headerType" ); + _headerType = new KComboBox( false, GroupBox7, "_headerType" ); Layout12->addWidget( _headerType ); TQLabel *TextLabel11 = new TQLabel( GroupBox7, "TextLabel11" ); @@ -111,7 +111,7 @@ void KControlHeader::init() TextLabel11->setAlignment( int( TQLabel::AlignVCenter | TQLabel::AlignRight ) ); Layout12->addWidget( TextLabel11 ); - _headerLevel = new KComboBox( FALSE, GroupBox7, "_headerLevel" ); + _headerLevel = new KComboBox( false, GroupBox7, "_headerLevel" ); Layout12->addWidget( _headerLevel ); Layout13->addLayout( Layout12, 2, 1 ); @@ -146,7 +146,7 @@ void KControlHeader::init() TQGroupBox *GroupBox8 = new TQGroupBox( mainView, "GroupBox8" ); GroupBox8->setTitle( i18n( "Picture" ) ); - GroupBox8->setColumnLayout(0, Qt::Vertical ); + GroupBox8->setColumnLayout(0, TQt::Vertical ); GroupBox8->layout()->setSpacing( 0 ); GroupBox8->layout()->setMargin( 0 ); TQHBoxLayout *GroupBox8Layout = new TQHBoxLayout( GroupBox8->layout() ); @@ -164,7 +164,7 @@ void KControlHeader::init() TQGroupBox *GroupBox6 = new TQGroupBox( mainView, "GroupBox6" ); GroupBox6->setTitle( i18n( "Author" ) ); - GroupBox6->setColumnLayout(0, Qt::Vertical ); + GroupBox6->setColumnLayout(0, TQt::Vertical ); GroupBox6->layout()->setSpacing( 0 ); GroupBox6->layout()->setMargin( 0 ); TQGridLayout *GroupBox6Layout = new TQGridLayout( GroupBox6->layout() ); @@ -267,7 +267,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) index = tag.findRev('.'); if (index != -1) tag.truncate(index); - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name")); @@ -281,7 +281,7 @@ void KControlHeader::loadCountryList(KLanguageCombo *combo) for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name")); TQString submenu = '-' + entry.readEntry(TQString::fromLatin1("Region")); diff --git a/keduca/keducabuilder/kcontrolheader.h b/keduca/keducabuilder/kcontrolheader.h index b4bf1489..2e060bcc 100644 --- a/keduca/keducabuilder/kcontrolheader.h +++ b/keduca/keducabuilder/kcontrolheader.h @@ -32,7 +32,7 @@ */ class KControlHeader : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index cfccc923..d7d1edf4 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -88,12 +88,12 @@ void KEducaBuilder::init() form2Layout->setMargin( 0 ); _split = new TQSplitter( mainView ); - _split->setOrientation( Qt::Vertical ); + _split->setOrientation( TQt::Vertical ); _listAnswer = new TDEListBox( _split, "_listAnswer" ); _listAnswer->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, _listAnswer->sizePolicy().hasHeightForWidth() ) ); - connect( _listAnswer, TQT_SIGNAL( highlighted(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotPreview(TQListBoxItem *) ) ); - connect( _listAnswer, TQT_SIGNAL( doubleClicked(TQListBoxItem *) ), TQT_TQOBJECT(this), TQT_SLOT( slotEditbyList(TQListBoxItem *) ) ); + connect( _listAnswer, TQ_SIGNAL( highlighted(TQListBoxItem *) ), this, TQ_SLOT( slotPreview(TQListBoxItem *) ) ); + connect( _listAnswer, TQ_SIGNAL( doubleClicked(TQListBoxItem *) ), this, TQ_SLOT( slotEditbyList(TQListBoxItem *) ) ); _preview = new TQTextView( _split, "_preview" ); _preview->setFrameShape( TQTextView::NoFrame ); @@ -111,21 +111,21 @@ void KEducaBuilder::init() /** Init menu bar settings */ void KEducaBuilder::initMenuBar() { - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT( slotFileOpenNew() ), actionCollection()); - KStdAction::open (TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection()); - (void)new TDEAction(i18n("Open &Gallery..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotGallery() ), actionCollection(), "open_gallery"); - _recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT ( slotFileOpenURL(const KURL &)), actionCollection()); - KStdAction::save (TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ), actionCollection()); - KStdAction::saveAs (TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection()); - KStdAction::print (TQT_TQOBJECT(this), TQT_SLOT( slotFilePrint() ), actionCollection()); - (void)new TDEAction(i18n("Document Info"), "application-vnd.tde.info", 0, TQT_TQOBJECT(this), TQT_SLOT( slotHeader() ), actionCollection(), "info_doc"); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection()); - - (void)new TDEAction(i18n("&Add..."), "addquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAdd() ), actionCollection(), "question_add"); - (void)new TDEAction(i18n("&Edit..."), "editquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotEdit() ), actionCollection(), "question_edit"); - (void)new TDEAction(i18n("&Remove"), "delquestion", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionCollection(), "question_remove"); - (void)new TDEAction(i18n("&Up"), "go-up", 0, TQT_TQOBJECT(this), TQT_SLOT( slotUp() ), actionCollection(), "question_up"); - (void)new TDEAction(i18n("&Down"), "go-down", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDown() ), actionCollection(), "question_down"); + KStdAction::openNew(this, TQ_SLOT( slotFileOpenNew() ), actionCollection()); + KStdAction::open (this, TQ_SLOT( slotFileOpen() ), actionCollection()); + (void)new TDEAction(i18n("Open &Gallery..."), 0, 0, this, TQ_SLOT( slotGallery() ), actionCollection(), "open_gallery"); + _recentFiles = KStdAction::openRecent(this, TQ_SLOT ( slotFileOpenURL(const KURL &)), actionCollection()); + KStdAction::save (this, TQ_SLOT( slotFileSave() ), actionCollection()); + KStdAction::saveAs (this, TQ_SLOT( slotFileSaveAs() ), actionCollection()); + KStdAction::print (this, TQ_SLOT( slotFilePrint() ), actionCollection()); + (void)new TDEAction(i18n("Document Info"), "application-vnd.tde.info", 0, this, TQ_SLOT( slotHeader() ), actionCollection(), "info_doc"); + KStdAction::quit(this, TQ_SLOT( close() ), actionCollection()); + + (void)new TDEAction(i18n("&Add..."), "addquestion", 0, this, TQ_SLOT( slotAdd() ), actionCollection(), "question_add"); + (void)new TDEAction(i18n("&Edit..."), "editquestion", 0, this, TQ_SLOT( slotEdit() ), actionCollection(), "question_edit"); + (void)new TDEAction(i18n("&Remove"), "delquestion", 0, this, TQ_SLOT( slotRemove() ), actionCollection(), "question_remove"); + (void)new TDEAction(i18n("&Up"), "go-up", 0, this, TQ_SLOT( slotUp() ), actionCollection(), "question_up"); + (void)new TDEAction(i18n("&Down"), "go-down", 0, this, TQ_SLOT( slotDown() ), actionCollection(), "question_down"); } /** Delete current document and start new */ @@ -312,7 +312,7 @@ bool KEducaBuilder::queryClose () return false; } configWrite(); - return( TRUE ); + return( true ); } /** Add question */ diff --git a/keduca/keducabuilder/keducabuilder.h b/keduca/keducabuilder/keducabuilder.h index 11841ab8..3957ff4c 100644 --- a/keduca/keducabuilder/keducabuilder.h +++ b/keduca/keducabuilder/keducabuilder.h @@ -35,7 +35,7 @@ */ class KEducaBuilder : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp index b75d4f40..a9fc0b2a 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.cpp +++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp @@ -42,8 +42,8 @@ KEducaEditorStartDialog::KEducaEditorStartDialog(KEducaBuilder * parent, const c // setup connections urlRequester->setFilter( "application/x-edu"); - connect( startChoiceBtnGrp, TQT_SIGNAL( clicked(int) ), - this, TQT_SLOT( slotChoiceChanged(int) ) ); + connect( startChoiceBtnGrp, TQ_SIGNAL( clicked(int) ), + this, TQ_SLOT( slotChoiceChanged(int) ) ); } /** based on code in tdeaction.cpp diff --git a/keduca/keducabuilder/keducaeditorstartdialog.h b/keduca/keducabuilder/keducaeditorstartdialog.h index e655d8b2..cce39e44 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.h +++ b/keduca/keducabuilder/keducaeditorstartdialog.h @@ -30,13 +30,13 @@ class KEducaBuilder; /** */ class KEducaEditorStartDialog : public KEducaEditorStartDialogBase{ - Q_OBJECT + TQ_OBJECT public: enum {Rejected=0, OpenDoc=1, OpenRecentDoc=2, Gallery=3, NewDoc=4}StartChoice; /** Constructor. */ - KEducaEditorStartDialog(KEducaBuilder * parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KEducaEditorStartDialog(KEducaBuilder * parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /** Destructor. */ virtual ~KEducaEditorStartDialog(); diff --git a/keduca/keducabuilder/klangcombo.cpp b/keduca/keducabuilder/klangcombo.cpp index 05a36669..3626a3cc 100644 --- a/keduca/keducabuilder/klangcombo.cpp +++ b/keduca/keducabuilder/klangcombo.cpp @@ -22,7 +22,7 @@ */ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "klangcombo.h" #include "klangcombo.moc" diff --git a/keduca/keducabuilder/klangcombo.h b/keduca/keducabuilder/klangcombo.h index fdb10006..49d98bce 100644 --- a/keduca/keducabuilder/klangcombo.h +++ b/keduca/keducabuilder/klangcombo.h @@ -34,7 +34,7 @@ */ class KLanguageCombo : public KTagComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/keducabuilder/ktagcombobox.cpp b/keduca/keducabuilder/ktagcombobox.cpp index 081d4254..905c7698 100644 --- a/keduca/keducabuilder/ktagcombobox.cpp +++ b/keduca/keducabuilder/ktagcombobox.cpp @@ -41,10 +41,10 @@ KTagComboBox::KTagComboBox (TQWidget * parent, const char *name) { _popup = new TQPopupMenu(this); _tags = new TQStringList; - connect( _popup, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( _popup, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( _popup, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( _popup, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } void KTagComboBox::popupMenu() @@ -148,10 +148,10 @@ void KTagComboBox::insertSubmenu(const TQString &text, const TQString &tag, cons TQPopupMenu *p = new TQPopupMenu(pi); pi->insertItem(text, p, count(), index); _tags->append(tag); - connect( p, TQT_SIGNAL(activated(int)), - TQT_SLOT(internalActivate(int)) ); - connect( p, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(internalHighlight(int)) ); + connect( p, TQ_SIGNAL(activated(int)), + TQ_SLOT(internalActivate(int)) ); + connect( p, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(internalHighlight(int)) ); } void KTagComboBox::changeItem( const TQString &text, int index ) diff --git a/keduca/keducabuilder/ktagcombobox.h b/keduca/keducabuilder/ktagcombobox.h index 7ef0045e..923cd659 100644 --- a/keduca/keducabuilder/ktagcombobox.h +++ b/keduca/keducabuilder/ktagcombobox.h @@ -38,7 +38,7 @@ class TQStringList; */ class KTagComboBox : public TQComboBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/libkeduca/Makefile.am b/keduca/libkeduca/Makefile.am index 1e1cf9c6..b7eeb7eb 100644 --- a/keduca/libkeduca/Makefile.am +++ b/keduca/libkeduca/Makefile.am @@ -2,7 +2,7 @@ INCLUDES=$(all_includes) noinst_LTLIBRARIES = libkeduca.la libkeduca_la_SOURCES = kgallerydialogbase.ui fileread.cpp kgallerydialog.cpp -libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libkeduca_la_LIBADD = -ltdeprint noinst_HEADERS = fileread.h kgallerydialog.h kgallerydialogbase.h diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp index 8ba07b50..0a174790 100644 --- a/keduca/libkeduca/fileread.cpp +++ b/keduca/libkeduca/fileread.cpp @@ -20,7 +20,7 @@ #include <assert.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kmimetype.h> #include <kdebug.h> #include <tdetempfile.h> @@ -670,7 +670,7 @@ bool FileRead::saveFile( const KURL &url, bool copyimages, bool saveCompressed ) if( saveFile(_tmpfile->name(), copyimages, saveCompressed) ) { // upload the file TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } @@ -689,7 +689,7 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom TQFile file(filename); TQStringList copyJOB; - stream.setDevice(TQT_TQIODEVICE(&buffer)); + stream.setDevice(&buffer); if ( (!file.open(IO_WriteOnly)) || (!buffer.open(IO_WriteOnly)) ) { @@ -847,7 +847,7 @@ bool FileRead::saveResults( const KURL &url, const TQString &results ) if( saveResults(_tmpfile->name(), results) ) { // upload the file TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } @@ -862,7 +862,7 @@ bool FileRead::saveResults( const TQString &filename, const TQString &results ) TQFile file(filename); TQStringList copyJOB; - stream.setDevice(TQT_TQIODEVICE(&file)); + stream.setDevice(&file); if(!file.open(IO_WriteOnly)) { diff --git a/keduca/libkeduca/fileread.h b/keduca/libkeduca/fileread.h index 9a34c1a8..ed9d54a2 100644 --- a/keduca/libkeduca/fileread.h +++ b/keduca/libkeduca/fileread.h @@ -33,7 +33,7 @@ class TQFile; */ class FileRead : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/keduca/libkeduca/kgallerydialog.h b/keduca/libkeduca/kgallerydialog.h index 9be42034..1712a61c 100644 --- a/keduca/libkeduca/kgallerydialog.h +++ b/keduca/libkeduca/kgallerydialog.h @@ -34,7 +34,7 @@ class KTempFile; namespace TDEIO { class Job; } class KGalleryDialog : public KGalleryDialogBase { - Q_OBJECT + TQ_OBJECT public: KGalleryDialog(TQWidget *parent=0, const char *name=0); diff --git a/keduca/libkeduca/kgallerydialogbase.ui b/keduca/libkeduca/kgallerydialogbase.ui index 5150ee42..f530fd86 100644 --- a/keduca/libkeduca/kgallerydialogbase.ui +++ b/keduca/libkeduca/kgallerydialogbase.ui @@ -362,9 +362,9 @@ <slot>slotServerSelected(TQListViewItem*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotButtonAdd()</slot> <slot>slotServerSelected(TQListViewItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kgeography/src/Makefile.am b/kgeography/src/Makefile.am index 54a3bede..196a8020 100644 --- a/kgeography/src/Makefile.am +++ b/kgeography/src/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = kgeography INCLUDES = $(all_includes) # the library search path. -kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. kgeography_LDADD = $(LIB_TDEUI) @@ -39,5 +39,5 @@ valgrind: kgeography noinst_PROGRAMS = script script_SOURCES = script.cpp -script_LDADD = $(LIB_QT) +script_LDADD = $(LIB_TQT) script_LDFLAGS = $(all_libraries) diff --git a/kgeography/src/askwidget.h b/kgeography/src/askwidget.h index 6c3c046c..81814b17 100644 --- a/kgeography/src/askwidget.h +++ b/kgeography/src/askwidget.h @@ -22,7 +22,7 @@ class KGmap; class askWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool showLabel = true); diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp index 7becc6c1..fa1cdb1b 100644 --- a/kgeography/src/boxasker.cpp +++ b/kgeography/src/boxasker.cpp @@ -33,7 +33,7 @@ boxAsker::boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : askWid for(int i = 0; i < 4; i++) { p_rb[i] = new TQRadioButton(bg); - p_rb[i]->setFocusPolicy(TQ_StrongFocus); + p_rb[i]->setFocusPolicy(TQWidget::StrongFocus); } p_accept = new KPushButton(this); @@ -71,7 +71,7 @@ void boxAsker::nextQuestionHook(const TQString &division) auxList << division; // we put the division in a random place - p_position = (int)((float)4 * kapp -> random() / (RAND_MAX + 1.0)); + p_position = (int)((float)4 * tdeApp -> random() / (RAND_MAX + 1.0)); nextBoxAskerQuestionHook(division, p_position, true); // we put other 3 names @@ -122,7 +122,7 @@ void boxAsker::init() nextQuestion(); p_accept -> disconnect(); - connect(p_accept, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswer())); + connect(p_accept, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswer())); } #include "boxasker.moc" diff --git a/kgeography/src/boxasker.h b/kgeography/src/boxasker.h index 0d476575..d997c24c 100644 --- a/kgeography/src/boxasker.h +++ b/kgeography/src/boxasker.h @@ -21,7 +21,7 @@ class TQVBoxLayout; class boxAsker : public askWidget { -Q_OBJECT +TQ_OBJECT public: boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count); diff --git a/kgeography/src/kgeography.cpp b/kgeography/src/kgeography.cpp index c3970a3e..a0dba217 100644 --- a/kgeography/src/kgeography.cpp +++ b/kgeography/src/kgeography.cpp @@ -65,16 +65,16 @@ kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResults setCentralWidget(p_bigWidget); - connect(p_consult, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(consult())); - connect(p_askMap, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askMap())); - connect(p_askCapitalDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askCapitalDivisions())); - connect(p_askDivisionCapitals, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionCapitals())); - connect(p_askFlagDivisions, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askFlagDivisions())); - connect(p_askDivisionFlags, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(askDivisionFlags())); - - TDEAction *a = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openMap()), actionCollection(), "openMap"); + connect(p_consult, TQ_SIGNAL(clicked()), this, TQ_SLOT(consult())); + connect(p_askMap, TQ_SIGNAL(clicked()), this, TQ_SLOT(askMap())); + connect(p_askCapitalDivisions, TQ_SIGNAL(clicked()), this, TQ_SLOT(askCapitalDivisions())); + connect(p_askDivisionCapitals, TQ_SIGNAL(clicked()), this, TQ_SLOT(askDivisionCapitals())); + connect(p_askFlagDivisions, TQ_SIGNAL(clicked()), this, TQ_SLOT(askFlagDivisions())); + connect(p_askDivisionFlags, TQ_SIGNAL(clicked()), this, TQ_SLOT(askDivisionFlags())); + + TDEAction *a = KStdAction::open(this, TQ_SLOT(openMap()), actionCollection(), "openMap"); a -> setText(i18n("&Open Map...")); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection(), "quit"); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection(), "quit"); p_zoom = new TDEToggleAction(i18n("&Zoom"), "zoom-fit-best", 0, 0, 0, actionCollection(), "zoom_select"); p_zoom -> setEnabled(false); @@ -85,7 +85,7 @@ kgeography::kgeography() : TDEMainWindow(), p_firstShow(true), p_mustShowResults p_move = new TDEToggleAction(i18n("&Move"), "move", 0, 0, 0, actionCollection(), "move"); p_move -> setEnabled(false); - new TDEAction(i18n("Disclaimer"), 0, TQT_TQOBJECT(this), TQT_SLOT(disclaimer()), actionCollection(), "disclaimer"); + new TDEAction(i18n("Disclaimer"), 0, this, TQ_SLOT(disclaimer()), actionCollection(), "disclaimer"); setupGUI(Keys | ToolBar | Save | Create); @@ -132,7 +132,7 @@ void kgeography::showEvent(TQShowEvent *) } // if anyone can explain why with the slot works and now without // i'll be glad to learn - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(resizeMainWindow())); + TQTimer::singleShot(0, this, TQ_SLOT(resizeMainWindow())); // resizeMainWindow(); p_firstShow = false; @@ -269,13 +269,13 @@ void kgeography::putAskWidget() { p_bigWidget -> setStretchFactor(p_askWidget, 1); p_askWidget -> show(); - connect(p_askWidget, TQT_SIGNAL(setZoomActionChecked(bool)), p_zoom, TQT_SLOT(setChecked(bool))); - connect(p_zoom, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setZoom(bool))); - connect(p_zoomOriginal, TQT_SIGNAL(activated()), p_askWidget, TQT_SLOT(setOriginalZoom())); - connect(p_askWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), p_move, TQT_SLOT(setEnabled(bool))); - connect(p_askWidget, TQT_SIGNAL(setMoveActionChecked(bool)), p_move, TQT_SLOT(setChecked(bool))); - connect(p_move, TQT_SIGNAL(toggled(bool)), p_askWidget, TQT_SLOT(setMovement(bool))); - connect(p_askWidget, TQT_SIGNAL(questionsEnded()), TQT_TQOBJECT(this), TQT_SLOT(showResultsDialog())); + connect(p_askWidget, TQ_SIGNAL(setZoomActionChecked(bool)), p_zoom, TQ_SLOT(setChecked(bool))); + connect(p_zoom, TQ_SIGNAL(toggled(bool)), p_askWidget, TQ_SLOT(setZoom(bool))); + connect(p_zoomOriginal, TQ_SIGNAL(activated()), p_askWidget, TQ_SLOT(setOriginalZoom())); + connect(p_askWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), p_move, TQ_SLOT(setEnabled(bool))); + connect(p_askWidget, TQ_SIGNAL(setMoveActionChecked(bool)), p_move, TQ_SLOT(setChecked(bool))); + connect(p_move, TQ_SIGNAL(toggled(bool)), p_askWidget, TQ_SLOT(setMovement(bool))); + connect(p_askWidget, TQ_SIGNAL(questionsEnded()), this, TQ_SLOT(showResultsDialog())); } void kgeography::setMap(KGmap *m) diff --git a/kgeography/src/kgeography.h b/kgeography/src/kgeography.h index a9343079..0a8c7be0 100644 --- a/kgeography/src/kgeography.h +++ b/kgeography/src/kgeography.h @@ -26,7 +26,7 @@ class askWidget; class kgeography : public TDEMainWindow { -Q_OBJECT +TQ_OBJECT public: kgeography(); diff --git a/kgeography/src/map.cpp b/kgeography/src/map.cpp index 6c54db69..6dac2722 100644 --- a/kgeography/src/map.cpp +++ b/kgeography/src/map.cpp @@ -119,7 +119,7 @@ TQString KGmap::getName() const TQString KGmap::getRandomDivision(bool clickDivisionMode) const { TQValueList<division*> aux; - int i = (int)((float)p_nameMap.size() * kapp -> random() / (RAND_MAX + 1.0)); + int i = (int)((float)p_nameMap.size() * tdeApp -> random() / (RAND_MAX + 1.0)); aux = p_nameMap.values(); if (!aux[i] -> canAsk(clickDivisionMode)) return getRandomDivision(clickDivisionMode); else return aux[i] -> getName(); diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp index 12ed0f53..0422aaea 100644 --- a/kgeography/src/mapasker.cpp +++ b/kgeography/src/mapasker.cpp @@ -27,9 +27,9 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou p_mapWidget = new mapWidget(this); lay -> addWidget(p_mapWidget, 0, 0); - p_hsb = new TQScrollBar(Qt::Horizontal, this); + p_hsb = new TQScrollBar(TQt::Horizontal, this); lay -> addWidget(p_hsb, 1, 0); - p_vsb = new TQScrollBar(Qt::Vertical, this); + p_vsb = new TQScrollBar(TQt::Vertical, this); lay -> addWidget(p_vsb, 0, 1); lay -> setRowStretch(2, 1); @@ -37,17 +37,17 @@ mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint cou p_shouldClearPopup = false; - connect(p_mapWidget, TQT_SIGNAL(clicked(TQRgb, const TQPoint&)), this, TQT_SLOT(handleMapClick(TQRgb, const TQPoint&))); - connect(p_mapWidget, TQT_SIGNAL(setMoveActionChecked(bool)), this, TQT_SIGNAL(setMoveActionChecked(bool))); - connect(p_mapWidget, TQT_SIGNAL(setZoomActionChecked(bool)), this, TQT_SIGNAL(setZoomActionChecked(bool))); - connect(p_mapWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), this, TQT_SIGNAL(setMoveActionEnabled(bool))); - connect(p_mapWidget, TQT_SIGNAL(setMoveActionEnabled(bool)), this, TQT_SLOT(showScrollBars(bool))); - connect(p_mapWidget, TQT_SIGNAL(updatePosition(int, int)), this, TQT_SLOT(setScrollBarsPosition(int, int))); - connect(p_mapWidget, TQT_SIGNAL(updateVisibleSize(int, int)), this, TQT_SLOT(setScrollBarsVisibleSize(int, int))); - connect(p_mapWidget, TQT_SIGNAL(updateMaximumSize(int, int)), this, TQT_SLOT(setScrollBarsMaximumSize(int, int))); - - connect(p_hsb, TQT_SIGNAL(valueChanged(int)), p_mapWidget, TQT_SLOT(updateHPosition(int))); - connect(p_vsb, TQT_SIGNAL(valueChanged(int)), p_mapWidget, TQT_SLOT(updateVPosition(int))); + connect(p_mapWidget, TQ_SIGNAL(clicked(TQRgb, const TQPoint&)), this, TQ_SLOT(handleMapClick(TQRgb, const TQPoint&))); + connect(p_mapWidget, TQ_SIGNAL(setMoveActionChecked(bool)), this, TQ_SIGNAL(setMoveActionChecked(bool))); + connect(p_mapWidget, TQ_SIGNAL(setZoomActionChecked(bool)), this, TQ_SIGNAL(setZoomActionChecked(bool))); + connect(p_mapWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), this, TQ_SIGNAL(setMoveActionEnabled(bool))); + connect(p_mapWidget, TQ_SIGNAL(setMoveActionEnabled(bool)), this, TQ_SLOT(showScrollBars(bool))); + connect(p_mapWidget, TQ_SIGNAL(updatePosition(int, int)), this, TQ_SLOT(setScrollBarsPosition(int, int))); + connect(p_mapWidget, TQ_SIGNAL(updateVisibleSize(int, int)), this, TQ_SLOT(setScrollBarsVisibleSize(int, int))); + connect(p_mapWidget, TQ_SIGNAL(updateMaximumSize(int, int)), this, TQ_SLOT(setScrollBarsMaximumSize(int, int))); + + connect(p_hsb, TQ_SIGNAL(valueChanged(int)), p_mapWidget, TQ_SLOT(updateHPosition(int))); + connect(p_vsb, TQ_SIGNAL(valueChanged(int)), p_mapWidget, TQ_SLOT(updateVPosition(int))); if (asker) { diff --git a/kgeography/src/mapasker.h b/kgeography/src/mapasker.h index e016074c..7e5a5544 100644 --- a/kgeography/src/mapasker.h +++ b/kgeography/src/mapasker.h @@ -24,7 +24,7 @@ class mapWidget; class mapAsker : public askWidget { -Q_OBJECT +TQ_OBJECT public: mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint count = 0); diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp index 50f720d9..da852413 100644 --- a/kgeography/src/mapchooser.cpp +++ b/kgeography/src/mapchooser.cpp @@ -11,7 +11,7 @@ #include <tdelocale.h> #include <tdeglobal.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqhbox.h> #include <tqimage.h> @@ -56,8 +56,8 @@ mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Ch p_image = new TQWidget(mapArea); mapLay -> addWidget(p_image, 1, 1); - connect(p_listBox, TQT_SIGNAL(highlighted(const TQString&)), this, TQT_SLOT(putImage(const TQString&))); - connect(p_listBox, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotOk())); + connect(p_listBox, TQ_SIGNAL(highlighted(const TQString&)), this, TQ_SLOT(putImage(const TQString&))); + connect(p_listBox, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotOk())); setMainWidget(mainHB); @@ -85,7 +85,7 @@ void mapChooser::putImage(const TQString &mapName) KGmap *m; m = p_maps[mapName]; TQImage image(m -> getMapFile()); - image = image.smoothScale(300, 225, TQ_ScaleMin); + image = image.smoothScale(300, 225, TQImage::ScaleMin); p_image -> setPaletteBackgroundPixmap(TQPixmap(image)); p_image -> setFixedSize(image.size()); } diff --git a/kgeography/src/mapchooser.h b/kgeography/src/mapchooser.h index 801f95ae..2777f55f 100644 --- a/kgeography/src/mapchooser.h +++ b/kgeography/src/mapchooser.h @@ -20,7 +20,7 @@ class mapChooser : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: mapChooser(TQWidget *parent); diff --git a/kgeography/src/mapparser.cpp b/kgeography/src/mapparser.cpp index 018bfd18..92920d45 100644 --- a/kgeography/src/mapparser.cpp +++ b/kgeography/src/mapparser.cpp @@ -30,7 +30,7 @@ bool mapReader::parseMap(const TQString &path) TQFile xmlFile(path); if (xmlFile.exists()) { - TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile)); + TQXmlInputSource source(&xmlFile); setContentHandler(&handler); if (parse(source)) return true; p_error = handler.errorString(); diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp index 81f55d82..d8fe9282 100644 --- a/kgeography/src/mapwidget.cpp +++ b/kgeography/src/mapwidget.cpp @@ -80,7 +80,7 @@ void mapWidget::updateVPosition(int value) void mapWidget::mousePressEvent(TQMouseEvent *e) { - if (e -> button() == Qt::LeftButton) + if (e -> button() == TQt::LeftButton) { if (p_wantZoom) { diff --git a/kgeography/src/mapwidget.h b/kgeography/src/mapwidget.h index 9ba6fe01..07f4d21e 100644 --- a/kgeography/src/mapwidget.h +++ b/kgeography/src/mapwidget.h @@ -17,7 +17,7 @@ class mapWidget : public TQWidget { -Q_OBJECT +TQ_OBJECT public: mapWidget(TQWidget *parent); diff --git a/kgeography/src/mypopup.h b/kgeography/src/mypopup.h index b177704c..6039a513 100644 --- a/kgeography/src/mypopup.h +++ b/kgeography/src/mypopup.h @@ -15,7 +15,7 @@ class myPopup : public TQFrame { -Q_OBJECT +TQ_OBJECT friend class popupManager; diff --git a/kgeography/src/popupmanager.cpp b/kgeography/src/popupmanager.cpp index 1a457f81..5c86adeb 100644 --- a/kgeography/src/popupmanager.cpp +++ b/kgeography/src/popupmanager.cpp @@ -61,7 +61,7 @@ void popupManager::init(const TQPoint &p) else y = maxY; p_mp -> move(x, y); p_mp -> show(); - connect(p_mp, TQT_SIGNAL(deleteMe()), this, TQT_SLOT(clear())); + connect(p_mp, TQ_SIGNAL(deleteMe()), this, TQ_SLOT(clear())); } #include "popupmanager.moc" diff --git a/kgeography/src/popupmanager.h b/kgeography/src/popupmanager.h index e097a31e..f6993b08 100644 --- a/kgeography/src/popupmanager.h +++ b/kgeography/src/popupmanager.h @@ -19,7 +19,7 @@ class myPopup; class popupManager : public TQObject { -Q_OBJECT +TQ_OBJECT public: popupManager(TQWidget *parent); diff --git a/khangman/khangman.kdevprj b/khangman/khangman.kdevprj deleted file mode 100644 index 1354ff38..00000000 --- a/khangman/khangman.kdevprj +++ /dev/null @@ -1,335 +0,0 @@ -[AUTHORS] -dist=true -install=false -install_location= -type=DATA - -[COPYING] -dist=true -install=false -install_location= -type=DATA - -[ChangeLog] -dist=true -install=false -install_location= -type=DATA - -[Config for BinMakefileAm] -addcxxflags= -bin_program=khangman -cflags= -cppflags= -cxxflags=\s-O0 -ldadd=\s$(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -ldflags= -libtool_dir= -path_to_bin_program=./khangman - -[General] -AMChanged=false -author=Whitehawk Stormchaser -configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux\s -dir_where_make_will_be_called=./ -email=zerokode@yahoo.com -kdevprj_version=1.3 -lfv_open_groups=Headers -make_options=\s-j1 -makefiles=Makefile.am,khangman/Makefile.am,khangman/sounds/Makefile.am,khangman/pics/Makefile.am,khangman/data/Makefile.am, -modifyMakefiles=true -project_name=KHangMan -project_type=mini_kde2 -short_info= -showNonProjectFiles=true -sub_dir=khangman/ -version= -version_control=None -workspace=265262646 - -[INSTALL] -dist=true -install=false -install_location= -type=DATA - -[LFV Groups] -Desktop=*.desktop, -GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS, -Headers=*.h,*.hxx,*.hpp,*.H, -Others=*, -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l, -Translations=*.ts,*.po, -User Interface=*.ui,*.kdevdlg,*.rc, -groups=Headers,Sources,GNU,Translations,User Interface,Desktop,Others - -[Makefile.am] -files=TODO,README,AUTHORS,khangman.lsm,INSTALL,ChangeLog,COPYING,khangman.kdevprj, -sub_dirs=khangman -type=normal - -[README] -dist=true -install=false -install_location= -type=DATA - -[TODO] -dist=true -install=false -install_location= -type=DATA - -[khangman.kdevprj] -dist=true -install=false -install_location= -type=DATA - -[khangman.lsm] -dist=true -install=false -install_location= -type=DATA - -[khangman/Makefile.am] -files=khangman/khsplash.h,khangman/khsplash.cpp,khangman/main.cpp,khangman/lo16-app-khangman.png,khangman/khangman.cpp,khangman/lo32-app-khangman.png,khangman/khangman.h,khangman/khangman.desktop,khangman/cr16-app-khangman.png,khangman/cr32-app-khangman.png,khangman/mainw.ui,khangman/infodlg.ui,khangman/info.cpp,khangman/info.h -sub_dirs=data,pics,sounds, -type=prog_main - -[khangman/data/Makefile.am] -files=khangman/data/easy.txt,khangman/data/animals.txt,khangman/data/hard.txt,khangman/data/medium.txt -sub_dirs= -type=normal - -[khangman/data/animals.txt] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/data/animals.txt -type=DATA - -[khangman/data/easy.txt] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/data/easy.txt -type=DATA - -[khangman/data/hard.txt] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/data/hard.txt -type=DATA - -[khangman/data/medium.txt] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/data/medium.txt -type=DATA - -[khangman/cr16-app-khangman.png] -dist=true -install=true -install_location=$$(kde_icondir)/crystalsvg/16x16/apps/khangman.png -type=DATA - -[khangman/cr32-app-khangman.png] -dist=true -install=true -install_location=$$(kde_icondir)/crystalsvg/32x32/apps/khangman.png -type=DATA - -[khangman/info.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[khangman/info.h] -dist=true -install=false -install_location= -type=HEADER - -[khangman/infodlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[khangman/khangman.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[khangman/khangman.desktop] -dist=true -install=false -install_location= -type=DATA - -[khangman/khangman.h] -dist=true -install=false -install_location= -type=HEADER - -[khangman/khsplash.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[khangman/khsplash.h] -dist=true -install=false -install_location= -type=HEADER - -[khangman/lo16-app-khangman.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/16x16/apps/khangman.png -type=DATA - -[khangman/lo32-app-khangman.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/32x32/apps/khangman.png -type=DATA - -[khangman/main.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[khangman/mainw.ui] -dist=true -install=false -install_location= -type=SOURCE - -[khangman/pics/Makefile.am] -files=khangman/pics/khm_splash.png,khangman/pics/hg10.jpg,khangman/pics/hg12.jpg,khangman/pics/hg13.jpg,khangman/pics/hg14.jpg,khangman/pics/hg1.jpg,khangman/pics/hg2.jpg,khangman/pics/hg3.jpg,khangman/pics/hg4.jpg,khangman/pics/hg5.jpg,khangman/pics/hg6.jpg,khangman/pics/hg7.jpg,khangman/pics/hg8.jpg,khangman/pics/hg9.jpg,khangman/pics/c_bg.png -sub_dirs= -type=normal - -[khangman/pics/c_bg.png] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/c_bg.png -type=DATA - -[khangman/pics/hg1.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg1.jpg -type=DATA - -[khangman/pics/hg10.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg10.jpg -type=DATA - -[khangman/pics/hg12.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg12.jpg -type=DATA - -[khangman/pics/hg13.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg13.jpg -type=DATA - -[khangman/pics/hg14.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg14.jpg -type=DATA - -[khangman/pics/hg2.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg2.jpg -type=DATA - -[khangman/pics/hg3.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg3.jpg -type=DATA - -[khangman/pics/hg4.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg4.jpg -type=DATA - -[khangman/pics/hg5.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg5.jpg -type=DATA - -[khangman/pics/hg6.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg6.jpg -type=DATA - -[khangman/pics/hg7.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg7.jpg -type=DATA - -[khangman/pics/hg8.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg8.jpg -type=DATA - -[khangman/pics/hg9.jpg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/hg9.jpg -type=DATA - -[khangman/pics/khm_splash.png] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/pics/khm_splash.png -type=DATA - -[khangman/sounds/Makefile.am] -files=khangman/sounds/new_game.wav,khangman/sounds/splash.wav,khangman/sounds/new_game.ogg,khangman/sounds/splash.ogg -sub_dirs= -type=normal - -[khangman/sounds/new_game.ogg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/sounds/new_game.ogg -type=DATA - -[khangman/sounds/new_game.wav] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/sounds/new_game.wav -type=DATA - -[khangman/sounds/splash.ogg] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/sounds/splash.ogg -type=DATA - -[khangman/sounds/splash.wav] -dist=true -install=true -install_location=$$(kde_datadir)/khangman/sounds/splash.wav -type=DATA diff --git a/khangman/khangman/Makefile.am b/khangman/khangman/Makefile.am index 1a3111d7..8c4052ad 100644 --- a/khangman/khangman/Makefile.am +++ b/khangman/khangman/Makefile.am @@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/libtdeedu/tdeeducore $(all_includes) METASOURCES = AUTO # the library search path. -khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor rc_DATA = khangmanui.rc rcdir = $(kde_datadir)/khangman diff --git a/khangman/khangman/khangman.cpp b/khangman/khangman/khangman.cpp index 99459074..6917f3ae 100644 --- a/khangman/khangman/khangman.cpp +++ b/khangman/khangman/khangman.cpp @@ -39,7 +39,7 @@ #include <tdelocale.h> #include <tdemainwindow.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <tdetoolbarbutton.h> @@ -74,30 +74,30 @@ KHangMan::~KHangMan() void KHangMan::setupActions() { // Game->New - TDEAction *action = new TDEAction(i18n("&New"), "document-new", CTRL+Key_N , TQT_TQOBJECT(m_view), TQT_SLOT(slotNewGame()), actionCollection(), "file_new"); + TDEAction *action = new TDEAction(i18n("&New"), "document-new", CTRL+Key_N , m_view, TQ_SLOT(slotNewGame()), actionCollection(), "file_new"); action->setToolTip(i18n( "Play with a new word" )); // Game->Get Words in New Language - new TDEAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); + new TDEAction( i18n("&Get Words in New Language..."), "knewstuff", CTRL+Key_G, this, TQ_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection()); m_levelAction = new TDESelectAction(i18n("Le&vel"), 0, actionCollection(), "combo_level"); m_levelAction->setToolTip(i18n( "Choose the level" )); m_levelAction->setWhatsThis(i18n( "Choose the level of difficulty" )); - connect(m_levelAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLevel(int))); + connect(m_levelAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLevel(int))); // Action for selecting language. m_languageAction = new TDESelectAction(i18n("&Language"), 0, actionCollection(), "languages"); m_languageAction->setItems(m_languageNames); m_languageAction->setCurrentItem(m_languages.findIndex(Prefs::selectedLanguage())); - connect(m_languageAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeLanguage(int))); + connect(m_languageAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLanguage(int))); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // Mode. Currently hard coded into Sea and Desert themes. TQStringList modes; - m_modeAction = new TDESelectAction(i18n("L&ook"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotChangeMode()), actionCollection(), "combo_mode"); + m_modeAction = new TDESelectAction(i18n("L&ook"), 0, this, TQ_SLOT(slotChangeMode()), actionCollection(), "combo_mode"); modes += i18n("&Sea Theme"); modes += i18n("&Desert Theme"); m_modeAction->setItems(modes); @@ -134,7 +134,7 @@ void KHangMan::slotQuit() { Prefs::setShowCharToolbar( secondToolbar->isVisible()); Prefs::writeConfig(); - kapp->quit(); + tdeApp->quit(); } @@ -223,12 +223,12 @@ void KHangMan::setLanguages() temp_languages.clear(); // Write the present languages in config so they cannot be downloaded. - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("TDENewStuffStatus"); for (uint i=0; i<m_languages.count(); i++) { TQString tmp = m_languages[i]; if (!config->readEntry(tmp)) - config->writeEntry(tmp, TQString(TQDate::currentDate().toString(Qt::ISODate))); + config->writeEntry(tmp, TQString(TQDate::currentDate().toString(TQt::ISODate))); } // We look in $TDEDIR/share/locale/all_languages from @@ -382,7 +382,7 @@ void KHangMan::optionsPreferences() Timer *m_timer = new Timer(); dialog->addPage(m_timer, i18n("Timers"), "clock"); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(updateSettings())); dialog->show(); } @@ -440,7 +440,7 @@ void KHangMan::loadLangToolBar() "check your installation.").arg(Prefs::selectedLanguage()); KMessageBox::sorry( this, mString, i18n("Error") ); - kapp->quit(); + tdeApp->quit(); } update(); @@ -457,8 +457,8 @@ void KHangMan::loadLangToolBar() for (int i=0; i<(int) m_allData.count(); i++) secondToolbar->insertButton (charIcon(m_allData[i].at(0)), i, - TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), - TQT_SLOT( slotPasteChar()), true, + TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").arg(m_allData[i]), i+1 ); } diff --git a/khangman/khangman/khangman.h b/khangman/khangman/khangman.h index 9edca427..920336af 100644 --- a/khangman/khangman/khangman.h +++ b/khangman/khangman/khangman.h @@ -50,7 +50,7 @@ const int IDS_HINT = 103; */ class KHangMan : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/khangman/khangman/khangmanview.cpp b/khangman/khangman/khangmanview.cpp index 0e2f7b2f..c2d11bf2 100644 --- a/khangman/khangman/khangmanview.cpp +++ b/khangman/khangman/khangmanview.cpp @@ -23,7 +23,7 @@ #include <tdemessagebox.h> #include <kpassivepopup.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqimage.h> #include <tqlabel.h> @@ -77,10 +77,10 @@ KHangManView::KHangManView(KHangMan*parent, const char *name) m_accentedLetters = true; m_hintExists = true; // Assume hint exists - connect( m_letterInput, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotTry() ) ); - connect( m_guessButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotTry() )); + connect( m_letterInput, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotTry() ) ); + connect( m_guessButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotTry() )); } @@ -190,7 +190,7 @@ bool KHangManView::containsChar(const TQString &sChar) void KHangManView::mousePressEvent(TQMouseEvent *mouse) { - if (mouse->button() == Qt::RightButton && m_hintExists && Prefs::hint()) { + if (mouse->button() == TQt::RightButton && m_hintExists && Prefs::hint()) { KPassivePopup *myPopup = new KPassivePopup( m_letterInput); myPopup->setView(i18n("Hint"), m_hint ); @@ -429,12 +429,12 @@ void KHangManView::slotTry() y = abspos.y() + height()*20/535; point = TQPoint(x, y); popup->show(mapToGlobal(point)); - TQTimer::singleShot( 4*1000, this, TQT_SLOT(slotNewGame()) ); + TQTimer::singleShot( 4*1000, this, TQ_SLOT(slotNewGame()) ); } else if (KMessageBox::questionYesNo(this, i18n("Congratulations! You won! Do you want to play again?"),TQString(),i18n("Play Again"), i18n("Do Not Play")) == 3) slotNewGame(); else - kapp->quit(); + tdeApp->quit(); } } else { @@ -475,12 +475,12 @@ void KHangManView::slotTry() int y = abspos.y() + height() * 20 / 535; popup->show(mapToGlobal(TQPoint(x, y))); - TQTimer::singleShot( 4 * 1000, this, TQT_SLOT(slotNewGame()) ); + TQTimer::singleShot( 4 * 1000, this, TQ_SLOT(slotNewGame()) ); } else if (KMessageBox::questionYesNo(this, newGameString, TQString(), i18n("Play Again"), i18n("Do Not Play")) == 3) slotNewGame(); else - kapp->quit(); + tdeApp->quit(); } } } @@ -507,7 +507,7 @@ void KHangManView::slotTry() // Create a 1 second single-shot timer, and reenable user // input after this time. TQTimer::singleShot( Prefs::missedTimer() * 1000, - this, TQT_SLOT(enableUserInput()) ); + this, TQ_SLOT(enableUserInput()) ); // Disable any possible entry m_letterInput->setEnabled(false); @@ -528,7 +528,7 @@ void KHangManView::slotTry() point = TQPoint(x, y); TQTimer::singleShot( Prefs::missedTimer() * 1000, - this, TQT_SLOT(enableUserInput()) ); + this, TQ_SLOT(enableUserInput()) ); // Disable any possible entry m_letterInput->setEnabled(false); @@ -596,7 +596,7 @@ void KHangManView::game() .arg(Prefs::selectedLanguage()) .arg(Prefs::levelFile()); KMessageBox::sorry( this, mString, i18n("Error") ); - kapp->quit(); + tdeApp->quit(); } // We open the file and store info into the stream... diff --git a/khangman/khangman/khangmanview.h b/khangman/khangman/khangmanview.h index d7400b5c..3e068b9c 100644 --- a/khangman/khangman/khangmanview.h +++ b/khangman/khangman/khangmanview.h @@ -40,7 +40,7 @@ class KHangMan; class KHangManView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/khangman/khangman/khnewstuff.cpp b/khangman/khangman/khnewstuff.cpp index a3719a9a..d0f844ac 100644 --- a/khangman/khangman/khnewstuff.cpp +++ b/khangman/khangman/khnewstuff.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktar.h> #include <tqdir.h> #include <tdeaction.h> @@ -47,7 +47,7 @@ bool KHNewStuff::install( const TQString &fileName ) return false; const KArchiveDirectory *archiveDir = archive.directory(); TDEStandardDirs myStdDir; - const TQString destDir =myStdDir.saveLocation("data", kapp->instanceName() + "/data/", true); + const TQString destDir =myStdDir.saveLocation("data", tdeApp->instanceName() + "/data/", true); TDEStandardDirs::makeDir( destDir ); archiveDir->copyTo(destDir); archive.close(); diff --git a/khangman/khangman/main.cpp b/khangman/khangman/main.cpp index 353b69a5..ee086fe3 100644 --- a/khangman/khangman/main.cpp +++ b/khangman/khangman/main.cpp @@ -23,8 +23,8 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdelocale.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include "fontchecker.h" diff --git a/khangman/khangman/pics/desert/animation10.png b/khangman/khangman/pics/desert/animation10.png Binary files differindex d05f82ba..ffe9eae4 100644 --- a/khangman/khangman/pics/desert/animation10.png +++ b/khangman/khangman/pics/desert/animation10.png diff --git a/khangman/khangman/pics/desert/animation9.png b/khangman/khangman/pics/desert/animation9.png Binary files differindex 42693ed8..f611aa67 100644 --- a/khangman/khangman/pics/desert/animation9.png +++ b/khangman/khangman/pics/desert/animation9.png diff --git a/khangman/khangman/pics/sea/animation10.png b/khangman/khangman/pics/sea/animation10.png Binary files differindex 30a5d5e9..f21e5e5a 100644 --- a/khangman/khangman/pics/sea/animation10.png +++ b/khangman/khangman/pics/sea/animation10.png diff --git a/khangman/khangman/pics/sea/animation9.png b/khangman/khangman/pics/sea/animation9.png Binary files differindex 7f2ff262..ae3dcce5 100644 --- a/khangman/khangman/pics/sea/animation9.png +++ b/khangman/khangman/pics/sea/animation9.png diff --git a/khangman/khangman/prefs.kcfgc b/khangman/khangman/prefs.kcfgc index feaa262c..f3bfb34a 100644 --- a/khangman/khangman/prefs.kcfgc +++ b/khangman/khangman/prefs.kcfgc @@ -1,6 +1,6 @@ # Code generation options for tdeconfig_compiler File=khangman.kcfg -IncludeFiles=kstandarddirs.h,tqdir.h +IncludeFiles=tdestandarddirs.h,tqdir.h ClassName=Prefs Singleton=true Mutators=true diff --git a/khangman/khangman/timer.cpp b/khangman/khangman/timer.cpp index 64fe60a7..21386035 100644 --- a/khangman/khangman/timer.cpp +++ b/khangman/khangman/timer.cpp @@ -32,8 +32,8 @@ Timer::Timer() { timeHintLabel->setText(TQString::number(Prefs::hintTimer()) + " " + i18n("seconds")); timeMissedLabel->setText(TQString::number(Prefs::missedTimer()) + " " + i18n("seconds")); - connect(kcfg_HintTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged())); - connect(kcfg_MissedTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged())); + connect(kcfg_HintTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged())); + connect(kcfg_MissedTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged())); } diff --git a/khangman/khangman/timer.h b/khangman/khangman/timer.h index 80d1e8af..ef779d02 100644 --- a/khangman/khangman/timer.h +++ b/khangman/khangman/timer.h @@ -32,7 +32,7 @@ class Timer : public timerdlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kig/CMakeLists.txt b/kig/CMakeLists.txt index 40d738a2..23a5511d 100644 --- a/kig/CMakeLists.txt +++ b/kig/CMakeLists.txt @@ -9,9 +9,13 @@ add_subdirectory( tdefile ) add_subdirectory( data ) add_subdirectory( icons ) add_subdirectory( pykig ) -add_subdirectory( scripting ) add_subdirectory( examples ) +if( WITH_KIG_PYTHON_SCRIPTING ) + add_subdirectory( scripting ) + set( KIGSCRIPTING_LIBRARIES kigscripting-static ) +endif( ) + include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} @@ -25,7 +29,6 @@ link_directories( ${TDE_LIB_DIR} ) - ##### libkigpart (kpart) configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY ) @@ -43,7 +46,7 @@ tde_add_kpart( libkigpart AUTOMOC kigobjects-static kigfilters-static kigmodes-static - kigscripting-static + ${KIGSCRIPTING_LIBRARIES} EMBED kigpart-static @@ -150,7 +150,7 @@ way. I will explain all the classes involved. First of all, there is the TextImp class. It is an ObjectImp ( cf. supra ), and thus represents a piece of text that can be drawn on -the document. It contains a QString ( the text to be shown ), a +the document. It contains a TQString ( the text to be shown ), a coordinate ( the location to draw it ), and a boolean saying whether a frame should be drawn around it. As with all ObjectImp's, it does not contain any code for calculating it, or how it behaves on user input. diff --git a/kig/Makefile.am b/kig/Makefile.am index eea9593b..3f6bebd1 100644 --- a/kig/Makefile.am +++ b/kig/Makefile.am @@ -25,7 +25,7 @@ SUBDIRS = \ kde_module_LTLIBRARIES = libkigpart.la libkigpart_la_SOURCES = dummy.cpp -libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor +libkigpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor libkigpart_la_LIBADD = $(LIB_TDEPARTS) \ misc/libmisc.la objects/libobjects.la filters/libfilters.la \ modes/libmodes.la kig/libkigparttemp.la $(scriptinglib) diff --git a/kig/filters/cabri-filter.cpp b/kig/filters/cabri-filter.cpp index 0a94f140..f65a0138 100644 --- a/kig/filters/cabri-filter.cpp +++ b/kig/filters/cabri-filter.cpp @@ -343,12 +343,12 @@ KigDocument* KigFilterCabri::load( const TQString& file ) return 0; // reading linestyle - Qt::PenStyle ls = Qt::SolidLine; + TQt::PenStyle ls = TQt::SolidLine; if ( ( obj.lineSegLength > 1 ) && ( obj.lineSegLength < 6 ) && ( obj.lineSegSplit > 1 ) && ( obj.lineSegSplit <= 10 ) ) - ls = Qt::DotLine; + ls = TQt::DotLine; else if ( ( obj.lineSegLength >= 6 ) && ( obj.lineSegSplit > 10 ) ) - ls = Qt::DashLine; + ls = TQt::DashLine; int ps = 0; args.clear(); diff --git a/kig/filters/drgeo-filter-chooser.cpp b/kig/filters/drgeo-filter-chooser.cpp index 89250235..4ec6db88 100644 --- a/kig/filters/drgeo-filter-chooser.cpp +++ b/kig/filters/drgeo-filter-chooser.cpp @@ -33,9 +33,9 @@ KigFilterDrgeoChooser::KigFilterDrgeoChooser( const TQStringList& l ) FigureListBox->insertStringList( l ); - connect( OKButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOKPressed() ) ); - connect( CancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancelPressed() ) ); - connect( FigureListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ), TQT_SLOT( slotExecuted( TQListBoxItem* ) ) ); + connect( OKButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOKPressed() ) ); + connect( CancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancelPressed() ) ); + connect( FigureListBox, TQ_SIGNAL( executed( TQListBoxItem* ) ), TQ_SLOT( slotExecuted( TQListBoxItem* ) ) ); } void KigFilterDrgeoChooser::slotOKPressed() diff --git a/kig/filters/drgeo-filter-chooser.h b/kig/filters/drgeo-filter-chooser.h index 78e3b4c0..9b227bca 100644 --- a/kig/filters/drgeo-filter-chooser.h +++ b/kig/filters/drgeo-filter-chooser.h @@ -27,7 +27,7 @@ class TQStringList; class KigFilterDrgeoChooser : public KigFilterDrgeoChooserBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kig/filters/drgeo-filter.cpp b/kig/filters/drgeo-filter.cpp index 9742fcf5..1c904c3e 100644 --- a/kig/filters/drgeo-filter.cpp +++ b/kig/filters/drgeo-filter.cpp @@ -729,7 +729,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co // Normal -> the medium // Thick -> the biggest one int w = -1; - Qt::PenStyle s = Qt::SolidLine; + TQt::PenStyle s = TQt::SolidLine; if ( domelem.tagName() == "point" ) { if ( domelem.attribute( "thickness" ) == "Normal" ) @@ -740,7 +740,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co else { if ( domelem.attribute( "thickness" ) == "Dashed" ) - s = Qt::DotLine; + s = TQt::DotLine; if ( domelem.attribute( "thickness" ) == "Thick" ) w = 2; } diff --git a/kig/filters/exporter.cpp b/kig/filters/exporter.cpp index 32b25f01..a64bab01 100644 --- a/kig/filters/exporter.cpp +++ b/kig/filters/exporter.cpp @@ -162,7 +162,7 @@ void ImageExporter::run( const KigPart& doc, KigWidget& w ) TQPixmap img( TQSize( width, height ) ); img.fill( TQt::white ); - KigPainter p( ScreenInfo( w.screenInfo().shownRect(), img.rect() ), TQT_TQPAINTDEVICE(&img), doc.document() ); + KigPainter p( ScreenInfo( w.screenInfo().shownRect(), img.rect() ), &img, doc.document() ); p.setWholeWinOverlay(); p.drawGrid( doc.document().coordinateSystem(), showgrid, showaxes ); // FIXME: show the selections ? diff --git a/kig/filters/imageexporteroptions.cpp b/kig/filters/imageexporteroptions.cpp index cd68a0af..a72b0ae7 100644 --- a/kig/filters/imageexporteroptions.cpp +++ b/kig/filters/imageexporteroptions.cpp @@ -28,8 +28,8 @@ ImageExporterOptions::ImageExporterOptions( TQWidget* parent, const TQSize& s ) minternallysettingstuff( false ) { keepAspectRatio->setChecked( true ); - connect( WidthInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotWidthChanged( int ) ) ); - connect( HeightInput, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHeightChanged( int ) ) ); + connect( WidthInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotWidthChanged( int ) ) ); + connect( HeightInput, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHeightChanged( int ) ) ); } ImageExporterOptions::~ImageExporterOptions() diff --git a/kig/filters/imageexporteroptions.h b/kig/filters/imageexporteroptions.h index ba5e645b..21b67c3e 100644 --- a/kig/filters/imageexporteroptions.h +++ b/kig/filters/imageexporteroptions.h @@ -25,7 +25,7 @@ class TQSize; class ImageExporterOptions : public ImageExporterOptionsBase { - Q_OBJECT + TQ_OBJECT TQSize msize; diff --git a/kig/filters/kgeo-filter.cpp b/kig/filters/kgeo-filter.cpp index 8849256b..1b0900cf 100644 --- a/kig/filters/kgeo-filter.cpp +++ b/kig/filters/kgeo-filter.cpp @@ -42,7 +42,7 @@ #include "../objects/transform_types.h" #include "../objects/vector_type.h" -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <algorithm> #include <functional> @@ -54,14 +54,14 @@ bool KigFilterKGeo::supportMime( const TQString& mime ) KigDocument* KigFilterKGeo::load( const TQString& sFrom ) { - // kgeo uses a KSimpleConfig to save its contents... - KSimpleConfig config ( sFrom ); + // kgeo uses a TDESimpleConfig to save its contents... + TDESimpleConfig config ( sFrom ); loadMetrics ( &config ); return loadObjects ( sFrom, &config ); } -void KigFilterKGeo::loadMetrics(KSimpleConfig* c ) +void KigFilterKGeo::loadMetrics(TDESimpleConfig* c ) { c->setGroup("Main"); xMax = c->readNumEntry("XMax", 16); @@ -100,7 +100,7 @@ static std::vector<KGeoHierarchyElement> sortElems( const std::vector<KGeoHierar return ret; } -KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c ) +KigDocument* KigFilterKGeo::loadObjects( const TQString& file, TDESimpleConfig* c ) { KigDocument* ret = new KigDocument(); diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h index 9bac9085..62fae04c 100644 --- a/kig/filters/kgeo-filter.h +++ b/kig/filters/kgeo-filter.h @@ -21,7 +21,7 @@ #include "filter.h" -class KSimpleConfig; +class TDESimpleConfig; /** * This is an import filter for files generated by the program KGeo, @@ -43,8 +43,8 @@ protected: KigFilterKGeo(); ~KigFilterKGeo(); - void loadMetrics ( KSimpleConfig* ); - KigDocument* loadObjects ( const TQString& file, KSimpleConfig* ); + void loadMetrics ( TDESimpleConfig* ); + KigDocument* loadObjects ( const TQString& file, TDESimpleConfig* ); int xMax; int yMax; diff --git a/kig/filters/latexexporter.cpp b/kig/filters/latexexporter.cpp index 622a1a49..bbf6144a 100644 --- a/kig/filters/latexexporter.cpp +++ b/kig/filters/latexexporter.cpp @@ -126,7 +126,7 @@ private: * Draws a line (segment) or a vector if vector is true. */ void emitLine( const Coordinate& a, const Coordinate& b, const int width, - const Qt::PenStyle s, bool vector = false ); + const TQt::PenStyle s, bool vector = false ); /** * Sends a new line character ( \n ) to stream. */ @@ -144,7 +144,7 @@ private: /** * Converts a pen style into latex style string. */ - TQString writeStyle( Qt::PenStyle style ); + TQString writeStyle( TQt::PenStyle style ); /** * Plots a generic curve though its points calc'ed with getPoint. */ @@ -157,7 +157,7 @@ void LatexExportImpVisitor::emitCoord( const Coordinate& c ) } void LatexExportImpVisitor::emitLine( const Coordinate& a, const Coordinate& b, - const int width, const Qt::PenStyle s, + const int width, const TQt::PenStyle s, bool vector ) { mstream << "\\psline[linecolor=" << mcurcolorid << ",linewidth=" << width / 100.0 @@ -210,7 +210,7 @@ double LatexExportImpVisitor::dimRealToCoord( int dim ) return fabs( r.width() ); } -TQString LatexExportImpVisitor::writeStyle( Qt::PenStyle style ) +TQString LatexExportImpVisitor::writeStyle( TQt::PenStyle style ) { TQString ret( "linestyle=" ); if ( style == TQt::DashLine ) diff --git a/kig/filters/native-filter.cpp b/kig/filters/native-filter.cpp index cf6521b2..72c464a8 100644 --- a/kig/filters/native-filter.cpp +++ b/kig/filters/native-filter.cpp @@ -39,7 +39,7 @@ #include <karchive.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktar.h> #include <stdio.h> @@ -536,7 +536,7 @@ KigDocument* KigFilterNative::load07( const TQString& file, const TQDomElement& if ( ! ok ) width = -1; tmp = e.attribute( "style" ); - Qt::PenStyle style = ObjectDrawer::styleFromString( tmp ); + TQt::PenStyle style = ObjectDrawer::styleFromString( tmp ); tmp = e.attribute( "point-style" ); int pointstyle = ObjectDrawer::pointStyleFromString( tmp ); diff --git a/kig/filters/svgexporter.cpp b/kig/filters/svgexporter.cpp index 2fd53756..54e9c5f1 100644 --- a/kig/filters/svgexporter.cpp +++ b/kig/filters/svgexporter.cpp @@ -91,7 +91,7 @@ void SVGExporter::run( const KigPart& part, KigWidget& w ) TQPicture pic; pic.setBoundingRect( r ); KigPainter* p = new KigPainter( ScreenInfo( w.screenInfo().shownRect(), viewrect ), - TQT_TQPAINTDEVICE(&pic), part.document() ); + &pic, part.document() ); // p->setWholeWinOverlay(); // p->setBrushColor( TQt::white ); // p->setBrushStyle( TQt::SolidPattern ); diff --git a/kig/kig/Makefile.am b/kig/kig/Makefile.am index 063b1e2e..67747bff 100644 --- a/kig/kig/Makefile.am +++ b/kig/kig/Makefile.am @@ -23,7 +23,7 @@ bin_PROGRAMS = kig # the application source, library search path, and link libraries kig_SOURCES = main.cpp kig.cpp -kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kig_LDADD = $(LIB_TDEPARTS) # this is where the desktop file will go diff --git a/kig/kig/kig.cpp b/kig/kig/kig.cpp index d6af88b2..4dd41cc3 100644 --- a/kig/kig/kig.cpp +++ b/kig/kig/kig.cpp @@ -69,7 +69,7 @@ Kig::Kig() // now that the Part is loaded, we cast it to a Part to get // our hands on it m_part = static_cast<KParts::ReadWritePart*> - (factory->create(TQT_TQOBJECT(this), "kig_part", "KParts::ReadWritePart" )); + (factory->create(this, "kig_part", "KParts::ReadWritePart" )); if (m_part) { // tell the KParts::MainWindow that this is indeed the main widget @@ -78,7 +78,7 @@ Kig::Kig() // and integrate the part's GUI with the shell's createGUI(m_part); // finally show tip-of-day ( if the user wants it :) ) - TQTimer::singleShot( 0, this, TQT_SLOT( startupTipOfDay() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( startupTipOfDay() ) ); } } else @@ -105,30 +105,30 @@ Kig::~Kig() void Kig::setupActions() { - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); #ifdef KIG_DONT_USE_NEW_KMAINWINDOW_FEATURES - 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()); #else createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); #endif // FIXME: this (recent files) should be app-wide, not specific to each window... - m_recentFilesAction = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL&)), actionCollection()); + m_recentFilesAction = KStdAction::openRecent(this, TQ_SLOT(openURL(const KURL&)), actionCollection()); m_recentFilesAction->loadEntries(config); #if KDE_IS_VERSION( 3, 2, 90 ) - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); + KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); #else - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); #endif - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" ); + KStdAction::tipOfDay( this, TQ_SLOT( tipOfDay() ), actionCollection(), "help_tipofday" ); } void Kig::saveProperties(TDEConfig* config) @@ -203,8 +203,8 @@ void Kig::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/kig/kig/kig.h b/kig/kig/kig.h index db2a3c33..d6681570 100644 --- a/kig/kig/kig.h +++ b/kig/kig/kig.h @@ -48,7 +48,7 @@ class TDERecentFilesAction; */ class Kig : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kig/kig/kig_commands.h b/kig/kig/kig_commands.h index b7e4ac12..16ab40b2 100644 --- a/kig/kig/kig_commands.h +++ b/kig/kig/kig_commands.h @@ -43,7 +43,7 @@ class Rect; class KigCommand : public TQObject, public KNamedCommand { - Q_OBJECT + TQ_OBJECT class Private; Private* d; diff --git a/kig/kig/kig_part.cpp b/kig/kig/kig_part.cpp index ef4de909..be58e391 100644 --- a/kig/kig/kig_part.cpp +++ b/kig/kig/kig_part.cpp @@ -49,13 +49,13 @@ #include <tdefiledialog.h> #include <tdeglobal.h> #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <tdemainwindow.h> #include <tdemessagebox.h> #include <kmimetype.h> #include <kprinter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdaction.h> #include <tdetoolbar.h> #include <tdeparts/genericfactory.h> @@ -193,7 +193,7 @@ KigPart::KigPart( TQWidget *parentWidget, const char *, // construct our command history mhistory = new KCommandHistory(actionCollection()); mhistory->documentSaved(); - connect( mhistory, TQT_SIGNAL( documentRestored() ), this, TQT_SLOT( setUnmodified() ) ); + connect( mhistory, TQ_SIGNAL( documentRestored() ), this, TQ_SLOT( setUnmodified() ) ); // we are read-write by default setReadWrite(true); @@ -206,21 +206,21 @@ KigPart::KigPart( TQWidget *parentWidget, const char *, void KigPart::setupActions() { // save actions.. - (void) KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - (void) KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); + (void) KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + (void) KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); // print actions - (void) KStdAction::print( this, TQT_SLOT( filePrint() ), actionCollection() ); - (void) KStdAction::printPreview( this, TQT_SLOT( filePrintPreview() ), actionCollection() ); + (void) KStdAction::print( this, TQ_SLOT( filePrint() ), actionCollection() ); + (void) KStdAction::printPreview( this, TQ_SLOT( filePrintPreview() ), actionCollection() ); // selection actions aSelectAll = KStdAction::selectAll( - this, TQT_SLOT( slotSelectAll() ), actionCollection() ); + this, TQ_SLOT( slotSelectAll() ), actionCollection() ); aDeselectAll = KStdAction::deselect( - this, TQT_SLOT( slotDeselectAll() ), actionCollection() ); + this, TQ_SLOT( slotDeselectAll() ), actionCollection() ); aInvertSelection = new TDEAction( i18n( "Invert Selection" ), "", 0, this, - TQT_SLOT( slotInvertSelection() ), actionCollection(), + TQ_SLOT( slotInvertSelection() ), actionCollection(), "edit_invert_selection" ); // we need icons... @@ -229,46 +229,46 @@ void KigPart::setupActions() aDeleteObjects = new TDEAction( i18n("&Delete Objects"), "edit-delete", Key_Delete, this, - TQT_SLOT(deleteObjects()), actionCollection(), "delete_objects"); + TQ_SLOT(deleteObjects()), actionCollection(), "delete_objects"); aDeleteObjects->setToolTip(i18n("Delete the selected objects")); aCancelConstruction = new TDEAction( i18n("Cancel Construction"), "process-stop", Key_Escape, this, - TQT_SLOT(cancelConstruction()), actionCollection(), "cancel_construction"); + TQ_SLOT(cancelConstruction()), actionCollection(), "cancel_construction"); aCancelConstruction->setToolTip( i18n("Cancel the construction of the object being constructed")); aCancelConstruction->setEnabled(false); aShowHidden = new TDEAction( - i18n("U&nhide All"), 0, this, TQT_SLOT( showHidden() ), + i18n("U&nhide All"), 0, this, TQ_SLOT( showHidden() ), actionCollection(), "edit_unhide_all"); aShowHidden->setToolTip(i18n("Show all hidden objects")); aShowHidden->setEnabled( true ); aNewMacro = new TDEAction( - i18n("&New Macro..."), "gear", 0, this, TQT_SLOT(newMacro()), + i18n("&New Macro..."), "gear", 0, this, TQ_SLOT(newMacro()), actionCollection(), "macro_action"); aNewMacro->setToolTip(i18n("Define a new macro")); aConfigureTypes = new TDEAction( - i18n("Manage &Types..."), 0, this, TQT_SLOT(editTypes()), + i18n("Manage &Types..."), 0, this, TQ_SLOT(editTypes()), actionCollection(), "types_edit"); aConfigureTypes->setToolTip(i18n("Manage macro types.")); KigExportManager::instance()->addMenuAction( this, m_widget->realWidget(), actionCollection() ); - TDEAction* a = KStdAction::zoomIn( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomIn() ), + TDEAction* a = KStdAction::zoomIn( m_widget, TQ_SLOT( slotZoomIn() ), actionCollection() ); a->setToolTip( i18n( "Zoom in on the document" ) ); a->setWhatsThis( i18n( "Zoom in on the document" ) ); - a = KStdAction::zoomOut( TQT_TQOBJECT(m_widget), TQT_SLOT( slotZoomOut() ), + a = KStdAction::zoomOut( m_widget, TQ_SLOT( slotZoomOut() ), actionCollection() ); a->setToolTip( i18n( "Zoom out of the document" ) ); a->setWhatsThis( i18n( "Zoom out of the document" ) ); - a = KStdAction::fitToPage( TQT_TQOBJECT(m_widget), TQT_SLOT( slotRecenterScreen() ), + a = KStdAction::fitToPage( m_widget, TQ_SLOT( slotRecenterScreen() ), actionCollection() ); // grr.. why isn't there an icon for this.. a->setIconSet( TQIconSet( l->loadIcon( "view_fit_to_page", TDEIcon::Toolbar ) ) ); @@ -281,12 +281,12 @@ void KigPart::setupActions() #endif #endif #ifdef KIG_PART_CPP_STD_FULLSCREEN_ACTION - a = KStdAction::fullScreen( TQT_TQOBJECT(m_widget), TQT_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" ); + a = KStdAction::fullScreen( m_widget, TQ_SLOT( toggleFullScreen() ), actionCollection(), (TQWidget*)(widget()->parent()),"fullscreen" ); #else tmp = l->loadIcon( "view-fullscreen", TDEIcon::Toolbar ); a = new TDEAction( i18n( "Full Screen" ), tmp, CTRL+SHIFT+Key_F, - m_widget, TQT_SLOT( toggleFullScreen() ), + m_widget, TQ_SLOT( toggleFullScreen() ), actionCollection(), "fullscreen" ); #endif a->setToolTip( i18n( "View this document full-screen." ) ); @@ -294,31 +294,31 @@ void KigPart::setupActions() // TODO: an icon for this.. a = new TDEAction( - i18n( "&Select Shown Area" ), "zoom-fit-best", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomRect() ), + i18n( "&Select Shown Area" ), "zoom-fit-best", 0, m_widget, TQ_SLOT( zoomRect() ), actionCollection(), "view_select_shown_rect" ); a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) ); a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) ); a = new TDEAction( - i18n( "S&elect Zoom Area" ), "viewmag", 0, TQT_TQOBJECT(m_widget), TQT_SLOT( zoomArea() ), + i18n( "S&elect Zoom Area" ), "viewmag", 0, m_widget, TQ_SLOT( zoomArea() ), actionCollection(), "view_zoom_area" ); // a->setToolTip( i18n( "Select the area that you want to be shown in the window." ) ); // a->setWhatsThis( i18n( "Select the area that you want to be shown in the window." ) ); aToggleGrid = new TDEToggleAction( - i18n( "Show &Grid" ), 0, this, TQT_SLOT( toggleGrid() ), + i18n( "Show &Grid" ), 0, this, TQ_SLOT( toggleGrid() ), actionCollection(), "settings_show_grid" ); aToggleGrid->setToolTip( i18n( "Show or hide the grid." ) ); aToggleGrid->setChecked( true ); aToggleAxes = new TDEToggleAction( - i18n( "Show &Axes" ), 0, this, TQT_SLOT( toggleAxes() ), + i18n( "Show &Axes" ), 0, this, TQ_SLOT( toggleAxes() ), actionCollection(), "settings_show_axes" ); aToggleAxes->setToolTip( i18n( "Show or hide the axes." ) ); aToggleAxes->setChecked( true ); aToggleNightVision = new TDEToggleAction( - i18n( "Wear Infrared Glasses" ), 0, this, TQT_SLOT( toggleNightVision() ), + i18n( "Wear Infrared Glasses" ), 0, this, TQ_SLOT( toggleNightVision() ), actionCollection(), "settings_toggle_nightvision" ); aToggleNightVision->setToolTip( i18n( "Enable/Disable hidden objects visibility." ) ); aToggleNightVision->setChecked( false ); @@ -563,8 +563,8 @@ void KigPart::delObjects( const std::vector<ObjectHolder*>& os ) void KigPart::enableConstructActions( bool enabled ) { for_each( aActions.begin(), aActions.end(), - bind2nd( mem_fun( &TDEAction::setEnabled ), - enabled ) ); + std::bind( mem_fn( &TDEAction::setEnabled ), + std::placeholders::_1, enabled ) ); } void KigPart::unplugActionLists() @@ -635,7 +635,7 @@ void KigPart::runMode( KigMode* m ) setMode( m ); - (void) kapp->eventLoop()->enterLoop(); + (void) tdeApp->eventLoop()->enterLoop(); setMode( prev ); redrawScreen(); @@ -646,7 +646,7 @@ void KigPart::doneMode( KigMode* d ) assert( d == mMode ); // pretend to use this var.. (void)d; - kapp->eventLoop()->exitLoop(); + tdeApp->eventLoop()->exitLoop(); } void KigPart::actionRemoved( GUIAction* a, GUIUpdateToken& t ) @@ -716,7 +716,7 @@ void KigPart::setupMacroTypes() }; // hack: we need to plug the action lists _after_ the gui is // built.. i can't find a better solution than this... - TQTimer::singleShot( 0, this, TQT_SLOT( plugActionLists() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( plugActionLists() ) ); } void KigPart::setupBuiltinMacros() diff --git a/kig/kig/kig_part.h b/kig/kig/kig_part.h index 140c56f6..8865b856 100644 --- a/kig/kig/kig_part.h +++ b/kig/kig/kig_part.h @@ -60,7 +60,7 @@ class ScreenInfo; */ class KigPart : public KParts::ReadWritePart { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kig/kig/kig_view.cpp b/kig/kig/kig_view.cpp index 7d988df4..b9f64590 100644 --- a/kig/kig/kig_view.cpp +++ b/kig/kig/kig_view.cpp @@ -69,7 +69,7 @@ KigWidget::KigWidget( KigPart* part, { part->addWidget(this); - setFocusPolicy(TQ_ClickFocus); + setFocusPolicy(TQWidget::ClickFocus); setBackgroundMode( TQt::NoBackground ); setMouseTracking(true); @@ -89,32 +89,32 @@ void KigWidget::paintEvent(TQPaintEvent*) void KigWidget::mousePressEvent (TQMouseEvent* e) { - if( e->button() & Qt::LeftButton ) + if( e->button() & TQt::LeftButton ) return mpart->mode()->leftClicked( e, this ); - if ( e->button() & Qt::MidButton ) + if ( e->button() & TQt::MidButton ) return mpart->mode()->midClicked( e, this ); - if ( e->button() & Qt::RightButton ) + if ( e->button() & TQt::RightButton ) return mpart->mode()->rightClicked( e, this ); } void KigWidget::mouseMoveEvent (TQMouseEvent* e) { - if( e->state() & Qt::LeftButton ) + if( e->state() & TQt::LeftButton ) return mpart->mode()->leftMouseMoved( e, this ); - if ( e->state() & Qt::MidButton ) + if ( e->state() & TQt::MidButton ) return mpart->mode()->midMouseMoved( e, this ); - if ( e->state() & Qt::RightButton ) + if ( e->state() & TQt::RightButton ) return mpart->mode()->rightMouseMoved( e, this ); return mpart->mode()->mouseMoved( e, this ); } void KigWidget::mouseReleaseEvent (TQMouseEvent* e) { - if( e->state() & Qt::LeftButton ) + if( e->state() & TQt::LeftButton ) return mpart->mode()->leftReleased( e, this ); - if ( e->state() & Qt::MidButton ) + if ( e->state() & TQt::MidButton ) return mpart->mode()->midReleased( e, this ); - if ( e->state() & Qt::RightButton ) + if ( e->state() & TQt::RightButton ) return mpart->mode()->rightReleased( e, this ); } @@ -245,7 +245,7 @@ void KigWidget::redrawScreen( const std::vector<ObjectHolder*>& selection, bool // update the screen... clearStillPix(); - KigPainter p( msi, TQT_TQPAINTDEVICE(&stillPix), mpart->document() ); + KigPainter p( msi, &stillPix, mpart->document() ); p.drawGrid( mpart->document().coordinateSystem(), mpart->document().grid(), mpart->document().axes() ); p.drawObjects( selection, true ); @@ -294,21 +294,21 @@ KigView::KigView( KigPart* part, mupdatingscrollbars( false ), mrealwidget( 0 ), mpart( part ) { - connect( part, TQT_SIGNAL( recenterScreen() ), this, TQT_SLOT( slotInternalRecenterScreen() ) ); + connect( part, TQ_SIGNAL( recenterScreen() ), this, TQ_SLOT( slotInternalRecenterScreen() ) ); mlayout = new TQGridLayout( this, 2, 2 ); - mrightscroll = new TQScrollBar(Qt::Vertical, this, "Right Scrollbar" ); + mrightscroll = new TQScrollBar(TQt::Vertical, this, "Right Scrollbar" ); // TODO: make this configurable... mrightscroll->setTracking( true ); - connect( mrightscroll, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotRightScrollValueChanged( int ) ) ); - connect( mrightscroll, TQT_SIGNAL( sliderReleased() ), - this, TQT_SLOT( updateScrollBars() ) ); - mbottomscroll = new TQScrollBar(Qt::Horizontal, this, "Bottom Scrollbar" ); - connect( mbottomscroll, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotBottomScrollValueChanged( int ) ) ); - connect( mbottomscroll, TQT_SIGNAL( sliderReleased() ), - this, TQT_SLOT( updateScrollBars() ) ); + connect( mrightscroll, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotRightScrollValueChanged( int ) ) ); + connect( mrightscroll, TQ_SIGNAL( sliderReleased() ), + this, TQ_SLOT( updateScrollBars() ) ); + mbottomscroll = new TQScrollBar(TQt::Horizontal, this, "Bottom Scrollbar" ); + connect( mbottomscroll, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotBottomScrollValueChanged( int ) ) ); + connect( mbottomscroll, TQ_SIGNAL( sliderReleased() ), + this, TQ_SLOT( updateScrollBars() ) ); mrealwidget = new KigWidget( part, this, this, "Kig Widget", fullscreen ); mlayout->addWidget( mbottomscroll, 1, 0 ); mlayout->addWidget( mrealwidget, 0, 0 ); @@ -451,8 +451,8 @@ TQSize KigWidget::sizeHint() const void KigWidget::wheelEvent( TQWheelEvent* e ) { int delta = e->delta(); - Qt::Orientation orient = e->orientation(); - if ( orient == Qt::Vertical ) + TQt::Orientation orient = e->orientation(); + if ( orient == TQt::Vertical ) mview->scrollVertical( delta ); else mview->scrollHorizontal( delta ); diff --git a/kig/kig/kig_view.h b/kig/kig/kig_view.h index 2e09014a..99535218 100644 --- a/kig/kig/kig_view.h +++ b/kig/kig/kig_view.h @@ -49,7 +49,7 @@ class KigView; */ class KigWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT KigPart* mpart; @@ -227,7 +227,7 @@ public: class KigView : public TQWidget { - Q_OBJECT + TQ_OBJECT TQGridLayout* mlayout; diff --git a/kig/kig/main.cpp b/kig/kig/main.cpp index 9923f9bf..b0c2d963 100644 --- a/kig/kig/main.cpp +++ b/kig/kig/main.cpp @@ -20,7 +20,7 @@ #include "kig.h" -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdelocale.h> @@ -40,7 +40,7 @@ static TDECmdLineOptions options[] = }; class KigApplication - : public KUniqueApplication + : public TDEUniqueApplication { public: KigApplication( bool gui = true ); @@ -49,7 +49,7 @@ public: }; KigApplication::KigApplication( bool gui ) - : KUniqueApplication( gui, gui ) + : TDEUniqueApplication( gui, gui ) { } diff --git a/kig/misc/boost_intrusive_pointer.h b/kig/misc/boost_intrusive_pointer.h index 1dd2dd81..292a73c9 100644 --- a/kig/misc/boost_intrusive_pointer.h +++ b/kig/misc/boost_intrusive_pointer.h @@ -141,7 +141,6 @@ public: return p_ == 0? 0: &intrusive_ptr::get; } - // operator! is a Borland-specific workaround bool operator! () const { return p_ == 0; diff --git a/kig/misc/guiaction.h b/kig/misc/guiaction.h index 56ab6f73..7837f6a6 100644 --- a/kig/misc/guiaction.h +++ b/kig/misc/guiaction.h @@ -34,7 +34,7 @@ class KigPart; class KigGUIAction : public TDEAction { - Q_OBJECT + TQ_OBJECT GUIAction* mact; KigPart& mdoc; diff --git a/kig/misc/kigfiledialog.h b/kig/misc/kigfiledialog.h index 14c53a2d..a96b8c81 100644 --- a/kig/misc/kigfiledialog.h +++ b/kig/misc/kigfiledialog.h @@ -27,7 +27,7 @@ class KigFileDialog : public KFileDialog { - Q_OBJECT + TQ_OBJECT private: diff --git a/kig/misc/kiginputdialog.cpp b/kig/misc/kiginputdialog.cpp index a596c87c..24c659cf 100644 --- a/kig/misc/kiginputdialog.cpp +++ b/kig/misc/kiginputdialog.cpp @@ -84,7 +84,7 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label, d->m_textEdit = new KTextEdit( frame ); d->m_textEdit->setText( label ); d->m_textEdit->setReadOnly( true ); - d->m_textEdit->setFocusPolicy( TQ_NoFocus ); + d->m_textEdit->setFocusPolicy( TQWidget::NoFocus ); // d->m_textEdit->setAlignment( d->m_textEdit->alignment() | TQt::WordBreak ); d->m_textEdit->setFrameStyle( TQFrame::NoFrame ); mainlay->addWidget( d->m_textEdit ); @@ -98,8 +98,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label, } mainlay->addWidget( d->m_lineEditFirst ); - connect( d->m_lineEditFirst, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotCoordsChanged(const TQString&)) ); + connect( d->m_lineEditFirst, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotCoordsChanged(const TQString&)) ); if ( d->m_coord2.valid() ) { @@ -108,8 +108,8 @@ KigInputDialog::KigInputDialog( const TQString& caption, const TQString& label, d->m_lineEditSecond->setText( d->m_doc.coordinateSystem().fromScreen( d->m_coord2, d->m_doc ) ); mainlay->addWidget( d->m_lineEditSecond ); - connect( d->m_lineEditSecond, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotCoordsChanged(const TQString&)) ); + connect( d->m_lineEditSecond, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotCoordsChanged(const TQString&)) ); deltay += d->m_lineEditSecond->height() + spacingHint(); } @@ -159,10 +159,10 @@ KigInputDialog::KigInputDialog( TQWidget* parent, const Goniometry& g ) mainlay->addLayout( horlay ); - connect( d->m_lineEditFirst, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotGonioTextChanged(const TQString&)) ); - connect( d->m_comboBox, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotGonioSystemChanged(int)) ); + connect( d->m_lineEditFirst, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotGonioTextChanged(const TQString&)) ); + connect( d->m_comboBox, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotGonioSystemChanged(int)) ); resize( 350, 100 ); diff --git a/kig/misc/kiginputdialog.h b/kig/misc/kiginputdialog.h index c9f4be7d..ecde4cbd 100644 --- a/kig/misc/kiginputdialog.h +++ b/kig/misc/kiginputdialog.h @@ -40,7 +40,7 @@ class KigInputDialogPrivate; class KigInputDialog : KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kig/misc/kigpainter.cpp b/kig/misc/kigpainter.cpp index 4b3ede2e..cbaf57be 100644 --- a/kig/misc/kigpainter.cpp +++ b/kig/misc/kigpainter.cpp @@ -43,10 +43,10 @@ KigPainter::KigPainter( const ScreenInfo& si, TQPaintDevice* device, const KigDocument& doc, bool no ) : mP ( device ), color( TQt::blue ), - style( Qt::SolidLine ), + style( TQt::SolidLine ), pointstyle( 0 ), width( -1 ), - brushStyle( Qt::NoBrush ), + brushStyle( TQt::NoBrush ), brushColor( TQt::blue ), mdoc( doc ), msi( si ), @@ -101,7 +101,7 @@ void KigPainter::drawFatPoint( const Coordinate& p ) case 0: { double radius = twidth * pixelWidth(); - setBrushStyle( Qt::SolidPattern ); + setBrushStyle( TQt::SolidPattern ); Coordinate rad( radius, radius ); rad /= 2; Coordinate tl = p - rad; @@ -115,7 +115,7 @@ void KigPainter::drawFatPoint( const Coordinate& p ) case 1: { double radius = twidth * pixelWidth(); - setBrushStyle( Qt::NoBrush ); + setBrushStyle( TQt::NoBrush ); Coordinate rad( radius, radius ); rad /= 2; Coordinate tl = p - rad; @@ -218,7 +218,7 @@ void KigPainter::setColor( const TQColor& c ) mP.setPen( TQPen( color, width == -1 ? 1 : width, style ) ); } -void KigPainter::setStyle( const Qt::PenStyle c ) +void KigPainter::setStyle( const TQt::PenStyle c ) { style = c; mP.setPen( TQPen( color, width == -1 ? 1 : width, style ) ); @@ -251,7 +251,7 @@ void KigPainter::setBrush( const TQBrush& b ) mP.setBrush( b ); } -void KigPainter::setBrushStyle( const Qt::BrushStyle c ) +void KigPainter::setBrushStyle( const TQt::BrushStyle c ) { brushStyle = c; mP.setBrush( TQBrush( brushColor, brushStyle ) ); @@ -291,7 +291,7 @@ void KigPainter::drawPolygon( const std::vector<TQPoint>& pts, TQPen oldpen = mP.pen(); TQBrush oldbrush = mP.brush(); setBrush( TQBrush( color, Dense4Pattern ) ); - setPen( Qt::NoPen ); + setPen( TQt::NoPen ); // i know this isn't really fast, but i blame it all on TQt with its // stupid container classes... what's wrong with the STL ? TQPointArray t( pts.size() ); @@ -314,7 +314,7 @@ void KigPainter::drawArea( const std::vector<Coordinate>& pts, bool border ) if ( border ) setPen( TQPen( color, width == -1 ? 1 : width ) ); else - setPen( Qt::NoPen ); + setPen( TQt::NoPen ); TQPointArray t( pts.size() ); int c = 0; for( std::vector<Coordinate>::const_iterator i = pts.begin(); i != pts.end(); ++i ) @@ -512,7 +512,7 @@ void KigPainter::drawTextStd( const TQPoint& p, const TQString& s ) int tf = AlignLeft | AlignTop | DontClip | WordBreak; // we need the rect where we're going to paint text setPen(TQPen(TQt::blue, 1, SolidLine)); - setBrush(Qt::NoBrush); + setBrush(TQt::NoBrush); drawText( Rect( msi.fromScreen(p), window().bottomRight() ).normalized(), s, tf ); @@ -643,7 +643,7 @@ void KigPainter::drawAngle( const Coordinate& cpoint, const double dstartangle, // arrow.push_back( end + orthvect + vect ); // arrow.push_back( end + orthvect - vect ); - setBrushStyle( Qt::SolidPattern ); + setBrushStyle( TQt::SolidPattern ); // drawPolygon( arrow ); mP.drawPolygon( arrow, false, 0, -1 ); diff --git a/kig/misc/kigpainter.h b/kig/misc/kigpainter.h index ee3b14c1..60ce119f 100644 --- a/kig/misc/kigpainter.h +++ b/kig/misc/kigpainter.h @@ -59,10 +59,10 @@ protected: mutable TQPainter mP; TQColor color; - Qt::PenStyle style; + TQt::PenStyle style; int pointstyle; int width; - Qt::BrushStyle brushStyle; + TQt::BrushStyle brushStyle; TQColor brushColor; const KigDocument& mdoc; @@ -94,7 +94,7 @@ public: Rect fromScreen( const TQRect& r ) const; // colors and stuff... - void setStyle( const Qt::PenStyle c ); + void setStyle( const TQt::PenStyle c ); void setColor( const TQColor& c ); /** * setting this to -1 means to use the default width for the object @@ -103,7 +103,7 @@ public: void setWidth( const int c ); void setPointStyle( const int p ); void setPen( const TQPen& p ); - void setBrushStyle( const Qt::BrushStyle c ); + void setBrushStyle( const TQt::BrushStyle c ); void setBrush( const TQBrush& b ); void setBrushColor( const TQColor& c ); diff --git a/kig/misc/object_constructor.cpp b/kig/misc/object_constructor.cpp index ae2a37d0..6db3d802 100644 --- a/kig/misc/object_constructor.cpp +++ b/kig/misc/object_constructor.cpp @@ -101,7 +101,7 @@ void StandardConstructorBase::handlePrelim( { assert ( margsparser.check( os ) != ArgsParser::Invalid ); std::vector<ObjectCalcer*> args = margsparser.parse( os ); - p.setBrushStyle( Qt::NoBrush ); + p.setBrushStyle( TQt::NoBrush ); p.setBrushColor( TQt::red ); p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being @@ -130,7 +130,7 @@ void SimpleObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPai Args args; using namespace std; transform( parents.begin(), parents.end(), - back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); + back_inserter( args ), mem_fn( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); drawer.draw( *data, p, true ); delete data; @@ -184,7 +184,7 @@ void MultiObjectTypeConstructor::drawprelim( const ObjectDrawer& drawer, KigPain Args args; using namespace std; transform( parents.begin(), parents.end(), - back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); + back_inserter( args ), mem_fn( &ObjectCalcer::imp ) ); for ( vector<int>::const_iterator i = mparams.begin(); i != mparams.end(); ++i ) { @@ -302,7 +302,7 @@ TQString StandardConstructorBase::useText( const ObjectCalcer& o, const std::vec { using namespace std; Args args; - transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); + transform( sel.begin(), sel.end(), back_inserter( args ), mem_fn( &ObjectCalcer::imp ) ); std::string ret = margsparser.usetext( o.imp(), args ); if ( ret.empty() ) return TQString(); @@ -315,7 +315,7 @@ TQString StandardConstructorBase::selectStatement( { using namespace std; Args args; - transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); + transform( sel.begin(), sel.end(), back_inserter( args ), mem_fn( &ObjectCalcer::imp ) ); std::string ret = margsparser.selectStatement( args ); if ( ret.empty() ) return TQString(); @@ -419,7 +419,7 @@ TQString MacroConstructor::selectStatement( using namespace std; Args args; transform( sel.begin(), sel.end(), back_inserter( args ), - mem_fun( &ObjectCalcer::imp ) ); + mem_fn( &ObjectCalcer::imp ) ); std::string ret = mparser.selectStatement( args ); if ( ret.empty() ) return TQString(); else return i18n( ret.c_str() ); @@ -432,7 +432,7 @@ TQString MacroConstructor::useText( const ObjectCalcer& o, const std::vector<Obj using namespace std; Args args; transform( sel.begin(), sel.end(), back_inserter( args ), - mem_fun( &ObjectCalcer::imp ) ); + mem_fn( &ObjectCalcer::imp ) ); std::string ret = mparser.usetext( o.imp(), args ); if ( ret.empty() ) return TQString(); else return i18n( ret.c_str() ); @@ -447,7 +447,7 @@ void MacroConstructor::handlePrelim( KigPainter& p, const std::vector<ObjectCalc using namespace std; Args args; transform( sel.begin(), sel.end(), back_inserter( args ), - mem_fun( &ObjectCalcer::imp ) ); + mem_fn( &ObjectCalcer::imp ) ); args = mparser.parse( args ); std::vector<ObjectImp*> ret = mhier.calc( args, doc ); for ( uint i = 0; i < ret.size(); ++i ) diff --git a/kig/misc/special_constructors.cpp b/kig/misc/special_constructors.cpp index 9618bc90..c8137966 100644 --- a/kig/misc/special_constructors.cpp +++ b/kig/misc/special_constructors.cpp @@ -116,7 +116,7 @@ void ConicRadicalConstructor::drawprelim( { Args args; std::transform( parents.begin(), parents.end(), - std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) ); + std::back_inserter( args ), std::mem_fn( &ObjectCalcer::imp ) ); for ( int i = -1; i < 2; i += 2 ) { IntImp root( i ); @@ -349,7 +349,7 @@ void PolygonBNPTypeConstructor::handlePrelim( } std::vector<ObjectCalcer*> args = os; - p.setBrushStyle( Qt::NoBrush ); + p.setBrushStyle( TQt::NoBrush ); p.setBrushColor( TQt::red ); p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being @@ -658,7 +658,7 @@ void PolygonBCVConstructor::handlePrelim( args.push_back( ns ); } - p.setBrushStyle( Qt::NoBrush ); + p.setBrushStyle( TQt::NoBrush ); p.setBrushColor( TQt::red ); p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being @@ -685,7 +685,7 @@ void PolygonBCVConstructor::handlePrelim( text = TextImp( TQString( "(%1)" ).arg(i), where, false ); text.draw( p ); } - p.setStyle( Qt::DotLine ); + p.setStyle( TQt::DotLine ); p.setWidth( 1 ); double radius = ( v - c ).length(); CircleImp circle = CircleImp( c, radius ); @@ -803,7 +803,7 @@ void PolygonBCVConstructor::drawprelim( const ObjectDrawer& drawer, KigPainter& Args args; std::transform( parents.begin(), parents.end(), - std::back_inserter( args ), std::mem_fun( &ObjectCalcer::imp ) ); + std::back_inserter( args ), std::mem_fn( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); drawer.draw( *data, p, true ); @@ -1178,7 +1178,7 @@ void MeasureTransportConstructor::handlePrelim( const KigDocument& d, const KigWidget& ) const { - p.setBrushStyle( Qt::NoBrush ); + p.setBrushStyle( TQt::NoBrush ); p.setBrushColor( TQt::red ); p.setPen( TQPen ( TQt::red, 1) ); p.setWidth( -1 ); // -1 means the default width for the object being @@ -1196,7 +1196,7 @@ void MeasureTransportConstructor::drawprelim( const ObjectDrawer& drawer, Args args; using namespace std; transform( parents.begin(), parents.end(), - back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); + back_inserter( args ), mem_fn( &ObjectCalcer::imp ) ); ObjectImp* data = mtype->calc( args, doc ); drawer.draw( *data, p, true ); delete data; diff --git a/kig/modes/construct_mode.cpp b/kig/modes/construct_mode.cpp index 02bb98fc..378fc999 100644 --- a/kig/modes/construct_mode.cpp +++ b/kig/modes/construct_mode.cpp @@ -182,7 +182,7 @@ void BaseConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const mdoc.emitStatusBarText( selectStatement( getCalcers( mparents ), w ) ); w.updateCurPix(); - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() ); Coordinate ncoord = w.fromScreen( p ); if ( shiftpressed ) @@ -330,7 +330,7 @@ void PointConstructMode::mouseMoved( bool shiftpressed ) { w.updateCurPix(); - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() ); Coordinate ncoord = w.fromScreen( p ); if ( shiftpressed ) @@ -423,7 +423,7 @@ void TestConstructMode::handlePrelim( const std::vector<ObjectCalcer*>& os, cons { Args args; std::transform( os.begin(), os.end(), std::back_inserter( args ), - std::mem_fun( &ObjectCalcer::imp ) ); + std::mem_fn( &ObjectCalcer::imp ) ); // usetext TQString usetext = i18n( mtype->argsParser().usetext( args.back(), args ).c_str() ); @@ -529,7 +529,7 @@ void TestConstructMode::mouseMoved( const std::vector<ObjectHolder*>& os, const w.setCursor( KCursor::blankCursor() ); w.updateCurPix(); - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.curPix, mdoc.document() ); TQPoint qloc = p + TQPoint( -40, 0 ); Coordinate loc = w.fromScreen( qloc ); @@ -554,7 +554,7 @@ TQString TestConstructMode::selectStatement( const std::vector<ObjectCalcer*>& s { using namespace std; Args args; - transform( sel.begin(), sel.end(), back_inserter( args ), mem_fun( &ObjectCalcer::imp ) ); + transform( sel.begin(), sel.end(), back_inserter( args ), mem_fn( &ObjectCalcer::imp ) ); std::string ret = mtype->argsParser().selectStatement( args ); if ( ret.empty() ) return TQString(); diff --git a/kig/modes/dragrectmode.cpp b/kig/modes/dragrectmode.cpp index 29b00886..1bb39cae 100644 --- a/kig/modes/dragrectmode.cpp +++ b/kig/modes/dragrectmode.cpp @@ -48,7 +48,7 @@ void DragRectMode::moved( const TQPoint& p, KigWidget& w ) std::vector<TQRect> overlay; if ( mstartselected ) { - KigPainter pt( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter pt( w.screenInfo(), &w.curPix, mdoc.document() ); pt.drawFilledRect( TQRect( p, mstart ) ); overlay = pt.overlay(); }; diff --git a/kig/modes/edittype.cpp b/kig/modes/edittype.cpp index 00686392..75ba9ca3 100644 --- a/kig/modes/edittype.cpp +++ b/kig/modes/edittype.cpp @@ -50,7 +50,7 @@ EditType::~EditType() void EditType::helpSlot() { - kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ), + tdeApp->invokeHelp( TQString::fromLatin1( "working-with-types" ), TQString::fromLatin1( "kig" ) ); } diff --git a/kig/modes/edittype.h b/kig/modes/edittype.h index 28e2353d..41c19f88 100644 --- a/kig/modes/edittype.h +++ b/kig/modes/edittype.h @@ -27,7 +27,7 @@ */ class EditType : public EditTypeBase { - Q_OBJECT + TQ_OBJECT TQString mname; diff --git a/kig/modes/edittypebase.ui b/kig/modes/edittypebase.ui index c0ed56cf..f8078404 100644 --- a/kig/modes/edittypebase.ui +++ b/kig/modes/edittypebase.ui @@ -270,11 +270,11 @@ <slot>cancelSlot()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>helpSlot()</slot> <slot>okSlot()</slot> <slot>cancelSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kig/modes/label.cpp b/kig/modes/label.cpp index 12f0d57c..73d26808 100644 --- a/kig/modes/label.cpp +++ b/kig/modes/label.cpp @@ -231,7 +231,7 @@ void TextLabelModeBase::mouseMoved( TQMouseEvent* e, KigWidget* w ) TQString s = d->locationparent->imp()->type()->attachToThisStatement(); mdoc.emitStatusBarText( s ); - KigPainter p( w->screenInfo(), TQT_TQPAINTDEVICE(&w->curPix), mdoc.document() ); + KigPainter p( w->screenInfo(), &w->curPix, mdoc.document() ); // set the text next to the arrow cursor TQPoint point = e->pos(); diff --git a/kig/modes/linkslabel.cpp b/kig/modes/linkslabel.cpp index 9d37d840..19cb744d 100644 --- a/kig/modes/linkslabel.cpp +++ b/kig/modes/linkslabel.cpp @@ -67,8 +67,8 @@ LinksLabel::~LinksLabel() void LinksLabel::urlClicked() { - const TQObject* o = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender())); - std::vector<KURLLabel*>::iterator i = std::find( p->urllabels.begin(), p->urllabels.end(), static_cast<const KURLLabel*>(TQT_TQWIDGET_CONST( o )) ); + const TQObject* o = sender(); + std::vector<KURLLabel*>::iterator i = std::find( p->urllabels.begin(), p->urllabels.end(), static_cast<const KURLLabel*>( o ) ); assert( i != p->urllabels.end() ); emit linkClicked( i - p->urllabels.begin() ); } @@ -112,7 +112,7 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) i->second, this ); p->urllabels.push_back( l ); p->layout->addWidget( l ); - connect( l, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( urlClicked() ) ); + connect( l, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( urlClicked() ) ); } else { @@ -129,6 +129,6 @@ void LinksLabel::applyEdit( LinksLabelEditBuf& buf ) p->layout->activate(); - std::for_each( p->urllabels.begin(), p->urllabels.end(), mem_fun( &TQWidget::show ) ); - std::for_each( p->labels.begin(), p->labels.end(), mem_fun( &TQWidget::show ) ); + std::for_each( p->urllabels.begin(), p->urllabels.end(), mem_fn( &TQWidget::show ) ); + std::for_each( p->labels.begin(), p->labels.end(), mem_fn( &TQWidget::show ) ); } diff --git a/kig/modes/linkslabel.h b/kig/modes/linkslabel.h index a45777d5..cb556a70 100644 --- a/kig/modes/linkslabel.h +++ b/kig/modes/linkslabel.h @@ -29,7 +29,7 @@ */ class LinksLabel : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kig/modes/macro.cpp b/kig/modes/macro.cpp index 8fe16b4d..be69d80b 100644 --- a/kig/modes/macro.cpp +++ b/kig/modes/macro.cpp @@ -94,11 +94,11 @@ void DefineMacroMode::namePageEntered() std::vector<ObjectCalcer*> given; std::transform( mgiven.begin(), mgiven.end(), std::back_inserter( given ), - std::mem_fun( memfun ) ); + std::mem_fn( memfun ) ); std::vector<ObjectCalcer*> final; std::transform( mfinal.begin(), mfinal.end(), std::back_inserter( final ), - std::mem_fun( memfun ) ); + std::mem_fn( memfun ) ); ObjectHierarchy hier( given, final ); if ( hier.resultDoesNotDependOnGiven() ) { @@ -132,11 +132,11 @@ void DefineMacroMode::finishPressed() std::vector<ObjectCalcer*> given; std::transform( mgiven.begin(), mgiven.end(), std::back_inserter( given ), - std::mem_fun( memfun ) ); + std::mem_fn( memfun ) ); std::vector<ObjectCalcer*> final; std::transform( mfinal.begin(), mfinal.end(), std::back_inserter( final ), - std::mem_fun( memfun ) ); + std::mem_fn( memfun ) ); ObjectHierarchy hier( given, final ); MacroConstructor* ctor = new MacroConstructor( hier, @@ -167,7 +167,7 @@ void DefineMacroMode::dragRect( const TQPoint& p, KigWidget& w ) std::vector<ObjectHolder*>* objs = mwizard->currentPage() == mwizard->mpgiven ? &mgiven : &mfinal; DragRectMode dm( p, mdoc, w ); mdoc.runMode( &dm ); - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); if ( ! dm.cancelled() ) { std::vector<ObjectHolder*> ret = dm.ret(); @@ -196,7 +196,7 @@ void DefineMacroMode::leftClickedObject( ObjectHolder* o, const TQPoint&, if ( isselected ) objs->erase( iter ); else objs->push_back( o ); - KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); + KigPainter p( w.screenInfo(), &w.stillPix, mdoc.document() ); p.drawObject( o, !isselected ); w.updateCurPix( p.overlay() ); w.updateWidget(); @@ -224,7 +224,7 @@ void DefineMacroMode::mouseMoved( const std::vector<ObjectHolder*>& os, const TQ // statusbar text mdoc.emitStatusBarText( selectstat ); - KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() ); // set the text next to the arrow cursor TQPoint point = pt; diff --git a/kig/modes/macrowizard.cpp b/kig/modes/macrowizard.cpp index c6b8f36c..3d1e598d 100644 --- a/kig/modes/macrowizard.cpp +++ b/kig/modes/macrowizard.cpp @@ -27,10 +27,10 @@ MacroWizard::MacroWizard( TQWidget* parent, DefineMacroMode* m ) : MacroWizardBase( parent, "Define Macro Wizard", false ), mmode( m ) { - connect( KLineEdit2, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( nameTextChanged( const TQString& ) ) ); - connect( this, TQT_SIGNAL( helpClicked() ), this, - TQT_SLOT( slotHelpClicked() ) ); + connect( KLineEdit2, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( nameTextChanged( const TQString& ) ) ); + connect( this, TQ_SIGNAL( helpClicked() ), this, + TQ_SLOT( slotHelpClicked() ) ); } MacroWizard::~MacroWizard() @@ -85,6 +85,6 @@ void MacroWizard::accept() void MacroWizard::slotHelpClicked() { - kapp->invokeHelp( TQString::fromLatin1( "defining-macros"), + tdeApp->invokeHelp( TQString::fromLatin1( "defining-macros"), TQString::fromLatin1( "kig" ) ); } diff --git a/kig/modes/macrowizard.h b/kig/modes/macrowizard.h index ebd4c519..acb67b5f 100644 --- a/kig/modes/macrowizard.h +++ b/kig/modes/macrowizard.h @@ -24,7 +24,7 @@ class DefineMacroMode; class MacroWizard : public MacroWizardBase { - Q_OBJECT + TQ_OBJECT public: MacroWizard( TQWidget* parent, DefineMacroMode* m ); diff --git a/kig/modes/moving.cpp b/kig/modes/moving.cpp index 593c7077..d7d07e89 100644 --- a/kig/modes/moving.cpp +++ b/kig/modes/moving.cpp @@ -55,13 +55,13 @@ void MovingModeBase::initScreen( const std::vector<ObjectCalcer*>& in ) std::inserter( notmovingobjs, notmovingobjs.begin() ) ); mview.clearStillPix(); - KigPainter p( mview.screenInfo(), TQT_TQPAINTDEVICE(&mview.stillPix), mdoc.document() ); + KigPainter p( mview.screenInfo(), &mview.stillPix, mdoc.document() ); p.drawGrid( mdoc.document().coordinateSystem(), mdoc.document().grid(), mdoc.document().axes() ); p.drawObjects( notmovingobjs.begin(), notmovingobjs.end(), false ); mview.updateCurPix(); - KigPainter p2( mview.screenInfo(), TQT_TQPAINTDEVICE(&mview.curPix), mdoc.document() ); + KigPainter p2( mview.screenInfo(), &mview.curPix, mdoc.document() ); p2.drawObjects( drawableset.begin(), drawableset.end(), true ); } @@ -91,7 +91,7 @@ void MovingModeBase::mouseMoved( TQMouseEvent* e, KigWidget* v ) for ( std::vector<ObjectCalcer*>::iterator i = mcalcable.begin(); i != mcalcable.end(); ++i ) ( *i )->calc( mdoc.document() ); - KigPainter p( v->screenInfo(), TQT_TQPAINTDEVICE(&v->curPix), mdoc.document() ); + KigPainter p( v->screenInfo(), &v->curPix, mdoc.document() ); // TODO: only draw the explicitly moving objects as selected, the // other ones as deselected.. Needs some support from the // subclasses.. diff --git a/kig/modes/normal.cpp b/kig/modes/normal.cpp index 9a30c213..b91db417 100644 --- a/kig/modes/normal.cpp +++ b/kig/modes/normal.cpp @@ -71,8 +71,8 @@ void NormalMode::selectObjects( const std::vector<ObjectHolder*>& os ) { // hehe, don't you love this c++ stuff ;) std::for_each( os.begin(), os.end(), - std::bind1st( - std::mem_fun( &NormalMode::selectObject ), this ) ); + std::bind( + std::mem_fn( &NormalMode::selectObject ), this, std::placeholders::_1 ) ); } void NormalMode::unselectObject( ObjectHolder* o ) @@ -133,7 +133,7 @@ void NormalMode::dragRect( const TQPoint& p, KigWidget& w ) DragRectMode d( p, mdoc, w ); mdoc.runMode( &d ); - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); if ( ! d.cancelled() ) { @@ -174,7 +174,7 @@ void NormalMode::dragObject( const std::vector<ObjectHolder*>& oco, const TQPoin void NormalMode::leftClickedObject( ObjectHolder* o, const TQPoint&, KigWidget& w, bool ctrlOrShiftDown ) { - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); if ( ! o ) { @@ -269,7 +269,7 @@ void NormalMode::mouseMoved( const std::vector<ObjectHolder*>& os, // statusbar text mdoc.emitStatusBarText( stat ); - KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() ); // set the text next to the arrow cursor TQPoint point = plc; diff --git a/kig/modes/popup.cpp b/kig/modes/popup.cpp index 05dc5d24..0a7e0265 100644 --- a/kig/modes/popup.cpp +++ b/kig/modes/popup.cpp @@ -190,7 +190,7 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, { bool empty = objs.empty(); bool single = objs.size() == 1; - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( toplevelMenuSlot( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( toplevelMenuSlot( int ) ) ); TQString title; if ( empty ) @@ -246,24 +246,24 @@ NormalModePopupObjects::NormalModePopupObjects( KigPart& part, for ( uint i = 0; i < NumberOfMenus; ++i ) mmenus[i] = new TQPopupMenu( this ); - connect( mmenus[TransformMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( transformMenuSlot( int ) ) ); - connect( mmenus[TestMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( testMenuSlot( int ) ) ); - connect( mmenus[ConstructMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( constructMenuSlot( int ) ) ); - connect( mmenus[StartMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( startMenuSlot( int ) ) ); - connect( mmenus[ShowMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( showMenuSlot( int ) ) ); - connect( mmenus[SetColorMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setColorMenuSlot( int ) ) ); - connect( mmenus[SetSizeMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setSizeMenuSlot( int ) ) ); - connect( mmenus[SetStyleMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setStyleMenuSlot( int ) ) ); - connect( mmenus[SetCoordinateSystemMenu], TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( setCoordinateSystemMenuSlot( int ) ) ); + connect( mmenus[TransformMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( transformMenuSlot( int ) ) ); + connect( mmenus[TestMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( testMenuSlot( int ) ) ); + connect( mmenus[ConstructMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( constructMenuSlot( int ) ) ); + connect( mmenus[StartMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( startMenuSlot( int ) ) ); + connect( mmenus[ShowMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( showMenuSlot( int ) ) ); + connect( mmenus[SetColorMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setColorMenuSlot( int ) ) ); + connect( mmenus[SetSizeMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setSizeMenuSlot( int ) ) ); + connect( mmenus[SetStyleMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setStyleMenuSlot( int ) ) ); + connect( mmenus[SetCoordinateSystemMenu], TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( setCoordinateSystemMenuSlot( int ) ) ); for ( int i = 0; i <= NumberOfMenus; ++i ) { @@ -470,23 +470,23 @@ void BuiltinObjectActionsProvider::fillUpMenu( NormalModePopupObjects& popup, in TQPixmap p( 20, 20 ); p.fill( popup.eraseColor() ); ScreenInfo si( Rect( -1, -1, 2, 2 ), p.rect() ); - KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false ); + KigPainter ptr( si, &p, popup.part().document(), false ); PointImp pt( Coordinate( 0, 0 ) ); - ObjectDrawer d( color, -1, true, Qt::SolidLine, i ); + ObjectDrawer d( color, -1, true, TQt::SolidLine, i ); d.draw( pt, ptr, false ); popup.addAction( menu, p, nextfree++ ); } else { - Qt::PenStyle penstyles[] = {Qt::SolidLine, Qt::DashLine, Qt::DashDotLine, Qt::DashDotDotLine, Qt::DotLine}; - for ( int i = 0; i < (int) ( sizeof( penstyles ) / sizeof( Qt::PenStyle ) ); ++i ) + TQt::PenStyle penstyles[] = {TQt::SolidLine, TQt::DashLine, TQt::DashDotLine, TQt::DashDotDotLine, TQt::DotLine}; + for ( int i = 0; i < (int) ( sizeof( penstyles ) / sizeof( TQt::PenStyle ) ); ++i ) { TQPixmap p( 50, 20 ); p.fill( popup.eraseColor() ); ScreenInfo si( Rect( -2.5, -1, 5, 2 ), p.rect() ); - KigPainter ptr( si, TQT_TQPAINTDEVICE(&p), popup.part().document(), false ); + KigPainter ptr( si, &p, popup.part().document(), false ); LineImp line( Coordinate( -1, 0 ), Coordinate( 1, 0 ) ); - Qt::PenStyle ps = penstyles[i]; + TQt::PenStyle ps = penstyles[i]; ObjectDrawer d( color, -1, true, ps, 1 ); d.draw( line, ptr, false ); popup.addAction( menu, p, nextfree++ ); @@ -712,9 +712,9 @@ bool BuiltinObjectActionsProvider::executeAction( } else { - Qt::PenStyle penstyles[] = {Qt::SolidLine, Qt::DashLine, Qt::DashDotLine, Qt::DashDotDotLine, Qt::DotLine}; - assert( id < (int)( sizeof( penstyles ) / sizeof( Qt::PenStyle ) ) ); - Qt::PenStyle p = penstyles[id]; + TQt::PenStyle penstyles[] = {TQt::SolidLine, TQt::DashLine, TQt::DashDotLine, TQt::DashDotDotLine, TQt::DotLine}; + assert( id < (int)( sizeof( penstyles ) / sizeof( TQt::PenStyle ) ) ); + TQt::PenStyle p = penstyles[id]; KigCommand* kc = new KigCommand( doc, i18n( "Change Object Style" ) ); for ( std::vector<ObjectHolder*>::const_iterator i = os.begin(); i != os.end(); ++i ) if ( ! (*i)->imp()->inherits( PointImp::stype() ) ) @@ -1187,7 +1187,7 @@ ObjectChooserPopup::ObjectChooserPopup( const TQPoint& p, KigWidget& view, i ); } - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( actionActivatedSlot( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( actionActivatedSlot( int ) ) ); } ObjectChooserPopup::~ObjectChooserPopup() diff --git a/kig/modes/popup.h b/kig/modes/popup.h index 16078c15..5ba95428 100644 --- a/kig/modes/popup.h +++ b/kig/modes/popup.h @@ -46,7 +46,7 @@ class ObjectHolder; class NormalModePopupObjects : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: @@ -117,7 +117,7 @@ private: class ObjectChooserPopup : public TDEPopupMenu { - Q_OBJECT + TQ_OBJECT public: diff --git a/kig/modes/textlabelwizard.cpp b/kig/modes/textlabelwizard.cpp index c92068de..f52e9bb0 100644 --- a/kig/modes/textlabelwizard.cpp +++ b/kig/modes/textlabelwizard.cpp @@ -29,12 +29,12 @@ TextLabelWizard::TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode ) : TextLabelWizardBase( parent, "TextLabelWizard", false ), mmode( mode ) { - connect( labelTextInput, TQT_SIGNAL( textChanged() ), - TQT_SLOT( textChanged() ) ); - connect( myCustomWidget1, TQT_SIGNAL( linkClicked( int ) ), - TQT_SLOT( linkClicked( int ) ) ); - connect( this, TQT_SIGNAL( helpClicked() ), - this, TQT_SLOT( slotHelpClicked() ) ); + connect( labelTextInput, TQ_SIGNAL( textChanged() ), + TQ_SLOT( textChanged() ) ); + connect( myCustomWidget1, TQ_SIGNAL( linkClicked( int ) ), + TQ_SLOT( linkClicked( int ) ) ); + connect( this, TQ_SIGNAL( helpClicked() ), + this, TQ_SLOT( slotHelpClicked() ) ); labelTextInput->setFocus(); } @@ -89,7 +89,7 @@ void TextLabelWizard::relayoutArgsPage() void TextLabelWizard::slotHelpClicked() { - kapp->invokeHelp( TQString::fromLatin1( "text-labels" ), + tdeApp->invokeHelp( TQString::fromLatin1( "text-labels" ), TQString::fromLatin1( "kig" ) ); } diff --git a/kig/modes/textlabelwizard.h b/kig/modes/textlabelwizard.h index 5e22ada2..f586b62f 100644 --- a/kig/modes/textlabelwizard.h +++ b/kig/modes/textlabelwizard.h @@ -24,7 +24,7 @@ class TextLabelModeBase; class TextLabelWizard : public TextLabelWizardBase { - Q_OBJECT + TQ_OBJECT public: TextLabelWizard( TQWidget* parent, TextLabelModeBase* mode ); diff --git a/kig/modes/typesdialog.cpp b/kig/modes/typesdialog.cpp index d8219308..0c3609c5 100644 --- a/kig/modes/typesdialog.cpp +++ b/kig/modes/typesdialog.cpp @@ -81,10 +81,10 @@ TypesDialog::TypesDialog( TQWidget* parent, KigPart& part ) loadAllMacros(); popup = new TQPopupMenu( this ); - popup->insertItem( SmallIcon( "edit" ), i18n( "&Edit..." ), this, TQT_SLOT( editType() ) ); - popup->insertItem( SmallIcon( "edit-delete" ), i18n( "&Delete" ), this, TQT_SLOT( deleteType() ) ); + popup->insertItem( SmallIcon( "edit" ), i18n( "&Edit..." ), this, TQ_SLOT( editType() ) ); + popup->insertItem( SmallIcon( "edit-delete" ), i18n( "&Delete" ), this, TQ_SLOT( deleteType() ) ); popup->insertSeparator(); - popup->insertItem( SmallIcon( "fileexport" ), i18n( "E&xport..." ), this, TQT_SLOT( exportType() ) ); + popup->insertItem( SmallIcon( "fileexport" ), i18n( "E&xport..." ), this, TQ_SLOT( exportType() ) ); // saving types part.saveTypes(); @@ -108,7 +108,7 @@ TypesDialog::~TypesDialog() void TypesDialog::helpSlot() { - kapp->invokeHelp( TQString::fromLatin1( "working-with-types" ), + tdeApp->invokeHelp( TQString::fromLatin1( "working-with-types" ), TQString::fromLatin1( "kig" ) ); } diff --git a/kig/modes/typesdialog.h b/kig/modes/typesdialog.h index 636999c5..6afb40f1 100644 --- a/kig/modes/typesdialog.h +++ b/kig/modes/typesdialog.h @@ -38,7 +38,7 @@ class KigDocument; */ class TypesDialog : public TypesDialogBase { - Q_OBJECT + TQ_OBJECT // necessary because some MacroList functions need it.. diff --git a/kig/modes/typesdialogbase.ui b/kig/modes/typesdialogbase.ui index bea69868..5aa9f34b 100644 --- a/kig/modes/typesdialogbase.ui +++ b/kig/modes/typesdialogbase.ui @@ -316,7 +316,7 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot access="protected">deleteType()</slot> <slot access="protected">exportType()</slot> <slot>helpSlot()</slot> @@ -325,7 +325,7 @@ <slot access="protected">editType()</slot> <slot access="protected">contextMenuRequested( TQListViewItem* i, const TQPoint& p, int c )</slot> <slot>cancelSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kig/objects/object_calcer.cpp b/kig/objects/object_calcer.cpp index 40545ed1..b15766bc 100644 --- a/kig/objects/object_calcer.cpp +++ b/kig/objects/object_calcer.cpp @@ -31,7 +31,7 @@ void ObjectTypeCalcer::calc( const KigDocument& doc ) Args a; a.reserve( mparents.size() ); std::transform( mparents.begin(), mparents.end(), - std::back_inserter( a ), std::mem_fun( &ObjectCalcer::imp ) ); + std::back_inserter( a ), std::mem_fn( &ObjectCalcer::imp ) ); ObjectImp* n = mtype->calc( a, doc ); delete mimp; mimp = n; @@ -42,7 +42,7 @@ ObjectTypeCalcer::ObjectTypeCalcer( const ObjectType* type, : mparents( ( sort )?type->sortArgs( parents ):parents ), mtype( type ), mimp( 0 ) { std::for_each( mparents.begin(), mparents.end(), - std::bind2nd( std::mem_fun( &ObjectCalcer::addChild ), this ) ); + std::bind( std::mem_fn( &ObjectCalcer::addChild ), std::placeholders::_1, this ) ); } ObjectCalcer::~ObjectCalcer() @@ -122,7 +122,7 @@ void ObjectCalcer::delChild( ObjectCalcer* c ) ObjectTypeCalcer::~ObjectTypeCalcer() { std::for_each( mparents.begin(), mparents.end(), - std::bind2nd( std::mem_fun( &ObjectCalcer::delChild ), this ) ); + std::bind( std::mem_fn( &ObjectCalcer::delChild ), std::placeholders::_1, this ) ); delete mimp; } @@ -201,7 +201,7 @@ const ObjectImpType* ObjectTypeCalcer::impRequirement( std::transform( os.begin(), os.end(), std::back_inserter( args ), - std::mem_fun( &ObjectCalcer::imp ) ); + std::mem_fn( &ObjectCalcer::imp ) ); assert( std::find( args.begin(), args.end(), o->imp() ) != args.end() ); return mtype->impRequirement( o->imp(), args ); } @@ -219,9 +219,9 @@ void ObjectConstCalcer::setImp( ObjectImp* newimp ) void ObjectTypeCalcer::setParents( const std::vector<ObjectCalcer*> np ) { std::for_each( np.begin(), np.end(), - std::bind2nd( std::mem_fun( &ObjectCalcer::addChild ), this ) ); + std::bind( std::mem_fn( &ObjectCalcer::addChild ), std::placeholders::_1, this ) ); std::for_each( mparents.begin(), mparents.end(), - std::bind2nd( std::mem_fun( &ObjectCalcer::delChild ), this ) ); + std::bind( std::mem_fn( &ObjectCalcer::delChild ), std::placeholders::_1, this ) ); mparents = np; } @@ -314,7 +314,7 @@ bool ObjectTypeCalcer::isDefinedOnOrThrough( const ObjectCalcer* o ) const std::transform( mparents.begin(), mparents.end(), std::back_inserter( args ), - std::mem_fun( &ObjectCalcer::imp ) ); + std::mem_fn( &ObjectCalcer::imp ) ); if ( std::find( args.begin(), args.end(), o->imp() ) == args.end() ) return false; diff --git a/kig/objects/object_drawer.cpp b/kig/objects/object_drawer.cpp index d6e41144..f1541f66 100644 --- a/kig/objects/object_drawer.cpp +++ b/kig/objects/object_drawer.cpp @@ -31,7 +31,7 @@ void ObjectDrawer::draw( const ObjectImp& imp, KigPainter& p, bool sel ) const bool nv = p.getNightVision( ); if ( mshown || nv ) { - p.setBrushStyle( Qt::NoBrush ); + p.setBrushStyle( TQt::NoBrush ); p.setBrushColor( sel ? TQt::red : ( mshown?mcolor:TQt::gray ) ); p.setPen( TQPen ( sel ? TQt::red : ( mshown?mcolor:TQt::gray ), 1) ); p.setWidth( mwidth ); @@ -90,7 +90,7 @@ ObjectDrawer* ObjectDrawer::getCopyWidth( int w ) const return ret; } -ObjectDrawer* ObjectDrawer::getCopyStyle( Qt::PenStyle s ) const +ObjectDrawer* ObjectDrawer::getCopyStyle( TQt::PenStyle s ) const { ObjectDrawer* ret = new ObjectDrawer; ret->mcolor = mcolor; @@ -117,7 +117,7 @@ int ObjectDrawer::width() const return mwidth; } -Qt::PenStyle ObjectDrawer::style() const +TQt::PenStyle ObjectDrawer::style() const { return mstyle; } @@ -127,13 +127,13 @@ int ObjectDrawer::pointStyle() const return mpointstyle; } -ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, Qt::PenStyle style, int pointStyle ) +ObjectDrawer::ObjectDrawer( const TQColor& color, int width, bool shown, TQt::PenStyle style, int pointStyle ) : mcolor( color ), mshown( shown ), mwidth( width ), mstyle( style ), mpointstyle( pointStyle ) { } ObjectDrawer::ObjectDrawer() - : mcolor( TQt::blue ), mshown( true ), mwidth( -1 ), mstyle( Qt::SolidLine ), mpointstyle( 0 ) + : mcolor( TQt::blue ), mshown( true ), mwidth( -1 ), mstyle( TQt::SolidLine ), mpointstyle( 0 ) { } @@ -173,19 +173,19 @@ TQString ObjectDrawer::pointStyleToString() const return TQString(); } -Qt::PenStyle ObjectDrawer::styleFromString( const TQString& style ) +TQt::PenStyle ObjectDrawer::styleFromString( const TQString& style ) { if ( style == "SolidLine" ) - return Qt::SolidLine; + return TQt::SolidLine; else if ( style == "DashLine" ) - return Qt::DashLine; + return TQt::DashLine; else if ( style == "DotLine" ) - return Qt::DotLine; + return TQt::DotLine; else if ( style == "DashDotLine" ) - return Qt::DashDotLine; + return TQt::DashDotLine; else if ( style == "DashDotDotLine" ) - return Qt::DashDotDotLine; - else return Qt::SolidLine; + return TQt::DashDotDotLine; + else return TQt::SolidLine; } TQString ObjectDrawer::styleToString() const diff --git a/kig/objects/object_drawer.h b/kig/objects/object_drawer.h index cbd1374a..b5336a06 100644 --- a/kig/objects/object_drawer.h +++ b/kig/objects/object_drawer.h @@ -48,7 +48,7 @@ class ObjectDrawer TQColor mcolor; bool mshown; int mwidth; - Qt::PenStyle mstyle; + TQt::PenStyle mstyle; int mpointstyle; public: /** @@ -57,7 +57,7 @@ public: * and pointstyle ( 0 ) */ ObjectDrawer(); - ObjectDrawer( const TQColor& color, int width = -1, bool shown = true, Qt::PenStyle = Qt::SolidLine, int pointStyle = 0 ); + ObjectDrawer( const TQColor& color, int width = -1, bool shown = true, TQt::PenStyle = TQt::SolidLine, int pointStyle = 0 ); /** * Draw the object \p imp on kigpainter \p p . If \p selected is true, it is * drawn in red, otherwise in its normal color. @@ -91,7 +91,7 @@ public: /** * return PenStyle for all objects except points */ - Qt::PenStyle style() const; + TQt::PenStyle style() const; /** * return pointStyle for points */ @@ -123,7 +123,7 @@ public: * returns a new ObjectDrawer that is identical to this one.. except * that the PenStyle state is set to \p s .. */ - ObjectDrawer* getCopyStyle( Qt::PenStyle s ) const; + ObjectDrawer* getCopyStyle( TQt::PenStyle s ) const; /** * returns a new ObjectDrawer that is identical to this one.. except * that the pointStyle state is set to \p p .. @@ -140,7 +140,7 @@ public: * given \p style string is unknown. In that case it returns a default * value. */ - static Qt::PenStyle styleFromString( const TQString& style ); + static TQt::PenStyle styleFromString( const TQString& style ); }; #endif diff --git a/kig/objects/object_factory.cpp b/kig/objects/object_factory.cpp index bf333094..7235e834 100644 --- a/kig/objects/object_factory.cpp +++ b/kig/objects/object_factory.cpp @@ -296,7 +296,7 @@ void ObjectFactory::redefinePoint( std::vector<ObjectCalcer*> os; ObjectCalcer* (ObjectHolder::*calcmeth)() = &ObjectHolder::calcer; std::transform( hos.begin(), hos.end(), std::back_inserter( os ), - std::mem_fun( calcmeth ) ); + std::mem_fn( calcmeth ) ); ObjectCalcer* v = 0; // we don't want one of our children as a parent... diff --git a/kig/objects/text_type.cpp b/kig/objects/text_type.cpp index c82c2047..05d564ff 100644 --- a/kig/objects/text_type.cpp +++ b/kig/objects/text_type.cpp @@ -144,7 +144,7 @@ void TextType::executeAction( int i, ObjectHolder& o, ObjectTypeCalcer& c, if ( i == 0 ) { - TQClipboard* cb = kapp->clipboard(); + TQClipboard* cb = tdeApp->clipboard(); // copy the text into the clipboard const TextImp* ti = static_cast<const TextImp*>( c.imp() ); diff --git a/kig/pykig/pykig.py b/kig/pykig/pykig.py index 106c8a0c..50cd5f2b 100755 --- a/kig/pykig/pykig.py +++ b/kig/pykig/pykig.py @@ -6,7 +6,7 @@ # # #--Maurizio Paolini-Daniele Zambelli-----------------------------2005---# # -# (licenza GPL) +# (GPL license) version="0.2.11" @@ -112,18 +112,18 @@ def kig_relpoint(obj, displ): ##### ##### -# Classe KigDocument +# Class KigDocument ##### class KigDocument(object): - """ Classe che produce il documento kig. + """ This class creates the kig document. - genealogia: + hierarchy: KigDocument <- object - attributi di classe: + class attributes: - attributi: + attributes: axes grid outfilename @@ -140,7 +140,7 @@ class KigDocument(object): shown color - metodi: + methods: viewappend hierarchyappend setcallkig @@ -234,24 +234,24 @@ class KigDocument(object): def setinternal(self, v): self.internal=v ##### -# Classe KigDOP +# Class KigDOP ##### #class KigDOP(KigOut): class KigDOP(object): - """Classe da cui deriva ogni elemento che ha un id: Data, Object, Property. + """Base class for all object containing an id: Data, Object, Property. - genealogia: + hierarchy: kigDOP <- object - attributo di classe: + class attributes: id-counter - attributi: + attributes: id type - metodi: + methods: getid str_hierarchy """ @@ -269,20 +269,20 @@ class KigDOP(object): def str_hierarchy(self): pass ##### -# Classe KigView +# Class KigView ##### #class KigView(KigOut): class KigView(object): - """ Classe con i dati di visualizzazione + """ Class containing visualization data - genealogia: + hierarchy: KigView <- object - attributi di classe: + class attributes: _kd - attributi: + attributes: shown width style @@ -290,7 +290,7 @@ class KigView(object): name pointstyle - metodi: + methods: str_view show hide @@ -308,9 +308,9 @@ class KigView(object): KigView._kd.viewappend(self) def str_view(self): - """Produce la stringa che viene scritta sotto <View>. + """Creates the string written in <View>. - esempio: + Example: <Draw width="-1" point-style="Round" namecalcer="none" style="SolidLine" shown=None color="#0000ff" object="3" /> """ @@ -321,19 +321,19 @@ style="SolidLine" shown=None color="#0000ff" object="3" /> self.linestyle, self.shown, self.color, self.object.getid()) ##### -# Classe Data +# Class Data ##### class Data(KigDOP): - """ Classe da cui deriva ogni elemento Data + """ Base class for all Data element - genealogia: + hierarchy: Data <- KigDOP <- object - attributi: + attributes: val - metodi: + methods: str_hierarchy """ def __init__(self, type, val): @@ -341,32 +341,32 @@ class Data(KigDOP): KigDOP.__init__(self, type) def str_hierarchy(self): - """Produce la stringa che viene scritta sotto <Data>. + """Creates the <Data> string. - esempio: + Example: <Data type="double" id="170" >0.1</Data> """ return ' <Data type="%s" id="%s" >%s</Data>\n' % \ (self._type, self.getid(), self.val) ##### -# Classe PropObj +# Class PropObj ##### class PropObj(KigDOP): - """ Classe da cui deriva ogni elemento visibile + """ Base class for all visible object - genealogia: + hierarchy: PropObj <- KigDOP <- object - attributi di classe: + class attributes: - attributi: + attributes: prop objvec view - metodi: + methods: str_hierarchy showname(self, n) show(self) @@ -393,8 +393,7 @@ class PropObj(KigDOP): if internal: self.view = None else: -# Qui si assume che, se viene dato un nome ad un oggetto, -# si voglia anche visualizzare questo nome +# Here we assume that if an object is named, the name should also be shown. if name: n_id=self.showname(name, shown, width, pointstyle, linestyle, color) else: n_id=None @@ -402,14 +401,14 @@ class PropObj(KigDOP): color) def str_hierarchy(self): - """Produce la stringa che viene scritta sotto <Data>. + """Creates the <Data> string. - esempio: + Example: <Property which="mid-point" id="170" > <Parent id="..." /> </Property> - oppure: + or: <Object type="ConstrainedPoint" id="14" > <Parent id="13" /> <Parent id="10" /> @@ -448,13 +447,13 @@ class PropObj(KigDOP): def setshown(self, s): self.view.shown=s ##### -# Classe Property +# Class Property ##### class Property(PropObj): - """ Classe da cui deriva ogni elemento Property + """ Base class for all Property elements - genealogia: + hierarchy: Property <- PropObj <- KigDOP <- object """ def __init__(self, type, parent, shown, name, internal, @@ -464,13 +463,13 @@ class Property(PropObj): # print shown ##### -# Classe Object +# Class Object ##### class Object(PropObj): - """ Classe da cui deriva ogni elemento Oggetto + """ Base class for all Object elements - genealogia: + hierarchy: Object <- PropObj <- KigDOP <- object """ @@ -509,7 +508,7 @@ for d in data: ##### # Objects ##### -"""Da aggiungere: +"""To be added: ("ConvexHall", "ConvexHall", "polygon,", "(polygon,),"), ("EllipseByFocusFocusPoint", "EllipseBFFP", "p1, p2, p3,", "(p1, p2, p3,),"), ("HyperbolaByFocusFocusPoint", "HyperbolaBFFP", "p1, p2, p3,", "(p1, p2, p3,),"), @@ -547,28 +546,27 @@ objects=(\ ##### ("LineLineIntersection", "LineLineIntersection", "l1, l2,", "(l1, l2),"), ##### -# Classe CircleCircleIntersection e ConicLineIntersection -# l'intero "which" puo' assumere i valori 1 o -1 per indicare quale -# delle due intersezioni si desidera ottenere -# si potrebbe mettere un controllo... +# Class CircleCircleIntersection and ConicLineIntersection +# the value of the "which" integer (1 or -1) indicates which of the two +# intersections we want to get. ##### ("CircleCircleIntersection", "CircleCircleIntersection", "c1, c2, witch,", "(c1, c2, Int(witch),),"), ("ConicLineIntersection", "ConicLineIntersection", "conic, line, witch,", "(conic, line, Int(witch),),"), -###### Classe Triangle +###### Class Triangle ("Triangle", "TriangleB3P", "p1, p2, p3,", "(p1, p2, p3),"), -###### Classe Polygon (the only argument is a points vect) +###### Class Polygon (the only argument is a points vect) ("Polygon", "PolygonBNP", "pvec,", "pvec,"), -###### Classe PolygonBCV -# Poligono regolare dati il centro e un vertice; il terzo argomento -# e' un intero contenente il numero di lati +###### Class PolygonBCV +# Regular polygon given the center and a vertex; the third parameter +# is an integer containing the number of sides. ("PolygonBCV", "PoligonBCV", "center, vertex, n,", "(center, vertex, Int(n)),"), -##### Classe PolygonVertex (poligono, intero >= 0) +##### Class PolygonVertex (polygon, integer >= 0) ("PolygonVertex", "PolygonVertex", "polygon, i,", "(polygon, Int(i)),"), -##### Classe PolygonSide (poligono, intero >= 0) +##### Class PolygonSide (polygon, integer >= 0) ("PolygonSide", "PolygonSide", "polygon, i,", "(polygon, Int(i)),"), ###### vector, angle,... @@ -677,7 +675,7 @@ for p in property: ##### # Start of properties definitions as Object's metod ##### -# da sistemare! +# fixme! points =(Point, ConstrainedPoint, RelativePoint, PolygonVertex) lines=(Segment, Ray, Vector, InvertLine) segments=(Segment, Vector, PolygonSide, InvertSegment) @@ -774,9 +772,9 @@ def prog(): elif _opt in ("-o", "--output"): _outfilename=_arg _of=True - _callKig=False # se c' il file di output, non viene chiamato Kig + _callKig=False # if the output filename is provided, don't call Kig if len(_args)==0: - _infilename=raw_input("Nome del file di input: ") + _infilename=raw_input("Input filename: ") if not _infilename: print "No Input filename" usage(2) @@ -803,7 +801,7 @@ def prog(): execfile(_infilename, globals()) except: print >> sys.stderr, 'syntax error in', _infilename - _info = sys.exc_info() # vorrei stampare il traceback... + _info = sys.exc_info() # print the traceback traceback.print_exc() sys.exit(3) kigdocument.close() diff --git a/kig/scripting/newscriptwizard.cpp b/kig/scripting/newscriptwizard.cpp index 9cb4d9e2..0268b67c 100644 --- a/kig/scripting/newscriptwizard.cpp +++ b/kig/scripting/newscriptwizard.cpp @@ -97,11 +97,11 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode ) TDEPopupMenu* pm = new TDEPopupMenu( editor ); // creating the actions for the code editor... TDEActionCollection* ac = new TDEActionCollection( editor ); - TDEAction* undoAction = KStdAction::undo( TQT_TQOBJECT(this), TQT_SLOT( slotUndo() ), ac ); - TDEAction* redoAction = KStdAction::redo( TQT_TQOBJECT(this), TQT_SLOT( slotRedo() ), ac ); - TDEAction* cutAction = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotCut() ), ac ); - TDEAction* copyAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotCopy() ), ac ); - TDEAction* pasteAction = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotPaste() ), ac ); + TDEAction* undoAction = KStdAction::undo( this, TQ_SLOT( slotUndo() ), ac ); + TDEAction* redoAction = KStdAction::redo( this, TQ_SLOT( slotRedo() ), ac ); + TDEAction* cutAction = KStdAction::cut( this, TQ_SLOT( slotCut() ), ac ); + TDEAction* copyAction = KStdAction::copy( this, TQ_SLOT( slotCopy() ), ac ); + TDEAction* pasteAction = KStdAction::paste( this, TQ_SLOT( slotPaste() ), ac ); // ... and plugging them into the popup menu (to build it, of course :) ) undoAction->plug( pm ); redoAction->plug( pm ); @@ -114,7 +114,7 @@ NewScriptWizard::NewScriptWizard( TQWidget* parent, ScriptModeBase* mode ) dynamic_cast<KTextEditor::PopupMenuInterface*>( editor )->installPopup( pm ); } - connect( this, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( slotHelpClicked() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), this, TQ_SLOT( slotHelpClicked() ) ); } void NewScriptWizard::back() @@ -159,7 +159,7 @@ void NewScriptWizard::accept() void NewScriptWizard::slotHelpClicked() { - kapp->invokeHelp( TQString::fromLatin1( "scripting" ), + tdeApp->invokeHelp( TQString::fromLatin1( "scripting" ), TQString::fromLatin1( "kig" ) ); } diff --git a/kig/scripting/newscriptwizard.h b/kig/scripting/newscriptwizard.h index 6fa9d07f..ad0203d3 100644 --- a/kig/scripting/newscriptwizard.h +++ b/kig/scripting/newscriptwizard.h @@ -34,7 +34,7 @@ class ScriptModeBase; class NewScriptWizard : public NewScriptWizardBase { - Q_OBJECT + TQ_OBJECT ScriptModeBase* mmode; public: diff --git a/kig/scripting/python_scripter.cpp b/kig/scripting/python_scripter.cpp index 00c7e162..f39d7121 100644 --- a/kig/scripting/python_scripter.cpp +++ b/kig/scripting/python_scripter.cpp @@ -495,9 +495,9 @@ ObjectImp* PythonScripter::calc( CompiledPythonScript& script, const Args& args }; tuple argstup( argstuph ); - handle<> reth( PyEval_CallObject( calcfunc.ptr(), argstup.ptr() ) ); + handle<> reth( PyObject_CallObject( calcfunc.ptr(), argstup.ptr() ) ); // object resulto = calcfunc( argstup ); -// handle<> reth( PyEval_CallObject( calcfunc.ptr(), args ) ); +// handle<> reth( PyObject_CallObject( calcfunc.ptr(), args ) ); object resulto( reth ); extract<ObjectImp&> result( resulto ); diff --git a/kig/scripting/script_mode.cpp b/kig/scripting/script_mode.cpp index 1fd88405..228ad739 100644 --- a/kig/scripting/script_mode.cpp +++ b/kig/scripting/script_mode.cpp @@ -45,7 +45,7 @@ void ScriptModeBase::dragRect( const TQPoint& p, KigWidget& w ) mdoc.runMode( &dm ); std::vector<ObjectHolder*> ret = dm.ret(); - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); if ( dm.needClear() ) { std::vector<ObjectHolder*> tmp( margs.begin(), margs.begin() ); @@ -67,7 +67,7 @@ void ScriptModeBase::leftClickedObject( ObjectHolder* o, const TQPoint&, if ( mwawd != SelectingArgs ) return; - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); if ( (dup_o = std::find( margs.begin(), margs.end(), o )) != margs.end() ) { @@ -105,7 +105,7 @@ void ScriptModeBase::mouseMoved( const std::vector<ObjectHolder*>& os, // statusbar text mdoc.emitStatusBarText( selectstat ); - KigPainter p( w.screenInfo(), TQT_TQPAINTDEVICE(&w.curPix), mdoc.document() ); + KigPainter p( w.screenInfo(), &w.curPix, mdoc.document() ); // set the text next to the arrow cursor TQPoint point = pt; @@ -246,7 +246,7 @@ void ScriptModeBase::setScriptType( ScriptType::Type type ) void ScriptModeBase::addArgs( const std::vector<ObjectHolder*>& obj, KigWidget& w ) { - KigPainter pter( w.screenInfo(), TQT_TQPAINTDEVICE(&w.stillPix), mdoc.document() ); + KigPainter pter( w.screenInfo(), &w.stillPix, mdoc.document() ); std::copy( obj.begin(), obj.end(), std::inserter( margs, margs.begin() ) ); pter.drawObjects( obj, true ); diff --git a/kig/tdefile/Makefile.am b/kig/tdefile/Makefile.am index ca77dc8e..59d1817d 100644 --- a/kig/tdefile/Makefile.am +++ b/kig/tdefile/Makefile.am @@ -9,11 +9,11 @@ kde_module_LTLIBRARIES = \ tdefile_kig.la tdefile_drgeo_la_SOURCES = tdefile_drgeo.cpp -tdefile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN) +tdefile_drgeo_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN) tdefile_drgeo_la_LIBADD = $(LIB_TDEIO) tdefile_kig_la_SOURCES = tdefile_kig.cpp -tdefile_kig_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN) +tdefile_kig_la_LDFLAGS = $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -module $(KDE_PLUGIN) tdefile_kig_la_LIBADD = $(LIB_TDEIO) METASOURCES = AUTO diff --git a/kig/tdefile/tdefile_drgeo.h b/kig/tdefile/tdefile_drgeo.h index 1eca85fa..ba0e97bf 100644 --- a/kig/tdefile/tdefile_drgeo.h +++ b/kig/tdefile/tdefile_drgeo.h @@ -27,7 +27,7 @@ class TQStringList; class DrgeoPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/kig/tdefile/tdefile_kig.cpp b/kig/tdefile/tdefile_kig.cpp index a1294641..e2fc6645 100644 --- a/kig/tdefile/tdefile_kig.cpp +++ b/kig/tdefile/tdefile_kig.cpp @@ -28,7 +28,7 @@ #include <kgenericfactory.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ktar.h> typedef KGenericFactory<KigPlugin> kigFactory; diff --git a/kig/tdefile/tdefile_kig.h b/kig/tdefile/tdefile_kig.h index 087caf17..97c44479 100644 --- a/kig/tdefile/tdefile_kig.h +++ b/kig/tdefile/tdefile_kig.h @@ -27,7 +27,7 @@ class TQStringList; class KigPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: diff --git a/kiten/Makefile.am b/kiten/Makefile.am index 944d816e..98ec6868 100644 --- a/kiten/Makefile.am +++ b/kiten/Makefile.am @@ -6,14 +6,14 @@ kiten_SOURCES = main.cpp kiten.cpp learn.cpp kloader.cpp ksaver.cpp \ configsearching.ui configlearn.ui configfont.ui configdictionariesbase.ui \ configdictionaries.cpp optiondialog.cpp kitenconfig.kcfgc -kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kiten_LDADD = libkiten.la $(LIB_TDEIO) bin_PROGRAMS = kiten kitengen lib_LTLIBRARIES = libkiten.la libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0 -libkiten_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEPRINT) $(LIB_QT) $(LIB_TDECORE) +libkiten_la_LIBADD = $(LIB_TDEUI) $(LIB_TDEPRINT) $(LIB_TQT) $(LIB_TDECORE) libkiten_la_SOURCES = asyndeta.cpp dict.cpp widgets.cpp kromajiedit.cpp rad.cpp \ deinf.cpp kitenconfig.kcfgc @@ -23,7 +23,7 @@ libkiteninclude_HEADERS = \ asyndeta.h dict.h widgets.h kromajiedit.h rad.h deinf.h kitengen_SOURCES = xjdxgen.c -kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/kiten/asyndeta.cpp b/kiten/asyndeta.cpp index e2d8a14a..67ae4633 100644 --- a/kiten/asyndeta.cpp +++ b/kiten/asyndeta.cpp @@ -21,7 +21,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> diff --git a/kiten/asyndeta.h b/kiten/asyndeta.h index d4946e17..ae35900e 100644 --- a/kiten/asyndeta.h +++ b/kiten/asyndeta.h @@ -28,7 +28,7 @@ namespace Dict class Index; } -class KDE_EXPORT Asyndeta +class TDE_EXPORT Asyndeta { public: // creates index diff --git a/kiten/configdictionaries.cpp b/kiten/configdictionaries.cpp index c7edcc80..b1f7fcce 100644 --- a/kiten/configdictionaries.cpp +++ b/kiten/configdictionaries.cpp @@ -31,10 +31,10 @@ ConfigDictionaries::ConfigDictionaries(TQWidget *parent, const char* name, WFlag { changed = false; config = Config::self(); - connect(delSelEdictButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelSelEdict())); - connect(addEdictButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddEdict())); - connect(delSelKanjidicButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelSelKanjidic())); - connect(addKanjidicButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddKanjidic())); + connect(delSelEdictButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelSelEdict())); + connect(addEdictButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddEdict())); + connect(delSelKanjidicButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelSelKanjidic())); + connect(addKanjidicButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddKanjidic())); } void ConfigDictionaries::updateWidgets() diff --git a/kiten/configdictionaries.h b/kiten/configdictionaries.h index 7f8e1051..4629ab5d 100644 --- a/kiten/configdictionaries.h +++ b/kiten/configdictionaries.h @@ -26,7 +26,7 @@ class ConfigDictionaries : public ConfigDictionariesBase { - Q_OBJECT + TQ_OBJECT public: ConfigDictionaries(TQWidget *parent = 0, const char* name = 0, WFlags f = 0); diff --git a/kiten/deinf.cpp b/kiten/deinf.cpp index 7831cfc6..78a51e00 100644 --- a/kiten/deinf.cpp +++ b/kiten/deinf.cpp @@ -19,7 +19,7 @@ **/ #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tqfile.h> diff --git a/kiten/deinf.h b/kiten/deinf.h index ca776289..98c7cb8e 100644 --- a/kiten/deinf.h +++ b/kiten/deinf.h @@ -34,7 +34,7 @@ struct Conjugation unsigned int num; }; -class KDE_EXPORT Index +class TDE_EXPORT Index { public: Index(); diff --git a/kiten/dict.cpp b/kiten/dict.cpp index ec8ceb6a..bdb7e0b8 100644 --- a/kiten/dict.cpp +++ b/kiten/dict.cpp @@ -21,8 +21,8 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <tqfileinfo.h> #include <tqregexp.h> diff --git a/kiten/dict.h b/kiten/dict.h index ba815f7c..0803d235 100644 --- a/kiten/dict.h +++ b/kiten/dict.h @@ -29,12 +29,7 @@ #include <tqstringlist.h> #include <sys/types.h> -#ifdef __osf__ -typedef unsigned int uint32_t; -typedef int int32_t; -#else #include <inttypes.h> -#endif namespace Dict { @@ -42,7 +37,7 @@ namespace Dict enum TextType { Text_Kanji, Text_Kana, Text_Latin }; // returns the TextType of the first part of the text -KDE_EXPORT TextType textType(const TQString &text); +TDE_EXPORT TextType textType(const TQString &text); // File needs to be able to give out Arrays based on its mmap'd data. // But, we don't want the users of the arrays to have to remember to @@ -106,7 +101,7 @@ private: bool valid; }; -class KDE_EXPORT Entry +class TDE_EXPORT Entry { public: // EDict ctor @@ -161,9 +156,9 @@ struct SearchResult enum SearchType { Search_Beginning, Search_FullWord, Search_Anywhere }; enum DictionaryType { Edict, Kanjidict }; -class KDE_EXPORT Index : public TQObject +class TDE_EXPORT Index : public TQObject { -Q_OBJECT +TQ_OBJECT public: @@ -193,12 +188,12 @@ private: }; // lotsa helper functions -KDE_EXPORT TQString prettyKanjiReading(TQStringList); -KDE_EXPORT TQString prettyMeaning(TQStringList); -KDE_EXPORT Entry parse(const TQString &); -KDE_EXPORT Entry kanjiParse(const TQString &); -KDE_EXPORT Dict::Entry firstEntry(Dict::SearchResult); -KDE_EXPORT TQString firstEntryText(Dict::SearchResult); +TDE_EXPORT TQString prettyKanjiReading(TQStringList); +TDE_EXPORT TQString prettyMeaning(TQStringList); +TDE_EXPORT Entry parse(const TQString &); +TDE_EXPORT Entry kanjiParse(const TQString &); +TDE_EXPORT Dict::Entry firstEntry(Dict::SearchResult); +TDE_EXPORT TQString firstEntryText(Dict::SearchResult); int eucStringCompare(const char *str1, const char *str2); bool isEUC(unsigned char c); diff --git a/kiten/edict b/kiten/edict index 1cc221eb..fd686375 100644 --- a/kiten/edict +++ b/kiten/edict @@ -55062,7 +55062,7 @@ 꿦 [Ƥ礯] /(n) handicraft/ 꿦 [Ƥ礯] /(n) handicraft/ 꿨 [Ƥ] /(n) feel/touch/ -꿮 [Ƥ] /hand Q_SIGNALS/flag Q_SIGNALS/ +꿮 [Ƥ] /hand signals/flag signals/ 꿴 [Ƥ] /(n) discretion/consideration/allowance/ 꿴ä [Ƥ廊] /(exp) to take into consideration/to use one's discretion/ 꿶 [Ƥ֤] /(n) movements or gestures of hands or arms/(P)/ diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index 3a29f781..8b3371eb 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -26,12 +26,12 @@ #include <kdebug.h> #include <tdeversion.h> #include <kedittoolbar.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kiconloader.h> #include <kkeydialog.h> #include <tdelocale.h> #include <tdemainwindow.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <tqclipboard.h> @@ -54,43 +54,43 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, n config = Config::self(); config->readConfig(); - Accel = new TDEGlobalAccel(TQT_TQOBJECT(this)); - (void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiSearchAccel())); - (void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, TQT_TQOBJECT(this), TQT_SLOT(searchAccel())); + Accel = new TDEGlobalAccel(this); + (void) Accel->insert("Lookup Kanji (Kanjidic)", i18n("Lookup Kanji (Kanjidic)"), i18n("Gives detailed information about Kanji currently on clipboard."), CTRL + ALT + Key_K, CTRL + ALT + Key_K, this, TQ_SLOT(kanjiSearchAccel())); + (void) Accel->insert("Lookup English/Japanese word", i18n("Lookup English/Japanese Word"), i18n("Looks up current text on clipboard in the same way as if you used Kiten's regular search."), CTRL + ALT + Key_S, CTRL + ALT + Key_S, this, TQ_SLOT(searchAccel())); Accel->readSettings(TDEGlobal::config()); Accel->updateConnections(); _ResultView = new ResultView(true, this, "_ResultView"); setCentralWidget(_ResultView); - (void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - (void) KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); - (void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotConfigure()), actionCollection()); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); - (void) new TDEAction(i18n("&Learn"), "pencil", CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(createLearn()), actionCollection(), "file_learn"); - (void) new TDEAction(i18n("&Dictionary Editor..."), "edit", 0, TQT_TQOBJECT(this), TQT_SLOT(createEEdit()), actionCollection(), "dict_editor"); - (void) new TDEAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, TQT_TQOBJECT(this), TQT_SLOT(radicalSearch()), actionCollection(), "search_radical"); - Edit = new EditAction(i18n("Search Edit"), 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search_edit"); - (void) new TDEAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQT_SLOT(clear()), actionCollection(), "clear_search"); - (void) new TDEAction(i18n("S&earch"), "key_enter", 0, TQT_TQOBJECT(this), TQT_SLOT(search()), actionCollection(), "search"); - (void) new TDEAction(i18n("Search with &Beginning of Word"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchBeginning()), actionCollection(), "search_beginning"); - (void) new TDEAction(i18n("Search &Anywhere"), 0, TQT_TQOBJECT(this), TQT_SLOT(searchAnywhere()), actionCollection(), "search_anywhere"); - (void) new TDEAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT(strokeSearch()), actionCollection(), "search_stroke"); - (void) new TDEAction(i18n("&Grade"), "format-justify-left", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(gradeSearch()), actionCollection(), "search_grade"); - kanjiCB = new TDEToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle"); - deinfCB = new TDEToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle"); - comCB = new TDEToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(toggleCom()), actionCollection(), "common"); - autoSearchToggle = new TDEToggleAction(i18n("&Automatically Search Clipboard Selections"), "edit-find", 0, TQT_TQOBJECT(this), TQT_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle"); - irAction = new TDEAction(i18n("Search &in Results"), "edit-find", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(resultSearch()), actionCollection(), "search_in_results"); - (void) KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolBars()), actionCollection()); - addAction = new TDEAction(i18n("Add &Kanji to Learning List"), 0, TQT_TQOBJECT(this), TQT_SLOT(addToList()), actionCollection(), "add"); + (void) KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + (void) KStdAction::print(this, TQ_SLOT(print()), actionCollection()); + (void) KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection()); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); + (void) new TDEAction(i18n("&Learn"), "pencil", CTRL+Key_L, this, TQ_SLOT(createLearn()), actionCollection(), "file_learn"); + (void) new TDEAction(i18n("&Dictionary Editor..."), "edit", 0, this, TQ_SLOT(createEEdit()), actionCollection(), "dict_editor"); + (void) new TDEAction(i18n("Ra&dical Search..."), "gear", CTRL+Key_R, this, TQ_SLOT(radicalSearch()), actionCollection(), "search_radical"); + Edit = new EditAction(i18n("Search Edit"), 0, this, TQ_SLOT(search()), actionCollection(), "search_edit"); + (void) new TDEAction(i18n("&Clear Search Bar"), BarIcon("locationbar_erase", 16), CTRL+Key_N, Edit, TQ_SLOT(clear()), actionCollection(), "clear_search"); + (void) new TDEAction(i18n("S&earch"), "key_enter", 0, this, TQ_SLOT(search()), actionCollection(), "search"); + (void) new TDEAction(i18n("Search with &Beginning of Word"), 0, this, TQ_SLOT(searchBeginning()), actionCollection(), "search_beginning"); + (void) new TDEAction(i18n("Search &Anywhere"), 0, this, TQ_SLOT(searchAnywhere()), actionCollection(), "search_anywhere"); + (void) new TDEAction(i18n("Stro&kes"), "paintbrush", CTRL+Key_S, this, TQ_SLOT(strokeSearch()), actionCollection(), "search_stroke"); + (void) new TDEAction(i18n("&Grade"), "format-justify-left", CTRL+Key_G, this, TQ_SLOT(gradeSearch()), actionCollection(), "search_grade"); + kanjiCB = new TDEToggleAction(i18n("&Kanjidic"), "kanjidic", CTRL+Key_K, this, TQ_SLOT(kanjiDictChange()), actionCollection(), "kanji_toggle"); + deinfCB = new TDEToggleAction(i18n("&Deinflect Verbs in Regular Search"), 0, this, TQ_SLOT(kanjiDictChange()), actionCollection(), "deinf_toggle"); + comCB = new TDEToggleAction(i18n("&Filter Rare"), "filter", CTRL+Key_F, this, TQ_SLOT(toggleCom()), actionCollection(), "common"); + autoSearchToggle = new TDEToggleAction(i18n("&Automatically Search Clipboard Selections"), "edit-find", 0, this, TQ_SLOT(kanjiDictChange()), actionCollection(), "autosearch_toggle"); + irAction = new TDEAction(i18n("Search &in Results"), "edit-find", CTRL+Key_I, this, TQ_SLOT(resultSearch()), actionCollection(), "search_in_results"); + (void) KStdAction::configureToolbars(this, TQ_SLOT(configureToolBars()), actionCollection()); + addAction = new TDEAction(i18n("Add &Kanji to Learning List"), 0, this, TQ_SLOT(addToList()), actionCollection(), "add"); addAction->setEnabled(false); - (void) new TDEAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding"); + (void) new TDEAction(i18n("Configure &Global Shortcuts..."), "configure_shortcuts", 0, this, TQ_SLOT(configureGlobalKeys()), actionCollection(), "options_configure_keybinding"); historyAction = new TDEListAction(i18n("&History"), 0, 0, 0, actionCollection(), "history"); - connect(historyAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(goInHistory(int))); - backAction = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection()); - forwardAction = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection()); + connect(historyAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(goInHistory(int))); + backAction = KStdAction::back(this, TQ_SLOT(back()), actionCollection()); + forwardAction = KStdAction::forward(this, TQ_SLOT(forward()), actionCollection()); backAction->setEnabled(false); forwardAction->setEnabled(false); currentResult = resultHistory.end(); @@ -114,10 +114,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) : TDEMainWindow(parent, n resize(600, 400); applyMainWindowSettings(TDEGlobal::config(), "TopLevelWindow"); - connect(_ResultView, TQT_SIGNAL(linkClicked(const TQString &)), TQT_SLOT(ressearch(const TQString &))); - connect(kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(autoSearch())); + connect(_ResultView, TQ_SIGNAL(linkClicked(const TQString &)), TQ_SLOT(ressearch(const TQString &))); + connect(tdeApp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(autoSearch())); - TQTimer::singleShot(10, TQT_TQOBJECT(this), TQT_SLOT(finishInit())); + TQTimer::singleShot(10, this, TQ_SLOT(finishInit())); } TopLevel::~TopLevel() @@ -130,7 +130,7 @@ void TopLevel::finishInit() { // if it's the application's first time starting, // the app group won't exist and we show demo - if (!kapp->config()->hasGroup("app")) + if (!tdeApp->config()->hasGroup("app")) { if (kanjiCB->isChecked()) Edit->setText(TQString::fromUtf8("辞")); @@ -277,14 +277,14 @@ void TopLevel::handleSearchResult(Dict::SearchResult results) { //kdDebug() << "adding " << (*it).kanji() << endl; _ResultView->addResult(*it, common); - kapp->processEvents(); + tdeApp->processEvents(); } } else { for (TQValueListIterator<Dict::Entry> it = results.list.begin(); it != results.list.end(); ++it) { - kapp->processEvents(); + tdeApp->processEvents(); _ResultView->addKanjiResult(*it, results.common); } } @@ -293,7 +293,7 @@ void TopLevel::handleSearchResult(Dict::SearchResult results) { for (TQValueListIterator<Dict::Entry> it = results.list.begin(); it != results.list.end(); ++it) { - kapp->processEvents(); + tdeApp->processEvents(); _ResultView->addResult(*it, comCB->isChecked()); } } @@ -529,9 +529,9 @@ void TopLevel::gradeSearch() TQString TopLevel::clipBoardText() // gets text from clipboard for globalaccels { - kapp->clipboard()->setSelectionMode(true); - TQString text = kapp->clipboard()->text().stripWhiteSpace(); - kapp->clipboard()->setSelectionMode(false); + tdeApp->clipboard()->setSelectionMode(true); + TQString text = tdeApp->clipboard()->text().stripWhiteSpace(); + tdeApp->clipboard()->setSelectionMode(false); return text; } @@ -609,9 +609,9 @@ void TopLevel::slotConfigure() //ConfigureDialog didn't find an instance of this dialog, so lets create it : optionDialog = new ConfigureDialog(this, "settings"); - connect(optionDialog, TQT_SIGNAL(hidden()),this,TQT_SLOT(slotConfigureHide())); - connect(optionDialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotConfigurationChanged())); - connect(optionDialog, TQT_SIGNAL(valueChanged()), TQT_TQOBJECT(this), TQT_SIGNAL(quizConfChanged())); + connect(optionDialog, TQ_SIGNAL(hidden()),this,TQ_SLOT(slotConfigureHide())); + connect(optionDialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotConfigurationChanged())); + connect(optionDialog, TQ_SIGNAL(valueChanged()), this, TQ_SIGNAL(quizConfChanged())); optionDialog->show(); return; @@ -625,7 +625,7 @@ void TopLevel::slotLearnConfigure() void TopLevel::slotConfigureHide() { - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureDestroy())); + TQTimer::singleShot(0, this, TQ_SLOT(slotConfigureDestroy())); } void TopLevel::slotConfigureDestroy() @@ -641,11 +641,11 @@ void TopLevel::createLearn() { Learn *_Learn = new Learn(_Asyndeta.retrieveIndex(), 0); - connect(_Learn, TQT_SIGNAL(destroyed(Learn *)), TQT_TQOBJECT(this), TQT_SLOT(learnDestroyed(Learn *))); - connect(_Learn, TQT_SIGNAL(linkClicked(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(ressearch(const TQString &))); - connect(_Learn, TQT_SIGNAL(configureLearn()), TQT_TQOBJECT(this), TQT_SLOT(slotLearnConfigure())); - connect(this, TQT_SIGNAL(quizConfChanged()), _Learn, TQT_SLOT(updateQuizConfiguration())); - connect(this, TQT_SIGNAL(add(Dict::Entry)), _Learn, TQT_SLOT(add(Dict::Entry))); + connect(_Learn, TQ_SIGNAL(destroyed(Learn *)), this, TQ_SLOT(learnDestroyed(Learn *))); + connect(_Learn, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(ressearch(const TQString &))); + connect(_Learn, TQ_SIGNAL(configureLearn()), this, TQ_SLOT(slotLearnConfigure())); + connect(this, TQ_SIGNAL(quizConfChanged()), _Learn, TQ_SLOT(updateQuizConfiguration())); + connect(this, TQ_SIGNAL(add(Dict::Entry)), _Learn, TQ_SLOT(add(Dict::Entry))); learnList.append(_Learn); @@ -730,7 +730,7 @@ void TopLevel::configureToolBars() { saveMainWindowSettings(TDEGlobal::config(), "TopLevelWindow"); KEditToolbar dlg(actionCollection(), "kitenui.rc"); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolBarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(newToolBarConfig())); dlg.exec(); } @@ -743,7 +743,7 @@ void TopLevel::newToolBarConfig() RadWidget *TopLevel::radicalSearch() { RadWidget *rw = new RadWidget(&_Rad, 0, "rw"); - connect(rw, TQT_SIGNAL(set(const TQStringList &, unsigned int, unsigned int)), TQT_TQOBJECT(this), TQT_SLOT(radSearch(const TQStringList &, unsigned int, unsigned int))); + connect(rw, TQ_SIGNAL(set(const TQStringList &, unsigned int, unsigned int)), this, TQ_SLOT(radSearch(const TQStringList &, unsigned int, unsigned int))); rw->show(); return rw; } diff --git a/kiten/kiten.h b/kiten/kiten.h index ef5cfda4..728b0fee 100644 --- a/kiten/kiten.h +++ b/kiten/kiten.h @@ -38,9 +38,9 @@ class TDEListAction; class Learn; class ResultView; -class KDE_EXPORT TopLevel : public TDEMainWindow +class TDE_EXPORT TopLevel : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kiten/kromajiedit.cpp b/kiten/kromajiedit.cpp index 6eda1d32..8c219784 100644 --- a/kiten/kromajiedit.cpp +++ b/kiten/kromajiedit.cpp @@ -19,7 +19,7 @@ **/ #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <tqfile.h> @@ -265,7 +265,7 @@ TQPopupMenu *KRomajiEdit::createPopupMenu() else if (kana == "hiragana") popup->setItemChecked(1, true); - connect(popup, TQT_SIGNAL(activated(int)), TQT_SLOT(setKana(int))); + connect(popup, TQ_SIGNAL(activated(int)), TQ_SLOT(setKana(int))); emit aboutToShowContextMenu(popup); return popup; diff --git a/kiten/kromajiedit.h b/kiten/kromajiedit.h index 86299511..498e11c5 100644 --- a/kiten/kromajiedit.h +++ b/kiten/kromajiedit.h @@ -32,7 +32,7 @@ class TQPopupMenu; class KRomajiEdit : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: diff --git a/kiten/learn.cpp b/kiten/learn.cpp index a1b685d4..cb647aa1 100644 --- a/kiten/learn.cpp +++ b/kiten/learn.cpp @@ -70,18 +70,18 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) TQVBoxLayout *veryTop = new TQVBoxLayout(dummy, 0, KDialog::spacingHint()); Tabs = new TQTabWidget(dummy); - connect(Tabs, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(tabChanged(TQWidget *))); + connect(Tabs, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(tabChanged(TQWidget *))); veryTop->addWidget(Tabs); listTop = new TQSplitter(Tabs); - listTop->setOrientation(Qt::Vertical); + listTop->setOrientation(TQt::Vertical); quizTop = new TQWidget(Tabs); Tabs->addTab(listTop, i18n("&List")); Tabs->addTab(quizTop, i18n("&Quiz")); View = new ResultView(true, listTop, "View"); View->setBasicMode(true); - connect(View, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SIGNAL(linkClicked(const TQString &))); + connect(View, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SIGNAL(linkClicked(const TQString &))); List = new TDEListView(listTop); @@ -101,8 +101,8 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) List->setSorting(4); List->setSelectionModeExt(TDEListView::Extended); - connect(List, TQT_SIGNAL(executed(TQListViewItem *)), TQT_SLOT(showKanji(TQListViewItem *))); - connect(List, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(itemSelectionChanged())); + connect(List, TQ_SIGNAL(executed(TQListViewItem *)), TQ_SLOT(showKanji(TQListViewItem *))); + connect(List, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(itemSelectionChanged())); TQStringList grades(i18n("Grade 1")); grades.append(i18n("Grade 2")); @@ -113,25 +113,25 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) grades.append(i18n("Others in Jouyou")); grades.append(i18n("Jinmeiyou")); - /*TDEAction *closeAction = */(void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - printAct = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(print()), actionCollection()); - forwardAct = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(next()), actionCollection()); + /*TDEAction *closeAction = */(void) KStdAction::close(this, TQ_SLOT(close()), actionCollection()); + printAct = KStdAction::print(this, TQ_SLOT(print()), actionCollection()); + forwardAct = KStdAction::forward(this, TQ_SLOT(next()), actionCollection()); forwardAct->plug(toolBar()); - backAct = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(prev()), actionCollection()); + backAct = KStdAction::back(this, TQ_SLOT(prev()), actionCollection()); backAct->plug(toolBar()); - cheatAct = new TDEAction(i18n("&Cheat"), CTRL + Key_C, TQT_TQOBJECT(this), TQT_SLOT(cheat()), actionCollection(), "cheat"); - randomAct = new TDEAction(i18n("&Random"), "goto", CTRL + Key_R, TQT_TQOBJECT(this), TQT_SLOT(random()), actionCollection(), "random"); + cheatAct = new TDEAction(i18n("&Cheat"), CTRL + Key_C, this, TQ_SLOT(cheat()), actionCollection(), "cheat"); + randomAct = new TDEAction(i18n("&Random"), "goto", CTRL + Key_R, this, TQ_SLOT(random()), actionCollection(), "random"); gradeAct = new TDEListAction(i18n("Grade"), 0, 0, 0, actionCollection(), "grade"); gradeAct->setItems(grades); - connect(gradeAct, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(updateGrade())); - removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del"); - addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add"); - addAllAct = new TDEAction(i18n("Add A&ll"), 0, TQT_TQOBJECT(this), TQT_SLOT(addAll()), actionCollection(), "addall"); - newAct = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); - openAct = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection()); - saveAct = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); - saveAsAct = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); - (void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SIGNAL(configureLearn()), actionCollection()); + connect(gradeAct, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(updateGrade())); + removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQ_SLOT(del()), actionCollection(), "del"); + addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQ_SLOT(add()), actionCollection(), "add"); + addAllAct = new TDEAction(i18n("Add A&ll"), 0, this, TQ_SLOT(addAll()), actionCollection(), "addall"); + newAct = KStdAction::openNew(this, TQ_SLOT(openNew()), actionCollection()); + openAct = KStdAction::open(this, TQ_SLOT(open()), actionCollection()); + saveAct = KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + saveAsAct = KStdAction::saveAs(this, TQ_SLOT(saveAs()), actionCollection()); + (void) KStdAction::preferences(this, TQ_SIGNAL(configureLearn()), actionCollection()); removeAct->setEnabled(false); @@ -140,18 +140,18 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) quizLayout->addStretch(); TQHBoxLayout *hlayout = new TQHBoxLayout(quizLayout); qKanji = new TQPushButton(quizTop); - connect(qKanji, TQT_SIGNAL(clicked()), this, TQT_SLOT(qKanjiClicked())); + connect(qKanji, TQ_SIGNAL(clicked()), this, TQ_SLOT(qKanjiClicked())); hlayout->addStretch(); hlayout->addWidget(qKanji); hlayout->addStretch(); quizLayout->addStretch(); - answers = new TQButtonGroup(1,Qt::Horizontal, quizTop); + answers = new TQButtonGroup(1,TQt::Horizontal, quizTop); for (int i = 0; i < numberOfAnswers; ++i) answers->insert(new KPushButton(answers), i); quizLayout->addWidget(answers); quizLayout->addStretch(); - connect(answers, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(answerClicked(int))); + connect(answers, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(answerClicked(int))); createGUI("learnui.rc"); //closeAction->plug(toolBar()); @@ -164,7 +164,7 @@ Learn::Learn(Dict::Index *parentDict, TQWidget *parent, const char *name) nogood = false; // this is so learn doesn't take so long to show itself - TQTimer::singleShot(200, this, TQT_SLOT(finishCtor())); + TQTimer::singleShot(200, this, TQ_SLOT(finishCtor())); } void Learn::finishCtor() @@ -247,7 +247,7 @@ bool Learn::queryClose() void Learn::random() { - int rand = static_cast<int>(static_cast<float>(list.count()) / (static_cast<float>(RAND_MAX) / kapp->random())); + int rand = static_cast<int>(static_cast<float>(list.count()) / (static_cast<float>(RAND_MAX) / tdeApp->random())); current = list.at(rand - 1); update(); @@ -303,7 +303,7 @@ void Learn::update() for (TQValueListIterator<Dict::Entry> it = compounds.list.begin(); it != compounds.list.end(); ++it) { - kapp->processEvents(); + tdeApp->processEvents(); View->addResult(*it, true); } @@ -683,12 +683,12 @@ TQString Learn::randomMeaning(TQStringList &oldMeanings) do { - float rand = kapp->random(); + float rand = tdeApp->random(); if ((rand > (RAND_MAX / 2)) || (List->childCount() < numberOfAnswers)) { // get a meaning from dict //kdDebug() << "from our dict\n"; - rand = kapp->random(); + rand = tdeApp->random(); float rand2 = RAND_MAX / rand; rand = ((float)list.count() - 1) / rand2; //rand -= 1; @@ -711,7 +711,7 @@ TQString Learn::randomMeaning(TQStringList &oldMeanings) { // get a meaning from our list //kdDebug() << "from our list\n"; - rand = kapp->random(); + rand = tdeApp->random(); float rand2 = RAND_MAX / rand; rand = List->childCount() / rand2; @@ -749,7 +749,7 @@ void Learn::qupdate() newFont.setPixelSize(24); qKanji->setFont(newFont); - float rand = kapp->random(); + float rand = tdeApp->random(); float rand2 = RAND_MAX / rand; seikai = static_cast<int>(numberOfAnswers / rand2); @@ -787,10 +787,10 @@ void Learn::qnew() // new quiz kanji // use f(2) every third time, f(1) otherwise // where f(1) = numberOfItems * rand[0..1] // and f(2) = numberOfItems * rand[0..1] * rand[0..1] - // rand[0..1] = kapp->random() / RAND_MAX - float max = static_cast<float>(count) / (static_cast<float>(RAND_MAX) / kapp->random()); - if (kapp->random() < (static_cast<float>(RAND_MAX) / 3.25)) - max /= (static_cast<float>(RAND_MAX) / (kapp->random() + 1)); + // rand[0..1] = tdeApp->random() / RAND_MAX + float max = static_cast<float>(count) / (static_cast<float>(RAND_MAX) / tdeApp->random()); + if (tdeApp->random() < (static_cast<float>(RAND_MAX) / 3.25)) + max /= (static_cast<float>(RAND_MAX) / (tdeApp->random() + 1)); max = static_cast<int>(max); diff --git a/kiten/learn.h b/kiten/learn.h index 2312cf46..08928a56 100644 --- a/kiten/learn.h +++ b/kiten/learn.h @@ -45,7 +45,7 @@ public: class Learn : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kiten/main.cpp b/kiten/main.cpp index 621fdf03..0fc18b5f 100644 --- a/kiten/main.cpp +++ b/kiten/main.cpp @@ -39,7 +39,7 @@ static TDECmdLineOptions options[] = int main(int argc, char *argv[]) { - tqInstallMsgHandler(noMessageOutput); + qInstallMsgHandler(noMessageOutput); TDEAboutData aboutData( "kiten", I18N_NOOP("Kiten"), "1.2", I18N_NOOP("Japanese Reference Tool"), TDEAboutData::License_GPL, "(c) 2001-2004, Jason Katz-Brown", 0, "http://www.katzbrown.com/kiten"); diff --git a/kiten/optiondialog.cpp b/kiten/optiondialog.cpp index 0a3fba44..0c3b6cd5 100644 --- a/kiten/optiondialog.cpp +++ b/kiten/optiondialog.cpp @@ -27,7 +27,7 @@ #include <tdelocale.h> #include <tqcombobox.h> #include <tdefiledialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurllabel.h> #include <krun.h> @@ -43,7 +43,7 @@ ConfigureDialog::ConfigureDialog(TQWidget *parent, const char *name) : TDEConfigDialog(parent, name, Config::self()) { configDic = new ConfigDictionaries(0, "dictionaries_page"); - connect(configDic, TQT_SIGNAL(widgetChanged()), this, TQT_SLOT(updateButtons())); + connect(configDic, TQ_SIGNAL(widgetChanged()), this, TQ_SLOT(updateButtons())); addPage(configDic, i18n("Dictionaries"), "contents"); addPage(new ConfigSearching(0, "searching_page"), i18n("Searching"), "edit-find"); addPage(new ConfigLearn(0, "learn_page"), i18n("Learn"), "pencil"); diff --git a/kiten/optiondialog.h b/kiten/optiondialog.h index d9319a4d..514c44b3 100644 --- a/kiten/optiondialog.h +++ b/kiten/optiondialog.h @@ -32,7 +32,7 @@ class TQCheckBox; class DictList; #include <tdeconfigdialog.h> -#include <kglobalaccel.h> +#include <tdeglobalaccel.h> #include <kkeydialog.h> #include "kitenconfig.h" @@ -40,7 +40,7 @@ class DictList; class ConfigureDialog : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: ConfigureDialog(TQWidget *parent=0, const char *name=0); diff --git a/kiten/rad.cpp b/kiten/rad.cpp index 44d2908c..b1dc7e11 100644 --- a/kiten/rad.cpp +++ b/kiten/rad.cpp @@ -27,7 +27,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqbuttongroup.h> #include <tqcheckbox.h> @@ -226,7 +226,7 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p TQHBoxLayout *hlayout = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); - hotlistGroup = new TQButtonGroup(1,Qt::Horizontal, i18n("Hotlist"), this); + hotlistGroup = new TQButtonGroup(1,TQt::Horizontal, i18n("Hotlist"), this); //hotlistGroup->setRadioButtonExclusive(true); vlayout->addWidget(hotlistGroup); @@ -244,12 +244,12 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p hotlistGroup->insert(new KPushButton(*hotlist.at(i), hotlistGroup), i); } - connect(hotlistGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(hotlistClicked(int))); + connect(hotlistGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(hotlistClicked(int))); TQVBoxLayout *layout = new TQVBoxLayout(vlayout, KDialog::spacingHint()); totalStrokes = new TQCheckBox(i18n("Search by total strokes"), this); - connect(totalStrokes, TQT_SIGNAL(clicked()), this, TQT_SLOT(totalClicked())); + connect(totalStrokes, TQ_SIGNAL(clicked()), this, TQ_SLOT(totalClicked())); layout->addWidget(totalStrokes); TQHBoxLayout *strokesLayout = new TQHBoxLayout(layout, KDialog::spacingHint()); @@ -263,11 +263,11 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p ok = new KPushButton(i18n("&Look Up"), this); ok->setEnabled(false); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(apply())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(apply())); layout->addWidget(ok); cancel = new KPushButton( KStdGuiItem::cancel(), this ); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(close())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(close())); layout->addWidget(cancel); TQVBoxLayout *middlevLayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); @@ -278,25 +278,25 @@ RadWidget::RadWidget(Rad *_rad, TQWidget *parent, const char *name) : TQWidget(p List = new TDEListBox(this); middlevLayout->addWidget(List); - connect(List, TQT_SIGNAL(executed(TQListBoxItem *)), this, TQT_SLOT(executed(TQListBoxItem *))); - connect(strokesSpin, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateList(int))); + connect(List, TQ_SIGNAL(executed(TQListBoxItem *)), this, TQ_SLOT(executed(TQListBoxItem *))); + connect(strokesSpin, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateList(int))); TQVBoxLayout *rightvlayout = new TQVBoxLayout(hlayout, KDialog::spacingHint()); selectedList = new TDEListBox(this); rightvlayout->addWidget(selectedList); - connect(selectedList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); + connect(selectedList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged())); remove = new KPushButton(i18n("&Remove"), this); rightvlayout->addWidget(remove); - connect(remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelected())); + connect(remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeSelected())); remove->setEnabled(false); clear = new KPushButton(KStdGuiItem::clear(), this); rightvlayout->addWidget(clear); - connect(clear, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearSelected())); + connect(clear, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearSelected())); clear->setEnabled(false); - setCaption(kapp->makeStdCaption(i18n("Radical Selector"))); + setCaption(tdeApp->makeStdCaption(i18n("Radical Selector"))); strokesSpin->setValue(config->strokes()); strokesSpin->setFocus(); diff --git a/kiten/rad.h b/kiten/rad.h index 54c5cc99..1ac7a477 100644 --- a/kiten/rad.h +++ b/kiten/rad.h @@ -33,7 +33,7 @@ class KPushButton; class TDEListBox; class TQButtonGroup; -class KDE_EXPORT Radical +class TDE_EXPORT Radical { public: Radical(TQString = TQString(), unsigned int = 0); @@ -50,9 +50,9 @@ class KDE_EXPORT Radical TQString Kanji; }; -class KDE_EXPORT Rad : public TQObject +class TDE_EXPORT Rad : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -72,9 +72,9 @@ class KDE_EXPORT Rad : public TQObject bool loaded; }; -class KDE_EXPORT RadWidget : public TQWidget +class TDE_EXPORT RadWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kiten/widgets.cpp b/kiten/widgets.cpp index f572a76c..e952fa63 100644 --- a/kiten/widgets.cpp +++ b/kiten/widgets.cpp @@ -26,8 +26,8 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kprinter.h> -#include <kprocess.h> -#include <kstandarddirs.h> +#include <tdeprocess.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <tqfileinfo.h> #include <tqpaintdevicemetrics.h> @@ -278,7 +278,7 @@ void ResultView::print(TQString title) printer.newPage(); page++; - kapp->processEvents(); + tdeApp->processEvents(); } while (true); } @@ -317,11 +317,11 @@ eEdit::eEdit(const TQString &_filename, TQWidget *parent, const char *name) List->setMultiSelection(true); List->setDragEnabled(true); - saveAct = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); - removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, TQT_TQOBJECT(this), TQT_SLOT(del()), actionCollection(), "del"); - (void) new TDEAction(i18n("&Disable Dictionary"), 0, TQT_TQOBJECT(this), TQT_SLOT(disable()), actionCollection(), "disable"); - addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection(), "add"); - (void) KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); + saveAct = KStdAction::save(this, TQ_SLOT(save()), actionCollection()); + removeAct = new TDEAction(i18n("&Delete"), "edit_remove", CTRL + Key_X, this, TQ_SLOT(del()), actionCollection(), "del"); + (void) new TDEAction(i18n("&Disable Dictionary"), 0, this, TQ_SLOT(disable()), actionCollection(), "disable"); + addAct = new TDEAction(i18n("&Add"), "edit_add", CTRL + Key_A, this, TQ_SLOT(add()), actionCollection(), "add"); + (void) KStdAction::close(this, TQ_SLOT(close()), actionCollection()); createGUI("eeditui.rc"); //closeAction->plug(toolBar()); @@ -458,11 +458,11 @@ int EditAction::plug( TQWidget *w, int index ) KRomajiEdit *comboBox = new KRomajiEdit(toolBar, "search edit"); toolBar->insertWidget( id, 70, comboBox, index ); - connect( comboBox, TQT_SIGNAL( returnPressed()), m_receiver, m_member ); + connect( comboBox, TQ_SIGNAL( returnPressed()), m_receiver, m_member ); addContainer(toolBar, id); - connect( toolBar, TQT_SIGNAL( destroyed() ), TQT_TQOBJECT(this), TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); toolBar->setItemAutoSized( id, true ); diff --git a/kiten/widgets.h b/kiten/widgets.h index 44ae4447..2319b4d0 100644 --- a/kiten/widgets.h +++ b/kiten/widgets.h @@ -34,9 +34,9 @@ class KStatusBar; #include "dict.h" #include "rad.h" -class KDE_EXPORT ResultView : public KTextBrowser +class TDE_EXPORT ResultView : public KTextBrowser { - Q_OBJECT + TQ_OBJECT public: @@ -64,9 +64,9 @@ class KDE_EXPORT ResultView : public KTextBrowser bool basicMode; }; -class KDE_EXPORT eEdit : public TDEMainWindow +class TDE_EXPORT eEdit : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: @@ -90,9 +90,9 @@ class KDE_EXPORT eEdit : public TDEMainWindow bool isMod; }; -class KDE_EXPORT EditAction : public TDEAction +class TDE_EXPORT EditAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: EditAction( const TQString& text, int accel, const TQObject *receiver, const char *member, TQObject* parent, const char* name ); diff --git a/kiten/xjdxgen.c b/kiten/xjdxgen.c index bf4de028..18afa221 100644 --- a/kiten/xjdxgen.c +++ b/kiten/xjdxgen.c @@ -30,6 +30,7 @@ #include <stdlib.h> #include <ctype.h> #include <string.h> +#include <stdbool.h> #ifdef HAVE_STDINT_H #include <stdint.h> @@ -37,8 +38,6 @@ #include "xjdic.h" -#define TRUE 1 -#define FALSE 0 #define SPTAG '@' #define EXLIM 100 #define TOKENLIM 40 @@ -62,7 +61,7 @@ int stringcomp(unsigned char *s1, unsigned char *s2); void jqsort(int32_t i, int32_t j); int Kstrcmp(uint32_t lhs, uint32_t rhs); void xjdicrc(); -int alphaoreuc(unsigned char x); +bool alphaoreuc(unsigned char x); int stringcomp(unsigned char *s1, unsigned char *s2) { @@ -86,9 +85,10 @@ extern char *getenv(const char *name); /*====function to Load Dictionary and load/create index table=======*/ int main(int argc, char *argv[]) { - FILE *fp,*fopen(); + FILE *fp; uint32_t possav,schi,diclen,indlen; - int i,inwd,cstrp,saving,isc,nodread; + int i,cstrp,isc,nodread; + bool inwd, saving; unsigned char c; unsigned char currstr[TOKENLIM]; @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) JDXname = argv[2]; printf("Commandline request to use files %s and %s \n", Dname, JDXname); - inwd = FALSE; + inwd = false; indptr = 1; llone = 1; if(stat(Dname, &buf) != 0) @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) kana/kanji string and every alphabetic string it finds which is >=3 characters and is not on the "exclude" list */ indptr = 1; - saving = FALSE; + saving = false; cstrp = 0; for (schi =0; schi < dbyte; schi++) /* scan whole dictionary */ { @@ -168,9 +168,9 @@ int main(int argc, char *argv[]) else { currstr[cstrp] = '\0'; - inwd = FALSE; - if ((strlen(currstr) <= 2) && (currstr[0] < 127))saving = FALSE; - if ((strlen(currstr) == 2) && (currstr[1] <= '9'))saving = TRUE; + inwd = false; + if ((strlen(currstr) <= 2) && (currstr[0] < 127))saving = false; + if ((strlen(currstr) == 2) && (currstr[1] <= '9'))saving = true; if (saving && (currstr[0] > 127)) { possav = jindex[indptr]; @@ -237,12 +237,12 @@ int main(int argc, char *argv[]) { if (alphaoreuc(c) || c == SPTAG) { - inwd = TRUE; + inwd = true; jindex[indptr] = schi; cstrp = 1; currstr[0] = c; currstr[1] = '\0'; - saving = TRUE; + saving = true; } } } @@ -326,7 +326,7 @@ void xjdicrc() { unsigned char xjdicdir[PATH_MAX],rcstr[80],*rcwd; int iex; - FILE *fm,*fopen(); + FILE *fm; iex = 0; xjdicdir[0] = '\0'; @@ -374,7 +374,7 @@ void xjdicrc() rcwd = (unsigned char *)strtok(rcstr," \t"); if( stringcomp((unsigned char *)"exlist",rcwd) == 0) { - while (TRUE) + while (true) { rcwd = (unsigned char *)strtok(NULL," \t\f\r\n"); if (rcwd == NULL) break; @@ -401,23 +401,23 @@ void xjdicrc() } */ /*=======function to test a character for alpha or kana/kanji====*/ -int alphaoreuc(unsigned char x) +bool alphaoreuc(unsigned char x) { int c; c = x & 0xff; if(((c >= 65) && (c <= 90)) || ((c >= 97) && (c <= 122))) { - return (TRUE); + return true; } if ((c >= '0') && (c <= '9')) { - return(TRUE); + return true; } if ((c & 0x80) > 0) { - return(TRUE); + return true; } - return (FALSE); + return false; } diff --git a/klatin/klatin/Makefile.am b/klatin/klatin/Makefile.am index b5d40d94..227b7fb8 100644 --- a/klatin/klatin/Makefile.am +++ b/klatin/klatin/Makefile.am @@ -12,7 +12,7 @@ bin_PROGRAMS = klatin INCLUDES = $(all_includes) # the library search path. -klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. klatin_LDADD = $(LIB_TDEFILE) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la diff --git a/klatin/klatin/klatin.cpp b/klatin/klatin/klatin.cpp index dc393c4e..3d7f28ce 100644 --- a/klatin/klatin/klatin.cpp +++ b/klatin/klatin/klatin.cpp @@ -21,7 +21,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <kurlrequester.h> @@ -53,12 +53,12 @@ KLatin::~KLatin() void KLatin::setupActions() { // Setup various menu actions - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(loadSettings()), actionCollection()); - m_loadVocab = new TDEAction(i18n("Load &Vocabulary"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVocab()), actionCollection(), "go_vocab"); - m_loadGrammar = new TDEAction(i18n("Load &Grammar"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadGrammar()), actionCollection(), "go_grammar"); - m_loadVerbs = new TDEAction(i18n("Load V&erbs"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadVerbs()), actionCollection(), "go_verbs"); - m_loadRevision = new TDEAction(i18n("Load &Revision"), 0, TQT_TQOBJECT(this), TQT_SLOT(loadRevision()), actionCollection(), "go_revision"); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(loadSettings()), actionCollection()); + m_loadVocab = new TDEAction(i18n("Load &Vocabulary"), 0, this, TQ_SLOT(loadVocab()), actionCollection(), "go_vocab"); + m_loadGrammar = new TDEAction(i18n("Load &Grammar"), 0, this, TQ_SLOT(loadGrammar()), actionCollection(), "go_grammar"); + m_loadVerbs = new TDEAction(i18n("Load V&erbs"), 0, this, TQ_SLOT(loadVerbs()), actionCollection(), "go_verbs"); + m_loadRevision = new TDEAction(i18n("Load &Revision"), 0, this, TQ_SLOT(loadRevision()), actionCollection(), "go_revision"); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); } void KLatin::startClicked() @@ -87,11 +87,11 @@ void KLatin::loadVocab() // Set this widget as the central widget setCentralWidget(klatinvocabsection); - updateSection(FALSE); + updateSection(false); // When the child emits the signal exitted(), // then reset the GUI to go back to the menu - connect(klatinvocabsection, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_SLOT(resetGUI())); + connect(klatinvocabsection, TQ_SIGNAL(exited()), this, TQ_SLOT(resetGUI())); // Set the section variable m_section = 1; @@ -107,15 +107,15 @@ void KLatin::loadGrammar() slotWriteMsg(i18n("Grammar")); // Disable all the menu entries under Section/ - updateSection(FALSE); + updateSection(false); // Set this widget as the central widget setCentralWidget(klatingrammarsection); // When the child emits the signal exited(), // then reset the GUI to go back to the menu - connect(klatingrammarsection, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_SLOT(resetGUI())); - connect(klatingrammarsection, TQT_SIGNAL(statusMsg(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotWriteMsg(const TQString&))); + connect(klatingrammarsection, TQ_SIGNAL(exited()), this, TQ_SLOT(resetGUI())); + connect(klatingrammarsection, TQ_SIGNAL(statusMsg(const TQString&)), this, TQ_SLOT(slotWriteMsg(const TQString&))); // Set the section variable m_section = 2; } @@ -135,15 +135,15 @@ void KLatin::loadVerbs() slotWriteMsg(i18n("Verbs")); // Disable all the menu entries under Section/ - updateSection(FALSE); + updateSection(false); // Set this widget as the central widget setCentralWidget(klatinverbssection); // When the child emits the signal exited(), // then reset the GUI to go back to the menu - connect(klatinverbssection, TQT_SIGNAL(exited()), TQT_TQOBJECT(this), TQT_SLOT(resetGUI())); - connect(klatinverbssection, TQT_SIGNAL(statusMsg(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotWriteMsg(const TQString&))); + connect(klatinverbssection, TQ_SIGNAL(exited()), this, TQ_SLOT(resetGUI())); + connect(klatinverbssection, TQ_SIGNAL(statusMsg(const TQString&)), this, TQ_SLOT(slotWriteMsg(const TQString&))); // Set the section variable m_section = 3; @@ -151,7 +151,7 @@ void KLatin::loadVerbs() void KLatin::loadRevision() { - kapp->invokeHelp("klatin-index", "klatin"); + tdeApp->invokeHelp("klatin-index", "klatin"); } void KLatin::loadSettings() @@ -166,7 +166,7 @@ void KLatin::loadSettings() vocabPage->kcfg_DefaultFile->setFilter("*.kvtml"); vocabPage->kcfg_DefaultFile->setCaption(i18n("Load Vocabulary File")); dialog->addPage(vocabPage, i18n("Vocabulary"), "kdict"); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(settingsChanged())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChanged())); dialog->show(); } @@ -189,12 +189,12 @@ void KLatin::resetGUI() setCentralWidget(klatinchoose); // Connect the "Start" button to slot StartPressed() - connect(klatinchoose->StartButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(startClicked())); + connect(klatinchoose->StartButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(startClicked())); // Make the quit button quit the application :) - connect(klatinchoose->QuitButton, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit())); + connect(klatinchoose->QuitButton, TQ_SIGNAL(clicked()), tdeApp, TQ_SLOT(quit())); // Enable all the menu entries under Section/ - updateSection(TRUE); + updateSection(true); // Use XML GUI to construct the menubar setupGUI(); diff --git a/klatin/klatin/klatin.h b/klatin/klatin/klatin.h index 3568148b..51542764 100644 --- a/klatin/klatin/klatin.h +++ b/klatin/klatin/klatin.h @@ -35,7 +35,7 @@ /** @short Main application class */ class KLatin : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: KLatin(TQWidget* parent=0, const char *name=0); diff --git a/klatin/klatin/klatin.kcfg b/klatin/klatin/klatin.kcfg index 38431aa5..d2f21767 100644 --- a/klatin/klatin/klatin.kcfg +++ b/klatin/klatin/klatin.kcfg @@ -17,7 +17,7 @@ filename += m_language; TQDir check(filename); - if (check.exists() == FALSE) { + if (!check.exists()) { m_language = "en"; } kdDebug()<< m_language <<endl; diff --git a/klatin/klatin/klatingrammar.cpp b/klatin/klatin/klatingrammar.cpp index e4f3f2a5..4dfb2efa 100644 --- a/klatin/klatin/klatingrammar.cpp +++ b/klatin/klatin/klatingrammar.cpp @@ -23,7 +23,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <stdlib.h> #include <time.h> @@ -42,10 +42,10 @@ KLatinGrammar::KLatinGrammar(TQWidget* parent, const char *name) BackButton->setIconSet(TDEGlobal::iconLoader()->loadIconSet("back", TDEIcon::Small)); // Set connections - connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack())); - connect(OKButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswer())); - connect(AnswerBox, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(checkAnswer())); - connect(ChooseSection, TQT_SIGNAL(activated(int)), this, TQT_SLOT(loadDatabase())); + connect(BackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(goBack())); + connect(OKButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswer())); + connect(AnswerBox, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(checkAnswer())); + connect(ChooseSection, TQ_SIGNAL(activated(int)), this, TQ_SLOT(loadDatabase())); // Insert the various declensions ChooseSection->insertItem(i18n("All Declensions")); @@ -115,7 +115,7 @@ void KLatinGrammar::loadDatabase() // Check whether the file actually exists // If not - warn user. - if (TQFile::exists(locate("data", file)) == FALSE) { + if (!TQFile::exists(locate("data", file))) { KMessageBox::error(this, i18n("Could not load grammar-definition file, check KLatin installation."), i18n("Error with KLatin")); QuestionLabel->setText(i18n("Error.")); return; diff --git a/klatin/klatin/klatingrammar.h b/klatin/klatin/klatingrammar.h index 18e1c21c..e5ea6787 100644 --- a/klatin/klatin/klatingrammar.h +++ b/klatin/klatin/klatingrammar.h @@ -26,7 +26,7 @@ /** @short Main class for testing grammar*/ class KLatinGrammar : public KLatinGrammarWidget { - Q_OBJECT + TQ_OBJECT public: KLatinGrammar(TQWidget* parent=0, const char *name=0); diff --git a/klatin/klatin/klatinverbs.cpp b/klatin/klatin/klatinverbs.cpp index 64dd13fa..cece4577 100644 --- a/klatin/klatin/klatinverbs.cpp +++ b/klatin/klatin/klatinverbs.cpp @@ -23,7 +23,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <stdlib.h> #include <time.h> @@ -81,11 +81,11 @@ KLatinVerbs::KLatinVerbs(TQWidget* parent, const char *name) question.tense.push_back(I18N_NOOP("pluperfect")); question.tense.push_back(I18N_NOOP("future perfect")); - connect(ChooseConjugation, TQT_SIGNAL(activated(int)), this, TQT_SLOT(conjugationActivated(int))); - connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack())); - connect(ChangeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(loadDatabase())); - connect(AnswerBox, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(checkAnswer())); - connect(OKButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswer())); + connect(ChooseConjugation, TQ_SIGNAL(activated(int)), this, TQ_SLOT(conjugationActivated(int))); + connect(BackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(goBack())); + connect(ChangeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(loadDatabase())); + connect(AnswerBox, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(checkAnswer())); + connect(OKButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswer())); loadDatabase(); @@ -105,7 +105,7 @@ void KLatinVerbs::loadDatabase() TQString fileName = "klatin/data/verbs/" + databaseFile; - if (TQFile::exists(locate("data", fileName)) == FALSE) { + if (!TQFile::exists(locate("data", fileName))) { KMessageBox::error(this, i18n("Could not load verb-definition file, check KLatin installation."), i18n("Error with KLatin")); goBack(); } diff --git a/klatin/klatin/klatinverbs.h b/klatin/klatin/klatinverbs.h index 281665cd..73bcd91d 100644 --- a/klatin/klatin/klatinverbs.h +++ b/klatin/klatin/klatinverbs.h @@ -40,7 +40,7 @@ struct questionparts { /** @short Main class for testing verb forms */ class KLatinVerbs : public KLatinVerbsWidget { - Q_OBJECT + TQ_OBJECT public: KLatinVerbs(TQWidget* parent=0, const char *name=0); diff --git a/klatin/klatin/klatinvocab.cpp b/klatin/klatin/klatinvocab.cpp index b30600eb..6d6b6c01 100644 --- a/klatin/klatin/klatinvocab.cpp +++ b/klatin/klatin/klatinvocab.cpp @@ -23,7 +23,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <stdlib.h> @@ -40,7 +40,7 @@ KLatinVocab::KLatinVocab(TQWidget* parent, const char *name) m_vocabFile = TQString(); // Goes back to the last dialog - connect(BackButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(goBack())); + connect(BackButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(goBack())); // Set default settings m_numberOfQuestions = Settings::numOfQuestions(); @@ -53,10 +53,10 @@ KLatinVocab::KLatinVocab(TQWidget* parent, const char *name) parseVocab(); // Connect the multiple choice buttons to the various slots - connect(Answer1, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerOne())); - connect(Answer2, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerTwo())); - connect(Answer3, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerThree())); - connect(Answer4, TQT_SIGNAL(clicked()), this, TQT_SLOT(checkAnswerFour())); + connect(Answer1, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerOne())); + connect(Answer2, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerTwo())); + connect(Answer3, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerThree())); + connect(Answer4, TQ_SIGNAL(clicked()), this, TQ_SLOT(checkAnswerFour())); } KLatinVocab::~KLatinVocab() @@ -86,7 +86,7 @@ void KLatinVocab::parseVocab(TQString customFile) // Check whether file exists or not // If not then regenerate working default - if (TQFile::exists(fileName) == FALSE) { + if (!TQFile::exists(fileName)) { TDEConfigBase *globalConf = TDEGlobal::config(); globalConf->setGroup("Locale"); @@ -98,7 +98,7 @@ void KLatinVocab::parseVocab(TQString customFile) TQDir checkLang(fileNameLang); - if (checkLang.exists() == FALSE) { + if (!checkLang.exists()) { language = "en"; } @@ -106,9 +106,9 @@ void KLatinVocab::parseVocab(TQString customFile) TQString defaultFile = (fileNameLang + "/" + vocabDirectory[0]); - if (TQFile::exists(defaultFile) == FALSE) { + if (!TQFile::exists(defaultFile)) { KMessageBox::error(this, i18n("Could not load vocabulary file; there is a problem with your KLatin installation."), i18n("Error with KLatin")); - kapp->quit(); + tdeApp->quit(); } else { fileName = defaultFile; Settings::setDefaultFile(defaultFile); @@ -123,9 +123,9 @@ void KLatinVocab::parseVocab(TQString customFile) // Start parsing file and allocating words to the TQValueList<TQStringPair> for(KEduVocDataItemList::Iterator dataIt = vocabulary.begin(); dataIt != vocabulary.end(); ++dataIt) { if (Settings::langToLatin()) { - m_texts.append(tqMakePair(vocabulary[it].originalText(), vocabulary[it].translatedText())); + m_texts.append(qMakePair(vocabulary[it].originalText(), vocabulary[it].translatedText())); } else { - m_texts.append(tqMakePair(vocabulary[it].translatedText(), vocabulary[it].originalText())); + m_texts.append(qMakePair(vocabulary[it].translatedText(), vocabulary[it].originalText())); } it++; } @@ -211,7 +211,7 @@ void KLatinVocab::newQuestion() // Initialise a couple of temporary variables int i = 0, j = 0, tempRand[4]; - bool override = FALSE; + bool override = false; // Assign m_choiceWords with the 4 words // to go into the multiple choice. Make sure @@ -242,15 +242,15 @@ void KLatinVocab::newQuestion() } // Make sure the actual answer isn't already in m_choiceWords - // If it is, set override to be TRUE + // If it is, set override to be true for (i = 0; i < 4; i++) { if (m_choiceWords[4] == m_choiceWords[i]) { m_lastAnswerNumber = i; - override = TRUE; + override = true; } } - bool exitLoop = FALSE; + bool exitLoop = false; // Override a random variable with the correct // answer @@ -260,7 +260,7 @@ void KLatinVocab::newQuestion() if (answerNumber != m_lastAnswerNumber) { m_choiceWords[answerNumber] = m_texts[randNum].second; m_lastAnswerNumber = answerNumber; - exitLoop = TRUE; + exitLoop = true; } else { answerNumber = (random() % 3); } @@ -348,7 +348,7 @@ void KLatinVocab::resultsDialog() { // Show the results dialog - results = new KLatinResultsDialog(this, 0, TRUE); + results = new KLatinResultsDialog(this, 0, true); results->CloseButton->setGuiItem(KStdGuiItem::close()); int temp = Score2Label->text().toInt(); diff --git a/klatin/klatin/klatinvocab.h b/klatin/klatin/klatinvocab.h index 0f37415d..1eabeed6 100644 --- a/klatin/klatin/klatinvocab.h +++ b/klatin/klatin/klatinvocab.h @@ -30,7 +30,7 @@ class KLatinVocab : public KLatinVocabWidget { - Q_OBJECT + TQ_OBJECT public: KLatinVocab(TQWidget* parent=0, const char *name=0); diff --git a/klatin/klatin/settings.kcfgc b/klatin/klatin/settings.kcfgc index b6246990..cbf32a20 100644 --- a/klatin/klatin/settings.kcfgc +++ b/klatin/klatin/settings.kcfgc @@ -1,5 +1,5 @@ File=klatin.kcfg ClassName=Settings -IncludeFiles=kstandarddirs.h,tqdir.h,tdelocale.h,kdebug.h +IncludeFiles=tdestandarddirs.h,tqdir.h,tdelocale.h,kdebug.h Singleton=true Mutators=true
\ No newline at end of file diff --git a/klettres/klettres/Makefile.am b/klettres/klettres/Makefile.am index 168efc4e..26d66c09 100644 --- a/klettres/klettres/Makefile.am +++ b/klettres/klettres/Makefile.am @@ -24,7 +24,7 @@ METASOURCES = AUTO KDE_ICON = AUTO # the library search path. -klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/klettres.pot; diff --git a/klettres/klettres/klettres.cpp b/klettres/klettres/klettres.cpp index f65d7697..af757870 100644 --- a/klettres/klettres/klettres.cpp +++ b/klettres/klettres/klettres.cpp @@ -38,7 +38,7 @@ #include <tdemenubar.h> #include <tdemessagebox.h> #include <knuminput.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <tdetoolbar.h> #include <tdetoolbarbutton.h> @@ -121,7 +121,7 @@ void KLettres::findLanguages() //TODO TEST in FRENCH m_languages.sort(); //write the present languages in config so they cannot be downloaded - TDEConfig *config=kapp->config(); + TDEConfig *config=tdeApp->config(); config->setGroup("TDENewStuffStatus"); for (uint i=0; i<m_languages.count(); i++) { @@ -178,7 +178,7 @@ bool KLettres::loadLayout(TQDomDocument &layoutDocument) "$TDEDIR/share/apps/klettres/\n\n" "Please install this file and start KLettres again.\n\n"); KMessageBox::information( this, mString,"KLettres - Error" ); - kapp->quit();//exit(1); + tdeApp->quit();//exit(1); } if (!layoutFile.open(IO_ReadOnly)) return false; @@ -195,16 +195,16 @@ bool KLettres::loadLayout(TQDomDocument &layoutDocument) void KLettres::setupActions() { - TDEAction *m_newAction = new TDEAction(i18n("New Sound"), "file_new", CTRL+Key_N, TQT_TQOBJECT(m_view), TQT_SLOT(game()), actionCollection(), "play_new"); + TDEAction *m_newAction = new TDEAction(i18n("New Sound"), "file_new", CTRL+Key_N, m_view, TQ_SLOT(game()), actionCollection(), "play_new"); m_newAction->setToolTip(i18n("Play a new sound")); m_newAction->setWhatsThis(i18n("You can play a new sound by clicking this button or using the File menu, New Sound.")); - new TDEAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, TQT_TQOBJECT(this), TQT_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); - TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"media-playback-start", CTRL+Key_P, TQT_TQOBJECT(m_view), TQT_SLOT(slotPlayAgain()), actionCollection(), "play_again"); + new TDEAction( i18n("Get Alphabet in New Language..."), "knewstuff", 0, this, TQ_SLOT( slotDownloadNewStuff() ), actionCollection(), "downloadnewstuff" ); + TDEAction *m_playAgainAction = new TDEAction(i18n("Replay Sound"),"media-playback-start", CTRL+Key_P, m_view, TQ_SLOT(slotPlayAgain()), actionCollection(), "play_again"); m_playAgainAction->setToolTip(i18n("Play the same sound again")); m_playAgainAction->setWhatsThis(i18n("You can replay the same sound again by clicking this button or using the File menu, Replay Sound.")); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"edit-clear", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotMenubar()), actionCollection(), "menubar"); + m_menubarAction = new TDEToggleAction(i18n("Show &Menubar"),"edit-clear", CTRL+Key_M, this, TQ_SLOT(slotMenubar()), actionCollection(), "menubar"); m_menubarAction->setCheckedState(i18n("Hide &Menubar")); m_menubarAction->setChecked(true); m_menubarAction->setWhatsThis(i18n("You can show or hide the menubar as you wish by clicking this button.")); @@ -230,16 +230,16 @@ void KLettres::setupActions() m_themeAction->setToolTip(i18n("Select the theme")); m_themeAction->setWhatsThis(i18n("Here you can change the theme for KLettres. A theme consists in the background picture and the font color for the letter displayed.")); - m_kidAction = new TDEToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, TQT_TQOBJECT(this), TQT_SLOT(slotModeKid()), actionCollection(), "mode_kid"); + m_kidAction = new TDEToggleAction(i18n("Mode Kid"), "klettres_kids", CTRL+Key_K, this, TQ_SLOT(slotModeKid()), actionCollection(), "mode_kid"); m_kidAction->setWhatsThis(i18n("If you are in the Grown-up mode, clicking on this button will set up the Kid mode. The Kid mode has no menubar and the font is bigger in the statusbar.")); - m_grownupAction = new TDEToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup"); + m_grownupAction = new TDEToggleAction(i18n("Mode Grown-up"), "klettres_grownup", CTRL+Key_G, this, TQ_SLOT(slotModeGrownup()), actionCollection(), "mode_grownup"); m_grownupAction->setWhatsThis(i18n("The Grown-up mode is the normal mode where you can see the menubar.")); - connect(m_levelAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLevel(int))); - connect(m_languageAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeLanguage(int))); - connect(m_themeAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChangeTheme(int))); + connect(m_levelAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLevel(int))); + connect(m_languageAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeLanguage(int))); + connect(m_themeAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChangeTheme(int))); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); setupGUI(); } @@ -273,7 +273,7 @@ void KLettres::optionsPreferences() //fonts is the icon Timer *m_timer = new Timer(); dialog->addPage(m_timer, i18n("Timer"), "clock"); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotUpdateSettings())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotUpdateSettings())); dialog->show(); } @@ -462,7 +462,7 @@ void KLettres::loadLangToolBar() "please check your installation.").arg(m_languages[Prefs::languageNumber()]); KMessageBox::sorry( this, mString, i18n("Error") ); - kapp->quit(); + tdeApp->quit(); } update(); //we open the file and store info into the stream... @@ -475,7 +475,7 @@ void KLettres::loadLangToolBar() openFileStream.close(); for (int i=0; i<(int) allData.count(); i++) { if (!allData[i].isEmpty()) - m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").arg(allData[i]), i+1 ); + m_secondToolbar->insertButton (charIcon(allData[i].at(0)), i, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotPasteChar()), true, i18n("Inserts the character %1").arg(allData[i]), i+1 ); } } } diff --git a/klettres/klettres/klettres.h b/klettres/klettres/klettres.h index 4102cd88..1baf0cb4 100644 --- a/klettres/klettres/klettres.h +++ b/klettres/klettres/klettres.h @@ -45,7 +45,7 @@ class KLNewStuff; */ class KLettres : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/klettres/klettres/klettresview.cpp b/klettres/klettres/klettresview.cpp index 69cc6bcc..f00bd1a6 100644 --- a/klettres/klettres/klettresview.cpp +++ b/klettres/klettres/klettresview.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> //Project headers #include "klettres.h" @@ -64,7 +64,7 @@ void KLettresView::chooseSound() if (m_klettres->soundFactory->sounds ==0) return; //get a random sound - m_random=kapp->random()%(m_klettres->soundFactory->sounds); + m_random=tdeApp->random()%(m_klettres->soundFactory->sounds); //have not 2 same sounds consecutively int temp = 0; if (temp<0) @@ -72,7 +72,7 @@ void KLettresView::chooseSound() else { while (m_random==temp) - m_random=kapp->random()%(m_klettres->soundFactory->sounds); + m_random=tdeApp->random()%(m_klettres->soundFactory->sounds); temp=m_random; } @@ -124,24 +124,24 @@ void KLettresView::game() m_cursorPos = 1; //reset everything so when you change language or levels //it all restarts nicely - TQObject::disconnect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::disconnect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(slotProcess(const TQString&)) ); m_letterEdit->clear(); m_letterEdit->setCursorPosition(0); m_letterEdit->setMaxLength(1); //fix that's in trunk m_letterEdit->setFocus(); chooseSound(); - TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) ); } void KLettresView::slotProcess(const TQString &inputLetter) { - TQObject::disconnect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::disconnect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) ); //check if backspace if(inputLetter.length() != m_cursorPos) { m_cursorPos--; m_letterEdit->setMaxLength( m_cursorPos ); - TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(slotProcess(const TQString&)) ); return; } @@ -153,14 +153,14 @@ void KLettresView::slotProcess(const TQString &inputLetter) m_letterEdit->selectAll(); m_letterEdit->cut(); m_letterEdit->setText(m_upperLetter); - TQTimer::singleShot(m_timer*100, this, TQT_SLOT(slotTimerDone())); + TQTimer::singleShot(m_timer*100, this, TQ_SLOT(slotTimerDone())); } else { kdDebug() << "in no char loop" << endl; kdDebug() << "cursor " << m_cursorPos << endl; m_letterEdit->backspace(); - TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(slotProcess(const TQString&)) ); } } @@ -177,7 +177,7 @@ void KLettresView::slotTimerDone() m_letterEdit->setCursorPosition( m_cursorPos ); m_letterEdit->setFocus(); m_cursorPos ++; - TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) ); } else { @@ -191,7 +191,7 @@ void KLettresView::slotTimerDone() //play sound again m_klettres->soundFactory->playSound(m_random); - TQObject::connect(m_letterEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotProcess(const TQString&)) ); + TQObject::connect(m_letterEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotProcess(const TQString&)) ); } } diff --git a/klettres/klettres/klettresview.h b/klettres/klettres/klettresview.h index 0629e288..1a78f6bb 100644 --- a/klettres/klettres/klettresview.h +++ b/klettres/klettres/klettresview.h @@ -40,7 +40,7 @@ class KLettres; class KLettresView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/klettres/klettres/klnewstuff.cpp b/klettres/klettres/klnewstuff.cpp index 5a542418..9f4b2e47 100644 --- a/klettres/klettres/klnewstuff.cpp +++ b/klettres/klettres/klnewstuff.cpp @@ -21,7 +21,7 @@ #include <tqdir.h> #include <tdeaction.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "klnewstuff.h" #include "prefs.h" @@ -40,7 +40,7 @@ bool KLNewStuff::install( const TQString &fileName ) return false; const KArchiveDirectory *archiveDir = archive.directory(); TDEStandardDirs myStdDir; - const TQString destDir =myStdDir.saveLocation("data", kapp->instanceName() + "/", true); + const TQString destDir =myStdDir.saveLocation("data", tdeApp->instanceName() + "/", true); TDEStandardDirs::makeDir( destDir ); archiveDir->copyTo(destDir); archive.close(); diff --git a/klettres/klettres/soundfactory.cpp b/klettres/klettres/soundfactory.cpp index 48a29ad0..3cc70452 100644 --- a/klettres/klettres/soundfactory.cpp +++ b/klettres/klettres/soundfactory.cpp @@ -25,7 +25,7 @@ #include <tdelocale.h> #include <kaudioplayer.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "soundfactory.h" #include "soundfactory.moc" diff --git a/klettres/klettres/soundfactory.h b/klettres/klettres/soundfactory.h index 053b06ee..24cfb806 100644 --- a/klettres/klettres/soundfactory.h +++ b/klettres/klettres/soundfactory.h @@ -40,7 +40,7 @@ class KLettres; class SoundFactory : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/klettres/klettres/timer.cpp b/klettres/klettres/timer.cpp index d6fa9a4b..6b7e06d6 100644 --- a/klettres/klettres/timer.cpp +++ b/klettres/klettres/timer.cpp @@ -34,8 +34,8 @@ Timer::Timer() { timeGrownLabel->setText(TQString::number(Prefs::grownTimer()) + " " + i18n("tenths of second")); timeKidLabel->setText(TQString::number(Prefs::kidTimer()) + " " + i18n("tenths of second")); - connect(kcfg_GrownTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged())); - connect(kcfg_KidTimer, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(sliderValueChanged())); + connect(kcfg_GrownTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged())); + connect(kcfg_KidTimer, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(sliderValueChanged())); } diff --git a/klettres/klettres/timer.h b/klettres/klettres/timer.h index f803c13d..f2d1c63a 100644 --- a/klettres/klettres/timer.h +++ b/klettres/klettres/timer.h @@ -34,7 +34,7 @@ class Timer : public timerdlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kmplot/KmPlot.tdevelop b/kmplot/KmPlot.tdevelop deleted file mode 100644 index 5e48c5d2..00000000 --- a/kmplot/KmPlot.tdevelop +++ /dev/null @@ -1,156 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Klaus-Dieter Moeller</author> - <email>kd.moeller@t-online.de</email> - <version>$VERSION$</version> - <projectmanagement>KDevCustomProject</projectmanagement> - <primarylanguage>C</primarylanguage> - <ignoreparts/> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <secondaryLanguages> - <language>C++</language> - </secondaryLanguages> - </general> - <kdevcustomproject> - <run> - <mainprogram>kmplot/kmplot</mainprogram> - <directoryradio>executable</directoryradio> - <customdirectory>/</customdirectory> - <programargs/> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars/> - </run> - <build> - <buildtool>make</buildtool> - <builddir/> - </build> - <make> - <abortonerror>false</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <selectedenvironment>default</selectedenvironment> - <environments> - <default/> - </environments> - <makeoptions/> - </make> - </kdevcustomproject> - <kdevdebugger> - <general> - <dbgshell/> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </kdevdebugger> - <kdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>kde2book</toc> - <toc>libstdc++</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>qt-kdev3</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwindows_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>Guide to the Qt Translation Tools</toc> - <toc>Qt Assistant Manual</toc> - <toc>Qt Designer Manual</toc> - <toc>Qt Reference Documentation</toc> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - <ignoredoxygen> - <toc>KDE Libraries (Doxygen)</toc> - </ignoredoxygen> - <projectdoc> - <userdocDir>html/</userdocDir> - <apidocDir>html/</apidocDir> - </projectdoc> - <ignorekdocs/> - <ignoredevhelp/> - </kdevdoctreeview> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="c" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevcppsupport> - <references> - <pcs>Qt</pcs> - <pcs>KDElibs</pcs> - </references> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - </kdevcppsupport> - <kdevfileview> - <groups> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns>*.o,*.lo,CVS,*.moc,*~</hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - </tree> - </kdevfileview> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> -</tdevelop> diff --git a/kmplot/KmPlot.tdevelop.filelist b/kmplot/KmPlot.tdevelop.filelist deleted file mode 100644 index f17adc32..00000000 --- a/kmplot/KmPlot.tdevelop.filelist +++ /dev/null @@ -1,89 +0,0 @@ -# KDevelop Custom Project File List -KmPlot.tdevelop -Makefile.am -TODO -pics/coords.png -pics/kfkt.png -pics/ksys1.png -pics/ksys2.png -pics/ksys3.png -pics/Makefile.am -pics/scaling.png -kmplot/AttrDlg.cpp -kmplot/AttrDlg.h -kmplot/AttrDlgData.ui -kmplot/BezWnd.cpp -kmplot/BezWnd.h -kmplot/BezWndData.ui -kmplot/diagr.cpp -kmplot/diagr.h -kmplot/FktDlg.cpp -kmplot/FktDlg.h -kmplot/FktDlgData.ui -kmplot/kmplot.desktop -kmplot/kmplot.kcfg -kmplot/kmplotui.rc -kmplot/KoordDlg.cpp -kmplot/KoordDlg.h -kmplot/KoordDlgData.ui -kmplot/KOptDlg.cpp -kmplot/KOptDlg.h -kmplot/KOptDlgData.ui -kmplot/kprinterdlg.cpp -kmplot/kprinterdlg.h -kmplot/ksettingsdlg.cpp -kmplot/ksettingsdlg.h -kmplot/main.cpp -kmplot/main.h -kmplot/MainDlg.cpp -kmplot/MainDlg.h -kmplot/Makefile.am -kmplot/misc.cpp -kmplot/misc.h -kmplot/parser.cpp -kmplot/parser.h -kmplot/RstDlg.cpp -kmplot/RstDlg.h -kmplot/RstDlgData.ui -kmplot/settings.kcfgc -kmplot/settingspagecolor.ui -kmplot/settingspagecoords.ui -kmplot/settingspagefonts.ui -kmplot/settingspagescaling.ui -kmplot/SkalDlg.cpp -kmplot/SkalDlg.h -kmplot/SkalDlgData.ui -kmplot/SwDlg.cpp -kmplot/SwDlg.h -kmplot/SwDlgData.ui -kmplot/View.cpp -kmplot/View.h -kmplot/x-kmplot.desktop -kmplot/xparser.cpp -kmplot/xparser.h -icons/cr128-app-kmplot.png -icons/cr16-app-kmplot.png -icons/cr32-app-kmplot.png -icons/cr48-app-kmplot.png -icons/Makefile.am -KmPlot.tdevelop.filelist -/keditfunction.h -/keditfunction.cpp -kmplot/qeditfunction.ui -/keditfunction2.h -/keditfunction2.cpp -/kfunctionedit.h -/kfunctionedit.cpp -keditfunction.h -keditfunction.cpp.c -kmplot/keditfunction.h -kmplot/keditfunction.cpp -/qfunctionlist.h -/qfunctionlist.cpp -kmplot/settingspageprecision.ui -kmplot/keditparametric.cpp -kmplot/keditparametric.h -kmplot/keditpolar.cpp -kmplot/keditpolar.h -kmplot/qeditparametric.ui -kmplot/qeditpolar.ui diff --git a/kmplot/kmplot/FktDlg.cpp b/kmplot/kmplot/FktDlg.cpp index bf0da759..e4df4f6d 100644 --- a/kmplot/kmplot/FktDlg.cpp +++ b/kmplot/kmplot/FktDlg.cpp @@ -51,11 +51,11 @@ FktDlg::FktDlg( TQWidget* parent, View *view ) : FktDlgData( parent, "editPlots" ), m_view(view) { - connect( cmdCopyFunction, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopyFunction()) ); - connect( cmdMoveFunction, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveFunction()) ); - connect( lb_fktliste, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(lb_fktliste_doubleClicked(TQListViewItem *, const TQPoint &, int)) ); - connect( lb_fktliste, TQT_SIGNAL( clicked(TQListViewItem *)), this, TQT_SLOT(lb_fktliste_clicked(TQListViewItem *))); - connect( lb_fktliste, TQT_SIGNAL( spacePressed(TQListViewItem *)), this, TQT_SLOT(lb_fktliste_spacePressed(TQListViewItem *))); + connect( cmdCopyFunction, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopyFunction()) ); + connect( cmdMoveFunction, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveFunction()) ); + connect( lb_fktliste, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int)), this, TQ_SLOT(lb_fktliste_doubleClicked(TQListViewItem *, const TQPoint &, int)) ); + connect( lb_fktliste, TQ_SIGNAL( clicked(TQListViewItem *)), this, TQ_SLOT(lb_fktliste_clicked(TQListViewItem *))); + connect( lb_fktliste, TQ_SIGNAL( spacePressed(TQListViewItem *)), this, TQ_SLOT(lb_fktliste_spacePressed(TQListViewItem *))); lb_fktliste->addColumn( "" ); lb_fktliste->header()->hide(); @@ -297,7 +297,7 @@ void FktDlg::getPlots() void FktDlg::slotHelp() { - kapp->invokeHelp( "", "kmplot" ); + tdeApp->invokeHelp( "", "kmplot" ); } bool FktDlg::isChanged() diff --git a/kmplot/kmplot/FktDlg.h b/kmplot/kmplot/FktDlg.h index 328d91a4..933e61fa 100644 --- a/kmplot/kmplot/FktDlg.h +++ b/kmplot/kmplot/FktDlg.h @@ -44,7 +44,7 @@ class XParser; */ class FktDlg : public FktDlgData { - Q_OBJECT + TQ_OBJECT public: diff --git a/kmplot/kmplot/FktDlgData.ui b/kmplot/kmplot/FktDlgData.ui index 75f0740c..95a41fd8 100644 --- a/kmplot/kmplot/FktDlgData.ui +++ b/kmplot/kmplot/FktDlgData.ui @@ -407,7 +407,7 @@ <tabstop>pushButtonCancel</tabstop> <tabstop>pushButtonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotDelete()</slot> <slot>slotEdit()</slot> <slot>slotHasSelection()</slot> @@ -416,7 +416,7 @@ <slot>slotNewFunction()</slot> <slot access="protected">slotHelp()</slot> <slot>slotNewPrime()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index 6b8ebc10..4b514926 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -35,7 +35,7 @@ #include <kdebug.h> #include <kedittoolbar.h> #include <tdeio/netaccess.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <klineedit.h> #include <tdelocale.h> #include <tdemessagebox.h> @@ -84,9 +84,9 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c coordsDialog = 0; m_popupmenu = new TDEPopupMenu(parentWidget); view = new View( m_readonly, m_modified, m_popupmenu, parentWidget ); - connect( view, TQT_SIGNAL( setStatusBarText(const TQString &)), this, TQT_SLOT( setReadOnlyStatusBarText(const TQString &) ) ); + connect( view, TQ_SIGNAL( setStatusBarText(const TQString &)), this, TQ_SLOT( setReadOnlyStatusBarText(const TQString &) ) ); setWidget( view ); - view->setFocusPolicy(TQ_ClickFocus); + view->setFocusPolicy(TQWidget::ClickFocus); minmaxdlg = new KMinMax(view, m_parent); view->setMinMaxDlg(minmaxdlg); m_quickEdit = new KLineEdit( parentWidget ); @@ -95,7 +95,7 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c setupActions(); loadConstants(); kmplotio = new KmPlotIO(view->parser()); - m_config = kapp->config(); + m_config = tdeApp->config(); m_recentFiles->loadEntries( m_config ); // Let's create a Configure Diloag @@ -109,8 +109,8 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c m_settingsDialog->addPage( m_constantsSettings, i18n("Constants"), "editconstants", i18n("Constants") ); // User edited the configuration - update your local copies of the // configuration data - connect( m_settingsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); - connect( view, TQT_SIGNAL( resetZoom() ), this, TQT_SLOT(resetZoom() ) ); + connect( m_settingsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); + connect( view, TQ_SIGNAL( resetZoom() ), this, TQ_SLOT(resetZoom() ) ); } MainDlg::~MainDlg() @@ -123,29 +123,29 @@ MainDlg::~MainDlg() void MainDlg::setupActions() { // standard actions - m_recentFiles = KStdAction::openRecent( this, TQT_SLOT( slotOpenRecent( const KURL& ) ), actionCollection(),"file_openrecent"); - KStdAction::print( this, TQT_SLOT( slotPrint() ), actionCollection(),"file_print" ); - KStdAction::save( this, TQT_SLOT( slotSave() ), actionCollection() ); - KStdAction::saveAs( this, TQT_SLOT( slotSaveas() ), actionCollection() ); - connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) ); + m_recentFiles = KStdAction::openRecent( this, TQ_SLOT( slotOpenRecent( const KURL& ) ), actionCollection(),"file_openrecent"); + KStdAction::print( this, TQ_SLOT( slotPrint() ), actionCollection(),"file_print" ); + KStdAction::save( this, TQ_SLOT( slotSave() ), actionCollection() ); + KStdAction::saveAs( this, TQ_SLOT( slotSaveas() ), actionCollection() ); + connect( tdeApp, TQ_SIGNAL( lastWindowClosed() ), tdeApp, TQ_SLOT( quit() ) ); - TDEAction *prefs = KStdAction::preferences( this, TQT_SLOT( slotSettings() ), actionCollection()); + TDEAction *prefs = KStdAction::preferences( this, TQ_SLOT( slotSettings() ), actionCollection()); prefs->setText( i18n( "Configure KmPlot..." ) ); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); // KmPlot specific actions // file menu - ( void ) new TDEAction( i18n( "E&xport..." ), 0, this, TQT_SLOT( slotExport() ), actionCollection(), "export"); + ( void ) new TDEAction( i18n( "E&xport..." ), 0, this, TQ_SLOT( slotExport() ), actionCollection(), "export"); //zoom menu - m_mnuNoZoom = new TDERadioAction(i18n("&No Zoom") ,"CTRL+0",TQT_TQOBJECT(view), TQT_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" ); - TDERadioAction * mnuRectangular = new TDERadioAction(i18n("Zoom &Rectangular"), "zoom-fit-best", "CTRL+1",TQT_TQOBJECT(view), TQT_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" ); - TDERadioAction * mnuZoomIn = new TDERadioAction(i18n("Zoom &In"), "zoom-in", "CTRL+2",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" ); - TDERadioAction * mnuZoomOut = new TDERadioAction(i18n("Zoom &Out"), "zoom-out", "CTRL+3",TQT_TQOBJECT(view), TQT_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" ); - TDERadioAction * mnuZoomCenter = new TDERadioAction(i18n("&Center Point") ,"CTRL+4",TQT_TQOBJECT(view), TQT_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" ); - (void ) new TDEAction(i18n("&Fit Widget to Trigonometric Functions") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" ); + m_mnuNoZoom = new TDERadioAction(i18n("&No Zoom") ,"CTRL+0",view, TQ_SLOT( mnuNoZoom_clicked() ),actionCollection(),"no_zoom" ); + TDERadioAction * mnuRectangular = new TDERadioAction(i18n("Zoom &Rectangular"), "zoom-fit-best", "CTRL+1",view, TQ_SLOT( mnuRectangular_clicked() ),actionCollection(),"zoom_rectangular" ); + TDERadioAction * mnuZoomIn = new TDERadioAction(i18n("Zoom &In"), "zoom-in", "CTRL+2",view, TQ_SLOT( mnuZoomIn_clicked() ),actionCollection(),"zoom_in" ); + TDERadioAction * mnuZoomOut = new TDERadioAction(i18n("Zoom &Out"), "zoom-out", "CTRL+3",view, TQ_SLOT( mnuZoomOut_clicked() ),actionCollection(),"zoom_out" ); + TDERadioAction * mnuZoomCenter = new TDERadioAction(i18n("&Center Point") ,"CTRL+4",view, TQ_SLOT( mnuCenter_clicked() ),actionCollection(),"zoom_center" ); + (void ) new TDEAction(i18n("&Fit Widget to Trigonometric Functions") ,0,view, TQ_SLOT( mnuTrig_clicked() ),actionCollection(),"zoom_trig" ); m_mnuNoZoom->setExclusiveGroup("zoom_modes"); m_mnuNoZoom->setChecked(true); mnuRectangular->setExclusiveGroup("zoom_modes"); @@ -154,52 +154,52 @@ void MainDlg::setupActions() mnuZoomCenter->setExclusiveGroup("zoom_modes"); // help menu - ( void ) new TDEAction( i18n( "Predefined &Math Functions" ), "functionhelp", 0, this, TQT_SLOT( slotNames() ), actionCollection(), "names" ); + ( void ) new TDEAction( i18n( "Predefined &Math Functions" ), "functionhelp", 0, this, TQ_SLOT( slotNames() ), actionCollection(), "names" ); // edit menu - ( void ) new TDEAction( i18n( "&Colors..." ), "colorize.png", 0, this, TQT_SLOT( editColors() ), actionCollection(), "editcolors" ); - ( void ) new TDEAction( i18n( "&Coordinate System..." ), "coords.png", 0, this, TQT_SLOT( editAxes() ), actionCollection(), "editaxes" ); - // ( void ) new TDEAction( i18n( "&Grid..." ), "coords.png", 0, this, TQT_SLOT( editGrid() ), actionCollection(), "editgrid" ); - ( void ) new TDEAction( i18n( "&Scaling..." ), "scaling", 0, this, TQT_SLOT( editScaling() ), actionCollection(), "editscaling" ); - ( void ) new TDEAction( i18n( "&Fonts..." ), "fonts", 0, this, TQT_SLOT( editFonts() ), actionCollection(), "editfonts" ); + ( void ) new TDEAction( i18n( "&Colors..." ), "colorize.png", 0, this, TQ_SLOT( editColors() ), actionCollection(), "editcolors" ); + ( void ) new TDEAction( i18n( "&Coordinate System..." ), "coords.png", 0, this, TQ_SLOT( editAxes() ), actionCollection(), "editaxes" ); + // ( void ) new TDEAction( i18n( "&Grid..." ), "coords.png", 0, this, TQ_SLOT( editGrid() ), actionCollection(), "editgrid" ); + ( void ) new TDEAction( i18n( "&Scaling..." ), "scaling", 0, this, TQ_SLOT( editScaling() ), actionCollection(), "editscaling" ); + ( void ) new TDEAction( i18n( "&Fonts..." ), "fonts", 0, this, TQ_SLOT( editFonts() ), actionCollection(), "editfonts" ); - ( void ) new TDEAction( i18n( "Coordinate System I" ), "ksys1.png", 0, this, TQT_SLOT( slotCoord1() ), actionCollection(), "coord_i" ); - ( void ) new TDEAction( i18n( "Coordinate System II" ), "ksys2.png", 0, this, TQT_SLOT( slotCoord2() ), actionCollection(), "coord_ii" ); - ( void ) new TDEAction( i18n( "Coordinate System III" ), "ksys3.png", 0, this, TQT_SLOT( slotCoord3() ), actionCollection(), "coord_iii" ); + ( void ) new TDEAction( i18n( "Coordinate System I" ), "ksys1.png", 0, this, TQ_SLOT( slotCoord1() ), actionCollection(), "coord_i" ); + ( void ) new TDEAction( i18n( "Coordinate System II" ), "ksys2.png", 0, this, TQ_SLOT( slotCoord2() ), actionCollection(), "coord_ii" ); + ( void ) new TDEAction( i18n( "Coordinate System III" ), "ksys3.png", 0, this, TQ_SLOT( slotCoord3() ), actionCollection(), "coord_iii" ); // plot menu - ( void ) new TDEAction( i18n( "&New Function Plot..." ), "newfunction", 0, this, TQT_SLOT( newFunction() ), actionCollection(), "newfunction" ); - ( void ) new TDEAction( i18n( "New Parametric Plot..." ), "newparametric", 0, this, TQT_SLOT( newParametric() ), actionCollection(), "newparametric" ); - ( void ) new TDEAction( i18n( "New Polar Plot..." ), "newpolar", 0, this, TQT_SLOT( newPolar() ), actionCollection(), "newpolar" ); - ( void ) new TDEAction( i18n( "Edit Plots..." ), "editplots", 0, this, TQT_SLOT( slotEditPlots() ), actionCollection(), "editplots" ); + ( void ) new TDEAction( i18n( "&New Function Plot..." ), "newfunction", 0, this, TQ_SLOT( newFunction() ), actionCollection(), "newfunction" ); + ( void ) new TDEAction( i18n( "New Parametric Plot..." ), "newparametric", 0, this, TQ_SLOT( newParametric() ), actionCollection(), "newparametric" ); + ( void ) new TDEAction( i18n( "New Polar Plot..." ), "newpolar", 0, this, TQ_SLOT( newPolar() ), actionCollection(), "newpolar" ); + ( void ) new TDEAction( i18n( "Edit Plots..." ), "editplots", 0, this, TQ_SLOT( slotEditPlots() ), actionCollection(), "editplots" ); // tools menu - TDEAction *mnuYValue = new TDEAction( i18n( "&Get y-Value..." ), 0, this, TQT_SLOT( getYValue() ), actionCollection(), "yvalue" ); - TDEAction *mnuMinValue = new TDEAction( i18n( "&Search for Minimum Value..." ), "minimum", 0, this, TQT_SLOT( findMinimumValue() ), actionCollection(), "minimumvalue" ); - TDEAction *mnuMaxValue = new TDEAction( i18n( "&Search for Maximum Value..." ), "maximum", 0, this, TQT_SLOT( findMaximumValue() ), actionCollection(), "maximumvalue" ); - TDEAction *mnuArea = new TDEAction( i18n( "&Calculate Integral" ), 0, this, TQT_SLOT( graphArea() ), actionCollection(), "grapharea" ); + TDEAction *mnuYValue = new TDEAction( i18n( "&Get y-Value..." ), 0, this, TQ_SLOT( getYValue() ), actionCollection(), "yvalue" ); + TDEAction *mnuMinValue = new TDEAction( i18n( "&Search for Minimum Value..." ), "minimum", 0, this, TQ_SLOT( findMinimumValue() ), actionCollection(), "minimumvalue" ); + TDEAction *mnuMaxValue = new TDEAction( i18n( "&Search for Maximum Value..." ), "maximum", 0, this, TQ_SLOT( findMaximumValue() ), actionCollection(), "maximumvalue" ); + TDEAction *mnuArea = new TDEAction( i18n( "&Calculate Integral" ), 0, this, TQ_SLOT( graphArea() ), actionCollection(), "grapharea" ); - connect( m_quickEdit, TQT_SIGNAL( returnPressed( const TQString& ) ), this, TQT_SLOT( slotQuickEdit( const TQString& ) ) ); + connect( m_quickEdit, TQ_SIGNAL( returnPressed( const TQString& ) ), this, TQ_SLOT( slotQuickEdit( const TQString& ) ) ); KWidgetAction* quickEditAction = new KWidgetAction( m_quickEdit, i18n( "Quick Edit" ), 0, this, 0, actionCollection(), "quickedit" ); quickEditAction->setWhatsThis( i18n( "Enter a simple function equation here.\n" "For instance: f(x)=x^2\nFor more options use Functions->Edit Plots... menu." ) ); - view->mnuSliders[0] = new TDEToggleAction( i18n( "Show Slider 1" ), 0, this, TQT_SLOT( toggleShowSlider0() ), actionCollection(), TQString( "options_configure_show_slider_0" ).latin1() ); - view->mnuSliders[1] = new TDEToggleAction( i18n( "Show Slider 2" ), 0, this, TQT_SLOT( toggleShowSlider1() ), actionCollection(), TQString( "options_configure_show_slider_1" ).latin1() ); - view->mnuSliders[2] = new TDEToggleAction( i18n( "Show Slider 3" ), 0, this, TQT_SLOT( toggleShowSlider2() ), actionCollection(), TQString( "options_configure_show_slider_2" ).latin1() ); - view->mnuSliders[3] = new TDEToggleAction( i18n( "Show Slider 4" ), 0, this, TQT_SLOT( toggleShowSlider3() ), actionCollection(), TQString( "options_configure_show_slider_3" ).latin1() ); + view->mnuSliders[0] = new TDEToggleAction( i18n( "Show Slider 1" ), 0, this, TQ_SLOT( toggleShowSlider0() ), actionCollection(), TQString( "options_configure_show_slider_0" ).latin1() ); + view->mnuSliders[1] = new TDEToggleAction( i18n( "Show Slider 2" ), 0, this, TQ_SLOT( toggleShowSlider1() ), actionCollection(), TQString( "options_configure_show_slider_1" ).latin1() ); + view->mnuSliders[2] = new TDEToggleAction( i18n( "Show Slider 3" ), 0, this, TQ_SLOT( toggleShowSlider2() ), actionCollection(), TQString( "options_configure_show_slider_2" ).latin1() ); + view->mnuSliders[3] = new TDEToggleAction( i18n( "Show Slider 4" ), 0, this, TQ_SLOT( toggleShowSlider3() ), actionCollection(), TQString( "options_configure_show_slider_3" ).latin1() ); // Popup menu - TDEAction *mnuHide = new TDEAction(i18n("&Hide") ,0,TQT_TQOBJECT(view), TQT_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" ); + TDEAction *mnuHide = new TDEAction(i18n("&Hide") ,0,view, TQ_SLOT( mnuHide_clicked() ),actionCollection(),"mnuhide" ); mnuHide->plug(m_popupmenu); - TDEAction *mnuRemove = new TDEAction(i18n("&Remove"),"edit-delete", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" ); + TDEAction *mnuRemove = new TDEAction(i18n("&Remove"),"edit-delete", 0,view, TQ_SLOT( mnuRemove_clicked() ),actionCollection(),"mnuremove" ); mnuRemove->plug(m_popupmenu); - TDEAction *mnuEdit = new TDEAction(i18n("&Edit"),"editplots", 0,TQT_TQOBJECT(view), TQT_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" ); + TDEAction *mnuEdit = new TDEAction(i18n("&Edit"),"editplots", 0,view, TQ_SLOT( mnuEdit_clicked() ),actionCollection(),"mnuedit" ); mnuEdit->plug(m_popupmenu); m_popupmenu->insertSeparator(); - TDEAction *mnuCopy = new TDEAction(i18n("&Copy"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" ); + TDEAction *mnuCopy = new TDEAction(i18n("&Copy"), 0,view, TQ_SLOT( mnuCopy_clicked() ),actionCollection(),"mnucopy" ); mnuCopy->plug(m_popupmenu); - TDEAction *mnuMove = new TDEAction(i18n("&Move"), 0,TQT_TQOBJECT(view), TQT_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" ); + TDEAction *mnuMove = new TDEAction(i18n("&Move"), 0,view, TQ_SLOT( mnuMove_clicked() ),actionCollection(),"mnumove" ); mnuMove->plug(m_popupmenu); m_popupmenu->insertSeparator(); mnuYValue->plug(m_popupmenu); @@ -298,7 +298,7 @@ void MainDlg::slotExport() if( url.fileName().right(4).lower()==".svg") { TQPicture pic; - view->draw(TQT_TQPAINTDEVICE(&pic), 2); + view->draw(&pic, 2); if (url.isLocalFile() ) pic.save( url.prettyURL(0,KURL::StripFileProtocol), "SVG"); else @@ -314,7 +314,7 @@ void MainDlg::slotExport() else if( url.fileName().right(4).lower()==".bmp") { TQPixmap pic(100, 100); - view->draw(TQT_TQPAINTDEVICE(&pic), 3); + view->draw(&pic, 3); if (url.isLocalFile() ) pic.save( url.prettyURL(0,KURL::StripFileProtocol), "BMP"); else @@ -330,7 +330,7 @@ void MainDlg::slotExport() else if( url.fileName().right(4).lower()==".png") { TQPixmap pic(100, 100); - view->draw(TQT_TQPAINTDEVICE(&pic), 3); + view->draw(&pic, 3); if (url.isLocalFile() ) pic.save( url.prettyURL(0,KURL::StripFileProtocol), "PNG"); else @@ -369,7 +369,7 @@ void MainDlg::slotOpenRecent( const KURL &url ) TQByteArray data; TQDataStream stream(data, IO_WriteOnly); stream << url; - TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","openFileInNewWindow(KURL)", data); + tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "KmPlotShell","openFileInNewWindow(KURL)", data); return; } @@ -408,7 +408,7 @@ void MainDlg::editColors() // User edited the configuration - update your local copies of the // configuration data - connect( colorsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( colorsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); colorsDialog->show(); } @@ -420,7 +420,7 @@ void MainDlg::editAxes() coordsDialog = new CoordsConfigDialog( view->parser(), m_parent); // User edited the configuration - update your local copies of the // configuration data - connect( coordsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( coordsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); } coordsDialog->show(); } @@ -433,7 +433,7 @@ void MainDlg::editScaling() scalingDialog->addPage( new SettingsPageScaling( 0, "scalingSettings" ), i18n( "Scale" ), "scaling", i18n( "Edit Scaling" ) ); // User edited the configuration - update your local copies of the // configuration data - connect( scalingDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( scalingDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); scalingDialog->show(); } @@ -445,7 +445,7 @@ void MainDlg::editFonts() fontsDialog->addPage( new SettingsPageFonts( 0, "fontsSettings" ), i18n( "Fonts" ), "fonts", i18n( "Edit Fonts" ) ); // User edited the configuration - update your local copies of the // configuration data - connect( fontsDialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT(updateSettings() ) ); + connect( fontsDialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT(updateSettings() ) ); fontsDialog->show(); } @@ -457,7 +457,7 @@ void MainDlg::editConstants() void MainDlg::slotNames() { - kapp->invokeHelp( "func-predefined", "kmplot" ); + tdeApp->invokeHelp( "func-predefined", "kmplot" ); } void MainDlg::newFunction() @@ -611,7 +611,7 @@ void MainDlg::updateSettings() void MainDlg::loadConstants() { - KSimpleConfig conf ("kcalcrc"); + TDESimpleConfig conf ("kcalcrc"); conf.setGroup("UserConstants"); TQString tmp; TQString tmp_constant; @@ -674,7 +674,7 @@ void MainDlg::loadConstants() void MainDlg::saveConstants() { - KSimpleConfig conf ("kcalcrc"); + TDESimpleConfig conf ("kcalcrc"); conf.deleteGroup("Constants"); conf.setGroup("UserConstants"); TQString tmp; @@ -736,8 +736,8 @@ void MainDlg::toggleShowSlider(int const num) if ( view->sliders[ num ] == 0 ) { view->sliders[ num ] = new KSliderWindow( view, num); - connect( view->sliders[num]->slider, TQT_SIGNAL( valueChanged( int ) ), view, TQT_SLOT( drawPlot() ) ); - connect( view->sliders[num], TQT_SIGNAL( windowClosed( int ) ), view, TQT_SLOT( sliderWindowClosed(int) ) ); + connect( view->sliders[num]->slider, TQ_SIGNAL( valueChanged( int ) ), view, TQ_SLOT( drawPlot() ) ); + connect( view->sliders[num], TQ_SIGNAL( windowClosed( int ) ), view, TQ_SLOT( sliderWindowClosed(int) ) ); } if ( !view->sliders[ num ]->isShown() ) view->sliders[ num ]->show(); @@ -752,12 +752,12 @@ void MainDlg::setReadOnlyStatusBarText(const TQString &text) void MainDlg::optionsConfigureKeys() { - TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureKeys()", TQByteArray()); + tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "KmPlotShell","optionsConfigureKeys()", TQByteArray()); } void MainDlg::optionsConfigureToolbars() { - TDEApplication::kApplication()->dcopClient()->send(TDEApplication::kApplication()->dcopClient()->appId(), "KmPlotShell","optionsConfigureToolbars()", TQByteArray()); + tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "KmPlotShell","optionsConfigureToolbars()", TQByteArray()); } void MainDlg::resetZoom() @@ -807,7 +807,7 @@ TDEInstance* KmPlotPartFactory::instance() extern "C" { - KDE_EXPORT void* init_libkmplotpart() + TDE_EXPORT void* init_libkmplotpart() { return new KmPlotPartFactory; } diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h index f258999c..e8bfecdd 100644 --- a/kmplot/kmplot/MainDlg.h +++ b/kmplot/kmplot/MainDlg.h @@ -35,7 +35,7 @@ #include <tdeaction.h> #include <tdefiledialog.h> #include <tdepopupmenu.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeparts/browserextension.h> #include <tdeparts/part.h> #include <tdeparts/factory.h> @@ -69,7 +69,7 @@ class BrowserExtension; */ class MainDlg : public KParts::ReadOnlyPart, virtual public MainDlgIface { - Q_OBJECT + TQ_OBJECT public: @@ -216,7 +216,7 @@ protected slots: class KmPlotPartFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KmPlotPartFactory(); @@ -233,7 +233,7 @@ private: class BrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: BrowserExtension(MainDlg*); diff --git a/kmplot/kmplot/Makefile.am b/kmplot/kmplot/Makefile.am index c845aecc..1009953d 100644 --- a/kmplot/kmplot/Makefile.am +++ b/kmplot/kmplot/Makefile.am @@ -25,7 +25,7 @@ bin_PROGRAMS = kmplot # the application source, library search path, and link libraries kmplot_SOURCES = main.cpp kmplot.cpp kmplotprogress.cpp kmplotIface.skel -kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP +kmplot_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP kmplot_LDADD = $(LIB_TDEPARTS) kmplot_COMPILE_FIRST = FktDlgData.h qminmax.h settings.h @@ -46,8 +46,8 @@ kde_module_LTLIBRARIES = libkmplotpart.la # the Part's source, library search path, and link libraries libkmplotpart_la_SOURCES = FktDlgData.ui parser.cpp xparser.cpp diagr.cpp View.cpp MainDlg.cpp FktDlg.cpp kprinterdlg.cpp settings.kcfgc settingspagecolor.ui kconstanteditor.cpp qparametereditor.ui kparametereditor.cpp settingspagecoords.ui settingspagefonts.ui settingspagescaling.ui settingspageprecision.ui qeditparametric.ui keditparametric.cpp qeditpolar.ui keditpolar.cpp editfunctionpage.ui editderivativespage.ui editintegralpage.ui editfunction.cpp qeditconstant.ui qminmax.ui kminmax.cpp qconstanteditor.ui keditconstant.cpp kmplotio.cpp sliderwindow.ui ksliderwindow.cpp MainDlgIface.skel parseriface.skel Viewiface.skel coordsconfigdialog.cpp -libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP -libkmplotpart_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_TDEPRINT) +libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPARTS) -lDCOP +libkmplotpart_la_LIBADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) $(LIBSOCKET) $(LIB_TDEPRINT) # this is where the desktop file will go partdesktopdir = $(kde_servicesdir) diff --git a/kmplot/kmplot/View.cpp b/kmplot/kmplot/View.cpp index 6c60fd50..db089543 100644 --- a/kmplot/kmplot/View.cpp +++ b/kmplot/kmplot/View.cpp @@ -56,7 +56,7 @@ double View::xmin = 0; double View::xmax = 0; -View::View(bool const r, bool &mo, TDEPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ), buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(TDEApplication::kApplication()->dcopClient()) +View::View(bool const r, bool &mo, TDEPopupMenu *p, TQWidget* parent, const char* name ) : DCOPObject("View"), TQWidget( parent, name , WStaticContents ), buffer( width(), height() ), m_popupmenu(p), m_modified(mo), m_readonly(r), m_dcop_client(tdeApp->dcopClient()) { csmode = csparam = -1; cstype = 0; @@ -231,7 +231,7 @@ void View::plotfkt(Ufkt *ufkt, TQPainter *pDC) double x, y, dmin, dmax; TQPoint p1, p2; TQPen pen; - pen.setCapStyle(Qt::RoundCap); + pen.setCapStyle(TQt::RoundCap); iy=0; y=0.0; @@ -346,7 +346,7 @@ void View::plotfkt(Ufkt *ufkt, TQPainter *pDC) y = m_parser->euler_method(x, ufkt); if ( int(x*100)%2==0) { - TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } break; @@ -594,7 +594,7 @@ void View::drawPlot() if( m_minmax->isShown() ) m_minmax->updateFunctions(); buffer.fill(backgroundcolor); - draw(TQT_TQPAINTDEVICE(&buffer), 0); + draw(&buffer, 0); TQPainter p; p.begin(this); bitBlt( this, 0, 0, &buffer, 0, 0, width(), height() ); @@ -605,7 +605,7 @@ void View::mouseMoveEvent(TQMouseEvent *e) { if ( isDrawing) return; - if (zoom_mode==4 && e->stateAfter() != Qt::NoButton) + if (zoom_mode==4 && e->stateAfter() != TQt::NoButton) { TQPainter p; p.begin(this); @@ -616,7 +616,7 @@ void View::mouseMoveEvent(TQMouseEvent *e) TQPen pen(TQt::white, 1, TQt::DotLine); painter.setRasterOp (TQt::XorROP); painter.setPen(pen); - painter.setBackgroundMode (Qt::OpaqueMode); + painter.setBackgroundMode (TQt::OpaqueMode); painter.setBackgroundColor (TQt::blue); painter.drawRect(rectangle_point.x(), rectangle_point.y(), e->pos().x()-rectangle_point.x(), e->pos().y()-rectangle_point.y()); @@ -639,7 +639,7 @@ void View::mouseMoveEvent(TQMouseEvent *e) csflg=0; } - if(area.contains(e->pos()) || (e->button()==Qt::LeftButton && e->state()==Qt::LeftButton && csxpos>xmin && csxpos<xmax)) + if(area.contains(e->pos()) || (e->button()==TQt::LeftButton && e->state()==TQt::LeftButton && csxpos>xmin && csxpos<xmax)) { TQPoint ptd, ptl; TQPainter DC; @@ -862,7 +862,7 @@ void View::mousePressEvent(TQMouseEvent *e) } double const g=tlgy*double(xmax-xmin)/(2*double(ymax-ymin)); - if( !m_readonly && e->button()==Qt::RightButton) //clicking with the right mouse button + if( !m_readonly && e->button()==TQt::RightButton) //clicking with the right mouse button { char function_type; for( TQValueVector<Ufkt>::iterator it = m_parser->ufkt.begin(); it != m_parser->ufkt.end(); ++it) @@ -969,7 +969,7 @@ void View::mousePressEvent(TQMouseEvent *e) } return; } - if(e->button()!=Qt::LeftButton) return ; + if(e->button()!=TQt::LeftButton) return ; if(csmode>=0) //disable trace mode if trace mode is enable { csmode=-1; @@ -1283,7 +1283,7 @@ void View::findMinMaxValue(Ufkt *ufkt, char p_mode, bool minimum, double &dmin, y = m_parser->euler_method(x, ufkt); if ( int(x*100)%2==0) { - TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } break; @@ -1416,7 +1416,7 @@ void View::getYValue(Ufkt *ufkt, char p_mode, double x, double &y, const TQStri y = m_parser->euler_method( x, ufkt ); if ( int(x*100)%2==0) { - TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } @@ -1471,9 +1471,9 @@ void View::keyPressEvent( TQKeyEvent * e) TQMouseEvent *event; if (e->key() == TQt::Key_Left ) - event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx-1,fcy-1),Qt::LeftButton,Qt::LeftButton); + event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx-1,fcy-1),TQt::LeftButton,TQt::LeftButton); else if (e->key() == TQt::Key_Right ) - event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx+1,fcy+1),Qt::LeftButton,Qt::LeftButton); + event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx+1,fcy+1),TQt::LeftButton,TQt::LeftButton); else if (e->key() == TQt::Key_Up || e->key() == TQt::Key_Down) //switch graph in trace mode { TQValueVector<Ufkt>::iterator it = &m_parser->ufkt[m_parser->ixValue(csmode)]; @@ -1573,18 +1573,18 @@ void View::keyPressEvent( TQKeyEvent * e) break; } } - event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx,fcy),Qt::LeftButton,Qt::LeftButton); + event = new TQMouseEvent(TQEvent::MouseMove,TQPoint(fcx,fcy),TQt::LeftButton,TQt::LeftButton); } else if ( e->key() == TQt::Key_Space ) { - event = new TQMouseEvent(TQEvent::MouseButtonPress,TQCursor::pos(),Qt::RightButton,Qt::RightButton); + event = new TQMouseEvent(TQEvent::MouseButtonPress,TQCursor::pos(),TQt::RightButton,TQt::RightButton); mousePressEvent(event); delete event; return; } else { - event = new TQMouseEvent(TQEvent::MouseButtonPress,TQPoint(fcx,fcy),Qt::LeftButton,Qt::LeftButton); + event = new TQMouseEvent(TQEvent::MouseButtonPress,TQPoint(fcx,fcy),TQt::LeftButton,TQt::LeftButton); mousePressEvent(event); delete event; return; @@ -1716,7 +1716,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double y = m_parser->euler_method(x, ufkt); if ( int(x*100)%2==0) { - TDEApplication::kApplication()->processEvents(); //makes the program usable when drawing a complicated integral function + tdeApp->processEvents(); //makes the program usable when drawing a complicated integral function increaseProgressBar(); } break; @@ -1801,7 +1801,7 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double DC->end(); setFocus(); update(); - draw(TQT_TQPAINTDEVICE(&buffer),0); + draw(&buffer,0); } if ( calculated_area>0) @@ -1841,8 +1841,8 @@ void View::updateSliders() if ( sliders[ it->use_slider ] == 0 ) { sliders[ it->use_slider ] = new KSliderWindow( this, it->use_slider); - connect( sliders[ it->use_slider ]->slider, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( drawPlot() ) ); - connect( sliders[ it->use_slider ], TQT_SIGNAL( windowClosed( int ) ), this , TQT_SLOT( sliderWindowClosed(int) ) ); + connect( sliders[ it->use_slider ]->slider, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( drawPlot() ) ); + connect( sliders[ it->use_slider ], TQ_SIGNAL( windowClosed( int ) ), this , TQ_SLOT( sliderWindowClosed(int) ) ); mnuSliders[ it->use_slider ]->setChecked(true); //set the slider-item in the menu } sliders[ it->use_slider ]->show(); @@ -1876,7 +1876,7 @@ void View::mnuHide_clicked() if ( !ufkt->f_mode && !ufkt->f1_mode && !ufkt->f2_mode) //all graphs for the function are hidden { csmode=-1; - TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),Qt::LeftButton,Qt::LeftButton); + TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),TQt::LeftButton,TQt::LeftButton); mousePressEvent(event); //leave trace mode delete event; return; @@ -1904,7 +1904,7 @@ void View::mnuRemove_clicked() if (csmode!=-1) // if trace mode is enabled { csmode=-1; - TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),Qt::LeftButton,Qt::LeftButton); + TQMouseEvent *event = new TQMouseEvent(TQMouseEvent::KeyPress,TQCursor::pos(),TQt::LeftButton,TQt::LeftButton); mousePressEvent(event); //leave trace mode delete event; } diff --git a/kmplot/kmplot/View.h b/kmplot/kmplot/View.h index c197d237..d219f0f5 100644 --- a/kmplot/kmplot/View.h +++ b/kmplot/kmplot/View.h @@ -66,7 +66,7 @@ enum ZoomMode */ class View : public TQWidget, virtual public ViewIface { - Q_OBJECT + TQ_OBJECT public: /// Contructor sets up the parser, too. diff --git a/kmplot/kmplot/coordsconfigdialog.h b/kmplot/kmplot/coordsconfigdialog.h index 716e2909..02ecfc9f 100644 --- a/kmplot/kmplot/coordsconfigdialog.h +++ b/kmplot/kmplot/coordsconfigdialog.h @@ -38,7 +38,7 @@ class SettingsPageCoords; /// class CoordsConfigDialog : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: CoordsConfigDialog(XParser *p, TQWidget *parent = 0); diff --git a/kmplot/kmplot/diagr.cpp b/kmplot/kmplot/diagr.cpp index 144e73b0..54f24a46 100644 --- a/kmplot/kmplot/diagr.cpp +++ b/kmplot/kmplot/diagr.cpp @@ -27,12 +27,6 @@ #include "diagr.h" #include "settings.h" -#ifdef __osf__ -#include <nan.h> -#define isnan(x) IsNAN(x) -#define isinf(x) IsINF(X) -#endif - #ifdef USE_SOLARIS #include <ieeefp.h> int isinf(double x) diff --git a/kmplot/kmplot/editfunction.cpp b/kmplot/kmplot/editfunction.cpp index 2d592676..0e9e7a09 100644 --- a/kmplot/kmplot/editfunction.cpp +++ b/kmplot/kmplot/editfunction.cpp @@ -69,10 +69,10 @@ EditFunction::EditFunction( XParser* parser, TQWidget* parent, const char* name { editfunctionpage->listOfSliders->insertItem( i18n( "Slider No. %1" ).arg( number +1) ); } - connect( editfunctionpage->cmdParameter, TQT_SIGNAL ( clicked() ), this, TQT_SLOT( cmdParameter_clicked() ) ); - connect( editfunctionpage->useNoParameter, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( noParameter_toggled(bool) ) ); - connect( editfunctionpage->customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) ); - connect( editfunctionpage->customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) ); + connect( editfunctionpage->cmdParameter, TQ_SIGNAL ( clicked() ), this, TQ_SLOT( cmdParameter_clicked() ) ); + connect( editfunctionpage->useNoParameter, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( noParameter_toggled(bool) ) ); + connect( editfunctionpage->customMinRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMinRange_toggled(bool) ) ); + connect( editfunctionpage->customMaxRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMaxRange_toggled(bool) ) ); m_updatedfunction = 0; } @@ -386,7 +386,7 @@ Ufkt * EditFunction::functionItem() void EditFunction::slotHelp() { - kapp->invokeHelp( "", "kmplot" ); + tdeApp->invokeHelp( "", "kmplot" ); } bool EditFunction::functionHas2Arguments() diff --git a/kmplot/kmplot/editfunction.h b/kmplot/kmplot/editfunction.h index a034b6e1..204a4bc2 100644 --- a/kmplot/kmplot/editfunction.h +++ b/kmplot/kmplot/editfunction.h @@ -38,7 +38,7 @@ class EditIntegralPage; /** @short Dialog window editing a function plot and its properties. */ class EditFunction : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /// @param parser points to the parser instance. diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui index dce7932c..a33ec849 100644 --- a/kmplot/kmplot/editfunctionpage.ui +++ b/kmplot/kmplot/editfunctionpage.ui @@ -893,9 +893,9 @@ Example: f(x)=x^2</string> <tabstop>lineWidth</tabstop> <tabstop>color</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotHelp()</slot> <slot>customRange_toggled( bool )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmplot/kmplot/kconstanteditor.cpp b/kmplot/kmplot/kconstanteditor.cpp index d8af85e8..c11f2d62 100644 --- a/kmplot/kmplot/kconstanteditor.cpp +++ b/kmplot/kmplot/kconstanteditor.cpp @@ -30,7 +30,7 @@ #include <tdelistview.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqpushbutton.h> #include <tqstringlist.h> #include <tqvaluevector.h> @@ -61,7 +61,7 @@ void KConstantEditor::cmdNew_clicked() { constant = '0'; KEditConstant *dlg = new KEditConstant(m_view->parser(), constant, value); - connect( dlg, TQT_SIGNAL( finished() ), this,TQT_SLOT(newConstantSlot() ) ); + connect( dlg, TQ_SIGNAL( finished() ), this,TQ_SLOT(newConstantSlot() ) ); dlg->show(); } @@ -73,7 +73,7 @@ void KConstantEditor::cmdEdit_clicked() value = varlist->currentItem()->text(1); KEditConstant *dlg = new KEditConstant(m_view->parser(), constant, value); - connect( dlg, TQT_SIGNAL( finished() ), this,TQT_SLOT(editConstantSlot() ) ); + connect( dlg, TQ_SIGNAL( finished() ), this,TQ_SLOT(editConstantSlot() ) ); dlg->show(); } diff --git a/kmplot/kmplot/kconstanteditor.h b/kmplot/kmplot/kconstanteditor.h index 62be39f6..6357c700 100644 --- a/kmplot/kmplot/kconstanteditor.h +++ b/kmplot/kmplot/kconstanteditor.h @@ -36,7 +36,7 @@ /// Handles all the constants. class KConstantEditor : public QConstantEditor { -Q_OBJECT +TQ_OBJECT public: KConstantEditor(View *, TQWidget *parent = 0, const char *name = 0); diff --git a/kmplot/kmplot/keditconstant.cpp b/kmplot/kmplot/keditconstant.cpp index 04dfa441..19bd3855 100644 --- a/kmplot/kmplot/keditconstant.cpp +++ b/kmplot/kmplot/keditconstant.cpp @@ -43,8 +43,8 @@ KEditConstant::KEditConstant(XParser *p, char &c, TQString &v, TQWidget *parent, txtValue->setFocus(); txtValue->selectAll(); } - connect( cmdCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteLater() )); - connect( cmdOK, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdOK_clicked() )); + connect( cmdCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteLater() )); + connect( cmdOK, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdOK_clicked() )); } diff --git a/kmplot/kmplot/keditconstant.h b/kmplot/kmplot/keditconstant.h index 90e2d9cd..cd742f6c 100644 --- a/kmplot/kmplot/keditconstant.h +++ b/kmplot/kmplot/keditconstant.h @@ -35,7 +35,7 @@ /// A small dialog for creating an editing constants class KEditConstant : public QEditConstant { - Q_OBJECT + TQ_OBJECT public: KEditConstant(XParser *p, char &, TQString &,TQWidget *parent = 0, const char *name = 0); diff --git a/kmplot/kmplot/keditparametric.cpp b/kmplot/kmplot/keditparametric.cpp index 0d83b3a7..ce0f2f74 100644 --- a/kmplot/kmplot/keditparametric.cpp +++ b/kmplot/kmplot/keditparametric.cpp @@ -44,8 +44,8 @@ KEditParametric::KEditParametric( XParser* parser, TQWidget* parent, const char* name ) : QEditParametric( parent, name ), m_parser(parser) { - connect( customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) ); - connect( customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) ); + connect( customMinRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMinRange_toggled(bool) ) ); + connect( customMaxRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMaxRange_toggled(bool) ) ); m_updatedfunction = 0; } @@ -326,7 +326,7 @@ Ufkt * KEditParametric::functionItem() void KEditParametric::slotHelp() { - kapp->invokeHelp( "", "kmplot" ); + tdeApp->invokeHelp( "", "kmplot" ); } void KEditParametric::customMinRange_toggled(bool status) { diff --git a/kmplot/kmplot/keditparametric.h b/kmplot/kmplot/keditparametric.h index bed49aef..0fb3d3ba 100644 --- a/kmplot/kmplot/keditparametric.h +++ b/kmplot/kmplot/keditparametric.h @@ -35,7 +35,7 @@ class XParser; /** @short Dialog window editing a parametric plot and its properties. */ class KEditParametric : public QEditParametric { - Q_OBJECT + TQ_OBJECT public: /// @param parser points to the parser instance. diff --git a/kmplot/kmplot/keditpolar.cpp b/kmplot/kmplot/keditpolar.cpp index 27334bb6..b1d4815e 100644 --- a/kmplot/kmplot/keditpolar.cpp +++ b/kmplot/kmplot/keditpolar.cpp @@ -45,8 +45,8 @@ KEditPolar::KEditPolar( XParser* parser, TQWidget* parent, const char* name ) : QEditPolar( parent, name ),m_parser(parser) { - connect( customMinRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMinRange_toggled(bool) ) ); - connect( customMaxRange, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT( customMaxRange_toggled(bool) ) ); + connect( customMinRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMinRange_toggled(bool) ) ); + connect( customMaxRange, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT( customMaxRange_toggled(bool) ) ); m_updatedfunction = 0; } @@ -230,7 +230,7 @@ Ufkt *KEditPolar::functionItem() void KEditPolar::slotHelp() { - kapp->invokeHelp( "", "kmplot" ); + tdeApp->invokeHelp( "", "kmplot" ); } void KEditPolar::customMinRange_toggled(bool status) diff --git a/kmplot/kmplot/keditpolar.h b/kmplot/kmplot/keditpolar.h index 09dcaf46..8a23c857 100644 --- a/kmplot/kmplot/keditpolar.h +++ b/kmplot/kmplot/keditpolar.h @@ -35,7 +35,7 @@ class XParser; /** @short Dialog window editing a polar plot and its properties. */ class KEditPolar : public QEditPolar { - Q_OBJECT + TQ_OBJECT public: /// @param parser points to the parser instance. diff --git a/kmplot/kmplot/kminmax.cpp b/kmplot/kmplot/kminmax.cpp index 3b947f97..1a6dffac 100644 --- a/kmplot/kmplot/kminmax.cpp +++ b/kmplot/kmplot/kminmax.cpp @@ -40,11 +40,11 @@ KMinMax::KMinMax(View *v, TQWidget *parent, const char *name) : QMinMax(parent, name), m_view(v) { m_mode=-1; - connect( cmdClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() )); - connect( cmdFind, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdFind_clicked() )); - connect( cmdParameter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdParameter_clicked() )); - connect( list, TQT_SIGNAL( highlighted(TQListBoxItem*) ), this, TQT_SLOT( list_highlighted(TQListBoxItem*) )); - connect( list, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( list_doubleClicked(TQListBoxItem *) )); + connect( cmdClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() )); + connect( cmdFind, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdFind_clicked() )); + connect( cmdParameter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdParameter_clicked() )); + connect( list, TQ_SIGNAL( highlighted(TQListBoxItem*) ), this, TQ_SLOT( list_highlighted(TQListBoxItem*) )); + connect( list, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( list_doubleClicked(TQListBoxItem *) )); parameter=""; } diff --git a/kmplot/kmplot/kminmax.h b/kmplot/kmplot/kminmax.h index 46f028a1..78c92739 100644 --- a/kmplot/kmplot/kminmax.h +++ b/kmplot/kmplot/kminmax.h @@ -35,7 +35,7 @@ /// KMinMax handles all the dialogs for the items in the tool-menu. class KMinMax : public QMinMax { -Q_OBJECT +TQ_OBJECT public: KMinMax(View *, TQWidget *parent = 0, const char *name = 0); diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index bbb49a8d..7c3208d9 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -59,7 +59,7 @@ KmPlot::KmPlot( TDECmdLineArgs* args) { // 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, "kmplot_part", "KParts::ReadOnlyPart" )); if (m_part) { @@ -75,8 +75,8 @@ KmPlot::KmPlot( TDECmdLineArgs* args) // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, i18n("Could not find KmPlot's part.")); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -135,18 +135,18 @@ bool KmPlot::load(const KURL& url) void KmPlot::setupActions() { - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - 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()); m_fullScreen = KStdAction::fullScreen( NULL, NULL, actionCollection(), this, "fullscreen"); - connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); + connect( m_fullScreen, TQ_SIGNAL( toggled( bool )), this, TQ_SLOT( slotUpdateFullScreen( bool ))); } void KmPlot::saveProperties(TDEConfig* /*config*/) @@ -210,7 +210,7 @@ void KmPlot::optionsConfigureToolbars() saveMainWindowSettings(TDEGlobal::config() ); // 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(); } @@ -265,7 +265,7 @@ bool KmPlot::checkModified() { TQCString replyType; TQByteArray replyData; - kapp->dcopClient()->call(kapp->dcopClient()->appId(), "MainDlg","checkModified()", TQByteArray(), replyType, replyData, false); + tdeApp->dcopClient()->call(tdeApp->dcopClient()->appId(), "MainDlg","checkModified()", TQByteArray(), replyType, replyData, false); bool result; TQDataStream stream(replyData, IO_ReadOnly); stream >> result; @@ -276,7 +276,7 @@ bool KmPlot::isModified() { TQCString replyType; TQByteArray replyData; - kapp->dcopClient()->call(kapp->dcopClient()->appId(), "MainDlg","isModified()", TQByteArray(), replyType, replyData, false); + tdeApp->dcopClient()->call(tdeApp->dcopClient()->appId(), "MainDlg","isModified()", TQByteArray(), replyType, replyData, false); bool result; TQDataStream stream(replyData, IO_ReadOnly); stream >> result; @@ -306,13 +306,13 @@ void KmPlot::setupStatusBar() m_progressbar = new KmPlotProgress( statusBar() ); m_progressbar->setMaximumHeight( statusBar()->height()-10 ); - connect( m_progressbar->button, TQT_SIGNAL (clicked() ), this, TQT_SLOT( progressbar_clicked() ) ); + connect( m_progressbar->button, TQ_SIGNAL (clicked() ), this, TQ_SLOT( progressbar_clicked() ) ); statusBar()->addWidget(m_progressbar); } void KmPlot::progressbar_clicked() { - kapp->dcopClient()->send(kapp->dcopClient()->appId(), "View","stopDrawing()", TQByteArray()); + tdeApp->dcopClient()->send(tdeApp->dcopClient()->appId(), "View","stopDrawing()", TQByteArray()); } #include "kmplot.moc" diff --git a/kmplot/kmplot/kmplot.h b/kmplot/kmplot/kmplot.h index 4bb4a26e..701a9ae0 100644 --- a/kmplot/kmplot/kmplot.h +++ b/kmplot/kmplot/kmplot.h @@ -48,7 +48,7 @@ class TDEToggleAction; */ class KmPlot : public KParts::MainWindow, virtual public KmPlotIface { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kmplot/kmplot/kmplot.kcfg b/kmplot/kmplot/kmplot.kcfg index df9eba38..0013ab68 100644 --- a/kmplot/kmplot/kmplot.kcfg +++ b/kmplot/kmplot/kmplot.kcfg @@ -208,10 +208,10 @@ <whatsthis>If relative step width is set to true, the step width will be adapted to the size of the window.</whatsthis> <default>true</default> </entry> - <entry name="anglemode" type="Int"> + <entry name="anglemode" type="Bool"> <label>Radians instead of degrees</label> <whatsthis>Check the box if you want to use radians</whatsthis> - <default>0</default> + <default>false</default> </entry> <entry name="backgroundcolor" type="Color"> <label>Background color</label> diff --git a/kmplot/kmplot/kmplotprogress.h b/kmplot/kmplot/kmplotprogress.h index 549fb09c..329bd8b8 100644 --- a/kmplot/kmplot/kmplotprogress.h +++ b/kmplot/kmplot/kmplotprogress.h @@ -32,7 +32,7 @@ /// The progress-widget in the statusbar which appears when drawing integrals class KmPlotProgress: public TQWidget { - Q_OBJECT + TQ_OBJECT public: KmPlotProgress( TQWidget* parent = 0, const char* name = 0 ); diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp index 972cd9b4..5aa0f810 100644 --- a/kmplot/kmplot/kparametereditor.cpp +++ b/kmplot/kmplot/kparametereditor.cpp @@ -49,14 +49,14 @@ KParameterEditor::KParameterEditor(XParser *m, TQValueList<ParameterValueItem> * list->insertItem( (*it).expression ); list->sort(); - connect( cmdNew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdNew_clicked() )); - connect( cmdEdit, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdEdit_clicked() )); - connect( cmdDelete, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdDelete_clicked() )); - connect( cmdImport, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdImport_clicked() )); - connect( cmdExport, TQT_SIGNAL( clicked() ), this, TQT_SLOT( cmdExport_clicked() )); - connect( cmdClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( close() )); - connect( list, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( varlist_doubleClicked( TQListBoxItem *) )); - connect( list, TQT_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQT_SLOT( varlist_clicked(TQListBoxItem * ) )); + connect( cmdNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdNew_clicked() )); + connect( cmdEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdEdit_clicked() )); + connect( cmdDelete, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdDelete_clicked() )); + connect( cmdImport, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdImport_clicked() )); + connect( cmdExport, TQ_SIGNAL( clicked() ), this, TQ_SLOT( cmdExport_clicked() )); + connect( cmdClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( close() )); + connect( list, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( varlist_doubleClicked( TQListBoxItem *) )); + connect( list, TQ_SIGNAL( clicked ( TQListBoxItem * ) ), this, TQ_SLOT( varlist_clicked(TQListBoxItem * ) )); } diff --git a/kmplot/kmplot/kparametereditor.h b/kmplot/kmplot/kparametereditor.h index 47702010..3c3b6c9c 100644 --- a/kmplot/kmplot/kparametereditor.h +++ b/kmplot/kmplot/kparametereditor.h @@ -37,7 +37,7 @@ class ParameterValueList; /// This class handles the parameter values: it can create, remove, edit and import values. class KParameterEditor : public QParameterEditor { -Q_OBJECT +TQ_OBJECT public: KParameterEditor(XParser *, TQValueList<ParameterValueItem> *, TQWidget *parent = 0, const char *name = 0); diff --git a/kmplot/kmplot/kprinterdlg.h b/kmplot/kmplot/kprinterdlg.h index fef92b8d..92a57246 100644 --- a/kmplot/kmplot/kprinterdlg.h +++ b/kmplot/kmplot/kprinterdlg.h @@ -41,7 +41,7 @@ */ class KPrinterDlg : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: /// Getting the common arguments. diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp index b2921bbd..f56e562e 100644 --- a/kmplot/kmplot/ksliderwindow.cpp +++ b/kmplot/kmplot/ksliderwindow.cpp @@ -61,9 +61,9 @@ KSliderWindow::KSliderWindow(TQWidget* parent, int num ) : installEventFilter(this); m_popupmenu = new TDEPopupMenu(this); - TDEAction *mnuMinValue = new TDEAction(i18n("&Change Minimum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMinValue_clicked() ),0); + TDEAction *mnuMinValue = new TDEAction(i18n("&Change Minimum Value") ,0,this, TQ_SLOT( mnuMinValue_clicked() ),0); mnuMinValue->plug(m_popupmenu); - TDEAction *mnuMaxValue = new TDEAction(i18n("&Change Maximum Value") ,0,TQT_TQOBJECT(this), TQT_SLOT( mnuMaxValue_clicked() ),0 ); + TDEAction *mnuMaxValue = new TDEAction(i18n("&Change Maximum Value") ,0,this, TQ_SLOT( mnuMaxValue_clicked() ),0 ); mnuMaxValue->plug(m_popupmenu); } @@ -82,7 +82,7 @@ bool KSliderWindow::eventFilter( TQObject *obj, TQEvent *ev ) if (ev->type() == TQEvent::MouseButtonPress) { TQMouseEvent *e = (TQMouseEvent *)ev; - if (e->button() != Qt::RightButton) + if (e->button() != TQt::RightButton) return SliderWindow::eventFilter( obj, ev ); m_popupmenu->exec(TQCursor::pos()); return true; diff --git a/kmplot/kmplot/ksliderwindow.h b/kmplot/kmplot/ksliderwindow.h index e19b25d2..d0d85d46 100644 --- a/kmplot/kmplot/ksliderwindow.h +++ b/kmplot/kmplot/ksliderwindow.h @@ -33,7 +33,7 @@ /** @short Slider window for changing a parameter value */ class KSliderWindow : public SliderWindow { - Q_OBJECT + TQ_OBJECT public: /// @param parent points to the parent widget. diff --git a/kmplot/kmplot/parser.cpp b/kmplot/kmplot/parser.cpp index eaa741ff..13d37681 100644 --- a/kmplot/kmplot/parser.cpp +++ b/kmplot/kmplot/parser.cpp @@ -142,9 +142,9 @@ Parser::~Parser() } } -void Parser::setAngleMode(int angle) +void Parser::setAngleMode(bool angle) { - if(angle==0) + if(!angle) m_anglemode = 1; else m_anglemode = M_PI/180; diff --git a/kmplot/kmplot/parser.h b/kmplot/kmplot/parser.h index 559fb53e..f975156a 100644 --- a/kmplot/kmplot/parser.h +++ b/kmplot/kmplot/parser.h @@ -201,12 +201,12 @@ public: /// Returns the ID-number of the function "name". If the function couldn't be found, -1 is returned. int fnameToId(const TQString &name); /// Returns the current error value. If showMessageBox is true, an error message box will appear if an error was found - int parserError(bool showMessageBox=TRUE); + int parserError(bool showMessageBox=true); /// return the angletype static double anglemode(); - /// Sets the angletype. TRUE is radians and FALSE degrees - void setAngleMode(int); + /// Sets the angletype. true is radians and false degrees + void setAngleMode(bool); /// sets the decimal symbol void setDecimalSymbol(const TQString ); diff --git a/kmplot/kmplot/qconstanteditor.ui b/kmplot/kmplot/qconstanteditor.ui index 0dc8ab8b..68ec9280 100644 --- a/kmplot/kmplot/qconstanteditor.ui +++ b/kmplot/kmplot/qconstanteditor.ui @@ -186,7 +186,7 @@ <forwards> <forward>class TQListViewItem;</forward> </forwards> -<Q_SLOTS> +<slots> <slot>cmdCancel_clicked()</slot> <slot>cmdNew_clicked()</slot> <slot>cmdEdit_clicked()</slot> @@ -195,7 +195,7 @@ <slot>cmdDuplicate_clicked()</slot> <slot>newNewConstantSlot()</slot> <slot>varlist_doubleClicked( TQListViewItem * )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdelistview.h</include> diff --git a/kmplot/kmplot/qeditconstant.ui b/kmplot/kmplot/qeditconstant.ui index ffb66c43..7afff3c0 100644 --- a/kmplot/kmplot/qeditconstant.ui +++ b/kmplot/kmplot/qeditconstant.ui @@ -128,9 +128,9 @@ <includes> <include location="local" impldecl="in implementation">qeditconstant.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>txtVariable_lostFocus()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kmplot/kmplot/qeditparametric.ui b/kmplot/kmplot/qeditparametric.ui index 1b7eaffb..398b2fbb 100644 --- a/kmplot/kmplot/qeditparametric.ui +++ b/kmplot/kmplot/qeditparametric.ui @@ -528,9 +528,9 @@ Example: sin(t)</string> <tabstop>buttonCancel</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotHelp()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> diff --git a/kmplot/kmplot/qeditpolar.ui b/kmplot/kmplot/qeditpolar.ui index 2d9a785c..9e533b1c 100644 --- a/kmplot/kmplot/qeditpolar.ui +++ b/kmplot/kmplot/qeditpolar.ui @@ -392,9 +392,9 @@ Example: loop(angle)=ln(angle)</string> <tabstop>buttonCancel</tabstop> <tabstop>buttonHelp</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotHelp()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcolorbutton.h</include> diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp index 4ab4300f..624b4883 100644 --- a/kmplot/kmplot/xparser.cpp +++ b/kmplot/kmplot/xparser.cpp @@ -759,10 +759,10 @@ bool XParser::setFunctionExpression(const TQString &f_str, uint id) bool XParser::sendFunction(int id, const TQString &dcopclient_target) { - QCStringList cstr_list = kapp->dcopClient()->registeredApplications(); + QCStringList cstr_list = tdeApp->dcopClient()->registeredApplications(); TQStringList str_list; for ( QCStringList::iterator it = cstr_list.begin(); it!=cstr_list.end();++it ) - if ( TQString(*it).startsWith("kmplot") && *it!=kapp->dcopClient()->appId() ) + if ( TQString(*it).startsWith("kmplot") && *it!=tdeApp->dcopClient()->appId() ) str_list.append(*it); if ( str_list.isEmpty() ) { @@ -801,7 +801,7 @@ bool XParser::sendFunction(int id, const TQString &dcopclient_target) arg << item->fstr << item->f_mode << item->f1_mode << item->f2_mode << item->integral_mode << item->integral_use_precision << item->linewidth << item->f1_linewidth << item->f2_linewidth << item->integral_linewidth << str_dmin << str_dmax << item->str_startx << item->str_starty << item->integral_precision << item->color << item->f1_color << item->f2_color << item->integral_color << str_parameters << item->use_slider; TQByteArray replay_data; TQCString replay_type; - bool ok = kapp->dcopClient()->call( str_result.utf8(), "Parser", "addFunction(TQString,bool,bool,bool,bool,bool,int,int,int,int,TQString,TQString,TQString,TQString,double,TQRgb,TQRgb,TQRgb,TQRgb,TQStringList,int)", parameters, replay_type, replay_data, false); + bool ok = tdeApp->dcopClient()->call( str_result.utf8(), "Parser", "addFunction(TQString,bool,bool,bool,bool,bool,int,int,int,int,TQString,TQString,TQString,TQString,double,TQRgb,TQRgb,TQRgb,TQRgb,TQStringList,int)", parameters, replay_type, replay_data, false); if (!ok) { KMessageBox::error(0, i18n("An error appeared during the transfer")); @@ -817,7 +817,7 @@ bool XParser::sendFunction(int id, const TQString &dcopclient_target) return false; } - kapp->dcopClient()->send(str_result.utf8(), "View","drawPlot()",TQByteArray() ); //update the other window + tdeApp->dcopClient()->send(str_result.utf8(), "View","drawPlot()",TQByteArray() ); //update the other window if (item->fname.at(0) == 'x') // a parametric function return sendFunction(id+1, str_result); diff --git a/kpercentage/kpercentage/Makefile.am b/kpercentage/kpercentage/Makefile.am index 2b919e79..a9c3e393 100644 --- a/kpercentage/kpercentage/Makefile.am +++ b/kpercentage/kpercentage/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = kpercentage kpercentage_SOURCES = kanimation.cpp kanswer.cpp kpercentmain.cpp kpercentage.cpp ksplashscreen.cpp main.cpp -kpercentage_LDADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) +kpercentage_LDADD = $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) $(LIBSOCKET) SUBDIRS = icons pics @@ -30,7 +30,7 @@ METASOURCES = AUTO # the library search path. -kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor stringstocpp: diff --git a/kpercentage/kpercentage/kanimation.cpp b/kpercentage/kpercentage/kanimation.cpp index 9be8601d..8716b481 100644 --- a/kpercentage/kpercentage/kanimation.cpp +++ b/kpercentage/kpercentage/kanimation.cpp @@ -31,9 +31,9 @@ KFrame::~KFrame() KScene::KScene() { current_frame_number = 0; - setAutoDelete( TRUE ); - following = new TQStrList( TRUE ); // deep copy - following->setAutoDelete( TRUE ); + setAutoDelete( true ); + following = new TQStrList( true ); // deep copy + following->setAutoDelete( true ); } KScene::~KScene() diff --git a/kpercentage/kpercentage/kanswer.cpp b/kpercentage/kpercentage/kanswer.cpp index 4177cbe9..0157da78 100644 --- a/kpercentage/kpercentage/kanswer.cpp +++ b/kpercentage/kpercentage/kanswer.cpp @@ -33,14 +33,14 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> // local includes #include "kanimation.h" #include "kanswer.h" -KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE ) +KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", true ) { setFont( parent->font() ); // fix size for the background pixmap @@ -106,7 +106,7 @@ KAnswer::KAnswer( TQWidget *parent ): KDialog( parent, "answer", TRUE ) // end layouting /////// - connect( ButtonOK, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( ButtonOK, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); loadAnswers(); } @@ -217,14 +217,14 @@ void KAnswer::setupSprite() advPer = 80; - canvas = new TQCanvas( TQT_TQOBJECT(this) ); + canvas = new TQCanvas( this ); canvas->resize( size().width(), size().height() ); pixs = new TQCanvasPixmapArray( locate( "data", "kpercentage/pics/" )+"smily%1.png", 7 ); right_animation = new KAnimation( locate( "data", "kpercentage/story/right.story" ), pixs , canvas ); - right_animation->setAnimated( TRUE ); + right_animation->setAnimated( true ); wrong_animation = new KAnimation( locate( "data", "kpercentage/story/wrong.story" ), pixs , canvas ); - wrong_animation->setAnimated( TRUE ); + wrong_animation->setAnimated( true ); canvas_view = new TQCanvasView( canvas, this ); canvas_view->resize( size() ); @@ -241,7 +241,7 @@ void KAnswer::timerEvent( TQTimerEvent *event ) int KAnswer::exec() { - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); startTimer( 3000 ); // 5 seconds return KDialog::exec(); } diff --git a/kpercentage/kpercentage/kanswer.h b/kpercentage/kpercentage/kanswer.h index f10872c4..f3f001f1 100644 --- a/kpercentage/kpercentage/kanswer.h +++ b/kpercentage/kpercentage/kanswer.h @@ -46,7 +46,7 @@ class KPushButton; */ class KAnswer : public KDialog { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kpercentage/kpercentage/kpercentage.cpp b/kpercentage/kpercentage/kpercentage.cpp index 0a61aff8..36ded4c5 100644 --- a/kpercentage/kpercentage/kpercentage.cpp +++ b/kpercentage/kpercentage/kpercentage.cpp @@ -34,7 +34,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> //local includes #include "kpercentage.h" @@ -100,12 +100,12 @@ KPercentage::KPercentage( const char *name ) : spin_box_number->setValue( 5 ); // connecting all the slots - connect( button_basevalue, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selBasevalue() ) ); - connect( button_percentvalue, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selPercentvalue() ) ); - connect( button_percentage, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selPercentage() ) ); - connect( button_random, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selRandom() ) ); - connect( button_help, TQT_SIGNAL( clicked() ), this, TQT_SLOT( needHelp() ) ); - connect( button_close, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( button_basevalue, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selBasevalue() ) ); + connect( button_percentvalue, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selPercentvalue() ) ); + connect( button_percentage, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selPercentage() ) ); + connect( button_random, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selRandom() ) ); + connect( button_help, TQ_SIGNAL( clicked() ), this, TQ_SLOT( needHelp() ) ); + connect( button_close, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); //////// // begin layouting @@ -220,7 +220,7 @@ void KPercentage::startExercise() void KPercentage::needHelp() { - kapp->invokeHelp( "", "kpercentage" ); + tdeApp->invokeHelp( "", "kpercentage" ); } void KPercentage::closeEvent( TQCloseEvent * ) diff --git a/kpercentage/kpercentage/kpercentage.h b/kpercentage/kpercentage/kpercentage.h index 8cd64c03..54ac9bfd 100644 --- a/kpercentage/kpercentage/kpercentage.h +++ b/kpercentage/kpercentage/kpercentage.h @@ -48,7 +48,7 @@ */ class KPercentage : public KDialog { - Q_OBJECT + TQ_OBJECT public: /** construtor */ diff --git a/kpercentage/kpercentage/kpercentmain.cpp b/kpercentage/kpercentage/kpercentmain.cpp index 2c71fb1a..8d20096f 100644 --- a/kpercentage/kpercentage/kpercentmain.cpp +++ b/kpercentage/kpercentage/kpercentmain.cpp @@ -33,7 +33,7 @@ // KDE includes #include <kiconloader.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstdguiitem.h> #include <knumvalidator.h> @@ -43,7 +43,7 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : - KDialog( parent, name, TRUE ) // TRUE for modal dialog + KDialog( parent, name, true ) // true for modal dialog { setFont( parent->font() ); /** load and set the background pixmap */ @@ -75,7 +75,7 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : progress_bar_right_wrong->setFrameShape( TQProgressBar::Panel ); progress_bar_right_wrong->setFrameShadow( TQProgressBar::Sunken ); // progress_bar_right_wrong->setFixedWidth( 250 ); - progress_bar_right_wrong->setPercentageVisible( FALSE ); + progress_bar_right_wrong->setPercentageVisible( false ); progress_bar_right_wrong->setPaletteBackgroundColor( TQColor( "red" ) ); label_right = new TQLabel( this, "" ); @@ -87,7 +87,7 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : push_button_apply = new TQPushButton( this, "push_button_apply" ); push_button_apply->setText( KStdGuiItem::apply().text() ); - push_button_apply->setDefault( TRUE ); + push_button_apply->setDefault( true ); push_button_apply->setBackgroundPixmap( bgp); push_button_apply->setBackgroundOrigin( TQPushButton::ParentOrigin ); @@ -181,8 +181,8 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : TQToolTip::add( push_button_cancel, i18n( "Back to the main window" ) ); // signals and slots connections - connect( push_button_apply, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotApplyInput() ) ); - connect( push_button_cancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); + connect( push_button_apply, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotApplyInput() ) ); + connect( push_button_cancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( accept() ) ); // build up the answer window answer = new KAnswer( this ); @@ -197,9 +197,9 @@ KPercentMain::KPercentMain( TQWidget *parent, const char *name ) : void KPercentMain::newTask() { // no Editline can be focused - line_edit_percentage->setFocusPolicy( TQ_NoFocus ); - line_edit_basevalue->setFocusPolicy( TQ_NoFocus ); - line_edit_percentvalue->setFocusPolicy( TQ_NoFocus ); + line_edit_percentage->setFocusPolicy( TQWidget::NoFocus ); + line_edit_basevalue->setFocusPolicy( TQWidget::NoFocus ); + line_edit_percentvalue->setFocusPolicy( TQWidget::NoFocus ); // set the number of managed tasks into a label label_count->setText( TQString( i18n("You got %1 of %2 exercises.").arg(count).arg(number) ) ); // update Label for the Progress @@ -245,7 +245,7 @@ void KPercentMain::newTask() // delete this one line_edit_input->clear(); // make the line_edit_layout accessable - line_edit_input->setFocusPolicy( TQ_StrongFocus ); + line_edit_input->setFocusPolicy( TQWidget::StrongFocus ); // set the focus on it line_edit_input->setFocus(); } diff --git a/kpercentage/kpercentage/kpercentmain.h b/kpercentage/kpercentage/kpercentmain.h index 773e87b5..27db8ea9 100644 --- a/kpercentage/kpercentage/kpercentmain.h +++ b/kpercentage/kpercentage/kpercentmain.h @@ -43,7 +43,7 @@ class TQVBoxLayout; */ class KPercentMain : public KDialog { - Q_OBJECT + TQ_OBJECT public: KPercentMain( TQWidget *parent, const char *name = 0 ); diff --git a/kpercentage/kpercentage/ksplashscreen.cpp b/kpercentage/kpercentage/ksplashscreen.cpp index 07c5b0d7..7f5359dd 100644 --- a/kpercentage/kpercentage/ksplashscreen.cpp +++ b/kpercentage/kpercentage/ksplashscreen.cpp @@ -24,7 +24,7 @@ #include <tqtimer.h> // KDE includes -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // local includes #include "kpercentage.h" @@ -32,14 +32,14 @@ /* creates the splash window without titlebar and border */ KSplashScreen::KSplashScreen( KPercentage *percentage, const char *name ) : - KDialog( 0L, name, FALSE, TQWidget::WStyle_Customize | TQWidget::WStyle_NoBorder ) + KDialog( 0L, name, false, TQWidget::WStyle_Customize | TQWidget::WStyle_NoBorder ) { percentage_window = percentage; resize( 380, 300 ); /* load the background pixmap */ TQPixmap bgp( locate( "data", "kpercentage/pics/splash.png" ) ); /* wait some time and start the main window */ - TQCanvas *canvas = new TQCanvas( TQT_TQOBJECT(this) ); + TQCanvas *canvas = new TQCanvas( this ); canvas->resize( 400, 300 ); /* set the background pixmap */ canvas->setBackgroundPixmap( bgp ); @@ -55,7 +55,7 @@ KSplashScreen::KSplashScreen( KPercentage *percentage, const char *name ) : view->setHScrollBarMode( TQCanvasView::AlwaysOff ); view->setFrameStyle( TQCanvasView::NoFrame ); view->show(); - TQTimer::singleShot( 2000, this, TQT_SLOT( showPercentage() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( showPercentage() ) ); } /* show the main window and close the splah window */ diff --git a/kpercentage/kpercentage/ksplashscreen.h b/kpercentage/kpercentage/ksplashscreen.h index a6637d0c..a560810c 100644 --- a/kpercentage/kpercentage/ksplashscreen.h +++ b/kpercentage/kpercentage/ksplashscreen.h @@ -34,7 +34,7 @@ class KPercentage; */ class KSplashScreen : public KDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/INSTALL b/kstars/INSTALL index baec6bca..70dbbece 100644 --- a/kstars/INSTALL +++ b/kstars/INSTALL @@ -15,7 +15,7 @@ Basic Installation source code, you will need to have the following packages installed. You will need both the base package and the "-devel" version. XFree86(-devel) (X11 libraries and headers) - libqt2(-devel) (QT libraries and headers) + libtqt2(-devel) (QT libraries and headers) tdelibs(-devel) (KDE libraries and headers) libpng(-devel) (PNG graphics library) libjpeg(-devel) (JPEG graphics library) diff --git a/kstars/README.planetmath b/kstars/README.planetmath index 5fd8f6f7..74d2d451 100644 --- a/kstars/README.planetmath +++ b/kstars/README.planetmath @@ -58,13 +58,13 @@ The KSplanet class contains a static OrbitDataManager member. The OrbitDataManager provides for loading and storing the A/B/C constants for each planet. In KstarsData::slotInitialize(), we simply call loadData() for each planet. KSPlanet::loadData() calls -OrbitDataManager::loadData(QString n), where n is the name of the planet. +OrbitDataManager::loadData(TQString n), where n is the name of the planet. The A/B/C constants are stored hierarchically: + The A,B,C values for a single term in an s(N) sum are stored in an OrbitData object. + The list of OrbitData objects that compose a single s(N) sum is - stored in a QVector (recall, this can have up to hundreds of elements). + stored in a QPtrVector (recall, this can have up to hundreds of elements). + The six s(N) sums (s(0) through s(5)) are collected as an array of these QVectors ( typedef QVector<OrbitData> OBArray[6] ). + The OBArrays for the Longitude, Latitude, and Distance are collected diff --git a/kstars/README.timekeeping b/kstars/README.timekeeping index 753fadc0..412c371a 100644 --- a/kstars/README.timekeeping +++ b/kstars/README.timekeeping @@ -96,7 +96,7 @@ time has passed since the last update. For example, the LastNumUpdate variable stores the julian day of the last time object coordinates were updated for precession/nutation/aberration. This needs to happen once per simulation day, so whenever (CurrentDate-LastNumUpdate) exceeds 1.0, -it Q_SIGNALS the update (by setting needNewCoords=true) and resets +it signals the update (by setting needNewCoords=true) and resets LastNumUpdate to CurrentDate. Similarly, we use LastPlanetUpdate to update planet coordinates 100 times per day. LastSkyUpdate monitors the last time the horizontal coordinates were updated (the update diff --git a/kstars/configure.in.in b/kstars/configure.in.in index 5e2d7933..9065ba5d 100644 --- a/kstars/configure.in.in +++ b/kstars/configure.in.in @@ -46,10 +46,10 @@ if test "${use_libusb}" != false ; then AC_LANG_CPLUSPLUS ac_save_CXXFLAGS="$CXXFLAGS" ac_save_LDFLAGS="$LDFLAGS" - if test -z "$qt_includes"; then + if test -z "$tqt_includes"; then CXXFLAGS="$CXXFLAGS" else - CXXFLAGS="$CXXFLAGS -I$qt_includes" + CXXFLAGS="$CXXFLAGS -I$tqt_includes" fi LDFLAGS="$LDFLAGS -ltqt" diff --git a/kstars/kstars.kdevprj b/kstars/kstars.kdevprj deleted file mode 100644 index 50c4a484..00000000 --- a/kstars/kstars.kdevprj +++ /dev/null @@ -1,3171 +0,0 @@ -[AUTHORS] -dist=true -install=false -install_location= -type=DATA - -[COPYING] -dist=true -install=false -install_location= -type=DATA - -[ChangeLog] -dist=true -install=false -install_location= -type=DATA - -[Config for BinMakefileAm] -addcxxflags= -bin_program=kstars -cflags= -cppflags= -cxxflags=\s-O0 -g3 -Wall -ldadd=-ltdeio -ltdeprint -lm $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) -ldflags=\s\s - -[General] -AMChanged=true -author=Jason Harris -configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/usr --with-qt-dir=/usr/lib/qt2\s -email=kstars@30doradus.org -kdevprj_version=1.3 -lfv_open_groups= -make_options=\s-j1 -makefiles=Makefile.am,kstars/Makefile.am,kstars/data/Makefile.am -modifyMakefiles=true -project_name=KStars -project_type=normal_kde2 -sgml_file= -short_info=A Desktop Planetarium for KDE -sub_dir=kstars/ -version=0.9.1 -version_control=None -workspace=33555202 - -[INSTALL] -dist=true -install=false -install_location= -type=DATA - -[LFV Groups] -GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS -Headers=*.h,*.hh,*.hxx,*.hpp,*.H -Others=* -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l -Translations=*.po -User Interface=*.kdevdlg,*.ui,*.rc -groups=Headers,Sources,User Interface,Translations,GNU,Others - -[Makefile.am] -files=kstars.kdevprj,AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,kstars.lsm,README.customize -sub_dirs=kstars -type=normal - -[README] -dist=true -install=false -install_location= -type=DATA - -[README.customize] -dist=true -install=false -install_location= -type=DATA - -[TODO] -dist=true -install=false -install_location= -type=DATA - -[kstars.kdevprj] -dist=true -install=false -install_location= -type=DATA - -[kstars.lsm] -dist=true -install=false -install_location= -type=DATA - -[kstars/KSFileReader.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/Makefile.am] -files=kstars/main.cpp,kstars/kstars.cpp,kstars/kstars.h,kstars/kstars.desktop,kstars/skymap.cpp,kstars/skymap.h,kstars/geolocation.cpp,kstars/geolocation.h,kstars/skyobject.cpp,kstars/skyobject.h,kstars/dms.cpp,kstars/dms.h,kstars/skypoint.cpp,kstars/skypoint.h,kstars/timedialog.cpp,kstars/timedialog.h,kstars/locationdialog.cpp,kstars/locationdialog.h,kstars/mapcanvas.cpp,kstars/mapcanvas.h,kstars/viewopsdialog.cpp,kstars/viewopsdialog.h,kstars/finddialog.cpp,kstars/finddialog.h,kstars/ksplanet.cpp,kstars/ksplanet.h,kstars/kssun.cpp,kstars/kssun.h,kstars/kstarsdata.cpp,kstars/kstarsdata.h,kstars/kstarssplash.cpp,kstars/kstarssplash.h,kstars/kstarsoptions.h,kstars/kstarsoptions.cpp,kstars/magnitudespinbox.cpp,kstars/magnitudespinbox.h,kstars/skyobjectname.cpp,kstars/skyobjectname.h,kstars/ksmoon.cpp,kstars/ksmoon.h,kstars/imageviewer.cpp,kstars/imageviewer.h,kstars/timespinbox.cpp,kstars/timespinbox.h,kstars/starobject.cpp,kstars/starobject.h,kstars/starpixmap.cpp,kstars/starpixmap.h,kstars/kspluto.cpp,kstars/kspluto.h,kstars/addlinkdialog.cpp,kstars/addlinkdialog.h,kstars/toggleaction.h,kstars/toggleaction.cpp,kstars/simclock.h,kstars/simclock.cpp,kstars/ksutils.h,kstars/ksutils.cpp,kstars/ksnumbers.cpp,kstars/ksnumbers.h,kstars/kstarsui.rc,kstars/ksplanetbase.cpp,kstars/ksplanetbase.h,kstars/dmsbox.cpp,kstars/dmsbox.h,kstars/timebox.cpp,kstars/timebox.h,kstars/astrocalc.cpp,kstars/astrocalc.h,kstars/modcalcjd.cpp,kstars/modcalcjd.h,kstars/modcalcprec.cpp,kstars/modcalcprec.h,kstars/modcalcgalcoord.cpp,kstars/modcalcgalcoord.h,kstars/modcalcsidtime.cpp,kstars/modcalcsidtime.h,kstars/modcalcgeodcoord.cpp,kstars/modcalcgeodcoord.h,kstars/filesource.cpp,kstars/filesource.h,kstars/stardatasink.cpp,kstars/stardatasink.h,kstars/planetcatalog.h,kstars/planetcatalog.cpp,kstars/objectnamelist.cpp,kstars/objectnamelist.h,kstars/kstarsactions.cpp,kstars/kstarsinit.cpp,kstars/addcatdialog.cpp,kstars/addcatdialog.h,kstars/kstarsmessagebox.cpp,kstars/kstarsmessagebox.h,kstars/skymapevents.cpp,kstars/focusdialog.cpp,kstars/focusdialog.h,kstars/kstars_options_handling.cpp,kstars/timezonerule.cpp,kstars/timezonerule.h,kstars/modcalcapcoord.cpp,kstars/modcalcapcoord.h,kstars/timestepbox.cpp,kstars/timestepbox.h,kstars/timeunitbox.cpp,kstars/timeunitbox.h,kstars/detaildialog.cpp,kstars/detaildialog.h,kstars/colorscheme.cpp,kstars/colorscheme.h,kstars/infobox.cpp,kstars/infoboxes.cpp,kstars/infoboxes.h,kstars/infobox.h,kstars/modcalcdaylength.cpp,kstars/modcalcdaylength.h,kstars/lcgenerator.h,kstars/lcgenerator.cpp,kstars/jupitermoons.cpp,kstars/jupitermoons.h,kstars/modcalcazeldlg.ui,kstars/modcalcazel.cpp,kstars/modcalcazel.h,kstars/elts.cpp,kstars/elts.h,kstars/eltscanvas.cpp,kstars/eltscanvas.h,kstars/KSFileReader.h,kstars/ksfilereader.cpp,kstars/ksfilereader.h,kstars/ksasteroid.cpp,kstars/ksasteroid.h,kstars/kscomet.cpp,kstars/kscomet.h,kstars/modcalcjddlg.ui,kstars/modcalcsidtimedlg.ui,kstars/modcalcprecdlg.ui,kstars/kspopupmenu.cpp,kstars/kspopupmenu.h,kstars/skymapdraw.cpp,kstars/kstarsdcop.cpp,kstars/modcalcgeoddlg.ui,kstars/wutdialog.cpp,kstars/wutdialog.h,kstars/modcalcapcoorddlg.ui,kstars/modcalcgalcoorddlg.ui,kstars/modcalcdaylengthdlg.ui,kstars/kslineedit.cpp,kstars/kslineedit.h,kstars/focusdialogdlg.ui -sub_dirs=data -type=prog_main - -[kstars/addcatdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/addcatdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/addlinkdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/addlinkdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/astrocalc.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/astrocalc.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/colorscheme.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/colorscheme.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/data/Cities.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/Cities.dat -type=DATA - -[kstars/data/Makefile.am] -files=kstars/data/Cities.dat,kstars/data/clines.dat,kstars/data/cnames.dat,kstars/data/ngcic01.dat,kstars/data/ngcic02.dat,kstars/data/ngcic03.dat,kstars/data/ngcic04.dat,kstars/data/ngcic05.dat,kstars/data/ngcic06.dat,kstars/data/ngcic07.dat,kstars/data/ngcic08.dat,kstars/data/ngcic09.dat,kstars/data/ngcic10.dat,kstars/data/ngcic11.dat,kstars/data/ngcic12.dat,kstars/data/ngcic13.dat,kstars/data/sao01.dat,kstars/data/sao02.dat,kstars/data/sao03.dat,kstars/data/sao04.dat,kstars/data/sao05.dat,kstars/data/sao06.dat,kstars/data/sao07.dat,kstars/data/sao08.dat,kstars/data/sao09.dat,kstars/data/sao10.dat,kstars/data/sao11.dat,kstars/data/sao12.dat,kstars/data/sao13.dat,kstars/data/sao14.dat,kstars/data/sao15.dat,kstars/data/sao16.dat,kstars/data/sao17.dat,kstars/data/sao18.dat,kstars/data/sao19.dat,kstars/data/sao20.dat,kstars/data/sao21.dat,kstars/data/sao22.dat,kstars/data/sao23.dat,kstars/data/sao24.dat,kstars/data/sao25.dat,kstars/data/sao26.dat,kstars/data/sao27.dat,kstars/data/sao28.dat,kstars/data/sao29.dat,kstars/data/sao30.dat,kstars/data/sao31.dat,kstars/data/sao32.dat,kstars/data/sao33.dat,kstars/data/sao34.dat,kstars/data/sao35.dat,kstars/data/sao36.dat,kstars/data/sao37.dat,kstars/data/sao38.dat,kstars/data/sao39.dat,kstars/data/sao40.dat,kstars/data/cr16-app-kstars.png,kstars/data/cr32-app-kstars.png,kstars/data/cr48-app-kstars.png,kstars/data/lo16-app-kstars.png,kstars/data/lo32-app-kstars.png,kstars/data/lo48-app-kstars.png,kstars/data/geomap.png,kstars/data/mercury.L0.vsop,kstars/data/mercury.L1.vsop,kstars/data/mercury.L2.vsop,kstars/data/mercury.L3.vsop,kstars/data/mercury.L4.vsop,kstars/data/mercury.L5.vsop,kstars/data/mercury.B0.vsop,kstars/data/mercury.B1.vsop,kstars/data/mercury.B2.vsop,kstars/data/mercury.B3.vsop,kstars/data/mercury.B4.vsop,kstars/data/mercury.B5.vsop,kstars/data/mercury.R0.vsop,kstars/data/mercury.R1.vsop,kstars/data/mercury.R2.vsop,kstars/data/mercury.R3.vsop,kstars/data/mercury.R4.vsop,kstars/data/mercury.R5.vsop,kstars/data/venus.L0.vsop,kstars/data/venus.L1.vsop,kstars/data/venus.L2.vsop,kstars/data/venus.L3.vsop,kstars/data/venus.L4.vsop,kstars/data/venus.L5.vsop,kstars/data/venus.B0.vsop,kstars/data/venus.B1.vsop,kstars/data/venus.B2.vsop,kstars/data/venus.B3.vsop,kstars/data/venus.B4.vsop,kstars/data/venus.B5.vsop,kstars/data/venus.R0.vsop,kstars/data/venus.R1.vsop,kstars/data/venus.R2.vsop,kstars/data/venus.R3.vsop,kstars/data/venus.R4.vsop,kstars/data/venus.R5.vsop,kstars/data/earth.L0.vsop,kstars/data/earth.L1.vsop,kstars/data/earth.L2.vsop,kstars/data/earth.L3.vsop,kstars/data/earth.L4.vsop,kstars/data/earth.L5.vsop,kstars/data/earth.B0.vsop,kstars/data/earth.B1.vsop,kstars/data/earth.B2.vsop,kstars/data/earth.B3.vsop,kstars/data/earth.B4.vsop,kstars/data/earth.R0.vsop,kstars/data/earth.R1.vsop,kstars/data/earth.R2.vsop,kstars/data/earth.R3.vsop,kstars/data/earth.R4.vsop,kstars/data/earth.R5.vsop,kstars/data/mars.L0.vsop,kstars/data/mars.L1.vsop,kstars/data/mars.L2.vsop,kstars/data/mars.L3.vsop,kstars/data/mars.L4.vsop,kstars/data/mars.L5.vsop,kstars/data/mars.B0.vsop,kstars/data/mars.B1.vsop,kstars/data/mars.B2.vsop,kstars/data/mars.B3.vsop,kstars/data/mars.B4.vsop,kstars/data/mars.B5.vsop,kstars/data/mars.R0.vsop,kstars/data/mars.R1.vsop,kstars/data/mars.R2.vsop,kstars/data/mars.R3.vsop,kstars/data/mars.R4.vsop,kstars/data/mars.R5.vsop,kstars/data/jupiter.L0.vsop,kstars/data/jupiter.L1.vsop,kstars/data/jupiter.L2.vsop,kstars/data/jupiter.L3.vsop,kstars/data/jupiter.L4.vsop,kstars/data/jupiter.L5.vsop,kstars/data/jupiter.B0.vsop,kstars/data/jupiter.B1.vsop,kstars/data/jupiter.B2.vsop,kstars/data/jupiter.B3.vsop,kstars/data/jupiter.B4.vsop,kstars/data/jupiter.B5.vsop,kstars/data/jupiter.R0.vsop,kstars/data/jupiter.R1.vsop,kstars/data/jupiter.R2.vsop,kstars/data/jupiter.R3.vsop,kstars/data/jupiter.R4.vsop,kstars/data/jupiter.R5.vsop,kstars/data/saturn.L0.vsop,kstars/data/saturn.L1.vsop,kstars/data/saturn.L2.vsop,kstars/data/saturn.L3.vsop,kstars/data/saturn.L4.vsop,kstars/data/saturn.L5.vsop,kstars/data/saturn.B0.vsop,kstars/data/saturn.B1.vsop,kstars/data/saturn.B2.vsop,kstars/data/saturn.B3.vsop,kstars/data/saturn.B4.vsop,kstars/data/saturn.B5.vsop,kstars/data/saturn.R0.vsop,kstars/data/saturn.R1.vsop,kstars/data/saturn.R2.vsop,kstars/data/saturn.R3.vsop,kstars/data/saturn.R4.vsop,kstars/data/saturn.R5.vsop,kstars/data/uranus.L0.vsop,kstars/data/uranus.L1.vsop,kstars/data/uranus.L2.vsop,kstars/data/uranus.L3.vsop,kstars/data/uranus.L4.vsop,kstars/data/uranus.L5.vsop,kstars/data/uranus.B0.vsop,kstars/data/uranus.B1.vsop,kstars/data/uranus.B2.vsop,kstars/data/uranus.B3.vsop,kstars/data/uranus.B4.vsop,kstars/data/uranus.R0.vsop,kstars/data/uranus.R1.vsop,kstars/data/uranus.R2.vsop,kstars/data/uranus.R3.vsop,kstars/data/uranus.R4.vsop,kstars/data/neptune.L0.vsop,kstars/data/neptune.L1.vsop,kstars/data/neptune.L2.vsop,kstars/data/neptune.L3.vsop,kstars/data/neptune.L4.vsop,kstars/data/neptune.L5.vsop,kstars/data/neptune.B0.vsop,kstars/data/neptune.B1.vsop,kstars/data/neptune.B2.vsop,kstars/data/neptune.B3.vsop,kstars/data/neptune.B4.vsop,kstars/data/neptune.B5.vsop,kstars/data/neptune.R0.vsop,kstars/data/neptune.R1.vsop,kstars/data/neptune.R2.vsop,kstars/data/neptune.R3.vsop,kstars/data/neptune.R4.vsop,kstars/data/jupiter.png,kstars/data/mars.png,kstars/data/mercury.png,kstars/data/neptune.png,kstars/data/pluto.png,kstars/data/saturn.png,kstars/data/sun.png,kstars/data/uranus.png,kstars/data/venus.png,kstars/data/kstars.png,kstars/data/earth.png,kstars/data/moon0.png,kstars/data/moon1.png,kstars/data/moon2.png,kstars/data/moon3.png,kstars/data/moon4.png,kstars/data/moon5.png,kstars/data/moon6.png,kstars/data/moon7.png,kstars/data/moon8.png,kstars/data/moon9.png,kstars/data/moon10.png,kstars/data/moon11.png,kstars/data/moon12.png,kstars/data/moon13.png,kstars/data/moon14.png,kstars/data/moon15.png,kstars/data/moon16.png,kstars/data/moon17.png,kstars/data/moon18.png,kstars/data/moon19.png,kstars/data/moon20.png,kstars/data/moon21.png,kstars/data/moon22.png,kstars/data/moon23.png,kstars/data/moonB.dat,kstars/data/moonLR.dat,kstars/data/fr_cnames.dat,kstars/data/image_url.dat,kstars/data/info_url.dat,kstars/data/m1.png,kstars/data/m10.png,kstars/data/m100.png,kstars/data/m101.png,kstars/data/m102.png,kstars/data/m103.png,kstars/data/m104.png,kstars/data/m105.png,kstars/data/m106.png,kstars/data/m107.png,kstars/data/m108.png,kstars/data/m109.png,kstars/data/m11.png,kstars/data/m110.png,kstars/data/m12.png,kstars/data/m13.png,kstars/data/m14.png,kstars/data/m15.png,kstars/data/m16.png,kstars/data/m17.png,kstars/data/m19.png,kstars/data/m2.png,kstars/data/m20.png,kstars/data/m22.png,kstars/data/m27.png,kstars/data/m28.png,kstars/data/m3.png,kstars/data/m30.png,kstars/data/m31.png,kstars/data/m32.png,kstars/data/m33.png,kstars/data/m4.png,kstars/data/m42.png,kstars/data/m45.png,kstars/data/m49.png,kstars/data/m5.png,kstars/data/m50.png,kstars/data/m51.png,kstars/data/m53.png,kstars/data/m54.png,kstars/data/m55.png,kstars/data/m56.png,kstars/data/m57.png,kstars/data/m58.png,kstars/data/m59.png,kstars/data/m6.png,kstars/data/m60.png,kstars/data/m61.png,kstars/data/m62.png,kstars/data/m63.png,kstars/data/m64.png,kstars/data/m65.png,kstars/data/m66.png,kstars/data/m67.png,kstars/data/m68.png,kstars/data/m69.png,kstars/data/m70.png,kstars/data/m71.png,kstars/data/m72.png,kstars/data/m73.png,kstars/data/m74.png,kstars/data/m75.png,kstars/data/m76.png,kstars/data/m77.png,kstars/data/m78.png,kstars/data/m79.png,kstars/data/m8.png,kstars/data/m80.png,kstars/data/m81.png,kstars/data/m82.png,kstars/data/m83.png,kstars/data/m84.png,kstars/data/m85.png,kstars/data/m86.png,kstars/data/m87.png,kstars/data/m88.png,kstars/data/m89.png,kstars/data/m9.png,kstars/data/m90.png,kstars/data/m91.png,kstars/data/m92.png,kstars/data/m93.png,kstars/data/m94.png,kstars/data/m95.png,kstars/data/m96.png,kstars/data/m97.png,kstars/data/m98.png,kstars/data/m99.png,kstars/data/pluto.freq,kstars/data/pluto.x,kstars/data/pluto.y,kstars/data/pluto.z,kstars/data/mw01.dat,kstars/data/mw02.dat,kstars/data/mw03.dat,kstars/data/mw04.dat,kstars/data/mw05.dat,kstars/data/mw06.dat,kstars/data/mw07.dat,kstars/data/mw08.dat,kstars/data/mw09.dat,kstars/data/mw10.dat,kstars/data/mw11.dat,kstars/data/chart.colors,kstars/data/default.colors,kstars/data/night.colors,kstars/data/tips,kstars/data/show_clines.png,kstars/data/show_cnames.png,kstars/data/show_deepsky.png,kstars/data/show_grid.png,kstars/data/show_horiz.png,kstars/data/show_mw.png,kstars/data/show_planets.png,kstars/data/show_stars.png,kstars/data/TZrules.dat,kstars/data/valaav.txt,kstars/data/asteroids.dat,kstars/data/comets.dat -sub_dirs= -type=normal - -[kstars/data/TZrules.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/TZrules.dat -type=DATA - -[kstars/data/asteroids.dat] -dist=true -install=false -install_location= -type=DATA - -[kstars/data/chart.colors] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/chart.colors -type=DATA - -[kstars/data/clines.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/clines.dat -type=DATA - -[kstars/data/cnames.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/cnames.dat -type=DATA - -[kstars/data/comets.dat] -dist=true -install=false -install_location= -type=DATA - -[kstars/data/cr16-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/crystalsvg/16x16/apps/kstars.png -type=DATA - -[kstars/data/cr32-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/crystalsvg/32x32/apps/kstars.png \s -type=DATA - -[kstars/data/cr48-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/crystalsvg/48x48/apps/kstars.png -type=DATA - -[kstars/data/default.colors] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/default.colors -type=DATA - -[kstars/data/earth.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.B0.vsop -type=DATA - -[kstars/data/earth.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.B1.vsop -type=DATA - -[kstars/data/earth.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.B2.vsop -type=DATA - -[kstars/data/earth.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.B3.vsop -type=DATA - -[kstars/data/earth.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.B4.vsop -type=DATA - -[kstars/data/earth.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L0.vsop -type=DATA - -[kstars/data/earth.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L1.vsop -type=DATA - -[kstars/data/earth.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L2.vsop -type=DATA - -[kstars/data/earth.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L3.vsop -type=DATA - -[kstars/data/earth.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L4.vsop -type=DATA - -[kstars/data/earth.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.L5.vsop -type=DATA - -[kstars/data/earth.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R0.vsop -type=DATA - -[kstars/data/earth.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R1.vsop -type=DATA - -[kstars/data/earth.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R2.vsop -type=DATA - -[kstars/data/earth.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R3.vsop -type=DATA - -[kstars/data/earth.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R4.vsop -type=DATA - -[kstars/data/earth.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.R5.vsop -type=DATA - -[kstars/data/earth.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/earth.png -type=DATA - -[kstars/data/fr_cnames.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/fr_cnames.dat -type=DATA - -[kstars/data/geomap.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/geomap.png -type=DATA - -[kstars/data/image_url.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/image_url.dat -type=DATA - -[kstars/data/info_url.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/info_url.dat -type=DATA - -[kstars/data/jupiter.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B0.vsop -type=DATA - -[kstars/data/jupiter.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B1.vsop -type=DATA - -[kstars/data/jupiter.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B2.vsop -type=DATA - -[kstars/data/jupiter.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B3.vsop -type=DATA - -[kstars/data/jupiter.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B4.vsop -type=DATA - -[kstars/data/jupiter.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.B5.vsop -type=DATA - -[kstars/data/jupiter.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L0.vsop -type=DATA - -[kstars/data/jupiter.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L1.vsop -type=DATA - -[kstars/data/jupiter.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L2.vsop -type=DATA - -[kstars/data/jupiter.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L3.vsop -type=DATA - -[kstars/data/jupiter.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L4.vsop -type=DATA - -[kstars/data/jupiter.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.L5.vsop -type=DATA - -[kstars/data/jupiter.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R0.vsop -type=DATA - -[kstars/data/jupiter.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R1.vsop -type=DATA - -[kstars/data/jupiter.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R2.vsop -type=DATA - -[kstars/data/jupiter.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R3.vsop -type=DATA - -[kstars/data/jupiter.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R4.vsop -type=DATA - -[kstars/data/jupiter.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.R5.vsop -type=DATA - -[kstars/data/jupiter.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/jupiter.png -type=DATA - -[kstars/data/kstars.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/kstars.png -type=DATA - -[kstars/data/lo16-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/16x16/apps/kstars.png\s -type=DATA - -[kstars/data/lo32-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/32x32/apps/kstars.png\s -type=DATA - -[kstars/data/lo48-app-kstars.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/48x48/apps/kstars.png\s -type=DATA - -[kstars/data/m1.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m1.png -type=DATA - -[kstars/data/m10.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m10.png -type=DATA - -[kstars/data/m100.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m100.png -type=DATA - -[kstars/data/m101.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m101.png -type=DATA - -[kstars/data/m102.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m102.png -type=DATA - -[kstars/data/m103.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m103.png -type=DATA - -[kstars/data/m104.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m104.png -type=DATA - -[kstars/data/m105.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m105.png -type=DATA - -[kstars/data/m106.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m106.png -type=DATA - -[kstars/data/m107.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m107.png -type=DATA - -[kstars/data/m108.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m108.png -type=DATA - -[kstars/data/m109.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m109.png -type=DATA - -[kstars/data/m11.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m11.png -type=DATA - -[kstars/data/m110.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m110.png -type=DATA - -[kstars/data/m12.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m12.png -type=DATA - -[kstars/data/m13.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m13.png -type=DATA - -[kstars/data/m14.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m14.png -type=DATA - -[kstars/data/m15.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m15.png -type=DATA - -[kstars/data/m16.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m16.png -type=DATA - -[kstars/data/m17.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m17.png -type=DATA - -[kstars/data/m19.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m19.png -type=DATA - -[kstars/data/m2.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m2.png -type=DATA - -[kstars/data/m20.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m20.png -type=DATA - -[kstars/data/m22.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m22.png -type=DATA - -[kstars/data/m27.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m27.png -type=DATA - -[kstars/data/m28.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m28.png -type=DATA - -[kstars/data/m3.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m3.png -type=DATA - -[kstars/data/m30.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m30.png -type=DATA - -[kstars/data/m31.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m31.png -type=DATA - -[kstars/data/m32.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m32.png -type=DATA - -[kstars/data/m33.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m33.png -type=DATA - -[kstars/data/m4.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m4.png -type=DATA - -[kstars/data/m42.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m42.png -type=DATA - -[kstars/data/m45.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m45.png -type=DATA - -[kstars/data/m49.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m49.png -type=DATA - -[kstars/data/m5.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m5.png -type=DATA - -[kstars/data/m50.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m50.png -type=DATA - -[kstars/data/m51.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m51.png -type=DATA - -[kstars/data/m53.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m53.png -type=DATA - -[kstars/data/m54.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m54.png -type=DATA - -[kstars/data/m55.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m55.png -type=DATA - -[kstars/data/m56.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m56.png -type=DATA - -[kstars/data/m57.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m57.png -type=DATA - -[kstars/data/m58.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m58.png -type=DATA - -[kstars/data/m59.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m59.png -type=DATA - -[kstars/data/m6.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m6.png -type=DATA - -[kstars/data/m60.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m60.png -type=DATA - -[kstars/data/m61.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m61.png -type=DATA - -[kstars/data/m62.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m62.png -type=DATA - -[kstars/data/m63.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m63.png -type=DATA - -[kstars/data/m64.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m64.png -type=DATA - -[kstars/data/m65.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m65.png -type=DATA - -[kstars/data/m66.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m66.png -type=DATA - -[kstars/data/m67.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m67.png -type=DATA - -[kstars/data/m68.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m68.png -type=DATA - -[kstars/data/m69.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m69.png -type=DATA - -[kstars/data/m70.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m70.png -type=DATA - -[kstars/data/m71.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m71.png -type=DATA - -[kstars/data/m72.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m72.png -type=DATA - -[kstars/data/m73.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m73.png -type=DATA - -[kstars/data/m74.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m74.png -type=DATA - -[kstars/data/m75.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m75.png -type=DATA - -[kstars/data/m76.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m76.png -type=DATA - -[kstars/data/m77.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m77.png -type=DATA - -[kstars/data/m78.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m78.png -type=DATA - -[kstars/data/m79.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m79.png -type=DATA - -[kstars/data/m8.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m8.png -type=DATA - -[kstars/data/m80.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m80.png -type=DATA - -[kstars/data/m81.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m81.png -type=DATA - -[kstars/data/m82.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m82.png -type=DATA - -[kstars/data/m83.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m83.png -type=DATA - -[kstars/data/m84.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m84.png -type=DATA - -[kstars/data/m85.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m85.png -type=DATA - -[kstars/data/m86.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m86.png -type=DATA - -[kstars/data/m87.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m87.png -type=DATA - -[kstars/data/m88.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m88.png -type=DATA - -[kstars/data/m89.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m89.png -type=DATA - -[kstars/data/m9.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m9.png -type=DATA - -[kstars/data/m90.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m90.png -type=DATA - -[kstars/data/m91.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m91.png -type=DATA - -[kstars/data/m92.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m92.png -type=DATA - -[kstars/data/m93.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m93.png -type=DATA - -[kstars/data/m94.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m94.png -type=DATA - -[kstars/data/m95.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m95.png -type=DATA - -[kstars/data/m96.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m96.png -type=DATA - -[kstars/data/m97.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m97.png -type=DATA - -[kstars/data/m98.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m98.png -type=DATA - -[kstars/data/m99.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/m99.png -type=DATA - -[kstars/data/mars.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B0.vsop -type=DATA - -[kstars/data/mars.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B1.vsop -type=DATA - -[kstars/data/mars.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B2.vsop -type=DATA - -[kstars/data/mars.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B3.vsop -type=DATA - -[kstars/data/mars.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B4.vsop -type=DATA - -[kstars/data/mars.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.B5.vsop -type=DATA - -[kstars/data/mars.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L0.vsop -type=DATA - -[kstars/data/mars.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L1.vsop -type=DATA - -[kstars/data/mars.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L2.vsop -type=DATA - -[kstars/data/mars.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L3.vsop -type=DATA - -[kstars/data/mars.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L4.vsop -type=DATA - -[kstars/data/mars.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.L5.vsop -type=DATA - -[kstars/data/mars.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R0.vsop -type=DATA - -[kstars/data/mars.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R1.vsop -type=DATA - -[kstars/data/mars.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R2.vsop -type=DATA - -[kstars/data/mars.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R3.vsop -type=DATA - -[kstars/data/mars.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R4.vsop -type=DATA - -[kstars/data/mars.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.R5.vsop -type=DATA - -[kstars/data/mars.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mars.png -type=DATA - -[kstars/data/mercury.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B0.vsop -type=DATA - -[kstars/data/mercury.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B1.vsop -type=DATA - -[kstars/data/mercury.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B2.vsop -type=DATA - -[kstars/data/mercury.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B3.vsop -type=DATA - -[kstars/data/mercury.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B4.vsop -type=DATA - -[kstars/data/mercury.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.B5.vsop -type=DATA - -[kstars/data/mercury.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L0.vsop -type=DATA - -[kstars/data/mercury.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L1.vsop -type=DATA - -[kstars/data/mercury.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L2.vsop -type=DATA - -[kstars/data/mercury.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L3.vsop -type=DATA - -[kstars/data/mercury.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L4.vsop -type=DATA - -[kstars/data/mercury.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.L5.vsop -type=DATA - -[kstars/data/mercury.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R0.vsop -type=DATA - -[kstars/data/mercury.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R1.vsop -type=DATA - -[kstars/data/mercury.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R2.vsop -type=DATA - -[kstars/data/mercury.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R3.vsop -type=DATA - -[kstars/data/mercury.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R4.vsop -type=DATA - -[kstars/data/mercury.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.R5.vsop -type=DATA - -[kstars/data/mercury.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mercury.png -type=DATA - -[kstars/data/moon0.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon0.png -type=DATA - -[kstars/data/moon1.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon1.png -type=DATA - -[kstars/data/moon10.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon10.png -type=DATA - -[kstars/data/moon11.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon11.png -type=DATA - -[kstars/data/moon12.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon12.png -type=DATA - -[kstars/data/moon13.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon13.png -type=DATA - -[kstars/data/moon14.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon14.png -type=DATA - -[kstars/data/moon15.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon15.png -type=DATA - -[kstars/data/moon16.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon16.png -type=DATA - -[kstars/data/moon17.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon17.png -type=DATA - -[kstars/data/moon18.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon18.png -type=DATA - -[kstars/data/moon19.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon19.png -type=DATA - -[kstars/data/moon2.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon2.png -type=DATA - -[kstars/data/moon20.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon20.png -type=DATA - -[kstars/data/moon21.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon21.png -type=DATA - -[kstars/data/moon22.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon22.png -type=DATA - -[kstars/data/moon23.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon23.png -type=DATA - -[kstars/data/moon3.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon3.png -type=DATA - -[kstars/data/moon4.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon4.png -type=DATA - -[kstars/data/moon5.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon5.png -type=DATA - -[kstars/data/moon6.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon6.png -type=DATA - -[kstars/data/moon7.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon7.png -type=DATA - -[kstars/data/moon8.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon8.png -type=DATA - -[kstars/data/moon9.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moon9.png -type=DATA - -[kstars/data/moonB.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moonB.dat -type=DATA - -[kstars/data/moonLR.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/moonLR.dat -type=DATA - -[kstars/data/mw01.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw01.dat -type=DATA - -[kstars/data/mw02.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw02.dat -type=DATA - -[kstars/data/mw03.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw03.dat -type=DATA - -[kstars/data/mw04.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw04.dat -type=DATA - -[kstars/data/mw05.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw05.dat -type=DATA - -[kstars/data/mw06.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw06.dat -type=DATA - -[kstars/data/mw07.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw07.dat -type=DATA - -[kstars/data/mw08.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw08.dat -type=DATA - -[kstars/data/mw09.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw09.dat -type=DATA - -[kstars/data/mw10.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw10.dat -type=DATA - -[kstars/data/mw11.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/mw11.dat -type=DATA - -[kstars/data/neptune.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B0.vsop -type=DATA - -[kstars/data/neptune.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B1.vsop -type=DATA - -[kstars/data/neptune.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B2.vsop -type=DATA - -[kstars/data/neptune.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B3.vsop -type=DATA - -[kstars/data/neptune.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B4.vsop -type=DATA - -[kstars/data/neptune.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.B5.vsop -type=DATA - -[kstars/data/neptune.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L0.vsop -type=DATA - -[kstars/data/neptune.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L1.vsop -type=DATA - -[kstars/data/neptune.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L2.vsop -type=DATA - -[kstars/data/neptune.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L3.vsop -type=DATA - -[kstars/data/neptune.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L4.vsop -type=DATA - -[kstars/data/neptune.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.L5.vsop -type=DATA - -[kstars/data/neptune.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.R0.vsop -type=DATA - -[kstars/data/neptune.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.R1.vsop -type=DATA - -[kstars/data/neptune.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.R2.vsop -type=DATA - -[kstars/data/neptune.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.R3.vsop -type=DATA - -[kstars/data/neptune.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.R4.vsop -type=DATA - -[kstars/data/neptune.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/neptune.png -type=DATA - -[kstars/data/ngcic01.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic01.dat -type=DATA - -[kstars/data/ngcic02.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic02.dat -type=DATA - -[kstars/data/ngcic03.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic03.dat -type=DATA - -[kstars/data/ngcic04.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic04.dat -type=DATA - -[kstars/data/ngcic05.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic05.dat -type=DATA - -[kstars/data/ngcic06.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic06.dat -type=DATA - -[kstars/data/ngcic07.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic07.dat -type=DATA - -[kstars/data/ngcic08.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic08.dat -type=DATA - -[kstars/data/ngcic09.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic09.dat -type=DATA - -[kstars/data/ngcic10.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic10.dat -type=DATA - -[kstars/data/ngcic11.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic11.dat -type=DATA - -[kstars/data/ngcic12.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic12.dat -type=DATA - -[kstars/data/ngcic13.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/ngcic13.dat -type=DATA - -[kstars/data/night.colors] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/night.colors -type=DATA - -[kstars/data/pluto.freq] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/pluto.freq -type=DATA - -[kstars/data/pluto.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/pluto.png -type=DATA - -[kstars/data/pluto.x] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/pluto.x -type=DATA - -[kstars/data/pluto.y] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/pluto.y -type=DATA - -[kstars/data/pluto.z] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/pluto.z -type=DATA - -[kstars/data/sao01.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao01.dat -type=DATA - -[kstars/data/sao02.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao02.dat -type=DATA - -[kstars/data/sao03.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao03.dat -type=DATA - -[kstars/data/sao04.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao04.dat -type=DATA - -[kstars/data/sao05.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao05.dat -type=DATA - -[kstars/data/sao06.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao06.dat -type=DATA - -[kstars/data/sao07.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao07.dat -type=DATA - -[kstars/data/sao08.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao08.dat -type=DATA - -[kstars/data/sao09.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao09.dat -type=DATA - -[kstars/data/sao10.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao10.dat -type=DATA - -[kstars/data/sao11.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao11.dat -type=DATA - -[kstars/data/sao12.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao12.dat -type=DATA - -[kstars/data/sao13.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao13.dat -type=DATA - -[kstars/data/sao14.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao14.dat -type=DATA - -[kstars/data/sao15.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao15.dat -type=DATA - -[kstars/data/sao16.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao16.dat -type=DATA - -[kstars/data/sao17.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao17.dat -type=DATA - -[kstars/data/sao18.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao18.dat -type=DATA - -[kstars/data/sao19.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao19.dat -type=DATA - -[kstars/data/sao20.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao20.dat -type=DATA - -[kstars/data/sao21.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao21.dat -type=DATA - -[kstars/data/sao22.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao22.dat -type=DATA - -[kstars/data/sao23.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao23.dat -type=DATA - -[kstars/data/sao24.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao24.dat -type=DATA - -[kstars/data/sao25.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao25.dat -type=DATA - -[kstars/data/sao26.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao26.dat -type=DATA - -[kstars/data/sao27.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao27.dat -type=DATA - -[kstars/data/sao28.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao28.dat -type=DATA - -[kstars/data/sao29.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao29.dat -type=DATA - -[kstars/data/sao30.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao30.dat -type=DATA - -[kstars/data/sao31.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao31.dat -type=DATA - -[kstars/data/sao32.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao32.dat -type=DATA - -[kstars/data/sao33.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao33.dat -type=DATA - -[kstars/data/sao34.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao34.dat -type=DATA - -[kstars/data/sao35.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao35.dat -type=DATA - -[kstars/data/sao36.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao36.dat -type=DATA - -[kstars/data/sao37.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao37.dat -type=DATA - -[kstars/data/sao38.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao38.dat -type=DATA - -[kstars/data/sao39.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao39.dat -type=DATA - -[kstars/data/sao40.dat] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sao40.dat -type=DATA - -[kstars/data/saturn.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B0.vsop -type=DATA - -[kstars/data/saturn.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B1.vsop -type=DATA - -[kstars/data/saturn.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B2.vsop -type=DATA - -[kstars/data/saturn.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B3.vsop -type=DATA - -[kstars/data/saturn.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B4.vsop -type=DATA - -[kstars/data/saturn.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.B5.vsop -type=DATA - -[kstars/data/saturn.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L0.vsop -type=DATA - -[kstars/data/saturn.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L1.vsop -type=DATA - -[kstars/data/saturn.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L2.vsop -type=DATA - -[kstars/data/saturn.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L3.vsop -type=DATA - -[kstars/data/saturn.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L4.vsop -type=DATA - -[kstars/data/saturn.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.L5.vsop -type=DATA - -[kstars/data/saturn.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R0.vsop -type=DATA - -[kstars/data/saturn.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R1.vsop -type=DATA - -[kstars/data/saturn.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R2.vsop -type=DATA - -[kstars/data/saturn.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R3.vsop -type=DATA - -[kstars/data/saturn.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R4.vsop -type=DATA - -[kstars/data/saturn.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.R5.vsop -type=DATA - -[kstars/data/saturn.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/saturn.png -type=DATA - -[kstars/data/show_clines.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_clines.png -type=DATA - -[kstars/data/show_cnames.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_cnames.png -type=DATA - -[kstars/data/show_deepsky.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_deepsky.png -type=DATA - -[kstars/data/show_grid.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_grid.png -type=DATA - -[kstars/data/show_horiz.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_horiz.png -type=DATA - -[kstars/data/show_mw.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_mw.png -type=DATA - -[kstars/data/show_planets.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_planets.png -type=DATA - -[kstars/data/show_stars.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/show_stars.png -type=DATA - -[kstars/data/sun.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/sun.png -type=DATA - -[kstars/data/tips] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/tips -type=DATA - -[kstars/data/uranus.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.B0.vsop -type=DATA - -[kstars/data/uranus.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.B1.vsop -type=DATA - -[kstars/data/uranus.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.B2.vsop -type=DATA - -[kstars/data/uranus.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.B3.vsop -type=DATA - -[kstars/data/uranus.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.B4.vsop -type=DATA - -[kstars/data/uranus.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L0.vsop -type=DATA - -[kstars/data/uranus.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L1.vsop -type=DATA - -[kstars/data/uranus.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L2.vsop -type=DATA - -[kstars/data/uranus.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L3.vsop -type=DATA - -[kstars/data/uranus.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L4.vsop -type=DATA - -[kstars/data/uranus.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.L5.vsop -type=DATA - -[kstars/data/uranus.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.R0.vsop -type=DATA - -[kstars/data/uranus.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.R1.vsop -type=DATA - -[kstars/data/uranus.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.R2.vsop -type=DATA - -[kstars/data/uranus.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.R3.vsop -type=DATA - -[kstars/data/uranus.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.R4.vsop -type=DATA - -[kstars/data/uranus.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/uranus.png -type=DATA - -[kstars/data/valaav.txt] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/valaav.txt -type=DATA - -[kstars/data/venus.B0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B0.vsop -type=DATA - -[kstars/data/venus.B1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B1.vsop -type=DATA - -[kstars/data/venus.B2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B2.vsop -type=DATA - -[kstars/data/venus.B3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B3.vsop -type=DATA - -[kstars/data/venus.B4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B4.vsop -type=DATA - -[kstars/data/venus.B5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.B5.vsop -type=DATA - -[kstars/data/venus.L0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L0.vsop -type=DATA - -[kstars/data/venus.L1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L1.vsop -type=DATA - -[kstars/data/venus.L2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L2.vsop -type=DATA - -[kstars/data/venus.L3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L3.vsop -type=DATA - -[kstars/data/venus.L4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L4.vsop -type=DATA - -[kstars/data/venus.L5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.L5.vsop -type=DATA - -[kstars/data/venus.R0.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R0.vsop -type=DATA - -[kstars/data/venus.R1.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R1.vsop -type=DATA - -[kstars/data/venus.R2.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R2.vsop -type=DATA - -[kstars/data/venus.R3.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R3.vsop -type=DATA - -[kstars/data/venus.R4.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R4.vsop -type=DATA - -[kstars/data/venus.R5.vsop] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.R5.vsop -type=DATA - -[kstars/data/venus.png] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/venus.png -type=DATA - -[kstars/detaildialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/detaildialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/dms.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/dms.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/dmsbox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/dmsbox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/elts.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/elts.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/eltscanvas.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/eltscanvas.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/filesource.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/filesource.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/finddialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/finddialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/focusdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/focusdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/focusdialogdlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/geolocation.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/geolocation.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/imageviewer.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/imageviewer.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/infobox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/infobox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/infoboxes.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/infoboxes.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/jupitermoons.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/jupitermoons.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksasteroid.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksasteroid.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kscomet.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kscomet.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksfilereader.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksfilereader.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksmoon.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksmoon.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksnumbers.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksnumbers.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksplanet.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksplanet.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/ksplanetbase.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksplanetbase.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kspluto.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kspluto.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kspopupmenu.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kspopupmenu.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kssun.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kssun.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstars.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstars.desktop] -dist=true -install=true -install_location=$$(kde_appsdir)/Edutainment/Science/kstars.desktop -type=DATA - -[kstars/kstars.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstars/kslineedit.cpp] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstars/kslineedit.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstars_options_handling.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsactions.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsdata.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstarsdcop.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsinit.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsmessagebox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsmessagebox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstarsoptions.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarsoptions.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstarssplash.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/kstarssplash.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/kstarsui.rc] -dist=true -install=true -install_location=$$(kde_datadir)/kstars/kstarsui.rc -type=DATA - -[kstars/ksutils.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/ksutils.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/lcgenerator.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/lcgenerator.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/locationdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/locationdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/magnitudespinbox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/magnitudespinbox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/main.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/mapcanvas.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/mapcanvas.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcapcoord.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcapcoord.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcapcoorddlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcazel.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcazel.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcazeldlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcdaylength.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcdaylength.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcdaylengthdlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcgalcoord.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcgalcoord.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcgalcoorddlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcgeodcoord.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcgeodcoord.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcgeoddlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcjd.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcjd.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcjddlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcprec.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcprec.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcprecdlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcsidtime.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/modcalcsidtime.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/modcalcsidtimedlg.ui] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/objectnamelist.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/objectnamelist.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/planetcatalog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/planetcatalog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/simclock.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/simclock.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/skymap.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skymap.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/skymapdraw.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skymapevents.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skyobject.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skyobject.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/skyobjectname.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skyobjectname.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/skypoint.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/skypoint.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/stardatasink.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/stardatasink.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/starobject.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/starobject.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/starpixmap.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/starpixmap.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timebox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timebox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timedialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timedialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timespinbox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timespinbox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timestepbox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timestepbox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timeunitbox.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timeunitbox.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/timezonerule.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/timezonerule.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/toggleaction.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/toggleaction.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/viewopsdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/viewopsdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[kstars/wutdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kstars/wutdialog.h] -dist=true -install=false -install_location= -type=HEADER diff --git a/kstars/kstars.tdevelop b/kstars/kstars.tdevelop deleted file mode 100644 index cd5d5374..00000000 --- a/kstars/kstars.tdevelop +++ /dev/null @@ -1,97 +0,0 @@ -<!DOCTYPE tdevelop> -<tdevelop> - <general> - <author>Jason Harris</author> - <email>kstars@30doradus.org</email> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>KDE</keyword> - <keyword>Qt</keyword> - </keywords> - </general> - <kdevautoproject> - <general> - <mainprogram>kstars</mainprogram> - </general> - <configure> - <configargs>\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/usr --with-qt-dir=/usr/lib/qt2\s</configargs> - </configure> - <make> - <abortonerror/> - <numberofjobs/> - <dontact/> - <makebin/> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - </make> - <compiler> - <cflags/> - <cxxflags>\s-O0 -g3 -Wall</cxxflags> - </compiler> - <makeenvvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </makeenvvars> - <run> - <directoryradio>executable</directoryradio> - </run> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.h,*.hh,*.hxx,*.hpp,*.H" name="Headers" /> - <group pattern="*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l" name="Sources" /> - <group pattern="*.kdevdlg,*.ui,*.rc" name="User Interface" /> - <group pattern="*.po" name="Translations" /> - <group pattern="AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS" name="GNU" /> - <group pattern="*" name="Others" /> - </groups> - <tree> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns></hidepatterns> - <showvcsfields>false</showvcsfields> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>gtk</toc> - <toc>gnustep</toc> - <toc>python</toc> - <toc>php</toc> - <toc>perl</toc> - </ignoretocs> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - </general> - </kdevdebugger> - <kdevcvs> - <cvsoptions>-f</cvsoptions> - <commitoptions></commitoptions> - <addoptions></addoptions> - <logoptions></logoptions> - <updateoptions>-dP</updateoptions> - <removeoptions>-f</removeoptions> - <revertoptions>-C -d -P</revertoptions> - <diffoptions>-u3 -p</diffoptions> - <rshoptions></rshoptions> - </kdevcvs> - <kdevcppsupport> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <references/> - </kdevcppsupport> -</tdevelop> diff --git a/kstars/kstars/Makefile.am b/kstars/kstars/Makefile.am index ef7cae2d..c90b8ca4 100644 --- a/kstars/kstars/Makefile.am +++ b/kstars/kstars/Makefile.am @@ -54,7 +54,7 @@ INCLUDES= -I$(top_srcdir) -Itools -I$(srcdir)/tools $(all_includes) METASOURCES = AUTO # the library search path. -kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # Uncomment the following two lines if you add a ui.rc file for your application to make use of # KDE diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp index 2487a6f3..ffb3f65c 100644 --- a/kstars/kstars/addcatdialog.cpp +++ b/kstars/kstars/addcatdialog.cpp @@ -41,11 +41,11 @@ AddCatDialog::AddCatDialog( TQWidget *parent ) acd = new AddCatDialogUI(page); vlay->addWidget( acd ); - connect( acd->DataURL->lineEdit(), TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotShowDataFile() ) ); - connect( acd->DataURL, TQT_SIGNAL( urlSelected( const TQString & ) ), - this, TQT_SLOT( slotShowDataFile() ) ); - connect( acd->PreviewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotPreviewCatalog() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotCreateCatalog() ) ); + connect( acd->DataURL->lineEdit(), TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotShowDataFile() ) ); + connect( acd->DataURL, TQ_SIGNAL( urlSelected( const TQString & ) ), + this, TQ_SLOT( slotShowDataFile() ) ); + connect( acd->PreviewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotPreviewCatalog() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotCreateCatalog() ) ); acd->FieldList->insertItem( i18n( "ID Number" ) ); acd->FieldList->insertItem( i18n( "Right Ascension" ) ); @@ -187,7 +187,7 @@ void AddCatDialog::slotShowDataFile() { if ( ! acd->DataURL->url().isEmpty() && dataFile.open( IO_ReadOnly ) ) { acd->DataFileBox->clear(); TQTextStream dataStream( &dataFile ); - acd->DataFileBox->insertStringList( TQStringList::split( "\n", dataStream.read(), TRUE ) ); + acd->DataFileBox->insertStringList( TQStringList::split( "\n", dataStream.read(), true ) ); dataFile.close(); } } diff --git a/kstars/kstars/addcatdialog.h b/kstars/kstars/addcatdialog.h index 9cb931b1..385c2fe3 100644 --- a/kstars/kstars/addcatdialog.h +++ b/kstars/kstars/addcatdialog.h @@ -35,7 +35,7 @@ */ class AddCatDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /**Default constructor diff --git a/kstars/kstars/addlinkdialog.cpp b/kstars/kstars/addlinkdialog.cpp index a52b6fc5..9649d719 100644 --- a/kstars/kstars/addlinkdialog.cpp +++ b/kstars/kstars/addlinkdialog.cpp @@ -38,8 +38,8 @@ AddLinkDialog::AddLinkDialog( TQWidget *parent, const TQString &oname ) vlay->activate(); //connect signals to slots - connect( ald->URLButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( checkURL() ) ); - connect( ald->TypeBox, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( changeDefaultDescription( int ) ) ); + connect( ald->URLButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( checkURL() ) ); + connect( ald->TypeBox, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( changeDefaultDescription( int ) ) ); ald->ImageRadio->setChecked(true); ald->DescBox->setText( i18n( "Show image of " ) + ObjectName ); @@ -48,12 +48,12 @@ AddLinkDialog::AddLinkDialog( TQWidget *parent, const TQString &oname ) void AddLinkDialog::checkURL( void ) { KURL _url ( url() ); if ( _url.isValid() ) { //Is the string a valid URL? - kapp->invokeBrowser( _url.url() ); //If so, launch the browser to see if it's the correct document + tdeApp->invokeBrowser( _url.url() ); //If so, launch the browser to see if it's the correct document } else { //If not, print a warning message box that offers to open the browser to a search engine. TQString message = i18n( "The URL is not valid. Would you like to open a browser window\nto the Google search engine?" ); TQString caption = i18n( "Invalid URL" ); if ( KMessageBox::warningYesNo( 0, message, caption, i18n("Browse Google"), i18n("Do Not Browse") )==KMessageBox::Yes ) { - kapp->invokeBrowser( "http://www.google.com" ); + tdeApp->invokeBrowser( "http://www.google.com" ); } } } diff --git a/kstars/kstars/addlinkdialog.h b/kstars/kstars/addlinkdialog.h index 64722467..23206924 100644 --- a/kstars/kstars/addlinkdialog.h +++ b/kstars/kstars/addlinkdialog.h @@ -35,7 +35,7 @@ class SkyMap; */ class AddLinkDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /**Constructor. */ @@ -60,7 +60,7 @@ public: */ void setDesc( const TQString &s ) { ald->DescBox->setText( s ); } -/**@return TRUE if user declared the link is an image */ +/**@return true if user declared the link is an image */ bool isImageLink() const { return ald->ImageRadio->isChecked(); } /**@short Set the link type diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp index 6d86c413..fc953a61 100644 --- a/kstars/kstars/ccdpreviewwg.cpp +++ b/kstars/kstars/ccdpreviewwg.cpp @@ -76,12 +76,12 @@ FILE *CCDwfp; imgFormatCombo->insertStrList(TQImage::outputFormats()); - connect(playB, TQT_SIGNAL(clicked()), this, TQT_SLOT(playPressed())); - connect(captureB, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureImage())); - connect(brightnessBar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(brightnessChanged(int))); - connect(contrastBar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(contrastChanged(int))); - connect(gammaBar, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(gammaChanged(int))); - connect(focalEdit, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(updateFWHM())); + connect(playB, TQ_SIGNAL(clicked()), this, TQ_SLOT(playPressed())); + connect(captureB, TQ_SIGNAL(clicked()), this, TQ_SLOT(captureImage())); + connect(brightnessBar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(brightnessChanged(int))); + connect(contrastBar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(contrastChanged(int))); + connect(gammaBar, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(gammaChanged(int))); + connect(focalEdit, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(updateFWHM())); } CCDPreviewWG::~CCDPreviewWG() @@ -128,7 +128,7 @@ void CCDPreviewWG::setColorFrame(bool color) // callback notified sNotifier = new TQSocketNotifier( streamFD, TQSocketNotifier::Read, this); - TQObject::connect( sNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(streamReceived())); + TQObject::connect( sNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(streamReceived())); }*/ void CCDPreviewWG::enableStream(bool enable) diff --git a/kstars/kstars/ccdpreviewwg.h b/kstars/kstars/ccdpreviewwg.h index 17315e4a..7c785f39 100644 --- a/kstars/kstars/ccdpreviewwg.h +++ b/kstars/kstars/ccdpreviewwg.h @@ -30,7 +30,7 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; class CCDPreviewWG : public CCDPreviewForm { - Q_OBJECT + TQ_OBJECT public: @@ -73,7 +73,7 @@ enum Pixelorder {PIXELORDER_NORMAL=1, PIXELORDER_DUAL=2}; class CCDVideoWG : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/colorscheme.cpp b/kstars/kstars/colorscheme.cpp index f9e01e5e..9c0188fa 100644 --- a/kstars/kstars/colorscheme.cpp +++ b/kstars/kstars/colorscheme.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "ksutils.h" #include "colorscheme.h" diff --git a/kstars/kstars/colorscheme.h b/kstars/kstars/colorscheme.h index 696abcc0..e6190c8e 100644 --- a/kstars/kstars/colorscheme.h +++ b/kstars/kstars/colorscheme.h @@ -93,13 +93,13 @@ class ColorScheme { /**Load a color scheme from a *.colors file *@p filename the filename of the color scheme to be loaded. - *@return TRUE if the scheme was successfully loaded + *@return true if the scheme was successfully loaded */ bool load( const TQString &filename ); /**Save the current color scheme to a *.colors file. *@p name the filename to create - *@return TRUE if the color scheme is successfully writeen to a file + *@return true if the color scheme is successfully writeen to a file */ bool save( const TQString &name ); diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp index 2334d6f1..0a60d4c6 100644 --- a/kstars/kstars/conbridlg.cpp +++ b/kstars/kstars/conbridlg.cpp @@ -68,8 +68,8 @@ ContrastBrightnessDlg::ContrastBrightnessDlg(TQWidget *parent) : setMainWidget(ConBriDlg); show(); - connect(ConBriDlg->conSlider, TQT_SIGNAL( valueChanged(int)), this, TQT_SLOT (setContrast(int ))); - connect(ConBriDlg->briSlider, TQT_SIGNAL( valueChanged(int)), this, TQT_SLOT (setBrightness(int))); + connect(ConBriDlg->conSlider, TQ_SIGNAL( valueChanged(int)), this, TQ_SLOT (setContrast(int ))); + connect(ConBriDlg->briSlider, TQ_SIGNAL( valueChanged(int)), this, TQ_SLOT (setBrightness(int))); } diff --git a/kstars/kstars/conbridlg.h b/kstars/kstars/conbridlg.h index 03c704ca..046293ef 100644 --- a/kstars/kstars/conbridlg.h +++ b/kstars/kstars/conbridlg.h @@ -28,7 +28,7 @@ class ContrastBrightnessDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: ContrastBrightnessDlg(TQWidget *parent=0); diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp index d90131a3..5a6af06a 100644 --- a/kstars/kstars/detaildialog.cpp +++ b/kstars/kstars/detaildialog.cpp @@ -22,7 +22,7 @@ #include <tqregexp.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kactivelabel.h> #include <kpushbutton.h> @@ -91,10 +91,10 @@ DetailDialog::DetailDialog(SkyObject *o, const KStarsDateTime &ut, GeoLocation * createLogTab(); //Connections - connect( Data->ObsListButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addToObservingList() ) ); - connect( Data->CenterButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( centerMap() ) ); - connect( Data->ScopeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( centerTelescope() ) ); - connect( Data->Image, TQT_SIGNAL( clicked() ), this, TQT_SLOT( updateThumbnail() ) ); + connect( Data->ObsListButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addToObservingList() ) ); + connect( Data->CenterButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( centerMap() ) ); + connect( Data->ScopeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( centerTelescope() ) ); + connect( Data->Image, TQ_SIGNAL( clicked() ), this, TQ_SLOT( updateThumbnail() ) ); } void DetailDialog::createGeneralTab() @@ -434,13 +434,13 @@ void DetailDialog::createLinksTab() } // Signals/Slots - connect( Links->ViewButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( viewLink() ) ); - connect( Links->AddLinkButton, TQT_SIGNAL(clicked()), ksw->map(), TQT_SLOT( addLink() ) ); - connect( Links->EditLinkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( editLinkDialog() ) ); - connect( Links->RemoveLinkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( removeLinkDialog() ) ); - connect( Links->InfoList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT( unselectImagesList() ) ); - connect( Links->ImagesList, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT( unselectInfoList() ) ); - connect( ksw->map(), TQT_SIGNAL(linkAdded()), this, TQT_SLOT( updateLists() ) ); + connect( Links->ViewButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( viewLink() ) ); + connect( Links->AddLinkButton, TQ_SIGNAL(clicked()), ksw->map(), TQ_SLOT( addLink() ) ); + connect( Links->EditLinkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( editLinkDialog() ) ); + connect( Links->RemoveLinkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( removeLinkDialog() ) ); + connect( Links->InfoList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT( unselectImagesList() ) ); + connect( Links->ImagesList, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT( unselectInfoList() ) ); + connect( ksw->map(), TQ_SIGNAL(linkAdded()), this, TQ_SLOT( updateLists() ) ); } void DetailDialog::createAdvancedTab() @@ -461,7 +461,7 @@ void DetailDialog::createAdvancedTab() vlay->addWidget( Adv ); treeIt = new TQPtrListIterator<ADVTreeData> (ksw->data()->ADVtreeList); - connect( Adv->ADVTree, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(viewADVData())); + connect( Adv->ADVTree, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(viewADVData())); populateADVTree(NULL); } @@ -489,7 +489,7 @@ void DetailDialog::createLogTab() Log->UserLog->setText(selectedObject->userLog); //Automatically save the log contents when the widget loses focus - connect( Log->UserLog, TQT_SIGNAL( focusOut() ), this, TQT_SLOT( saveLogData() ) ); + connect( Log->UserLog, TQ_SIGNAL( focusOut() ), this, TQ_SLOT( saveLogData() ) ); } @@ -514,7 +514,7 @@ void DetailDialog::viewLink() URL = TQString( *selectedObject->ImageList.at( Links->ImagesList->currentItem() ) ); if (!URL.isEmpty()) - kapp->invokeBrowser(URL); + tdeApp->invokeBrowser(URL); } void DetailDialog::updateLists() @@ -837,7 +837,7 @@ void DetailDialog::viewADVData() link = treeIt->current()->Link; link = parseADVData(link); - kapp->invokeBrowser(link); + tdeApp->invokeBrowser(link); } TQString DetailDialog::parseADVData(TQString link) diff --git a/kstars/kstars/detaildialog.h b/kstars/kstars/detaildialog.h index 734ccf7d..1d025c7c 100644 --- a/kstars/kstars/detaildialog.h +++ b/kstars/kstars/detaildialog.h @@ -55,7 +55,7 @@ struct ADVTreeData *@version 1.0 */ class LogEdit : public KTextEdit { - Q_OBJECT + TQ_OBJECT public: LogEdit( TQWidget *parent=0, const char *name=0 ); @@ -73,7 +73,7 @@ protected: *@version 1.0 */ class ClickLabel : public TQLabel { - Q_OBJECT + TQ_OBJECT public: ClickLabel( TQWidget *parent=0, const char *name=0 ); @@ -83,7 +83,7 @@ signals: void clicked(); protected: - void mousePressEvent( TQMouseEvent *e ) { if ( e->button() == Qt::LeftButton ) emit clicked(); } + void mousePressEvent( TQMouseEvent *e ) { if ( e->button() == TQt::LeftButton ) emit clicked(); } }; /**@class DetailDialog is a window showing detailed information for a selected object. @@ -105,7 +105,7 @@ protected: */ class DetailDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /**Constructor diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp index c88e645d..df3380d5 100644 --- a/kstars/kstars/devicemanager.cpp +++ b/kstars/kstars/devicemanager.cpp @@ -109,7 +109,7 @@ bool DeviceManager::indiConnect(TQString inHost, TQString inPort) // callback notified sNotifier = new TQSocketNotifier( serverFD, TQSocketNotifier::Read, this); - TQObject::connect( sNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(dataReceived())); + TQObject::connect( sNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(dataReceived())); if (XMLParser) delLilXML(XMLParser); diff --git a/kstars/kstars/devicemanager.h b/kstars/kstars/devicemanager.h index 05337aa2..4eea0a29 100644 --- a/kstars/kstars/devicemanager.h +++ b/kstars/kstars/devicemanager.h @@ -25,7 +25,7 @@ // INDI device manager class DeviceManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: DeviceManager(INDIMenu *INDIparent, int inID); diff --git a/kstars/kstars/dms.h b/kstars/kstars/dms.h index b66814da..cc7bfaf1 100644 --- a/kstars/kstars/dms.h +++ b/kstars/kstars/dms.h @@ -348,7 +348,7 @@ public: *@li space-delimited ( 5 0 0; -33 0 0 ) or ( 5 0.0 or -33 0.0 ) *@li space-delimited, with unit labels ( 5h 0m 0s or -33d 0m 0s ) *@param s the string to be parsed as an angle value - *@param deg if TRUE, s is expressed in degrees; if FALSE, s is expressed in hours + *@param deg if true, s is expressed in degrees; if false, s is expressed in hours *@return a dms object whose value is parsed from the string argument */ static dms fromString(TQString & s, bool deg); diff --git a/kstars/kstars/dmsbox.cpp b/kstars/kstars/dmsbox.cpp index 32fd2fd2..a0e1981d 100644 --- a/kstars/kstars/dmsbox.cpp +++ b/kstars/kstars/dmsbox.cpp @@ -33,7 +33,7 @@ dmsBox::dmsBox(TQWidget *parent, const char *name, bool dg) setDegType( dg ); - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotTextChanged( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotTextChanged( const TQString & ) ) ); } void dmsBox::setEmptyText() { diff --git a/kstars/kstars/dmsbox.h b/kstars/kstars/dmsbox.h index 6932ff8d..7b04b411 100644 --- a/kstars/kstars/dmsbox.h +++ b/kstars/kstars/dmsbox.h @@ -41,7 +41,7 @@ */ class dmsBox : public KLineEdit { -Q_OBJECT +TQ_OBJECT TQ_PROPERTY (bool degType READ degType WRITE setDegType) @@ -49,10 +49,10 @@ public: /**Constructor for the dmsBox object. *@param parent pointer to the parent TQWidget *@param ni the name of the object - *@param deg if TRUE use deg/arcmin/arcsec; otherwise + *@param deg if true use deg/arcmin/arcsec; otherwise * use hours/min/sec. */ - dmsBox(TQWidget *parent, const char *ni=0, bool deg=TRUE); + dmsBox(TQWidget *parent, const char *ni=0, bool deg=true); /**Destructor (empty)*/ ~dmsBox(); @@ -82,19 +82,19 @@ public: /**Display an angle. Simply calls showInDegrees(t) or *showInHours(t) depending on the value of deg. *@param t the dms object which is to be displayed. - *@param deg if TRUE, display Deg/Arcmin/Arcsec; otherwise + *@param deg if true, display Deg/Arcmin/Arcsec; otherwise *display Hours/Min/Sec. */ - void show(dms t, bool deg=TRUE); + void show(dms t, bool deg=true); /**Display an angle. Simply calls showInDegrees(t) or *showInHours(t) depending on the value of deg. *This behaves essentially like the above function. It *differs only in the data type of its argument. *@param t the dms object which is to be displayed. - *@param deg if TRUE, display Deg/Arcmin/Arcsec; otherwise + *@param deg if true, display Deg/Arcmin/Arcsec; otherwise *display Hours/Min/Sec. */ - void show(const dms *t,bool deg=TRUE); + void show(const dms *t,bool deg=true); /**Simply display a string. *@note JH: Why don't we just use KLineEdit::setText() instead? @@ -107,12 +107,12 @@ public: *or colons) representing deg/hrs, min, sec. It is also possible to have two *fields. In this case, if the second field is a double, it is converted *to decimal min and double sec. - *@param deg if TRUE use deg/arcmin/arcsec; otherwise + *@param deg if true use deg/arcmin/arcsec; otherwise * use hours/min/sec. *@param ok set to true if a dms object was succedssfully created. *@return a dms object constructed from the fields of the dmsbox */ - dms createDms(bool deg=TRUE, bool *ok=0); + dms createDms(bool deg=true, bool *ok=0); /**@return a boolean indicating if object contains degrees or hours */ diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp index 324b0690..81cbc711 100644 --- a/kstars/kstars/draglistbox.cpp +++ b/kstars/kstars/draglistbox.cpp @@ -24,8 +24,8 @@ DragListBox::DragListBox( TQWidget *parent, const char *name, WFlags f ) : TDEListBox( parent, name, f ) { - setAcceptDrops( TRUE ); - dragging = FALSE; + setAcceptDrops( true ); + dragging = false; } DragListBox::~DragListBox() {} @@ -70,7 +70,7 @@ void DragListBox::dropEvent( TQDropEvent *evt ) { void DragListBox::mousePressEvent( TQMouseEvent *evt ) { TQListBox::mousePressEvent( evt ); - dragging = TRUE; + dragging = true; //Record position of the Ignore item; we may have to restore it. if ( currentText() == i18n("Ignore") ) @@ -85,7 +85,7 @@ void DragListBox::mouseMoveEvent( TQMouseEvent * ) if ( dragging ) { TQDragObject *drag = new TQTextDrag( currentText(), this ); drag->dragMove(); - dragging = FALSE; + dragging = false; } } diff --git a/kstars/kstars/draglistbox.h b/kstars/kstars/draglistbox.h index 2327c21c..ffafdac8 100644 --- a/kstars/kstars/draglistbox.h +++ b/kstars/kstars/draglistbox.h @@ -31,7 +31,7 @@ class TQDragDropEvent; */ class DragListBox : public TDEListBox { - Q_OBJECT + TQ_OBJECT public: /**@short Default constructor diff --git a/kstars/kstars/filesource.h b/kstars/kstars/filesource.h index 7de46055..8189e5f0 100644 --- a/kstars/kstars/filesource.h +++ b/kstars/kstars/filesource.h @@ -90,7 +90,7 @@ class FileSource : public TQDataSource { *A low value needs longer to reload data, but it doesn't interrupt the *main event loop (it's smoother). *But it's important to know that 500 lines to read is very fast, but - *appending to TQList in StarDataSink will take the most time and this + *appending to TQPtrList in StarDataSink will take the most time and this *will also defined with this value. */ #define maxLines 500 diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp index f73c3b08..ea9c0139 100644 --- a/kstars/kstars/finddialog.cpp +++ b/kstars/kstars/finddialog.cpp @@ -91,16 +91,16 @@ FindDialog::FindDialog( TQWidget* parent ) : Filter = 0; //Connect signals to slots -// connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() ) ) ; - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); - connect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( filter() ) ); - connect( SearchBox, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotOk() ) ); - connect( filterType, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setFilter( int ) ) ); - connect( SearchList, TQT_SIGNAL (selectionChanged (TQListBoxItem *)), TQT_SLOT (updateSelection (TQListBoxItem *))); - connect( SearchList, TQT_SIGNAL( doubleClicked ( TQListBoxItem * ) ), TQT_SLOT( slotOk() ) ); +// connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() ) ) ; + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); + connect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( filter() ) ); + connect( SearchBox, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotOk() ) ); + connect( filterType, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setFilter( int ) ) ); + connect( SearchList, TQ_SIGNAL (selectionChanged (TQListBoxItem *)), TQ_SLOT (updateSelection (TQListBoxItem *))); + connect( SearchList, TQ_SIGNAL( doubleClicked ( TQListBoxItem * ) ), TQ_SLOT( slotOk() ) ); // first create and paint dialog and then load list - TQTimer::singleShot(0, this, TQT_SLOT( init() )); + TQTimer::singleShot(0, this, TQ_SLOT( init() )); } FindDialog::~FindDialog() { @@ -126,7 +126,7 @@ void FindDialog::filter() { //Filter the list of names with the string in the S if ( name->text().lower().startsWith( searchFor ) ) { new SkyObjectNameListItem ( SearchList, name ); /* if ( i++ >= 5000 ) { //Every 5000 name insertions, - kapp->processEvents ( 50 ); //spend 50 msec processing TDEApplication events + tdeApp->processEvents ( 50 ); //spend 50 msec processing TDEApplication events i = 0; }*/ } @@ -182,14 +182,14 @@ void FindDialog::setFilter( int f ) { Filter = f2; if ( Filter == 0 ) { // any type will shown // delete old connections and create new connections - disconnect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterByType() ) ); - connect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( filter() ) ); + disconnect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterByType() ) ); + connect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( filter() ) ); filter(); } else { // delete old connections and create new connections - disconnect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filter() ) ); - connect( SearchBox, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( filterByType() ) ); + disconnect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filter() ) ); + connect( SearchBox, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( filterByType() ) ); filterByType(); } } diff --git a/kstars/kstars/finddialog.h b/kstars/kstars/finddialog.h index 589a6398..b7711209 100644 --- a/kstars/kstars/finddialog.h +++ b/kstars/kstars/finddialog.h @@ -45,7 +45,7 @@ class SkyObjectNameListItem; */ class FindDialog : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/fitshistogram.cpp b/kstars/kstars/fitshistogram.cpp index 55f634a1..aea3730e 100644 --- a/kstars/kstars/fitshistogram.cpp +++ b/kstars/kstars/fitshistogram.cpp @@ -58,11 +58,11 @@ histFrame->setMouseTracking(true); setMouseTracking(true); - connect(minSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateBoxes())); - connect(minSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateIntenFreq(int ))); - connect(maxSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateBoxes())); - connect(maxSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(updateIntenFreq(int ))); - connect(applyB, TQT_SIGNAL(clicked()), this, TQT_SLOT(applyScale())); + connect(minSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateBoxes())); + connect(minSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateIntenFreq(int ))); + connect(maxSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateBoxes())); + connect(maxSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(updateIntenFreq(int ))); + connect(applyB, TQ_SIGNAL(clicked()), this, TQ_SLOT(applyScale())); constructHistogram(viewer->imgBuffer); diff --git a/kstars/kstars/fitshistogram.h b/kstars/kstars/fitshistogram.h index f16d3c86..9952ebb9 100644 --- a/kstars/kstars/fitshistogram.h +++ b/kstars/kstars/fitshistogram.h @@ -28,7 +28,7 @@ class FITSHistogram : public histDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/fitsimage.h b/kstars/kstars/fitsimage.h index 514fc5dc..78a8db8c 100644 --- a/kstars/kstars/fitsimage.h +++ b/kstars/kstars/fitsimage.h @@ -43,7 +43,7 @@ class FITSViewer; class FITSFrame; class FITSImage : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: @@ -108,7 +108,7 @@ class FITSImage : public TQScrollView { class FITSFrame : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/fitsprocess.cpp b/kstars/kstars/fitsprocess.cpp index 717650fe..aa2bf2c4 100644 --- a/kstars/kstars/fitsprocess.cpp +++ b/kstars/kstars/fitsprocess.cpp @@ -64,7 +64,7 @@ } reduceProgress.progressBar()->setProgress(++nprogress); - kapp->processEvents(); + tdeApp->processEvents(); darkFrames.append(buffer); } @@ -78,7 +78,7 @@ } reduceProgress.progressBar()->setProgress(++nprogress); - kapp->processEvents(); + tdeApp->processEvents(); flatFrames.append(buffer); } @@ -92,7 +92,7 @@ } reduceProgress.progressBar()->setProgress(++nprogress); - kapp->processEvents(); + tdeApp->processEvents(); darkflatFrames.append(buffer); } @@ -266,29 +266,29 @@ void FITSProcess::reduce() reduceProgress.show(); reduceProgress.progressBar()->setProgress(1); - kapp->processEvents(); + tdeApp->processEvents(); /* Combine darks */ finalDark = combine(darkFrames, darkCombineMode); reduceProgress.progressBar()->setProgress(5); - kapp->processEvents(); + tdeApp->processEvents(); /* Combine flats */ finalFlat = combine(flatFrames, flatCombineMode); reduceProgress.progressBar()->setProgress(10); - kapp->processEvents(); + tdeApp->processEvents(); /* Combine dark flats */ finalDarkFlat = combine(darkflatFrames, darkflatCombineMode); reduceProgress.progressBar()->setProgress(12); - kapp->processEvents(); + tdeApp->processEvents(); /* Subtract the dark frame */ if (finalDark) subtract( viewer->imgBuffer, finalDark); reduceProgress.progressBar()->setProgress(14); - kapp->processEvents(); + tdeApp->processEvents(); /* Subtract the fark frame from the flat field and then apply to the image buffer */ @@ -297,17 +297,17 @@ void FITSProcess::reduce() if (finalDarkFlat) subtract( finalFlat, finalDarkFlat); reduceProgress.progressBar()->setProgress(16); - kapp->processEvents(); + tdeApp->processEvents(); normalize(finalFlat); reduceProgress.progressBar()->setProgress(18); - kapp->processEvents(); + tdeApp->processEvents(); divide(viewer->imgBuffer, finalFlat); } reduceProgress.progressBar()->setProgress(20); - kapp->processEvents(); + tdeApp->processEvents(); } diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp index b054c940..f10dfe95 100644 --- a/kstars/kstars/fitsviewer.cpp +++ b/kstars/kstars/fitsviewer.cpp @@ -105,7 +105,7 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) history->setUndoLimit(10); history->setRedoLimit(10); history->documentSaved(); - connect(history, TQT_SIGNAL(documentRestored()), this, TQT_SLOT(fitsRestore())); + connect(history, TQ_SIGNAL(documentRestored()), this, TQ_SLOT(fitsRestore())); /* Setup image widget */ image = new FITSImage(this); @@ -131,39 +131,39 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name) if (KSUtils::openDataFile( tempFile, "imgreduction.png" ) ) { - new TDEAction( i18n("Image Reduction"), tempFile.name(), TDEShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new TDEAction( i18n("Image Reduction"), tempFile.name(), TDEShortcut( "Ctrl+R" ), this, TQ_SLOT( imageReduction()), actionCollection(), "image_reduce"); tempFile.close(); } else - new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce"); + new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), this, TQ_SLOT( imageReduction()), actionCollection(), "image_reduce"); /*if (KSUtils::openDataFile( tempFile, "bricon.png" ) ) { - new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), this, TQ_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); tempFile.close(); } else*/ - new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); + new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), this, TQ_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast"); if (KSUtils::openDataFile( tempFile, "histogram.png" ) ) { - new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), this, TQ_SLOT (imageHistogram()), actionCollection(), "image_histogram"); tempFile.close(); } else - new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram"); + new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), this, TQ_SLOT (imageHistogram()), actionCollection(), "image_histogram"); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection()); - KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(fitsCOPY()), actionCollection()); - KStdAction::zoomIn(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomIn()), actionCollection()); - KStdAction::zoomOut(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomOut()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::close(this, TQ_SLOT(slotClose()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(fitsCOPY()), actionCollection()); + KStdAction::zoomIn(image, TQ_SLOT(fitsZoomIn()), actionCollection()); + KStdAction::zoomOut(image, TQ_SLOT(fitsZoomOut()), actionCollection()); new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+D" ), - TQT_TQOBJECT(image), TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); - new TDEAction( i18n( "Statistics"), "sum", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats"); - new TDEAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor"); + image, TQ_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" ); + new TDEAction( i18n( "Statistics"), "sum", 0, this, TQ_SLOT(fitsStatistics()), actionCollection(), "image_stats"); + new TDEAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, this, TQ_SLOT(fitsHeader()), actionCollection(), "fits_editor"); /* Create GUI */ createGUI("fitsviewer.rc"); @@ -557,7 +557,7 @@ void FITSViewer::fileSave() if (TQFile::exists(currentURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(currentURL.fileName()), i18n( "Overwrite File?" ), @@ -712,7 +712,7 @@ void FITSViewer::fileSaveAs() void FITSViewer::fitsCOPY() { - kapp->clipboard()->setImage(*image->displayImage); + tdeApp->clipboard()->setImage(*image->displayImage); } void FITSViewer::updateImgBuffer() diff --git a/kstars/kstars/fitsviewer.h b/kstars/kstars/fitsviewer.h index a951d01c..5e2abd2f 100644 --- a/kstars/kstars/fitsviewer.h +++ b/kstars/kstars/fitsviewer.h @@ -46,7 +46,7 @@ class FITSImage; class FITSHistogram; class FITSViewer : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp index 997550ee..3dcfbf3a 100644 --- a/kstars/kstars/focusdialog.cpp +++ b/kstars/kstars/focusdialog.cpp @@ -42,14 +42,14 @@ FocusDialog::FocusDialog( TQWidget *parent ) setMainWidget(page); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, spacingHint() ); fdlg = new FocusDialogDlg(page); - fdlg->epochName->setValidator( new KDoubleValidator( TQT_TQOBJECT(fdlg->epochName) ) ); + fdlg->epochName->setValidator( new KDoubleValidator( fdlg->epochName ) ); vlay->addWidget( fdlg ); - connect( fdlg->raBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( fdlg->decBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( fdlg->azBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( fdlg->altBox, TQT_SIGNAL(textChanged( const TQString & ) ), this, TQT_SLOT( checkLineEdits() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( validatePoint() ) ); + connect( fdlg->raBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( fdlg->decBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( fdlg->azBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( fdlg->altBox, TQ_SIGNAL(textChanged( const TQString & ) ), this, TQ_SLOT( checkLineEdits() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( validatePoint() ) ); fdlg->raBox->setDegType(false); //RA box should be HMS-style fdlg->raBox->setFocus(); //set input focus diff --git a/kstars/kstars/focusdialog.h b/kstars/kstars/focusdialog.h index c2d03de0..e02ecb0a 100644 --- a/kstars/kstars/focusdialog.h +++ b/kstars/kstars/focusdialog.h @@ -34,7 +34,7 @@ class FocusDialogDlg; */ class FocusDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /**Constructor. */ diff --git a/kstars/kstars/focusdialogdlg.ui b/kstars/kstars/focusdialogdlg.ui index 38fe97a7..d661282a 100644 --- a/kstars/kstars/focusdialogdlg.ui +++ b/kstars/kstars/focusdialogdlg.ui @@ -201,9 +201,9 @@ <data format="XPM.GZ" length="4350">789c6dd7594f23471007f0f7fd14d6d6db2aaaf58c3db647511eb831b7317794879ac30760cc61c010e5bba7dcf5af5688167664fdb66bbaababbb67cccf1f8dab93c3c68f9fdf5e16b298968d7222cf8d1fd5eb6cf6f1e75f7ffcfded7b9a3656ff9aad46fafdb76fdf078b46d9389a3fd42bf04841699e964933b830b79a7019dd0b96955b895b5a703bcd572e08eea576ff6570ae0eedd477b792103f854b8b2fc6d1163f77237e646e37113f89b6f8307e3bf1785a8b0eedbc696eb7ad9db7e01ee6476ee4ffe0c6fd158c7c69182cde4eec6e87fea50dfbf8176e6ba7d07f96669999cfa325ccaf862bcc97a36dbccf60f178cee11cde706761f16917ae30fe6b7488a7851bf14d7327417f676eb4f756eea41e2f57e6d83e83919f6cba117f04235fd9765b3b0fa36dfc398cf973edc67a6fb951ffe768ab6765ee26b8dff213ef5f4630e2b9e7463ea7ee8ee5ff60ee2618af8eb6fe3238437eb91bf1299cdbfacad3cadd5617f5a11738c7fe4adcb8ffd68d7aeec15e8fc3683b9f62ee2518ef33dafa3f75e3bc957086f86eb4d56f3db8e8e6dd56f01a5cc1bbe65e629673d8ebd18d0efdc9058cf9f2c08df9e630ce037db8719ec37c7a9a7fb708f10267b65e7cef46fb3e9ca3fd23dad6ef0cf67abe99f304f95ec3a8871cbb71be52d8d777e8b6fee412f6f958be3adf5ea817b561afe7d86ded7c67ce13c46fc37ede2766c17a17059cd9f38e466e8c3f8eb6fd700f0b9ef7095c37cd3d37de178f2be76dcf876fa343bd790267f012f67a77cc319f69b4ed872e2ca8e732daeabfe3c6fa9cc235f21f9b8bd4f2a5cd687bfedbfd659ee7ede017b842becf6eb44fa3cbd0df8559b0ffe808ceb0ff37e01afba3652e52cc87a26dbe276ecca7097790ff73b4cdef0616ac4fdf6df1c2d1d67ee8c6f80318eb4bd1180ff529513f0ecf7b694b62f5a002ceccb2662e523c2fb7605f9f0fd8fbbf75e3bc2dcd3e9ebcb9f17ce8c05e8f83685bcf701e44eb2db65e4fd1b65eebe62245be53b8c6f3ffdd8dfd3933fbf884761f5f0edcd88f951bf118bf44bde926dae24fe01ae7af76e3f9169e2f45bb143c0f5fdcf6fea23b18f773eac6f3e63ddac6db75e37df5e8c6fbae65aebcde6d37beaf84f528aa52f03c9dc3359ea79939c627d136deab1befaf75b883ef23e76e3ccfaea36d7dc2f795322b05ebfb0ad738af7db7ad371f99fd7e59b8b13f276e9cdf1318f5e54337e6d78cb67cf761ec170efba1acaa1afd9db92d3f3a36d729ea77efc6f33cbccf2beddfe6478fe6d85e45dbfd851bf1577007f5d877e3bc86f5a9ea3a2d6cffdfc1debe116df5db73a39e37b0e777191dda257c7fa83b6e8a2eaae00eeceb13d6b7d69f325b79b058fd32b170c1a55ebffaac2ccae2b9e6118f79c253bd6ef9ee3fd7587fef79c60f7acf3cc617fcc84ffcac6d8ffcc20b7ee5377ee7257ff027aff1bac66ff0269716cf5b1ab7cd3bbcabb17ddee37d3ee0433ee2633ee1019ff290cff89c2ff89229c48b66f1ac3d5df135df7093134eb9c56dcef4b3c35dee71ce393111dbfa8c784a4205955451cd1d1ad1982634a55bbad3f80eddd38c1ef882e66cf52ab5ff2b8d7ea4277aa6175ad06bb866f446efb4d4df0ffad4fed762ffb7b44e1b9cd2266dd142c75e5ddb3cd0bb3e347a477bd9d5f83ee245e3f7689f0ee830f67d44c77412ee186946033aa5e197fecfe85c7bf7be2fe892aee89a6ea84989f6bfa434f4eff9df52c509b5d0779b32ea684d13ea528f728d1e882ebfce37f6cf077422b4ea5b440ad14af1a15452ab473aee52c65ff39789b64fe955f44eb9937b5d858c5b32d377c0c32a7fee7ecd5fe61aff284ff22c2fb290577993775db1443fb53ef2219f5ff2bf93356d5b970dd9d41eb77820dbb223bbab155ed55ffab2f725ffb1eccb81aed6931cca116ab490633909d10339fd5ffdef795d869ae7923bc27226e772415d5986b51d683663b9d4fcfbb1ff190fe54aaec35aeaa577ee20f24673e94b531249a585fc2b69ebfe3ed7dae91f75ba964b5c03e9d344ba1add93bce0826c3f87f3b2a9fb6f18aeba10ba2f563f25eb1b563771a5d17531e2513c5fba538b3111cd690dd73c7ef6a95f4c8aa99de12fe77da4951de9ffffea730be7fd9fdfbffd0b690edc6c</data> </image> </images> -<Q_SLOTS> +<slots> <slot>checkLineEdits()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">dmsbox.h</include> diff --git a/kstars/kstars/fov.cpp b/kstars/kstars/fov.cpp index af40388c..1b34f910 100644 --- a/kstars/kstars/fov.cpp +++ b/kstars/kstars/fov.cpp @@ -19,7 +19,7 @@ #include <tqfile.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "fov.h" diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp index 2e1722e9..07f249e6 100644 --- a/kstars/kstars/fovdialog.cpp +++ b/kstars/kstars/fovdialog.cpp @@ -29,7 +29,7 @@ #include <knuminput.h> #include <klineedit.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "fovdialog.h" #include "kstars.h" @@ -42,17 +42,17 @@ FOVDialog::FOVDialog( TQWidget *parent ) : KDialogBase( KDialogBase::Plain, i18n( "Set FOV Indicator" ), Ok|Cancel, Ok, parent ) { - ks = (KStars*)TQT_TQWIDGET(parent); + ks = (KStars*)parent; TQFrame *page = plainPage(); TQVBoxLayout *vlay = new TQVBoxLayout( page, 0, 0 ); fov = new FOVDialogUI( page ); vlay->addWidget( fov ); - connect( fov->FOVListBox, TQT_SIGNAL( currentChanged( TQListBoxItem* ) ), TQT_SLOT( slotSelect( TQListBoxItem* ) ) ); - connect( fov->NewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotNewFOV() ) ); - connect( fov->EditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFOV() ) ); - connect( fov->RemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveFOV() ) ); + connect( fov->FOVListBox, TQ_SIGNAL( currentChanged( TQListBoxItem* ) ), TQ_SLOT( slotSelect( TQListBoxItem* ) ) ); + connect( fov->NewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotNewFOV() ) ); + connect( fov->EditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFOV() ) ); + connect( fov->RemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveFOV() ) ); FOVList.setAutoDelete( true ); initList(); @@ -199,13 +199,13 @@ NewFOV::NewFOV( TQWidget *parent ) ui = new NewFOVUI( page ); vlay->addWidget( ui ); - connect( ui->FOVName, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->FOVEdit, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->ColorButton, TQT_SIGNAL( changed( const TQColor & ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->ShapeBox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotUpdateFOV() ) ); - connect( ui->ComputeEyeFOV, TQT_SIGNAL( clicked() ), TQT_SLOT( slotComputeFOV() ) ); - connect( ui->ComputeCameraFOV, TQT_SIGNAL( clicked() ), TQT_SLOT( slotComputeFOV() ) ); - connect( ui->ComputeHPBW, TQT_SIGNAL( clicked() ), TQT_SLOT( slotComputeFOV() ) ); + connect( ui->FOVName, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->FOVEdit, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->ColorButton, TQ_SIGNAL( changed( const TQColor & ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->ShapeBox, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotUpdateFOV() ) ); + connect( ui->ComputeEyeFOV, TQ_SIGNAL( clicked() ), TQ_SLOT( slotComputeFOV() ) ); + connect( ui->ComputeCameraFOV, TQ_SIGNAL( clicked() ), TQ_SLOT( slotComputeFOV() ) ); + connect( ui->ComputeHPBW, TQ_SIGNAL( clicked() ), TQ_SLOT( slotComputeFOV() ) ); slotUpdateFOV(); } @@ -237,15 +237,15 @@ void NewFOV::paintEvent( TQPaintEvent * ) { void NewFOV::slotComputeFOV() { //DEBUG - kdDebug() << ":" << TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() << ":" << endl; - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "ComputeEyeFOV" ) ) kdDebug() << "A" << endl; - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) kdDebug() << "B" << endl; + kdDebug() << ":" << sender()->name() << ":" << endl; + if ( sender()->name() == TQString( "ComputeEyeFOV" ) ) kdDebug() << "A" << endl; + if ( sender()->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) kdDebug() << "B" << endl; - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) + if ( sender()->name() == TQString( "ComputeEyeFOV" ) && ui->TLength1->value() > 0.0 ) ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( ui->EyeFOV->value() * ui->EyeLength->value() / ui->TLength1->value() ) ); - else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "ComputeCameraFOV" ) && ui->TLength2->value() > 0.0 ) + else if ( sender()->name() == TQString( "ComputeCameraFOV" ) && ui->TLength2->value() > 0.0 ) ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( ui->ChipSize->value() * 3438.0 / ui->TLength2->value() ) ); - else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "ComputeHPBW" ) && ui->RTDiameter->value() > 0.0 && ui->WaveLength->value() > 0.0 ) { + else if ( sender()->name() == TQString( "ComputeHPBW" ) && ui->RTDiameter->value() > 0.0 && ui->WaveLength->value() > 0.0 ) { ui->FOVEdit->setText( TDEGlobal::locale()->formatNumber( 34.34 * 1.2 * ui->WaveLength->value() / ui->RTDiameter->value() ) ); // Beam width for an antenna is usually a circle on the sky. ui->ShapeBox->setCurrentItem(4); diff --git a/kstars/kstars/fovdialog.h b/kstars/kstars/fovdialog.h index ce25d7e7..62ad30c3 100644 --- a/kstars/kstars/fovdialog.h +++ b/kstars/kstars/fovdialog.h @@ -33,7 +33,7 @@ class NewFOVUI; class FOVDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FOVDialog( TQWidget *parent=0 ); @@ -63,7 +63,7 @@ private: */ class NewFOV : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: NewFOV( TQWidget *parent=0 ); diff --git a/kstars/kstars/imagereductiondlg.cpp b/kstars/kstars/imagereductiondlg.cpp index f5776c8c..08e28f39 100644 --- a/kstars/kstars/imagereductiondlg.cpp +++ b/kstars/kstars/imagereductiondlg.cpp @@ -26,15 +26,15 @@ ImageReductionDlg::ImageReductionDlg(TQWidget * parent, const char * name) : imageReductionUI(parent, name) { - connect(darkAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDarkFile())); - connect(flatAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addFlatFile())); - connect(darkRemoveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeDarkFile())); - connect(flatRemoveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeFlatFile())); - connect(darkDetailsB, TQT_SIGNAL(clicked()), this, TQT_SLOT(detailsDarkFile())); - connect(flatDetailsB, TQT_SIGNAL(clicked()), this, TQT_SLOT(detailsFlatFile())); - connect(darkflatAddB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addDarkFlatFile())); - connect(darkflatRemoveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeDarkFlatFile())); - connect(darkflatDetailsB, TQT_SIGNAL(clicked()), this, TQT_SLOT(detailsDarkFlatFile())); + connect(darkAddB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addDarkFile())); + connect(flatAddB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addFlatFile())); + connect(darkRemoveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeDarkFile())); + connect(flatRemoveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeFlatFile())); + connect(darkDetailsB, TQ_SIGNAL(clicked()), this, TQ_SLOT(detailsDarkFile())); + connect(flatDetailsB, TQ_SIGNAL(clicked()), this, TQ_SLOT(detailsFlatFile())); + connect(darkflatAddB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addDarkFlatFile())); + connect(darkflatRemoveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeDarkFlatFile())); + connect(darkflatDetailsB, TQ_SIGNAL(clicked()), this, TQ_SLOT(detailsDarkFlatFile())); darkListView->setSorting(-1); flatListView->setSorting(-1); diff --git a/kstars/kstars/imagereductiondlg.h b/kstars/kstars/imagereductiondlg.h index 8461d90f..1a5594bc 100644 --- a/kstars/kstars/imagereductiondlg.h +++ b/kstars/kstars/imagereductiondlg.h @@ -22,7 +22,7 @@ class ImageReductionDlg : public imageReductionUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/imagereductionui.ui b/kstars/kstars/imagereductionui.ui index 7a2f75a2..87cb0e86 100644 --- a/kstars/kstars/imagereductionui.ui +++ b/kstars/kstars/imagereductionui.ui @@ -565,9 +565,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -582,9 +579,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp index a05b65ad..6e98b10f 100644 --- a/kstars/kstars/imagesequence.cpp +++ b/kstars/kstars/imagesequence.cpp @@ -46,8 +46,8 @@ imagesequence::imagesequence(TQWidget* parent, const char* name, bool modal, WFl if (devMenu) { - connect (devMenu, TQT_SIGNAL(newDevice()), this, TQT_SLOT(newCCD())); - connect (devMenu, TQT_SIGNAL(newDevice()), this, TQT_SLOT(newFilter())); + connect (devMenu, TQ_SIGNAL(newDevice()), this, TQ_SLOT(newCCD())); + connect (devMenu, TQ_SIGNAL(newDevice()), this, TQ_SLOT(newFilter())); } seqTimer = new TQTimer(this); @@ -55,12 +55,12 @@ imagesequence::imagesequence(TQWidget* parent, const char* name, bool modal, WFl setModal(false); // Connect signals and slots - connect(startB, TQT_SIGNAL(clicked()), this, TQT_SLOT(startSequence())); - connect(stopB, TQT_SIGNAL(clicked()), this, TQT_SLOT(stopSequence())); - connect(closeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); - connect(seqTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(prepareCapture())); - connect(CCDCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(checkCCD(int))); - connect(filterCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateFilterCombo(int))); + connect(startB, TQ_SIGNAL(clicked()), this, TQ_SLOT(startSequence())); + connect(stopB, TQ_SIGNAL(clicked()), this, TQ_SLOT(stopSequence())); + connect(closeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); + connect(seqTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(prepareCapture())); + connect(CCDCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(checkCCD(int))); + connect(filterCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateFilterCombo(int))); active = false; ISOStamp = false; @@ -253,7 +253,7 @@ void imagesequence::startSequence() currentImgCountOUT->setText(TQString("%1").arg(seqCurrentCount)); // Ok, now let's connect signals and slots for this device - connect(stdDevCCD, TQT_SIGNAL(FITSReceived(TQString)), this, TQT_SLOT(newFITS(TQString))); + connect(stdDevCCD, TQ_SIGNAL(FITSReceived(TQString)), this, TQ_SLOT(newFITS(TQString))); // set the progress info imgProgress->setEnabled(true); @@ -294,7 +294,7 @@ void imagesequence::stopSequence() stdDevCCD->batchMode = false; stdDevCCD->ISOMode = false; - stdDevCCD->disconnect( TQT_SIGNAL(FITSReceived(TQString))); + stdDevCCD->disconnect( TQ_SIGNAL(FITSReceived(TQString))); } } @@ -358,7 +358,7 @@ void imagesequence::newFITS(TQString deviceLabel) seqTimer->stop(); if (stdDevCCD) - stdDevCCD->disconnect( TQT_SIGNAL(FITSReceived(TQString))); + stdDevCCD->disconnect( TQ_SIGNAL(FITSReceived(TQString))); resetButtons(); } @@ -469,7 +469,7 @@ bool imagesequence::verifyFilterIntegrity() return false; } - // #3 Make sure it has FILTER_SLOT std property by searching for its TQT_SLOT element + // #3 Make sure it has FILTER_SLOT std property by searching for its SLOT element filterElem = filterDevice->findElem("SLOT"); if (filterElem == NULL) { @@ -507,7 +507,7 @@ void imagesequence::prepareCapture() if ( stdDevFilter && ((tempProp = stdDevFilter->dp->findProp("FILTER_SLOT")) != NULL)) { - connect (tempProp, TQT_SIGNAL(okState()), this, TQT_SLOT(captureImage())); + connect (tempProp, TQ_SIGNAL(okState()), this, TQ_SLOT(captureImage())); selectFilter(); } else @@ -531,7 +531,7 @@ void imagesequence::captureImage() // D. The property has been lost. if ( stdDevFilter && ((tempProp = stdDevFilter->dp->findProp("FILTER_SLOT")) != NULL)) - tempProp->disconnect( TQT_SIGNAL (okState())); + tempProp->disconnect( TQ_SIGNAL (okState())); if (!verifyCCDIntegrity()) { diff --git a/kstars/kstars/imagesequence.h b/kstars/kstars/imagesequence.h index 2622bbfb..dc4e1231 100644 --- a/kstars/kstars/imagesequence.h +++ b/kstars/kstars/imagesequence.h @@ -20,11 +20,11 @@ class INDIStdDevice; class imagesequence : public imgSequenceDlg { - Q_OBJECT + TQ_OBJECT public: - imagesequence(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + imagesequence(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~imagesequence(); diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp index 7e31d3cc..480104d9 100644 --- a/kstars/kstars/imageviewer.cpp +++ b/kstars/kstars/imageviewer.cpp @@ -37,9 +37,9 @@ ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *pa // JH: easier to just disable its mobility toolBar()->setMovingEnabled( false ); - TDEAction *action = new TDEAction (i18n ("Close Window"), "window-close", CTRL+Key_Q, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection()); + TDEAction *action = new TDEAction (i18n ("Close Window"), "window-close", CTRL+Key_Q, this, TQ_SLOT (close()), actionCollection()); action->plug (toolBar()); - action = new TDEAction (i18n ("Save Image"), "document-save", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection()); + action = new TDEAction (i18n ("Save Image"), "document-save", CTRL+Key_S, this, TQ_SLOT (saveFileToDisc()), actionCollection()); action->plug (toolBar()); statusBar()->insertItem( capText, 0, 1, true ); @@ -132,7 +132,7 @@ void ImageViewer::loadImageFromURL() kdDebug()<<"tempfile-URL is malformed\n"; downloadJob = TDEIO::copy (imageURL, saveURL); // starts the download asynchron - connect (downloadJob, TQT_SIGNAL (result (TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (downloadJob, TQ_SIGNAL (result (TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); } void ImageViewer::downloadReady (TDEIO::Job *job) @@ -173,7 +173,7 @@ void ImageViewer::showImage() image.smoothScale ( statusBar()->width() , image.height() * statusBar()->width() / image.width() ); } - TQRect deskRect = kapp->desktop()->availableGeometry(); + TQRect deskRect = tdeApp->desktop()->availableGeometry(); int w = deskRect.width(); // screen width int h = deskRect.height(); // screen height int h2 = image.height() + toolBar()->height() + statusBar()->height(); //height required for ImageViewer @@ -208,7 +208,7 @@ void ImageViewer::saveFileToDisc() TQFile f (newURL.directory() + "/" + newURL.fileName()); if (f.exists()) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(newURL.fileName()), i18n( "Overwrite File?" ), diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h index 36aacb42..e7071f1f 100644 --- a/kstars/kstars/imageviewer.h +++ b/kstars/kstars/imageviewer.h @@ -46,7 +46,7 @@ class KURL; class TQFile; class ImageViewer : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/indi/Makefile.am b/kstars/kstars/indi/Makefile.am index 303dffad..fc78522a 100644 --- a/kstars/kstars/indi/Makefile.am +++ b/kstars/kstars/indi/Makefile.am @@ -20,59 +20,59 @@ noinst_LIBRARIES = liblilxml.a libindicom.a indiserver_SOURCES = indiserver.c fq.c indiserver_LDADD = liblilxml.a ${LIBPTHREAD} ${USE_THREADS} $(LIBSOCKET) -indiserver_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +indiserver_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) lx200generic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200autostar.cpp lx200_16.cpp lx200gps.cpp lx200generic.cpp lx200classic.cpp lx200generic_LDADD = liblilxml.a libindicom.a -lm -lx200generic_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +lx200generic_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) lx200basic_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c lx200basic.cpp lx200basic_LDADD = liblilxml.a libindicom.a -lx200basic_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +lx200basic_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) celestrongps_SOURCES = indidrivermain.c base64.c eventloop.c celestronprotocol.c celestrongps.cpp celestrongps_LDADD = liblilxml.a libindicom.a -lm -celestrongps_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +celestrongps_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) apmount_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c apmount.cpp apmount_LDADD = liblilxml.a libindicom.a -apmount_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +apmount_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) fliccd_SOURCES = eventloop.c base64.c fli_ccd.c indidrivermain.c fliccd_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm -lz $(LIBSOCKET) -fliccd_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +fliccd_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) fliwheel_SOURCES = eventloop.c base64.c fli_wheel.c indidrivermain.c fliwheel_LDADD = fli/libfli.la libindicom.a liblilxml.a -lm -fliwheel_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +fliwheel_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) v4ldriver_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_v4l.cpp v4ldriver_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz -v4ldriver_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +v4ldriver_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) v4lphilips_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp v4lphilips.cpp indi_philips.cpp v4lphilips_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lm -lz -v4lphilips_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +v4lphilips_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) meade_lpi_SOURCES = eventloop.c base64.c indidrivermain.c v4ldriver.cpp indi_lpi.cpp meade_lpi_LDADD = libindicom.a liblilxml.a webcam/libwebcam.la -lz -meade_lpi_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +meade_lpi_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) temma_SOURCES = indidrivermain.c base64.c eventloop.c temmadriver.c temma_LDADD = liblilxml.a libindicom.a -lm -temma_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +temma_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) skycommander_SOURCES = indidrivermain.c base64.c eventloop.c lx200driver.c skycommander.c skycommander_LDADD = liblilxml.a libindicom.a -lm -skycommander_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +skycommander_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) apogee_ppi_SOURCES = apogee_ppi.cpp base64.c eventloop.c indidrivermain.c apogee_ppi_LDADD = libindicom.a liblilxml.a apogee/libapogee_PPI.la -lz -apogee_ppi_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +apogee_ppi_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) sbigccd_SOURCES = sbigccd.cpp base64.c eventloop.c indidrivermain.c sbigccd_LDADD = libindicom.a liblilxml.a -lz -sbigccd_LDFLAGS = $(LIB_QT) $(QT_LDFLAGS) +sbigccd_LDFLAGS = $(LIB_TQT) $(QT_LDFLAGS) install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(bindir) diff --git a/kstars/kstars/indi/apogee/ApogeeLinux.h b/kstars/kstars/indi/apogee/ApogeeLinux.h index d17e7bde..dd181027 100644 --- a/kstars/kstars/indi/apogee/ApogeeLinux.h +++ b/kstars/kstars/indi/apogee/ApogeeLinux.h @@ -10,6 +10,10 @@ #ifndef APOGEELINUX_H #define APOGEELINUX_H +#ifdef Q_OS_SOLARIS +#include <sys/ioccom.h> +#endif /* solaris */ + #define APISA_READ_USHORT _IOR('a', 0x01, unsigned int) #define APISA_READ_LINE _IOR('a', 0x02, unsigned int) #define APISA_WRITE_USHORT _IOW('a', 0x03, unsigned int) diff --git a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp index 67d217ec..e508789d 100644 --- a/kstars/kstars/indi/apogee/CameraIO_Linux.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_Linux.cpp @@ -14,7 +14,6 @@ #include <unistd.h> #include <fcntl.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 @@ -203,7 +202,7 @@ void CCameraIO::RegWrite( short reg, unsigned short val ) m_RegShadow[ Reg_BICCounter ] = val; break; default: - _ASSERT( FALSE ); // application program bug + _ASSERT( false ); // application program bug } } diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp index 16a6bb72..41fd4fe5 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxISA.cpp @@ -13,7 +13,6 @@ #include <fcntl.h> #include <stdio.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp index a83a594e..80d66fdc 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPCI.cpp @@ -13,7 +13,6 @@ #include <fcntl.h> #include <stdio.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 diff --git a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp index 7025d9ce..b9613498 100644 --- a/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_LinuxPPI.cpp @@ -13,7 +13,6 @@ #include <fcntl.h> #include <stdio.h> #define HANDLE int -#define FALSE 0 #define DWORD long #define _ASSERT assert #define REALTIME_PRIORITY_CLASS 1 diff --git a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp index 3e6cc43e..65ab972d 100644 --- a/kstars/kstars/indi/apogee/CameraIO_PCI.cpp +++ b/kstars/kstars/indi/apogee/CameraIO_PCI.cpp @@ -72,7 +72,7 @@ long CCameraIO_PCI::Read(unsigned short reg, unsigned short& val) RegNumber = RegPCI_CommandReadback; break; default: - _ASSERT( FALSE ); // Application program bug + _ASSERT( false ); // Application program bug val = 0; return 0; } @@ -348,7 +348,7 @@ bool CCameraIO_PCI::InitDriver() return false; } - BOOL IoctlResult = DeviceIoControl( + BOOLEAN IoctlResult = DeviceIoControl( m_hDriver, // Handle to device IOCTL_PCI_BUS_SCAN, // IO Control code for PCI Bus Scan NULL, // Buffer to driver. diff --git a/kstars/kstars/indi/fli/libfli-usb-sys-bsd.c b/kstars/kstars/indi/fli/libfli-usb-sys-bsd.c index caccf859..cf9ff447 100644 --- a/kstars/kstars/indi/fli/libfli-usb-sys-bsd.c +++ b/kstars/kstars/indi/fli/libfli-usb-sys-bsd.c @@ -93,7 +93,7 @@ long unix_usbverifydescriptor(flidev_t dev, fli_unixio_t *io) break; } - DEVICE->devinfo.fwrev = usb_desc.bcdDevice; + DEVICE->devinfo.fwrev = (long)usb_desc.bcdDevice; } return 0; diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp index 23914204..1fb309f4 100644 --- a/kstars/kstars/indidevice.cpp +++ b/kstars/kstars/indidevice.cpp @@ -404,15 +404,15 @@ int INDI_D::setLabelState (INDI_P *pp, XMLEle *root, char errmsg[]) if (islight) break; - lp->push_w->setDown(state == PS_ON ? true : false); + lp->push_w->setDown(state == PS_ON); buttonFont = lp->push_w->font(); - buttonFont.setBold(state == PS_ON ? TRUE : FALSE); + buttonFont.setBold(state == PS_ON); lp->push_w->setFont(buttonFont); break; case PG_RADIO: - lp->check_w->setChecked(state == PS_ON ? true : false); + lp->check_w->setChecked(state == PS_ON); break; case PG_MENU: if (state == PS_ON) diff --git a/kstars/kstars/indidevice.h b/kstars/kstars/indidevice.h index 366e7b3a..13013845 100644 --- a/kstars/kstars/indidevice.h +++ b/kstars/kstars/indidevice.h @@ -69,7 +69,7 @@ class TQVBox; /* INDI device */ class INDI_D : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: INDI_D(INDIMenu *parentMenu, DeviceManager *parentManager, TQString inName, TQString inLabel); diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp index ae5997f1..1241a322 100644 --- a/kstars/kstars/indidriver.cpp +++ b/kstars/kstars/indidriver.cpp @@ -34,11 +34,11 @@ #include <kiconloader.h> #include <tdelistview.h> #include <tdepopupmenu.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <kpushbutton.h> #include <klineedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeaction.h> #include <kextsock.h> @@ -46,7 +46,7 @@ /* * The dialog will by default be modeless, unless you set 'modal' to - * TRUE to construct a modal dialog. + * true to construct a modal dialog. */ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) @@ -96,28 +96,28 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent ) lastGroup = NULL; - TQObject::connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addINDIHost())); - TQObject::connect(modifyB, TQT_SIGNAL(clicked()), this, TQT_SLOT(modifyINDIHost())); - TQObject::connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeINDIHost())); + TQObject::connect(addB, TQ_SIGNAL(clicked()), this, TQ_SLOT(addINDIHost())); + TQObject::connect(modifyB, TQ_SIGNAL(clicked()), this, TQ_SLOT(modifyINDIHost())); + TQObject::connect(removeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeINDIHost())); - TQObject::connect(clientListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ))); + TQObject::connect(clientListView, TQ_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(ClientprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(ClientpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHostStatus(int))); +TQObject::connect(ClientpopMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processHostStatus(int))); -TQObject::connect(localListView, TQT_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ))); +TQObject::connect(localListView, TQ_SIGNAL(rightButtonPressed ( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(LocalprocessRightButton( TQListViewItem *, const TQPoint &, int ))); -TQObject::connect(LocalpopMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processDeviceStatus(int))); +TQObject::connect(LocalpopMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processDeviceStatus(int))); -TQObject::connect(ksw->getINDIMenu(), TQT_SIGNAL(driverDisconnected(int)), this, TQT_SLOT(shutdownHost(int))); +TQObject::connect(ksw->getINDIMenu(), TQ_SIGNAL(driverDisconnected(int)), this, TQ_SLOT(shutdownHost(int))); -TQObject::connect(connectHostB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateHostConnection())); -TQObject::connect(disconnectHostB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateHostDisconnection())); +TQObject::connect(connectHostB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateHostConnection())); +TQObject::connect(disconnectHostB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateHostDisconnection())); -TQObject::connect(runServiceB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateRunService())); -TQObject::connect(stopServiceB, TQT_SIGNAL(clicked()), this, TQT_SLOT(activateStopService())); +TQObject::connect(runServiceB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateRunService())); +TQObject::connect(stopServiceB, TQ_SIGNAL(clicked()), this, TQ_SLOT(activateStopService())); -TQObject::connect(localListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateLocalButtons())); -TQObject::connect(clientListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(updateClientButtons())); +TQObject::connect(localListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateLocalButtons())); +TQObject::connect(clientListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(updateClientButtons())); readXMLDriver(); resize( 500, 300); @@ -415,7 +415,7 @@ bool INDIDriver::runDevice(IDevice *dev) else localListView->selectedItem()->setPixmap(2, serverMode); - connect(dev->proc, TQT_SIGNAL(receivedStderr (TDEProcess *, char *, int)), dev, TQT_SLOT(processstd(TDEProcess *, char*, int))); + connect(dev->proc, TQ_SIGNAL(receivedStderr (TDEProcess *, char *, int)), dev, TQ_SLOT(processstd(TDEProcess *, char*, int))); dev->proc->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr); //dev->proc->start(); @@ -724,7 +724,7 @@ bool INDIDriver::buildDriverElement(XMLEle *root, TQListViewItem *DGroup, int gr dv = new IDevice(label, driver, version); dv->deviceType = groupType; - connect(dv, TQT_SIGNAL(newServerInput()), this, TQT_SLOT(updateLocalButtons())); + connect(dv, TQ_SIGNAL(newServerInput()), this, TQ_SLOT(updateLocalButtons())); if (focal_length > 0) dv->focal_length = focal_length; if (aperture > 0) @@ -732,7 +732,7 @@ bool INDIDriver::buildDriverElement(XMLEle *root, TQListViewItem *DGroup, int gr devices.push_back(dv); - // SLOTS/SIGNAL, pop menu, indi server logic + // SLOTS/TQ_SIGNAL, pop menu, indi server logic return true; } diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h index 617d89de..fe7eaf18 100644 --- a/kstars/kstars/indidriver.h +++ b/kstars/kstars/indidriver.h @@ -42,7 +42,7 @@ struct INDIHostsInfo class IDevice : public TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -79,7 +79,7 @@ class IDevice : public TQObject class INDIDriver : public devManager { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp index 4308de45..4e2a7759 100644 --- a/kstars/kstars/indielement.cpp +++ b/kstars/kstars/indielement.cpp @@ -287,10 +287,10 @@ void INDI_E::setupElementScale(int length) int steps = (int) ((max - min) / step); spin_w = new KDoubleSpinBox(min, max, step, value, 2, pp->pg->propertyContainer ); -slider_w = new TQSlider(0, steps, 1, (int) ((value - min) / step), Qt::Horizontal, pp->pg->propertyContainer ); +slider_w = new TQSlider(0, steps, 1, (int) ((value - min) / step), TQt::Horizontal, pp->pg->propertyContainer ); -connect(spin_w, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(spinChanged(double ))); -connect(slider_w, TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(sliderChanged(int ))); +connect(spin_w, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(spinChanged(double ))); +connect(slider_w, TQ_SIGNAL(sliderMoved(int)), this, TQ_SLOT(sliderChanged(int ))); //kdDebug() << "For element " << label << " we have step of " << step << endl; @@ -363,7 +363,7 @@ void INDI_E::setupElementWrite(int length) write_w->setMinimumWidth( length ); write_w->setMaximumWidth( length); - TQObject::connect(write_w, TQT_SIGNAL(returnPressed()), pp, TQT_SLOT(newText())); + TQObject::connect(write_w, TQ_SIGNAL(returnPressed()), pp, TQ_SLOT(newText())); EHBox->addWidget(write_w); } @@ -373,12 +373,12 @@ void INDI_E::setupElementRead(int length) read_w = new KLineEdit( pp->pg->propertyContainer ); read_w->setMinimumWidth( length ); - read_w->setFocusPolicy( TQ_NoFocus ); + read_w->setFocusPolicy( TQWidget::NoFocus ); read_w->setFrameShape( KLineEdit::GroupBoxPanel ); read_w->setFrameShadow( KLineEdit::Plain ); read_w->setCursorPosition( 0 ); read_w->setAlignment( int( KLineEdit::AlignHCenter ) ); - read_w->setReadOnly( TRUE ); + read_w->setReadOnly( true ); read_w->setText(text); EHBox->addWidget(read_w); @@ -393,7 +393,7 @@ void INDI_E::setupBrowseButton() browse_w->setMaximumWidth( MAX_SET_WIDTH ); EHBox->addWidget(browse_w); - TQObject::connect(browse_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(browseBlob())); + TQObject::connect(browse_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(browseBlob())); } diff --git a/kstars/kstars/indielement.h b/kstars/kstars/indielement.h index c7ae6dd4..0bf7c321 100644 --- a/kstars/kstars/indielement.h +++ b/kstars/kstars/indielement.h @@ -88,7 +88,7 @@ XMLEle * findEle (XMLEle *ep , INDI_P *pp, const char *child, char errmsg /* INDI Element */ class INDI_E : public TQObject { - Q_OBJECT + TQ_OBJECT public: INDI_E(INDI_P *parentProperty, TQString inName, TQString inLabel); @@ -98,7 +98,7 @@ class INDI_E : public TQObject PState state; /* control on/off t/f etc */ INDI_P *pp; /* parent property */ - TQHBoxLayout *EHBox; /*Qt::Horizontal layout */ + TQHBoxLayout *EHBox; /* Horizontal layout */ /* GUI widgets, only malloced when needed */ KSqueezedTextLabel *label_w; // label diff --git a/kstars/kstars/indifitsconf.cpp b/kstars/kstars/indifitsconf.cpp index 83779bb1..e362d805 100644 --- a/kstars/kstars/indifitsconf.cpp +++ b/kstars/kstars/indifitsconf.cpp @@ -29,8 +29,8 @@ INDIFITSConf::INDIFITSConf(TQWidget* parent, const char* name, bool modal, WFlag TDEIconLoader *icons = TDEGlobal::iconLoader(); selectDirB->setPixmap( icons->loadIcon( "document-open", TDEIcon::Toolbar ) ); - connect(selectDirB, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveFITSDirectory())); - connect(filterCombo, TQT_SIGNAL(activated (int)), this, TQT_SLOT(comboUpdate(int))); + connect(selectDirB, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveFITSDirectory())); + connect(filterCombo, TQ_SIGNAL(activated (int)), this, TQ_SLOT(comboUpdate(int))); } diff --git a/kstars/kstars/indifitsconf.h b/kstars/kstars/indifitsconf.h index 90687f3c..09e6aa34 100644 --- a/kstars/kstars/indifitsconf.h +++ b/kstars/kstars/indifitsconf.h @@ -14,11 +14,11 @@ class INDIFITSConf : public INDIConf { - Q_OBJECT + TQ_OBJECT public: - INDIFITSConf(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + INDIFITSConf(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~INDIFITSConf(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kstars/kstars/indigroup.h b/kstars/kstars/indigroup.h index b68a976d..097e6a10 100644 --- a/kstars/kstars/indigroup.h +++ b/kstars/kstars/indigroup.h @@ -35,7 +35,7 @@ class INDI_G INDI_D *dp; /* Parent device */ TQFrame *propertyContainer; /* Properties container */ TQVBoxLayout *propertyLayout; /* Properties layout */ - TQSpacerItem *VerticalSpacer; /*Qt::Vertical spacer */ + TQSpacerItem *VerticalSpacer; /* Vertical spacer */ TQPtrList<INDI_P> pl; /* malloced list of pointers to properties */ diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp index 8a4df6d2..b1a59593 100644 --- a/kstars/kstars/indimenu.cpp +++ b/kstars/kstars/indimenu.cpp @@ -127,8 +127,8 @@ DeviceManager *dev; drivers->devices[i]->mgrID = mgrCounter; drivers->devices[i]->managed = true; mgr.append(dev); - connect(dev, TQT_SIGNAL(newDevice()), drivers, TQT_SLOT(updateMenuActions())); - connect(dev, TQT_SIGNAL(newDevice()), this, TQT_SLOT(discoverDevice())); + connect(dev, TQ_SIGNAL(newDevice()), drivers, TQ_SLOT(updateMenuActions())); + connect(dev, TQ_SIGNAL(newDevice()), this, TQ_SLOT(discoverDevice())); mgrCounter++; @@ -165,8 +165,8 @@ int INDIMenu::processClient(TQString hostname, TQString portnumber) mgr.append(dev); if (drivers) { - connect(dev, TQT_SIGNAL(newDevice()), drivers, TQT_SLOT(updateMenuActions())); - connect(dev, TQT_SIGNAL(newDevice()), this, TQT_SLOT(discoverDevice())); + connect(dev, TQ_SIGNAL(newDevice()), drivers, TQ_SLOT(updateMenuActions())); + connect(dev, TQ_SIGNAL(newDevice()), this, TQ_SLOT(discoverDevice())); } } else @@ -234,7 +234,7 @@ else void INDIMenu::discoverDevice() { - TQTimer::singleShot( 1000, this, TQT_SLOT(announceDevice()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(announceDevice()) ); } void INDIMenu::announceDevice() diff --git a/kstars/kstars/indimenu.h b/kstars/kstars/indimenu.h index 3ff8f4fc..45c3d552 100644 --- a/kstars/kstars/indimenu.h +++ b/kstars/kstars/indimenu.h @@ -47,7 +47,7 @@ class DeviceManager; class INDIMenu : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: INDIMenu(TQWidget * parent = 0 , const char *name = 0); diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp index 85899ce3..d828ca8f 100644 --- a/kstars/kstars/indiproperty.cpp +++ b/kstars/kstars/indiproperty.cpp @@ -126,7 +126,7 @@ void INDI_P::drawLt(PState lstate) case PS_OK: light->setColor(TQt::green); emit okState(); - disconnect( this, TQT_SIGNAL(okState()), 0, 0 ); + disconnect( this, TQ_SIGNAL(okState()), 0, 0 ); break; case PS_BUSY: @@ -278,14 +278,14 @@ void INDI_P::newSwitch(int id) el.at(i)->push_w->setDown(false); buttonFont = el.at(i)->push_w->font(); - buttonFont.setBold(FALSE); + buttonFont.setBold(false); el.at(i)->push_w->setFont(buttonFont); el.at(i)->state = PS_OFF; } lp->push_w->setDown(true); buttonFont = lp->push_w->font(); - buttonFont.setBold(TRUE); + buttonFont.setBold(true); lp->push_w->setFont(buttonFont); lp->state = PS_ON; @@ -508,12 +508,12 @@ int INDI_P::buildTextGUI(XMLEle *root, char errmsg[]) if (name == "TIME") { setupSetButton("Time"); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), indistd, TQT_SLOT(newTime())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), indistd, TQ_SLOT(newTime())); } else { setupSetButton("Set"); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(newText())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(newText())); } return 0; @@ -591,7 +591,7 @@ int INDI_P::buildNumberGUI (XMLEle *root, char errmsg[]) else setupSetButton("Set"); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(newText())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(newText())); return (0); } @@ -682,7 +682,7 @@ int INDI_P::buildMenuGUI(XMLEle *root, char errmsg[]) PHBox->addWidget(om_w); PHBox->addItem(HorSpacer); - TQObject::connect(om_w, TQT_SIGNAL(activated(int)), this, TQT_SLOT(newSwitch(int))); + TQObject::connect(om_w, TQ_SIGNAL(activated(int)), this, TQ_SLOT(newSwitch(int))); return (0); } @@ -703,7 +703,7 @@ int INDI_P::buildSwitchesGUI(XMLEle *root, char errmsg[]) if (guitype == PG_BUTTONS) groupB->setExclusive(true); - TQObject::connect(groupB, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(newSwitch(int))); + TQObject::connect(groupB, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(newSwitch(int))); for (sep = nextXMLEle (root, 1), j=-1; sep != NULL; sep = nextXMLEle (root, 0)) { @@ -754,7 +754,7 @@ int INDI_P::buildSwitchesGUI(XMLEle *root, char errmsg[]) { button->setDown(true); buttonFont = button->font(); - buttonFont.setBold(TRUE); + buttonFont.setBold(true); button->setFont(buttonFont); } @@ -900,7 +900,7 @@ int INDI_P::buildBLOBGUI(XMLEle *root, char errmsg[]) return 0; setupSetButton(i18n("Upload")); - TQObject::connect(set_w, TQT_SIGNAL(clicked()), this, TQT_SLOT(newBlob())); + TQObject::connect(set_w, TQ_SIGNAL(clicked()), this, TQ_SLOT(newBlob())); return 0; diff --git a/kstars/kstars/indiproperty.h b/kstars/kstars/indiproperty.h index c655903a..e0fb3f15 100644 --- a/kstars/kstars/indiproperty.h +++ b/kstars/kstars/indiproperty.h @@ -33,7 +33,7 @@ class TQButtonGroup; /* INDI property */ class INDI_P : public TQObject { - Q_OBJECT + TQ_OBJECT public: INDI_P(INDI_G *parentGroup, TQString inName); @@ -57,9 +57,9 @@ class INDI_P : public TQObject TQLabel *label_w; /* Label widget */ TQPushButton *set_w; /* set button */ - TQSpacerItem *HorSpacer; /*Qt::Horizontal spacer */ - TQHBoxLayout *PHBox; /*Qt::Horizontal container */ - TQVBoxLayout *PVBox; /*Qt::Vertical container */ + TQSpacerItem *HorSpacer; /* Horizontal spacer */ + TQHBoxLayout *PHBox; /* Horizontal container */ + TQVBoxLayout *PVBox; /* Vertical container */ TQButtonGroup *groupB; /* group button for radio and check boxes (Elements) */ KComboBox *om_w; /* Combo box for menu */ diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp index 6bfe8ef9..cc009405 100644 --- a/kstars/kstars/indistd.cpp +++ b/kstars/kstars/indistd.cpp @@ -77,8 +77,8 @@ telescopeSkyObject = new SkyObject(0, 0, 0, 0, i18n("Telescope")); ksw->data()->appendTelescopeObject(telescopeSkyObject); - connect( devTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); - connect( seqLister, TQT_SIGNAL(newItems (const KFileItemList & )), this, TQT_SLOT(checkSeqBoundary(const KFileItemList &))); + connect( devTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); + connect( seqLister, TQ_SIGNAL(newItems (const KFileItemList & )), this, TQ_SLOT(checkSeqBoundary(const KFileItemList &))); downloadDialog = new KProgressDialog(NULL, 0, i18n("INDI"), i18n("Downloading Data...")); downloadDialog->cancel(); diff --git a/kstars/kstars/indistd.h b/kstars/kstars/indistd.h index a23178ab..3de233ba 100644 --- a/kstars/kstars/indistd.h +++ b/kstars/kstars/indistd.h @@ -32,7 +32,7 @@ /* This class implmements standard properties on the device level*/ class INDIStdDevice : public TQObject { - Q_OBJECT + TQ_OBJECT public: INDIStdDevice(INDI_D *associatedDevice, KStars * kswPtr); @@ -97,7 +97,7 @@ /* This class implmements standard properties */ class INDIStdProperty : public TQObject { - Q_OBJECT + TQ_OBJECT public: INDIStdProperty(INDI_P *associatedProperty, KStars * kswPtr, INDIStdDevice *stdDevPtr); diff --git a/kstars/kstars/infobox.h b/kstars/kstars/infobox.h index f7269e49..591ed1d6 100644 --- a/kstars/kstars/infobox.h +++ b/kstars/kstars/infobox.h @@ -36,7 +36,7 @@ class TQPainter; class InfoBox : public TQObject { - Q_OBJECT + TQ_OBJECT public: /**default constructor. Creates an infobox with empty text string @@ -47,7 +47,7 @@ public: /**General constructor. Specify The text string, x,y position and size. *@param x the X-coordinate for the box *@param y the Y-coordinate for the box - *@param shade if TRUE, apply text shading as well + *@param shade if true, apply text shading as well *@param t1 The first line of text *@param t2 The second line of text *@param t3 The third line of text @@ -58,7 +58,7 @@ public: *This behaves just like the above function. It differs only in the data types *of its arguments. *@param p The (x,y) position of the box - *@param shade if TRUE, apply text shading as well + *@param shade if true, apply text shading as well *@param t1 The first line of text *@param t2 The second line of text *@param t3 The third line of text @@ -113,7 +113,7 @@ public: /**Make sure the InfoBox is inside (or outside) the TQRect r. *@return true if the function was able to obey the constraint. *@param r the Rect which the box must lie completely inside/outside of. - *@param inside if TRUE (the default), the box must lie inside the rect r. + *@param inside if true (the default), the box must lie inside the rect r. *Otherwise, the box must lie *outside* rect r. */ bool constrain( TQRect r, bool inside=true ); @@ -173,10 +173,10 @@ public: /**@return the geometry of the box*/ TQRect rect() const; - /**@return TRUE if the box is anchored to the right window edge*/ + /**@return true if the box is anchored to the right window edge*/ bool anchorRight() const { return ( AnchorFlag & AnchorRight ); } - /**@return TRUE if the box is anchored to the bottom window edge*/ + /**@return true if the box is anchored to the bottom window edge*/ bool anchorBottom() const { return ( AnchorFlag & AnchorBottom ); } /**Set the box to be anchored to the right window edge*/ diff --git a/kstars/kstars/infoboxes.h b/kstars/kstars/infoboxes.h index e8ba6d18..45410684 100644 --- a/kstars/kstars/infoboxes.h +++ b/kstars/kstars/infoboxes.h @@ -44,7 +44,7 @@ class InfoBox; class KStarsDateTime; class InfoBoxes : public TQObject { -Q_OBJECT +TQ_OBJECT public: /**Constructor. Create three infoboxes and place them in the skymap. @@ -54,13 +54,13 @@ public: *(typically the height of the SkyMap) *@param tx the x-position of the Time infobox *@param ty the y-position of the Time infobox - *@param tshade if TRUE, apply text shading to the Time infobox + *@param tshade if true, apply text shading to the Time infobox *@param gx the x-position of the Geographic infobox *@param gy the y-position of the Geographic infobox - *@param gshade if TRUE, apply text shading to the Geographic infobox + *@param gshade if true, apply text shading to the Geographic infobox *@param fx the x-position of the Focus-object infobox *@param fy the y-position of the Focus-object infobox - *@param fshade if TRUE, apply text shading to the Focus-object infobox + *@param fshade if true, apply text shading to the Focus-object infobox *@param colorText The foreground color for infoboxes *@param colorGrab The foreground color for infoboxes, while they are *"grabbed" by the user @@ -85,11 +85,11 @@ public: *@param h The height of the region in which the boxes can be drawn *(typically the height of the SkyMap) *@param tp the position of the Time infobox - *@param tshade if TRUE, apply text shading to the Time infobox + *@param tshade if true, apply text shading to the Time infobox *@param gp the position of the Geographic infobox - *@param gshade if TRUE, apply text shading to the Geographic infobox + *@param gshade if true, apply text shading to the Geographic infobox *@param fp the position of the Focus-object infobox - *@param fshade if TRUE, apply text shading to the Focus-object infobox + *@param fshade if true, apply text shading to the Focus-object infobox *@param colorText The foreground color for infoboxes *@param colorGrab The foreground color for infoboxes, while they are *"grabbed" by the user diff --git a/kstars/kstars/jupitermoons.h b/kstars/kstars/jupitermoons.h index 4555d74a..230c4d1f 100644 --- a/kstars/kstars/jupitermoons.h +++ b/kstars/kstars/jupitermoons.h @@ -69,7 +69,7 @@ public: */ SkyPoint* pos( int id ) { return &Pos[id]; } - /**@return TRUE if the Moon is nearer to Earth than Jupiter. + /**@return true if the Moon is nearer to Earth than Jupiter. *@param id which moon? 0=Io, 1=Europa, 2=Ganymede, 3=Callisto */ bool inFront( int id ) const { return InFront[id]; } diff --git a/kstars/kstars/ksfilereader.h b/kstars/kstars/ksfilereader.h index c062cdab..c3a18d1f 100644 --- a/kstars/kstars/ksfilereader.h +++ b/kstars/kstars/ksfilereader.h @@ -33,7 +33,7 @@ class TQFile; class TQString; class KSFileReader : public TQObject { - Q_OBJECT + TQ_OBJECT public: /**Constructor. Read an entire file into a TQStringList object. @@ -44,7 +44,7 @@ public: /**Destructor*/ ~KSFileReader(); - /**@return TRUE if we are not yet at the end of the file. + /**@return true if we are not yet at the end of the file. */ bool hasMoreLines(); diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp index eaf455df..f0163440 100644 --- a/kstars/kstars/ksnewstuff.cpp +++ b/kstars/kstars/ksnewstuff.cpp @@ -22,7 +22,7 @@ #include <tdeaction.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdirwatch.h> #include <kprogress.h> #include <ktar.h> @@ -42,7 +42,7 @@ KSNewStuff::KSNewStuff( TQWidget *parent ) : { ks = (KStars*)parent; kdw = new KDirWatch( this ); - kdw->addDir( TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true) ); + kdw->addDir( TDEGlobal::dirs()->saveLocation("data", tdeApp->instanceName(), true) ); } bool KSNewStuff::install( const TQString &fileName ) @@ -54,15 +54,15 @@ bool KSNewStuff::install( const TQString &fileName ) return false; const KArchiveDirectory *archiveDir = archive.directory(); - const TQString destDir = TDEGlobal::dirs()->saveLocation("data", kapp->instanceName(), true); + const TQString destDir = TDEGlobal::dirs()->saveLocation("data", tdeApp->instanceName(), true); TDEStandardDirs::makeDir( destDir ); //monitor destDir for changes; inform updateData when files are created. - connect( kdw, TQT_SIGNAL( dirty( const TQString & ) ), this, TQT_SLOT( updateData( const TQString & ) ) ); + connect( kdw, TQ_SIGNAL( dirty( const TQString & ) ), this, TQ_SLOT( updateData( const TQString & ) ) ); archiveDir->copyTo(destDir); archive.close(); - kapp->processEvents(10000); + tdeApp->processEvents(10000); //read the new data into the program //this return might be the result of checking if everything is installed ok @@ -87,7 +87,7 @@ void KSNewStuff::updateData( const TQString &path ) { prog.setMinimumDuration( 0 /*millisec*/ ); prog.progressBar()->setTotalSteps( 0 ); //show generic progress activity prog.show(); - kapp->processEvents(1000); + tdeApp->processEvents(1000); //First, remove the existing NGC/IC objects from the ObjectNameList. for ( DeepSkyObject *o = ks->data()->deepSkyList.first(); o; o = ks->data()->deepSkyList.next() ) { @@ -105,8 +105,8 @@ void KSNewStuff::updateData( const TQString &path ) { ks->data()->deepSkyList.clear(); //Send progress messages to the console - connect( ks->data(), TQT_SIGNAL( progressText(TQString) ), ks->data(), TQT_SLOT( slotConsoleMessage(TQString) ) ); - connect( ks->data(), TQT_SIGNAL( progressText(TQString) ), ks->data(), TQT_SLOT( slotProcessEvents() ) ); + connect( ks->data(), TQ_SIGNAL( progressText(TQString) ), ks->data(), TQ_SLOT( slotConsoleMessage(TQString) ) ); + connect( ks->data(), TQ_SIGNAL( progressText(TQString) ), ks->data(), TQ_SLOT( slotProcessEvents() ) ); //We are now ready to read the new NGC/IC catalog ks->data()->readDeepSkyData(); @@ -150,7 +150,7 @@ void KSNewStuff::updateData( const TQString &path ) { ks->data()->cometList.clear(); //Send progress messages to the console - connect( ks->data(), TQT_SIGNAL( progressText(TQString) ), ks->data(), TQT_SLOT( slotConsoleMessage(TQString) ) ); + connect( ks->data(), TQ_SIGNAL( progressText(TQString) ), ks->data(), TQ_SLOT( slotConsoleMessage(TQString) ) ); //add new asteroids and comets ks->data()->readAsteroidData(); @@ -166,7 +166,7 @@ void KSNewStuff::updateData( const TQString &path ) { ks->setCursor(TQCursor(TQt::ArrowCursor)); } -void KSNewStuff::slotProcessEvents() { kapp->processEvents( 500 ); } +void KSNewStuff::slotProcessEvents() { tdeApp->processEvents( 500 ); } #include "ksnewstuff.moc" diff --git a/kstars/kstars/ksnewstuff.h b/kstars/kstars/ksnewstuff.h index 69e8fbc4..71a506cd 100644 --- a/kstars/kstars/ksnewstuff.h +++ b/kstars/kstars/ksnewstuff.h @@ -43,7 +43,7 @@ class KStars; class KSNewStuff : public TQObject, public TDENewStuff { - Q_OBJECT + TQ_OBJECT public: /** @@ -78,7 +78,7 @@ class KSNewStuff : public TQObject, public TDENewStuff void updateData( const TQString &newFile ); /** - *Simply calls kapp->processEvents(), to make the UI responsive while + *Simply calls tdeApp->processEvents(), to make the UI responsive while *new NGC/IC data are being added to the program. */ void slotProcessEvents(); diff --git a/kstars/kstars/ksplanetbase.cpp b/kstars/kstars/ksplanetbase.cpp index 87f5e004..4b787318 100644 --- a/kstars/kstars/ksplanetbase.cpp +++ b/kstars/kstars/ksplanetbase.cpp @@ -45,7 +45,7 @@ KSPlanetBase::KSPlanetBase( KStarsData *kd, TQString s, TQString image_file, dou PositionAngle = 0.0; ImageAngle = 0.0; PhysicalSize = pSize; - Trail.setAutoDelete( TRUE ); + Trail.setAutoDelete( true ); } void KSPlanetBase::EquatorialToEcliptic( const dms *Obliquity ) { diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp index 80125fbe..34716d10 100644 --- a/kstars/kstars/kspopupmenu.cpp +++ b/kstars/kstars/kspopupmenu.cpp @@ -45,8 +45,8 @@ KSPopupMenu::~KSPopupMenu() void KSPopupMenu::createEmptyMenu( SkyObject *nullObj ) { initPopupMenu( nullObj, i18n( "Empty sky" ), TQString(), TQString(), true, true, false, false, false, true, false ); - insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS() ) ); - insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS2() ) ); + insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS() ) ); + insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS2() ) ); } void KSPopupMenu::createStarMenu( StarObject *star ) { @@ -58,8 +58,8 @@ void KSPopupMenu::createStarMenu( StarObject *star ) { if ( star->name() != "star" ) { addLinksToMenu( star ); } else { - insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS() ) ); - insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS2() ) ); + insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS() ) ); + insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS2() ) ); } } @@ -104,13 +104,13 @@ void KSPopupMenu::addLinksToMenu( SkyObject *obj, bool showDSS, bool allowCustom for ( ; itList != itListEnd; ++itList ) { TQString t = TQString(*itTitle); sURL = TQString(*itList); - insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQT_SLOT( slotImage( int ) ), 0, id++ ); + insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQ_SLOT( slotImage( int ) ), 0, id++ ); ++itTitle; } if ( showDSS ) { - insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS() ) ); - insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQT_SLOT( slotDSS2() ) ); + insertItem( i18n( "First Generation Digitized Sky Survey", "Show 1st-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS() ) ); + insertItem( i18n( "Second Generation Digitized Sky Survey", "Show 2nd-Gen DSS Image" ), ksw->map(), TQ_SLOT( slotDSS2() ) ); insertSeparator(); } else if ( obj->ImageList.count() ) insertSeparator(); @@ -123,13 +123,13 @@ void KSPopupMenu::addLinksToMenu( SkyObject *obj, bool showDSS, bool allowCustom for ( ; itList != itListEnd; ++itList ) { TQString t = TQString(*itTitle); sURL = TQString(*itList); - insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQT_SLOT( slotInfo( int ) ), 0, id++ ); + insertItem( i18n( "Image/info menu item (should be translated)", t.local8Bit() ), ksw->map(), TQ_SLOT( slotInfo( int ) ), 0, id++ ); ++itTitle; } if ( allowCustom ) { insertSeparator(); - insertItem( i18n( "Add Link..." ), ksw->map(), TQT_SLOT( addLink() ), 0, id++ ); + insertItem( i18n( "Add Link..." ), ksw->map(), TQ_SLOT( addLink() ), 0, id++ ); } } @@ -201,7 +201,7 @@ bool KSPopupMenu::addINDI(void) } } - TQObject::connect(menuDevice, TQT_SIGNAL(activated(int)), prop, TQT_SLOT (convertSwitch(int))); + TQObject::connect(menuDevice, TQ_SIGNAL(activated(int)), prop, TQ_SLOT (convertSwitch(int))); } // end property } // end group @@ -217,7 +217,7 @@ bool KSPopupMenu::addINDI(void) prop = dev->findElem("ALT")->pp; prop->assosiatedPopup = menuDevice; - TQObject::connect(menuDevice, TQT_SIGNAL(activated(int)), prop, TQT_SLOT(convertSwitch(int))); + TQObject::connect(menuDevice, TQ_SIGNAL(activated(int)), prop, TQ_SLOT(convertSwitch(int))); } } // end device @@ -239,8 +239,8 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr pmTitle = new TQLabel( s1, this ); pmTitle->setAlignment( AlignCenter ); TQPalette pal( pmTitle->palette() ); - pal.setColor( TQPalette::Normal, TQColorGroup::Background, pal.color( TQPalette::Normal, TQColorGroup::Base ) ); - pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, pal.color( TQPalette::Normal, TQColorGroup::Text ) ); + pal.setColor( TQPalette::Active, TQColorGroup::Background, pal.color( TQPalette::Active, TQColorGroup::Base ) ); + pal.setColor( TQPalette::Active, TQColorGroup::Foreground, pal.color( TQPalette::Active, TQColorGroup::Text ) ); pmTitle->setPalette( pal ); insertItem( pmTitle ); @@ -291,15 +291,15 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr //Insert item for centering on object if ( showCenterTrack && obj ) { insertSeparator(); - insertItem( i18n( "Center && Track" ), ksw->map(), TQT_SLOT( slotCenter() ) ); + insertItem( i18n( "Center && Track" ), ksw->map(), TQ_SLOT( slotCenter() ) ); } //Insert item for measuring distances if ( showAngularDistance && obj ) { if (! (ksw->map()->isAngleMode()) ) { - insertItem( i18n( "Angular Distance To... [" ), ksw->map(), TQT_SLOT( slotBeginAngularDistance() ) ); + insertItem( i18n( "Angular Distance To... [" ), ksw->map(), TQ_SLOT( slotBeginAngularDistance() ) ); } else { - insertItem( i18n( "Compute Angular Distance ]" ), ksw->map(), TQT_SLOT( slotEndAngularDistance() ) ); + insertItem( i18n( "Compute Angular Distance ]" ), ksw->map(), TQ_SLOT( slotEndAngularDistance() ) ); } } @@ -307,30 +307,30 @@ void KSPopupMenu::initPopupMenu( SkyObject *obj, TQString s1, TQString s2, TQStr //Insert item for Showing details dialog if ( showDetails && obj ) { - insertItem( i18n( "Show Detailed Information Dialog", "Details" ), ksw->map(), TQT_SLOT( slotDetail() ) ); + insertItem( i18n( "Show Detailed Information Dialog", "Details" ), ksw->map(), TQ_SLOT( slotDetail() ) ); } //Insert "Add/Remove Label" item if ( showLabel && obj ) { if ( ksw->map()->isObjectLabeled( obj ) ) { - insertItem( i18n( "Remove Label" ), ksw->map(), TQT_SLOT( slotRemoveObjectLabel() ) ); + insertItem( i18n( "Remove Label" ), ksw->map(), TQ_SLOT( slotRemoveObjectLabel() ) ); } else { - insertItem( i18n( "Attach Label" ), ksw->map(), TQT_SLOT( slotAddObjectLabel() ) ); + insertItem( i18n( "Attach Label" ), ksw->map(), TQ_SLOT( slotAddObjectLabel() ) ); } } if ( showObsList && obj ) { if ( ksw->observingList()->contains( obj ) ) - insertItem( i18n("Remove From List"), ksw->observingList(), TQT_SLOT( slotRemoveObject() ) ); + insertItem( i18n("Remove From List"), ksw->observingList(), TQ_SLOT( slotRemoveObject() ) ); else - insertItem( i18n("Add to List"), ksw->observingList(), TQT_SLOT( slotAddObject() ) ); + insertItem( i18n("Add to List"), ksw->observingList(), TQ_SLOT( slotAddObject() ) ); } if ( showTrail && obj && obj->isSolarSystem() ) { if ( addTrail ) { - insertItem( i18n( "Add Trail" ), ksw->map(), TQT_SLOT( slotAddPlanetTrail() ) ); + insertItem( i18n( "Add Trail" ), ksw->map(), TQ_SLOT( slotAddPlanetTrail() ) ); } else { - insertItem( i18n( "Remove Trail" ), ksw->map(), TQT_SLOT( slotRemovePlanetTrail() ) ); + insertItem( i18n( "Remove Trail" ), ksw->map(), TQ_SLOT( slotRemovePlanetTrail() ) ); } } diff --git a/kstars/kstars/kspopupmenu.h b/kstars/kstars/kspopupmenu.h index a96b4118..e2031e81 100644 --- a/kstars/kstars/kspopupmenu.h +++ b/kstars/kstars/kspopupmenu.h @@ -38,7 +38,7 @@ class TQLabel; class KSPopupMenu : public TDEPopupMenu { -Q_OBJECT +TQ_OBJECT public: /**Default constructor*/ @@ -76,8 +76,8 @@ public: *"Add link..." item will be included, which allows the user to add their own cutsom *URLs for this object. *@param obj pointer to the skyobject which the menu describes - *@param showDSS if TRUE, include DSS Image links - *@param allowCustom if TRUE, include the "Add Link..." item + *@param showDSS if true, include DSS Image links + *@param allowCustom if true, include the "Add Link..." item */ void addLinksToMenu( SkyObject *obj, bool showDSS=true, bool allowCustom=true ); diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp index e75199d4..34b656b9 100644 --- a/kstars/kstars/kstars.cpp +++ b/kstars/kstars/kstars.cpp @@ -57,17 +57,17 @@ KStars::KStars( bool doSplash, bool clockrun, const TQString &startdate ) : pd = new privatedata(this); // we're nowhere near ready to take dcop calls - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); if ( doSplash ) { pd->kstarsData = new KStarsData(); - TQObject::connect(pd->kstarsData, TQT_SIGNAL( initFinished(bool) ), - this, TQT_SLOT( datainitFinished(bool) ) ); + TQObject::connect(pd->kstarsData, TQ_SIGNAL( initFinished(bool) ), + this, TQ_SLOT( datainitFinished(bool) ) ); pd->splash = new KStarsSplash(0, "Splash"); - TQObject::connect(pd->splash, TQT_SIGNAL( closeWindow() ), kapp, TQT_SLOT( quit() ) ); - TQObject::connect(pd->kstarsData, TQT_SIGNAL( progressText(TQString) ), - pd->splash, TQT_SLOT( setMessage(TQString) )); + TQObject::connect(pd->splash, TQ_SIGNAL( closeWindow() ), tdeApp, TQ_SLOT( quit() ) ); + TQObject::connect(pd->kstarsData, TQ_SIGNAL( progressText(TQString) ), + pd->splash, TQ_SLOT( setMessage(TQString) )); pd->splash->show(); } @@ -81,10 +81,10 @@ KStars::KStars( bool doSplash, bool clockrun, const TQString &startdate ) : //set up Dark color scheme for application windows DarkPalette = TQPalette(TQColor("red4"), TQColor("DarkRed")); - DarkPalette.setColor( TQPalette::Normal, TQColorGroup::Base, TQColor( "black" ) ); - DarkPalette.setColor( TQPalette::Normal, TQColorGroup::Text, TQColor( "red2" ) ); - DarkPalette.setColor( TQPalette::Normal, TQColorGroup::Highlight, TQColor( "red2" ) ); - DarkPalette.setColor( TQPalette::Normal, TQColorGroup::HighlightedText, TQColor( "black" ) ); + DarkPalette.setColor( TQPalette::Active, TQColorGroup::Base, TQColor( "black" ) ); + DarkPalette.setColor( TQPalette::Active, TQColorGroup::Text, TQColor( "red2" ) ); + DarkPalette.setColor( TQPalette::Active, TQColorGroup::Highlight, TQColor( "red2" ) ); + DarkPalette.setColor( TQPalette::Active, TQColorGroup::HighlightedText, TQColor( "black" ) ); //store original color scheme OriginalPalette = TQApplication::palette(); @@ -108,7 +108,7 @@ KStars::~KStars() Options::setWindowHeight( height() ); //We need to explicitly save the colorscheme data to the config file - data()->colorScheme()->saveToConfig( kapp->config() ); + data()->colorScheme()->saveToConfig( tdeApp->config() ); //synch the config file with the Config object Options::writeConfig(); @@ -182,7 +182,7 @@ void KStars::applyConfig() { ((TDEToggleAction*)actionCollection()->action("show_horizon"))->setChecked( Options::showGround() ); //color scheme - pd->kstarsData->colorScheme()->loadFromConfig( kapp->config() ); + pd->kstarsData->colorScheme()->loadFromConfig( tdeApp->config() ); if ( Options::darkAppColors() ) { TQApplication::setPalette( DarkPalette, true ); } else { @@ -243,7 +243,7 @@ void KStars::updateTime( const bool automaticDSTchange ) { //Wrap the call to manualTick() in a singleshot timer so that it doesn't get called until //the skymap has been completely updated. if ( Data->clock()->isManualMode() && Data->clock()->isActive() ) { - TQTimer::singleShot( 0, Data->clock(), TQT_SLOT( manualTick() ) ); + TQTimer::singleShot( 0, Data->clock(), TQ_SLOT( manualTick() ) ); } } diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h index 51b55cf1..db8ac252 100644 --- a/kstars/kstars/kstars.h +++ b/kstars/kstars/kstars.h @@ -67,7 +67,7 @@ class imagesequence; class KStars : public TDEMainWindow, virtual public KStarsInterface { - Q_OBJECT + TQ_OBJECT public: /** @@ -431,7 +431,7 @@ class KStars : public TDEMainWindow, virtual public KStarsInterface /** *Resume execution of DCOP commands */ - void resumeDCOP( void ) { kapp->dcopClient()->resume(); } + void resumeDCOP( void ) { tdeApp->dcopClient()->resume(); } /** *Remove all trails which may have been added to solar system bodies diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp index 81ac63ba..0f2288d6 100644 --- a/kstars/kstars/kstarsactions.cpp +++ b/kstars/kstars/kstarsactions.cpp @@ -28,13 +28,13 @@ #include <tdemessagebox.h> #include <tdetempfile.h> #include <ktip.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfigdialog.h> #include <tdefiledialog.h> #include <kinputdialog.h> #include <tdepopupmenu.h> #include <kstatusbar.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqcheckbox.h> #include <tqdir.h> #include <tdeversion.h> @@ -93,23 +93,23 @@ void KStars::slotViewToolBar() { - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_stars" ) ) { + if ( sender()->name() == TQString( "show_stars" ) ) { Options::setShowStars( !Options::showStars() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_deepsky" ) ) { + } else if ( sender()->name() == TQString( "show_deepsky" ) ) { Options::setShowDeepSky( ! Options::showDeepSky() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_planets" ) ) { + } else if ( sender()->name() == TQString( "show_planets" ) ) { Options::setShowPlanets( ! Options::showPlanets() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_clines" ) ) { + } else if ( sender()->name() == TQString( "show_clines" ) ) { Options::setShowCLines( !Options::showCLines() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_cnames" ) ) { + } else if ( sender()->name() == TQString( "show_cnames" ) ) { Options::setShowCNames( !Options::showCNames() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_cbounds" ) ) { + } else if ( sender()->name() == TQString( "show_cbounds" ) ) { Options::setShowCBounds( !Options::showCBounds() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_mw" ) ) { + } else if ( sender()->name() == TQString( "show_mw" ) ) { Options::setShowMilkyWay( !Options::showMilkyWay() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_grid" ) ) { + } else if ( sender()->name() == TQString( "show_grid" ) ) { Options::setShowGrid( !Options::showGrid() ); - } else if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_horizon" ) ) { + } else if ( sender()->name() == TQString( "show_horizon" ) ) { Options::setShowGround( !Options::showGround() ); } @@ -198,7 +198,7 @@ void KStars::slotWUT() { //FIXME GLOSSARY // void KStars::slotGlossary(){ -// GlossaryDialog *dlg = new GlossaryDialog( true, TQT_TQOBJECT(this), "glossary" ); +// GlossaryDialog *dlg = new GlossaryDialog( true, this, "glossary" ); // TQString glossaryfile =data()->stdDirs->findResource( "data", "kstars/glossary.xml" ); // KURL u = glossaryfile; // Glossary *g = Glossary::readFromXML( u ); @@ -356,8 +356,8 @@ void KStars::slotViewOps() { TDEConfigDialog* dialog = new TDEConfigDialog( this, "settings", Options::self() ); - connect( dialog, TQT_SIGNAL( applyClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); - connect( dialog, TQT_SIGNAL( okClicked() ), TQT_TQOBJECT(this), TQT_SLOT( slotApplySettings() ) ); + connect( dialog, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApplySettings() ) ); + connect( dialog, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotApplySettings() ) ); OpsCatalog *opcatalog = new OpsCatalog( this, "catalogs" ); OpsGuides *opguides = new OpsGuides( this, "guides" ); @@ -450,7 +450,7 @@ void KStars::slotExportImage() { //Warn user if file exists! if (TQFile::exists(fileURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(fileURL.fileName()), i18n( "Overwrite File?" ), @@ -569,7 +569,7 @@ void KStars::slotRunScript() { p << f.name(); p.start( TDEProcess::DontCare ); - while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) tdeApp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. } } @@ -623,7 +623,7 @@ void KStars::slotToggleTimer() { //Focus void KStars::slotPointFocus() { - TQString sentFrom( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); + TQString sentFrom( sender()->name() ); if ( sentFrom == "zenith" ) map()->invokeKey( KKey( "Z" ).keyCodeQt() ); @@ -813,12 +813,12 @@ void KStars::slotCoordSys() { //Settings Menu: void KStars::slotColorScheme() { //use mid(3) to exclude the leading "cs_" prefix from the action name - TQString filename = TQString( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ).mid(3) + ".colors"; + TQString filename = TQString( sender()->name() ).mid(3) + ".colors"; loadColorScheme( filename ); } void KStars::slotTargetSymbol() { - TQString symbolName( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() ); + TQString symbolName( sender()->name() ); FOV f( symbolName ); //read data from fov.dat Options::setFOVName( f.name() ); @@ -873,7 +873,7 @@ void KStars::slotFOVEdit() { if ( fields.count() == 4 ) { TQString nm = fields[0].stripWhiteSpace(); - TDEToggleAction *kta = new TDEToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), + TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQ_SLOT( slotTargetSymbol() ), actionCollection(), nm.utf8() ); kta->setExclusiveGroup( "fovsymbol" ); fovActionMenu->insert( kta ); @@ -884,8 +884,8 @@ void KStars::slotFOVEdit() { } fovActionMenu->popupMenu()->insertSeparator(); - fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), - TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); + fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, this, + TQ_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); //set FOV to whatever was highlighted in FOV dialog if ( fovdlg.FOVList.count() > 0 ) { @@ -955,24 +955,24 @@ void KStars::slotClearAllTrails() { //toggle display of GUI Items on/off void KStars::slotShowGUIItem( bool show ) { //Toolbars - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_mainToolBar" ) ) { + if ( sender()->name() == TQString( "show_mainToolBar" ) ) { Options::setShowMainToolBar( show ); if ( show ) toolBar( "mainToolBar" )->show(); else toolBar( "mainToolBar" )->hide(); } - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_viewToolBar" ) ) { + if ( sender()->name() == TQString( "show_viewToolBar" ) ) { Options::setShowViewToolBar( show ); if ( show ) toolBar( "viewToolBar" )->show(); else toolBar( "viewToolBar" )->hide(); } - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_statusBar" ) ) { + if ( sender()->name() == TQString( "show_statusBar" ) ) { Options::setShowStatusBar( show ); if ( show ) statusBar()->show(); else statusBar()->hide(); } - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_sbAzAlt" ) ) { + if ( sender()->name() == TQString( "show_sbAzAlt" ) ) { Options::setShowAltAzField( show ); if ( show ) { //To preserve the order (AzAlt before RADec), we have to remove @@ -994,7 +994,7 @@ void KStars::slotShowGUIItem( bool show ) { } } - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_sbRADec" ) ) { + if ( sender()->name() == TQString( "show_sbRADec" ) ) { Options::setShowRADecField( show ); if ( show ) { TQString s = "000d 00m 00s, +00d 00\' 00\""; //only need this to set the width @@ -1008,19 +1008,19 @@ void KStars::slotShowGUIItem( bool show ) { //InfoBoxes: we only change options here; these are also connected to slots in //InfoBoxes that actually toggle the display. - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_boxes" ) ) + if ( sender()->name() == TQString( "show_boxes" ) ) Options::setShowInfoBoxes( show ); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_time_box" ) ) + if ( sender()->name() == TQString( "show_time_box" ) ) Options::setShowTimeBox( show ); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_location_box" ) ) + if ( sender()->name() == TQString( "show_location_box" ) ) Options::setShowGeoBox( show ); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "show_focus_box" ) ) + if ( sender()->name() == TQString( "show_focus_box" ) ) Options::setShowFocusBox( show ); } void KStars::addColorMenuItem( TQString name, TQString actionName ) { colorActionMenu->insert( new TDEAction( name, 0, - TQT_TQOBJECT(this), TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); + this, TQ_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) ); } void KStars::removeColorMenuItem( TQString actionName ) { diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp index 95ca0d50..68746191 100644 --- a/kstars/kstars/kstarsdata.cpp +++ b/kstars/kstars/kstarsdata.cpp @@ -23,7 +23,7 @@ #include <tdemessagebox.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kstarsdata.h" @@ -88,41 +88,41 @@ KStarsData::KStarsData() : stdDirs(0), locale(0), //initialize FOV symbol fovSymbol = FOV(); - //set AutoDelete property for TQPtrLists. Most are set TRUE, - //but some 'meta-lists' need to be FALSE. - starList.setAutoDelete( TRUE ); - ADVtreeList.setAutoDelete( TRUE ); - geoList.setAutoDelete( TRUE ); - deepSkyList.setAutoDelete( TRUE ); // list of all deep space objects + //set AutoDelete property for TQPtrLists. Most are set true, + //but some 'meta-lists' need to be false. + starList.setAutoDelete( true ); + ADVtreeList.setAutoDelete( true ); + geoList.setAutoDelete( true ); + deepSkyList.setAutoDelete( true ); // list of all deep space objects //separate lists for each deep-sky catalog. The objects are duplicates of //deepSkyList, so do not delete them twice! - deepSkyListMessier.setAutoDelete( FALSE ); - deepSkyListNGC.setAutoDelete( FALSE ); - deepSkyListIC.setAutoDelete( FALSE ); - deepSkyListOther.setAutoDelete( FALSE ); + deepSkyListMessier.setAutoDelete( false ); + deepSkyListNGC.setAutoDelete( false ); + deepSkyListIC.setAutoDelete( false ); + deepSkyListOther.setAutoDelete( false ); //ObjLabelList does not construct new objects, so no autoDelete needed - ObjLabelList.setAutoDelete( FALSE ); + ObjLabelList.setAutoDelete( false ); - cometList.setAutoDelete( TRUE ); - asteroidList.setAutoDelete( TRUE ); + cometList.setAutoDelete( true ); + asteroidList.setAutoDelete( true ); //Constellation lines are now pointers to existing StarObjects; //these are already auto-deleted by starList. - clineList.setAutoDelete( FALSE ); - clineModeList.setAutoDelete( TRUE ); - cnameList.setAutoDelete( TRUE ); - csegmentList.setAutoDelete( TRUE ); + clineList.setAutoDelete( false ); + clineModeList.setAutoDelete( true ); + cnameList.setAutoDelete( true ); + csegmentList.setAutoDelete( true ); - Equator.setAutoDelete( TRUE ); - Ecliptic.setAutoDelete( TRUE ); - Horizon.setAutoDelete( TRUE ); - for ( unsigned int i=0; i<11; ++i ) MilkyWay[i].setAutoDelete( TRUE ); + Equator.setAutoDelete( true ); + Ecliptic.setAutoDelete( true ); + Horizon.setAutoDelete( true ); + for ( unsigned int i=0; i<11; ++i ) MilkyWay[i].setAutoDelete( true ); - VariableStarsList.setAutoDelete(TRUE); - INDIHostsList.setAutoDelete(TRUE); - INDITelescopeList.setAutoDelete(TRUE); + VariableStarsList.setAutoDelete(true); + INDIHostsList.setAutoDelete(true); + INDITelescopeList.setAutoDelete(true); //Initialize object type strings TypeName[0] = i18n( "star" ); @@ -1698,9 +1698,9 @@ void KStarsData::setMagnitude( float newMagnitude, bool forceReload ) { if (reloadingData() == false) { // if not already reloading data source = new FileSource(this, newMagnitude); loader = new StarDataSink(this); - connect(loader, TQT_SIGNAL(done()), this, TQT_SLOT(checkDataPumpAction())); - connect(loader, TQT_SIGNAL(updateSkymap()), this, TQT_SLOT(updateSkymap())); - connect(loader, TQT_SIGNAL(clearCache()), this, TQT_SLOT(sendClearCache())); + connect(loader, TQ_SIGNAL(done()), this, TQ_SLOT(checkDataPumpAction())); + connect(loader, TQ_SIGNAL(updateSkymap()), this, TQ_SLOT(updateSkymap())); + connect(loader, TQ_SIGNAL(clearCache()), this, TQ_SLOT(sendClearCache())); // start reloading pump = new TQDataPump (source, (TQDataSink*) loader); } @@ -1762,7 +1762,7 @@ void KStarsData::initialize() { if (startupComplete) return; initTimer = new TQTimer; - TQObject::connect(initTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( slotInitialize() ) ); + TQObject::connect(initTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( slotInitialize() ) ); initCounter = 0; initTimer->start(1); } @@ -1808,7 +1808,7 @@ void KStarsData::slotInitialize() { TQFile imFile; TQString ImageName; - kapp->flush(); // flush all paint events before loading data + tdeApp->flush(); // flush all paint events before loading data switch ( initCounter ) { @@ -2219,7 +2219,7 @@ void KStarsData::updateTime( GeoLocation *geo, SkyMap *skymap, const bool automa skymap->updateFocus(); if ( clock()->isManualMode() ) - TQTimer::singleShot( 0, skymap, TQT_SLOT( forceUpdateNow() ) ); + TQTimer::singleShot( 0, skymap, TQ_SLOT( forceUpdateNow() ) ); else skymap->forceUpdate(); } } diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h index 3007ed58..3c835da3 100644 --- a/kstars/kstars/kstarsdata.h +++ b/kstars/kstars/kstarsdata.h @@ -88,7 +88,7 @@ class CustomCatalog; class KStarsData : public TQObject { - Q_OBJECT + TQ_OBJECT public: //Friend classes can see the private data. @@ -283,7 +283,7 @@ public: *@li 13-15 IAU Abbreviation [string] e.g., 'Ori' == Orion *@li 17- Constellation name [string] *@short Read in constellation name data. - *@return TRUE if data file was successfully read. + *@return true if data file was successfully read. */ bool readCNameData( void ); @@ -302,7 +302,7 @@ public: *word-by-word, rather than line-by-line as we do in other files. * *@short Read in the constellation boundary data. - *@return TRUE if the boundary data is successfully parsed. + *@return true if the boundary data is successfully parsed. */ bool readCBoundData( void ); @@ -367,7 +367,7 @@ public: /**@short open a file containing URL links. *@param urlfile string representation of the filename to open *@param file reference to the TQFile object which will be opened to this file. - *@return TRUE if file successfully opened. + *@return true if file successfully opened. */ bool openURLFile(TQString urlfile, TQFile& file); @@ -526,7 +526,7 @@ public: *be used if you have previously called setSnapNextFocus(true), but then decided *you didn't want that after all. In other words, it's extremely unlikely you'd *ever want to use setSnapNextFocus(false). - *@param b when TRUE (the default), the next Focus chnage will omit the slewing + *@param b when true (the default), the next Focus chnage will omit the slewing *animation. */ void setSnapNextFocus(bool b=true) { snapToFocus = b; } @@ -536,7 +536,7 @@ public: *a sky image in command-line dump mode). *@param name the filename of the script to "execute". *@param map pointer to the SkyMap object. - *@return TRUE if the script was successfully parsed. + *@return true if the script was successfully parsed. */ bool executeScript( const TQString &name, SkyMap *map ); @@ -596,17 +596,17 @@ public slots: void setTimeDirection( float scale ); /**@short Save the shaded state of the Time infobox. - *@param b TRUE if the box is shaded + *@param b true if the box is shaded */ void saveTimeBoxShaded( bool b ); /**@short Save the shaded state of the Geo infobox. - *@param b TRUE if the box is shaded + *@param b true if the box is shaded */ void saveGeoBoxShaded( bool b ); /**@short Save the shaded state of the Focus infobox. - *@param b TRUE if the box is shaded + *@param b true if the box is shaded */ void saveFocusBoxShaded( bool b ); @@ -656,7 +656,7 @@ private: *was marked as "required", then abort the program when the messagebox is closed. *Otherwise, continue loading the program. *@param fn the name of the file which could not be opened. - *@param required if TRUE, then the error message is more severe, and the program + *@param required if true, then the error message is more severe, and the program *exits when the messagebox is closed. */ void initError(TQString fn, bool required); diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp index bc1f4ff4..3266370b 100644 --- a/kstars/kstars/kstarsdcop.cpp +++ b/kstars/kstars/kstarsdcop.cpp @@ -105,14 +105,14 @@ void KStars::setLocalTime(int yr, int mth, int day, int hr, int min, int sec) { } void KStars::waitFor( double t ) { - kapp->dcopClient()->suspend(); - TQTimer::singleShot( int( 1000.*t ), this, TQT_SLOT( resumeDCOP() ) ); + tdeApp->dcopClient()->suspend(); + TQTimer::singleShot( int( 1000.*t ), this, TQ_SLOT( resumeDCOP() ) ); } void KStars::waitForKey( const TQString k ) { data()->resumeKey = KKey( k ); if ( ! data()->resumeKey.isNull() ) { - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); } else { kdDebug() << i18n( "Error [DCOP waitForKey()]: Invalid key requested." ) << endl; } @@ -420,8 +420,8 @@ void KStars::exportImage( const TQString url, int w, int h ) { else if ( ext.lower() == "bmp" ) { format = "BMP"; } else { kdWarning() << i18n( "Could not parse image format of %1; assuming PNG." ).arg( fname ) << endl; } - map()->exportSkyImage( TQT_TQPAINTDEVICE(&skyimage) ); - kapp->processEvents(10000); + map()->exportSkyImage( &skyimage ); + tdeApp->processEvents(10000); //skyImage is the size of the sky map. The requested image size is w x h. //If w x h is smaller than the skymap, then we simply crop the image. @@ -472,7 +472,7 @@ void KStars::printImage( bool usePrintDialog, bool useChartColors ) { ok = printer.autoConfigure(); if( ok ) { - kapp->setOverrideCursor( waitCursor ); + tdeApp->setOverrideCursor( waitCursor ); //Save current colorscheme and switch to Star Chart colors //(if requested) @@ -496,7 +496,7 @@ void KStars::printImage( bool usePrintDialog, bool useChartColors ) { map()->forceUpdate(); } - kapp->restoreOverrideCursor(); + tdeApp->restoreOverrideCursor(); } } @@ -775,12 +775,12 @@ void KStars::waitForINDIAction(TQString deviceName, TQString action) el = dev->findElem(action); if (!el) return; - TQObject::connect(el->pp, TQT_SIGNAL(okState()), this, TQT_SLOT(resumeDCOP(void ))); + TQObject::connect(el->pp, TQ_SIGNAL(okState()), this, TQ_SLOT(resumeDCOP(void ))); } else - TQObject::connect(prop, TQT_SIGNAL(okState()), this, TQT_SLOT(resumeDCOP(void ))); + TQObject::connect(prop, TQ_SIGNAL(okState()), this, TQ_SLOT(resumeDCOP(void ))); - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); } @@ -977,7 +977,7 @@ void KStars::setINDIFilterNum(TQString deviceName, int filter_num) prop = dev->findProp("FILTER_SLOT"); if (!prop) return; - el = prop->findElement("SLOT"); + el = prop->findElement("TQ_SLOT"); if (!el) return; if (el->write_w) diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp index 71ff520b..cf5ec4b5 100644 --- a/kstars/kstars/kstarsinit.cpp +++ b/kstars/kstars/kstarsinit.cpp @@ -25,7 +25,7 @@ #include <kstatusbar.h> #include <ktip.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeversion.h> #include "Options.h" @@ -49,66 +49,66 @@ void KStars::initActions() { //File Menu: new TDEAction(i18n("&New Window"), "window-new", TDEShortcut( "Ctrl+N" ), - TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection(), "new_window"); + this, TQ_SLOT( newWindow() ), actionCollection(), "new_window"); new TDEAction(i18n("&Close Window"), "window-close", TDEShortcut( "Ctrl+W" ), - TQT_TQOBJECT(this), TQT_SLOT( closeWindow() ), actionCollection(), "close_window"); + this, TQ_SLOT( closeWindow() ), actionCollection(), "close_window"); new TDEAction( i18n( "&Download Data..." ), "knewstuff", TDEShortcut( "Ctrl+D" ), - TQT_TQOBJECT(this), TQT_SLOT( slotDownload() ), actionCollection(), "get_data" ); - new TDEAction( i18n( "Open FITS..."), "document-open", TDEShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file"); + this, TQ_SLOT( slotDownload() ), actionCollection(), "get_data" ); + new TDEAction( i18n( "Open FITS..."), "document-open", TDEShortcut( "Ctrl+O"), this, TQ_SLOT( slotOpenFITS()), actionCollection(), "open_file"); new TDEAction( i18n( "&Save Sky Image..." ), "fileexport", TDEShortcut( "Ctrl+I" ), - TQT_TQOBJECT(this), TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" ); + this, TQ_SLOT( slotExportImage() ), actionCollection(), "export_image" ); new TDEAction( i18n( "&Run Script..." ), "launch", TDEShortcut( "Ctrl+R" ), - TQT_TQOBJECT(this), TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" ); - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), actionCollection(), "print" ); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" ); + this, TQ_SLOT( slotRunScript() ), actionCollection(), "run_script" ); + KStdAction::print(this, TQ_SLOT( slotPrint() ), actionCollection(), "print" ); + KStdAction::quit(this, TQ_SLOT( close() ), actionCollection(), "quit" ); //Time Menu: new TDEAction( i18n( "Set Time to &Now" ), TDEShortcut( "Ctrl+E" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); + this, TQ_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" ); new TDEAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", TDEShortcut( "Ctrl+S" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); + this, TQ_SLOT( slotSetTime() ), actionCollection(), "time_dialog" ); ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("media-playback-pause"), i18n("Start &Clock"), BarIcon("1rightarrow"), - 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" ); + 0, this, TQ_SLOT( slotToggleTimer() ), actionCollection(), "timer_control" ); actTimeRun->setOffToolTip( i18n( "Start Clock" ) ); actTimeRun->setOnToolTip( i18n( "Stop Clock" ) ); - TQObject::connect(data()->clock(), TQT_SIGNAL(clockStarted()), actTimeRun, TQT_SLOT(turnOn()) ); - TQObject::connect(data()->clock(), TQT_SIGNAL(clockStopped()), actTimeRun, TQT_SLOT(turnOff()) ); + TQObject::connect(data()->clock(), TQ_SIGNAL(clockStarted()), actTimeRun, TQ_SLOT(turnOn()) ); + TQObject::connect(data()->clock(), TQ_SIGNAL(clockStopped()), actTimeRun, TQ_SLOT(turnOff()) ); //UpdateTime() if clock is stopped (so hidden objects get drawn) - TQObject::connect(data()->clock(), TQT_SIGNAL(clockStopped()), this, TQT_SLOT(updateTime()) ); + TQObject::connect(data()->clock(), TQ_SIGNAL(clockStopped()), this, TQ_SLOT(updateTime()) ); //Focus Menu: new TDEAction(i18n( "&Zenith" ), TDEShortcut( "Z" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "zenith"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "zenith"); new TDEAction(i18n( "&North" ), TDEShortcut( "N" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "north"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "north"); new TDEAction(i18n( "&East" ), TDEShortcut( "E" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "east"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "east"); new TDEAction(i18n( "&South" ), TDEShortcut( "S" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "south"); + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "south"); new TDEAction(i18n( "&West" ), TDEShortcut( "W" ), - TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ), actionCollection(), "west"); - TDEAction *tmpAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), + this, TQ_SLOT( slotPointFocus() ), actionCollection(), "west"); + TDEAction *tmpAction = KStdAction::find( this, TQ_SLOT( slotFind() ), actionCollection(), "find_object" ); tmpAction->setText( i18n( "&Find Object..." ) ); tmpAction->setToolTip( i18n( "Find object" ) ); new TDEAction( i18n( "Engage &Tracking" ), "decrypted", TDEShortcut( "Ctrl+T" ), - TQT_TQOBJECT(this), TQT_SLOT( slotTrack() ), actionCollection(), "track_object" ); + this, TQ_SLOT( slotTrack() ), actionCollection(), "track_object" ); new TDEAction( i18n( "Set Focus &Manually..." ), TDEShortcut( "Ctrl+M" ), - TQT_TQOBJECT(this), TQT_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); + this, TQ_SLOT( slotManualFocus() ), actionCollection(), "manual_focus" ); //View Menu: - KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); - KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); + KStdAction::zoomIn(this, TQ_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" ); + KStdAction::zoomOut(this, TQ_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" ); new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+Z" ), - TQT_TQOBJECT(this), TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); + this, TQ_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" ); new TDEAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", TDEShortcut( "Ctrl+Shift+Z" ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); + this, TQ_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" ); actCoordSys = new ToggleAction( i18n("Horizontal &Coordinates"), i18n( "Equatorial &Coordinates" ), - Key_Space, TQT_TQOBJECT(this), TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); - KStdAction::fullScreen( TQT_TQOBJECT(this), TQT_SLOT( slotFullScreen() ), actionCollection(), 0 ); + Key_Space, this, TQ_SLOT( slotCoordSys() ), actionCollection(), "coordsys" ); + KStdAction::fullScreen( this, TQ_SLOT( slotFullScreen() ), actionCollection(), 0 ); //Settings Menu: @@ -122,45 +122,45 @@ void KStars::initActions() { TDEToggleAction *a = new TDEToggleAction(i18n( "Show the information boxes", "Show &Info Boxes"), 0, 0, 0, actionCollection(), "show_boxes"); a->setChecked( Options::showInfoBoxes() ); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(setVisible(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(setVisible(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show time-related info box", "Show &Time Box"), 0, 0, 0, actionCollection(), "show_time_box"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showTimeBox(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(showTimeBox(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show focus-related info box", "Show &Focus Box"), 0, 0, 0, actionCollection(), "show_focus_box"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showFocusBox(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(showFocusBox(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show location-related info box", "Show &Location Box"), 0, 0, 0, actionCollection(), "show_location_box"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showGeoBox(bool))); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), infoBoxes(), TQ_SLOT(showGeoBox(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); //Toolbar view options a = new TDEToggleAction(i18n( "Show Main Toolbar" ), 0, 0, 0, actionCollection(), "show_mainToolBar"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show View Toolbar" ), 0, 0, 0, actionCollection(), "show_viewToolBar"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); //Statusbar view options a = new TDEToggleAction(i18n( "Show Statusbar" ), 0, 0, 0, actionCollection(), "show_statusBar"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show Az/Alt Field" ), 0, 0, 0, actionCollection(), "show_sbAzAlt"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); a = new TDEToggleAction(i18n( "Show RA/Dec Field" ), 0, 0, 0, actionCollection(), "show_sbRADec"); - TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool))); + TQObject::connect(a, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT(slotShowGUIItem(bool))); //Color scheme actions. These are added to the "colorschemes" TDEActionMenu. colorActionMenu = new TDEActionMenu( i18n( "C&olor Schemes" ), actionCollection(), "colorschemes" ); @@ -191,62 +191,62 @@ void KStars::initActions() { initFOV(); new TDEAction( i18n( "Location on Earth", "&Geographic..." ), - "kstars_geo", TDEShortcut( "Ctrl+G" ), TQT_TQOBJECT(this), - TQT_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" ); + "kstars_geo", TDEShortcut( "Ctrl+G" ), this, + TQ_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" ); - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotViewOps() ), actionCollection(), "configure" ); + KStdAction::preferences( this, TQ_SLOT( slotViewOps() ), actionCollection(), "configure" ); new TDEAction(i18n( "Startup Wizard..." ), "wizard", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" ); + this, TQ_SLOT( slotWizard() ), actionCollection(), "startwizard" ); //Tools Menu: new TDEAction(i18n( "Calculator..."), TDEShortcut( "Ctrl+C"), - TQT_TQOBJECT(this), TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); + this, TQ_SLOT( slotCalculator() ), actionCollection(), "astrocalculator"); new TDEAction(i18n( "Observing List..."), TDEShortcut( "Ctrl+L"), - TQT_TQOBJECT(this), TQT_SLOT( slotObsList() ), actionCollection(), "obslist"); + this, TQ_SLOT( slotObsList() ), actionCollection(), "obslist"); // enable action only if file was loaded and processed successfully. if (!data()->VariableStarsList.isEmpty()) new TDEAction(i18n( "AAVSO Light Curves..."), TDEShortcut( "Ctrl+V"), - TQT_TQOBJECT(this), TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); + this, TQ_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator"); new TDEAction(i18n( "Altitude vs. Time..."), TDEShortcut( "Ctrl+A"), - TQT_TQOBJECT(this), TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); + this, TQ_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time"); new TDEAction(i18n( "What's up Tonight..."), TDEShortcut("Ctrl+U"), - TQT_TQOBJECT(this), TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); + this, TQ_SLOT(slotWUT()), actionCollection(), "whats_up_tonight"); //FIXME GLOSSARY // new TDEAction(i18n( "Glossary..."), TDEShortcut("Ctrl+K"), -// this, TQT_SLOT(slotGlossary()), actionCollection(), "glossary"); +// this, TQ_SLOT(slotGlossary()), actionCollection(), "glossary"); new TDEAction(i18n( "Script Builder..."), TDEShortcut("Ctrl+B"), - TQT_TQOBJECT(this), TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); + this, TQ_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder"); new TDEAction(i18n( "Solar System..."), TDEShortcut("Ctrl+Y"), - TQT_TQOBJECT(this), TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); + this, TQ_SLOT(slotSolarSystem()), actionCollection(), "solarsystem"); new TDEAction(i18n( "Jupiter's Moons..."), TDEShortcut("Ctrl+J"), - TQT_TQOBJECT(this), TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); + this, TQ_SLOT(slotJMoonTool()), actionCollection(), "jmoontool"); // devices Menu - new TDEAction(i18n("Telescope Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); - new TDEAction(i18n("Telescope Properties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); - new TDEAction(i18n("Device Manager..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); + new TDEAction(i18n("Telescope Wizard..."), 0, this, TQ_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard"); + new TDEAction(i18n("Telescope Properties..."), 0, this, TQ_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties"); + new TDEAction(i18n("Device Manager..."), 0, this, TQ_SLOT(slotINDIDriver()), actionCollection(), "device_manager"); - tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); + tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, this, TQ_SLOT(slotImageSequence()), actionCollection(), "capture_sequence"); tmpAction->setEnabled(false); - tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); + tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, this, TQ_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel"); tmpAction->setEnabled(false); - new TDEAction(i18n("Configure INDI..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); + new TDEAction(i18n("Configure INDI..."), 0, this, TQ_SLOT(slotINDIConf()), actionCollection(), "configure_indi"); //Help Menu: new TDEAction( i18n( "Tip of the Day" ), "idea", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); + this, TQ_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" ); //Handbook toolBar item: new TDEAction( i18n( "&Handbook" ), "contents", TDEShortcut( "F1" ), - TQT_TQOBJECT(this), TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); + this, TQ_SLOT( appHelpActivated() ), actionCollection(), "handbook" ); // //viewToolBar actions: @@ -254,39 +254,39 @@ void KStars::initActions() { //show_stars: a = new TDEToggleAction( i18n( "Toggle Stars" ), "kstars_stars", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" ); //show_deepsky: a = new TDEToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" ); //show_planets: a = new TDEToggleAction( i18n( "Toggle Solar System" ), "kstars_planets", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" ); //show_clines: a = new TDEToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" ); //show_cnames: a = new TDEToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" ); //show_cbound: a = new TDEToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" ); //show_mw: a = new TDEToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" ); //show_grid: a = new TDEToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" ); //show_horizon: a = new TDEToggleAction( i18n( "Toggle Ground" ), "kstars_horizon", - 0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" ); + 0, this, TQ_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" ); if (Options::fitsSaveDirectory().isEmpty()) Options::setFitsSaveDirectory(TQDir:: homeDirPath()); @@ -327,7 +327,7 @@ void KStars::initFOV() { if ( fields.count() == 4 ) { nm = fields[0].stripWhiteSpace(); - TDEToggleAction *kta = new TDEToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), + TDEToggleAction *kta = new TDEToggleAction( nm, 0, this, TQ_SLOT( slotTargetSymbol() ), actionCollection(), nm.utf8() ); kta->setExclusiveGroup( "fovsymbol" ); if ( nm == Options::fOVName() ) kta->setChecked( true ); @@ -339,7 +339,7 @@ void KStars::initFOV() { } fovActionMenu->popupMenu()->insertSeparator(); - fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); + fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, this, TQ_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) ); } void KStars::initStatusBar() { @@ -365,7 +365,7 @@ void KStars::initStatusBar() { void KStars::datainitFinished(bool worked) { if (!worked) { - kapp->quit(); + tdeApp->quit(); return; } @@ -459,7 +459,7 @@ void KStars::privatedata::buildGUI() { ks->skymap = new SkyMap( ks->data(), ks->centralWidget ); // update skymap if KStarsData send update signal - TQObject::connect(kstarsData, TQT_SIGNAL( update() ), ks->skymap, TQT_SLOT( forceUpdateNow() ) ); + TQObject::connect(kstarsData, TQ_SIGNAL( update() ), ks->skymap, TQ_SLOT( forceUpdateNow() ) ); // get focus of keyboard and mouse actions (for example zoom in with +) ks->map()->TQWidget::setFocus(); @@ -484,11 +484,11 @@ void KStars::privatedata::buildGUI() { //Changing the timestep needs to propagate to the clock, check if slew mode should be //(dis)engaged, and return input focus to the skymap. - connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks->data(), TQT_SLOT( setTimeDirection( float ) ) ); - connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks->data()->clock(), TQT_SLOT( setScale( float )) ); -// connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks->skymap, TQT_SLOT( slotClockSlewing() ) ); - connect( ks->data()->clock(), TQT_SIGNAL( scaleChanged( float ) ), ks->map(), TQT_SLOT( slotClockSlewing() ) ); - connect( ks->TimeStep, TQT_SIGNAL( scaleChanged( float ) ), ks, TQT_SLOT( mapGetsFocus() ) ); + connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks->data(), TQ_SLOT( setTimeDirection( float ) ) ); + connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks->data()->clock(), TQ_SLOT( setScale( float )) ); +// connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks->skymap, TQ_SLOT( slotClockSlewing() ) ); + connect( ks->data()->clock(), TQ_SIGNAL( scaleChanged( float ) ), ks->map(), TQ_SLOT( slotClockSlewing() ) ); + connect( ks->TimeStep, TQ_SIGNAL( scaleChanged( float ) ), ks, TQ_SLOT( mapGetsFocus() ) ); ks->resize( Options::windowWidth(), Options::windowHeight() ); @@ -507,11 +507,11 @@ void KStars::privatedata::buildGUI() { ks->data()->initGuides(&tempnum); //Connect the clock. - TQObject::connect( ks->data()->clock(), TQT_SIGNAL( timeAdvanced() ), ks, TQT_SLOT( updateTime() ) ); - TQObject::connect( ks->data()->clock(), TQT_SIGNAL( timeChanged() ), ks, TQT_SLOT( updateTime() ) ); + TQObject::connect( ks->data()->clock(), TQ_SIGNAL( timeAdvanced() ), ks, TQ_SLOT( updateTime() ) ); + TQObject::connect( ks->data()->clock(), TQ_SIGNAL( timeChanged() ), ks, TQ_SLOT( updateTime() ) ); // Connect cache function - TQObject::connect( kstarsData, TQT_SIGNAL( clearCache() ), ks, TQT_SLOT( clearCachedFindDialog() ) ); + TQObject::connect( kstarsData, TQ_SIGNAL( clearCache() ), ks, TQ_SLOT( clearCachedFindDialog() ) ); SkyPoint newPoint; if ( ks->data()->useDefaultOptions ) { @@ -578,5 +578,5 @@ void KStars::privatedata::buildGUI() { if ( Options::zoomFactor() >= MAXZOOM ) ks->actionCollection()->action("zoom_in")->setEnabled( false ); if ( Options::zoomFactor() <= MINZOOM ) ks->actionCollection()->action("zoom_out")->setEnabled( false ); - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); } diff --git a/kstars/kstars/kstarsinterface.h b/kstars/kstars/kstarsinterface.h index 5bf2aa2c..2df3adc4 100644 --- a/kstars/kstars/kstarsinterface.h +++ b/kstars/kstars/kstarsinterface.h @@ -107,7 +107,7 @@ class KStarsInterface : virtual public DCOPObject /**Turn tracking mode on or off. If tracking is on, then the coordinates at *the center of the screen remain fixed with time. If tracking is off, then *the sky "drifts" past the screen at the sidereal rate. - *@param track if TRUE, turn tracking on; otherwise turn it off. + *@param track if true, turn tracking on; otherwise turn it off. */ virtual ASYNC setTracking( bool track ) = 0; diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp index 4867c0fd..cb850820 100644 --- a/kstars/kstars/kstarssplash.cpp +++ b/kstars/kstars/kstarssplash.cpp @@ -54,9 +54,9 @@ KStarsSplash::KStarsSplash( TQWidget *parent, const char* name ) //initialize the "Welcome to KStars message label label = new TQLabel( page, "label1" ); TQPalette pal( label->palette() ); - pal.setColor( TQPalette::Normal, TQColorGroup::Background, TQColor( "Black" ) ); + pal.setColor( TQPalette::Active, TQColorGroup::Background, TQColor( "Black" ) ); pal.setColor( TQPalette::Inactive, TQColorGroup::Background, TQColor( "Black" ) ); - pal.setColor( TQPalette::Normal, TQColorGroup::Foreground, TQColor( "White" ) ); + pal.setColor( TQPalette::Active, TQColorGroup::Foreground, TQColor( "White" ) ); pal.setColor( TQPalette::Inactive, TQColorGroup::Foreground, TQColor( "White" ) ); label->setPalette( pal ); label->setAlignment( AlignHCenter ); @@ -97,7 +97,7 @@ void KStarsSplash::setMessage( TQString s ) { *repaint call will queued in event buffer. With flush all X11 events of *this application will flushed. */ - kapp->flush(); + tdeApp->flush(); } #include "kstarssplash.moc" diff --git a/kstars/kstars/kstarssplash.h b/kstars/kstars/kstarssplash.h index 66b327d6..996606d0 100644 --- a/kstars/kstars/kstarssplash.h +++ b/kstars/kstars/kstarssplash.h @@ -32,7 +32,7 @@ class TQLabel; class KStarsSplash : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/ksutils.cpp b/kstars/kstars/ksutils.cpp index 666b9117..44b87b2b 100644 --- a/kstars/kstars/ksutils.cpp +++ b/kstars/kstars/ksutils.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include "ksutils.h" diff --git a/kstars/kstars/kswizard.cpp b/kstars/kstars/kswizard.cpp index 1c4ed73d..ff8015dc 100644 --- a/kstars/kstars/kswizard.cpp +++ b/kstars/kstars/kswizard.cpp @@ -86,14 +86,14 @@ KSWizard::KSWizard( TQWidget *parent, const char *name ) #endif //connect signals/slots - connect( CityListBox, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotChangeCity() ) ); - connect( CityFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotFilterCities() ) ); - connect( ProvinceFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotFilterCities() ) ); - connect( CountryFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotFilterCities() ) ); + connect( CityListBox, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotChangeCity() ) ); + connect( CityFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotFilterCities() ) ); + connect( ProvinceFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotFilterCities() ) ); + connect( CountryFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotFilterCities() ) ); //Uncomment if we ever need the telescope page... -// connect( TelescopeWizardButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTelescopeSetup() ) ); +// connect( TelescopeWizardButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTelescopeSetup() ) ); #if ( KDE_IS_VERSION( 3, 2, 90 ) ) - connect( DownloadButton, TQT_SIGNAL( clicked() ), ksw, TQT_SLOT( slotDownload() ) ); + connect( DownloadButton, TQ_SIGNAL( clicked() ), ksw, TQ_SLOT( slotDownload() ) ); #endif //Initialize Geographic Location page diff --git a/kstars/kstars/kswizard.h b/kstars/kstars/kswizard.h index 6cc832d6..061af9f3 100644 --- a/kstars/kstars/kswizard.h +++ b/kstars/kstars/kswizard.h @@ -38,7 +38,7 @@ class GeoLocation; class KSWizard : public KSWizardUI { -Q_OBJECT +TQ_OBJECT public: /** diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp index 0ac2a751..6054440a 100644 --- a/kstars/kstars/locationdialog.cpp +++ b/kstars/kstars/locationdialog.cpp @@ -19,7 +19,7 @@ #include <stdio.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <klineedit.h> #include <tqlayout.h> @@ -180,21 +180,21 @@ LocationDialog::LocationDialog( TQWidget* parent ) CoordLay->activate(); RootLay->activate(); - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() ) ); - connect( CityFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterCity() ) ); - connect( ProvinceFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterCity() ) ); - connect( CountryFilter, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( filterCity() ) ); - connect( NewCityName, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( nameChanged() ) ); - connect( NewProvinceName, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( nameChanged() ) ); - connect( NewCountryName, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( nameChanged() ) ); - connect( NewLong, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( dataChanged() ) ); - connect( NewLat, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( dataChanged() ) ); - connect( TZBox, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( dataChanged() ) ); - connect( TZRuleBox, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( dataChanged() ) ); - connect( GeoBox, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( changeCity() ) ); - connect( AddCityButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addCity() ) ); - connect( ClearFields, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clearFields() ) ); - connect( ShowTZRules, TQT_SIGNAL( clicked() ), this, TQT_SLOT( showTZRules() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() ) ); + connect( CityFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterCity() ) ); + connect( ProvinceFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterCity() ) ); + connect( CountryFilter, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( filterCity() ) ); + connect( NewCityName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( nameChanged() ) ); + connect( NewProvinceName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( nameChanged() ) ); + connect( NewCountryName, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( nameChanged() ) ); + connect( NewLong, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( dataChanged() ) ); + connect( NewLat, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( dataChanged() ) ); + connect( TZBox, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( dataChanged() ) ); + connect( TZRuleBox, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( dataChanged() ) ); + connect( GeoBox, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( changeCity() ) ); + connect( AddCityButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addCity() ) ); + connect( ClearFields, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clearFields() ) ); + connect( ShowTZRules, TQ_SIGNAL( clicked() ), this, TQ_SLOT( showTZRules() ) ); dataModified = false; nameModified = false; diff --git a/kstars/kstars/locationdialog.h b/kstars/kstars/locationdialog.h index b4756898..590948fb 100644 --- a/kstars/kstars/locationdialog.h +++ b/kstars/kstars/locationdialog.h @@ -57,7 +57,7 @@ class MapCanvas; class dmsBox; class LocationDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp index 8a516860..f8d12121 100644 --- a/kstars/kstars/main.cpp +++ b/kstars/kstars/main.cpp @@ -94,15 +94,15 @@ int main(int argc, char *argv[]) } KStarsData *dat = new KStarsData(); - TQObject::connect( dat, TQT_SIGNAL( progressText(TQString) ), dat, TQT_SLOT( slotConsoleMessage(TQString) ) ); + TQObject::connect( dat, TQ_SIGNAL( progressText(TQString) ), dat, TQ_SLOT( slotConsoleMessage(TQString) ) ); dat->initialize(); - while (!dat->startupComplete) { kapp->processEvents(50); } + while (!dat->startupComplete) { tdeApp->processEvents(50); } //Set Geographic Location dat->setLocationFromOptions(); //Set color scheme - dat->colorScheme()->loadFromConfig( kapp->config() ); + dat->colorScheme()->loadFromConfig( tdeApp->config() ); //set clock now that we have a location: //Check to see if user provided a date/time string. If not, use current CPU time @@ -111,13 +111,13 @@ int main(int argc, char *argv[]) if ( ! datestring.isEmpty() ) { if ( datestring.contains( "-" ) ) { //assume ISODate format if ( datestring.contains( ":" ) ) { //also includes time - kdt = KStarsDateTime::fromString( datestring, Qt::ISODate ); + kdt = KStarsDateTime::fromString( datestring, TQt::ISODate ); } else { //string probably contains date only - kdt.setDate( ExtDate::fromString( datestring, Qt::ISODate ) ); + kdt.setDate( ExtDate::fromString( datestring, TQt::ISODate ) ); kdt.setTime( TQTime( 0, 0, 0 ) ); } } else { //assume Text format for date string - kdt = dat->geo()->LTtoUT( KStarsDateTime::fromString( datestring, Qt::TextDate ) ); + kdt = dat->geo()->LTtoUT( KStarsDateTime::fromString( datestring, TQt::TextDate ) ); } if ( ! kdt.isValid() ) { @@ -160,10 +160,10 @@ int main(int argc, char *argv[]) dat->setFullTimeUpdate(); dat->updateTime(dat->geo(), map ); - kapp->processEvents(100000); + tdeApp->processEvents(100000); map->setMapGeometry(); - map->exportSkyImage( TQT_TQPAINTDEVICE(&sky) ); - kapp->processEvents(100000); + map->exportSkyImage( &sky ); + tdeApp->processEvents(100000); if ( ! sky.save( fname, format ) ) kdWarning() << i18n( "Unable to save image: %1 " ).arg( fname ) << endl; else kdDebug() << i18n( "Saved to file: %1" ).arg( fname ) << endl; @@ -185,7 +185,7 @@ int main(int argc, char *argv[]) new KStars( true, ! args->isSet( "paused" ), datestring ); args->clear(); - TQObject::connect(kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit())); + TQObject::connect(tdeApp, TQ_SIGNAL(lastWindowClosed()), tdeApp, TQ_SLOT(quit())); return a.exec(); } diff --git a/kstars/kstars/mapcanvas.cpp b/kstars/kstars/mapcanvas.cpp index 6059c1c7..0c2c081b 100644 --- a/kstars/kstars/mapcanvas.cpp +++ b/kstars/kstars/mapcanvas.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include <stdlib.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqpainter.h> #include <tqpixmap.h> diff --git a/kstars/kstars/mapcanvas.h b/kstars/kstars/mapcanvas.h index 60742d62..8900e4eb 100644 --- a/kstars/kstars/mapcanvas.h +++ b/kstars/kstars/mapcanvas.h @@ -37,7 +37,7 @@ class TQPixmap; class MapCanvas : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /**Default constructor. Initialize the widget: create pixmaps, load the diff --git a/kstars/kstars/objectnamelist.h b/kstars/kstars/objectnamelist.h index 63f5349a..4ff9bbb5 100644 --- a/kstars/kstars/objectnamelist.h +++ b/kstars/kstars/objectnamelist.h @@ -56,7 +56,7 @@ class ObjectNameList { /**Appends a skyobject to the list. *@param object pointer to the SkyObject to be appended to the list. - *@param useLongName if TRUE, use the longname of the object, + *@param useLongName if true, use the longname of the object, *rather than the primary name */ void append(SkyObject *object, bool useLongName=false); diff --git a/kstars/kstars/opsadvanced.cpp b/kstars/kstars/opsadvanced.cpp index 83cad040..50086e69 100644 --- a/kstars/kstars/opsadvanced.cpp +++ b/kstars/kstars/opsadvanced.cpp @@ -32,9 +32,9 @@ OpsAdvanced::OpsAdvanced( TQWidget *p, const char *name, WFlags fl ) //Initialize the timestep value SlewTimeScale->tsbox()->changeScale( Options::slewTimeScale() ); - connect( SlewTimeScale, TQT_SIGNAL( scaleChanged( float ) ), this, TQT_SLOT( slotChangeTimeScale( float ) ) ); + connect( SlewTimeScale, TQ_SIGNAL( scaleChanged( float ) ), this, TQ_SLOT( slotChangeTimeScale( float ) ) ); - connect( kcfg_HideOnSlew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotToggleHideOptions() ) ); + connect( kcfg_HideOnSlew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotToggleHideOptions() ) ); } OpsAdvanced::~OpsAdvanced() {} diff --git a/kstars/kstars/opsadvanced.h b/kstars/kstars/opsadvanced.h index ed107ea8..cb337dac 100644 --- a/kstars/kstars/opsadvanced.h +++ b/kstars/kstars/opsadvanced.h @@ -35,7 +35,7 @@ class KStars; class OpsAdvanced : public OpsAdvancedUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/opscatalog.cpp b/kstars/kstars/opscatalog.cpp index 71909872..07282cbf 100644 --- a/kstars/kstars/opscatalog.cpp +++ b/kstars/kstars/opscatalog.cpp @@ -64,17 +64,17 @@ OpsCatalog::OpsCatalog( TQWidget *p, const char *name, WFlags fl ) newItem->setOn( Options::showCatalog()[i] ); } - connect( CatalogList, TQT_SIGNAL( clicked( TQListViewItem* ) ), this, TQT_SLOT( updateDisplay() ) ); - connect( CatalogList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( selectCatalog() ) ); - connect( AddCatalog, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCatalog() ) ); - connect( LoadCatalog, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotLoadCatalog() ) ); - connect( RemoveCatalog, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveCatalog() ) ); - - connect( kcfg_MagLimitDrawStar, TQT_SIGNAL( valueChanged(double) ), - TQT_SLOT( slotSetDrawStarMagnitude(double) ) ); - connect( kcfg_MagLimitDrawStarZoomOut, TQT_SIGNAL( valueChanged(double) ), - TQT_SLOT( slotSetDrawStarZoomOutMagnitude(double) ) ); - connect( kcfg_ShowStars, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotStarWidgets(bool) ) ); + connect( CatalogList, TQ_SIGNAL( clicked( TQListViewItem* ) ), this, TQ_SLOT( updateDisplay() ) ); + connect( CatalogList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( selectCatalog() ) ); + connect( AddCatalog, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddCatalog() ) ); + connect( LoadCatalog, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotLoadCatalog() ) ); + connect( RemoveCatalog, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveCatalog() ) ); + + connect( kcfg_MagLimitDrawStar, TQ_SIGNAL( valueChanged(double) ), + TQ_SLOT( slotSetDrawStarMagnitude(double) ) ); + connect( kcfg_MagLimitDrawStarZoomOut, TQ_SIGNAL( valueChanged(double) ), + TQ_SLOT( slotSetDrawStarZoomOutMagnitude(double) ) ); + connect( kcfg_ShowStars, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotStarWidgets(bool) ) ); } //empty destructor @@ -82,7 +82,7 @@ OpsCatalog::~OpsCatalog() {} void OpsCatalog::updateDisplay() { //Modify display according to settings in the CatalogList - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "CatalogList" ) ) + if ( sender()->name() == TQString( "CatalogList" ) ) Options::setShowDeepSky( true ); Options::setShowMessier( showMessier->isOn() ); diff --git a/kstars/kstars/opscatalog.h b/kstars/kstars/opscatalog.h index 1f31be9d..2cb1f852 100644 --- a/kstars/kstars/opscatalog.h +++ b/kstars/kstars/opscatalog.h @@ -38,7 +38,7 @@ class TQCheckListItem; class OpsCatalog : public OpsCatalogUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/opscolors.cpp b/kstars/kstars/opscolors.cpp index 1b7bcbb7..e9456b98 100644 --- a/kstars/kstars/opscolors.cpp +++ b/kstars/kstars/opscolors.cpp @@ -24,7 +24,7 @@ #include <kcolordialog.h> #include <tdemessagebox.h> #include <kinputdialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "opscolors.h" #include "kstars.h" @@ -82,12 +82,12 @@ OpsColors::OpsColors( TQWidget *p, const char *name, WFlags fl ) else kcfg_StarColorIntensity->setEnabled( true ); - connect( ColorPalette, TQT_SIGNAL( clicked( TQListBoxItem* ) ), this, TQT_SLOT( newColor( TQListBoxItem* ) ) ); - connect( kcfg_StarColorIntensity, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotStarColorIntensity( int ) ) ); - connect( kcfg_StarColorMode, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotStarColorMode( int ) ) ); - connect( PresetBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotPreset( int ) ) ); - connect( AddPreset, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddPreset() ) ); - connect( RemovePreset, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemovePreset() ) ); + connect( ColorPalette, TQ_SIGNAL( clicked( TQListBoxItem* ) ), this, TQ_SLOT( newColor( TQListBoxItem* ) ) ); + connect( kcfg_StarColorIntensity, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotStarColorIntensity( int ) ) ); + connect( kcfg_StarColorMode, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotStarColorMode( int ) ) ); + connect( PresetBox, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( slotPreset( int ) ) ); + connect( AddPreset, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddPreset() ) ); + connect( RemovePreset, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemovePreset() ) ); RemovePreset->setEnabled( false ); } @@ -190,13 +190,13 @@ void OpsColors::slotRemovePreset() { //Remove entry from the ListBox and from the TQStringList holding filenames. //We don't want another color scheme to be selected, so first //temporarily disconnect the "highlighted" signal. - disconnect( PresetBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotPreset( int ) ) ); + disconnect( PresetBox, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( slotPreset( int ) ) ); PresetBox->removeItem( PresetBox->currentItem() ); PresetBox->setCurrentItem( -1 ); RemovePreset->setEnabled( false ); //Reconnect the "highlighted" signal - connect( PresetBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( slotPreset( int ) ) ); + connect( PresetBox, TQ_SIGNAL( highlighted( int ) ), this, TQ_SLOT( slotPreset( int ) ) ); //Read the contents of colors.dat into a TQStringList, except for the entry to be removed. TQTextStream stream( &cdatFile ); diff --git a/kstars/kstars/opscolors.h b/kstars/kstars/opscolors.h index 87f36997..ef9aed5d 100644 --- a/kstars/kstars/opscolors.h +++ b/kstars/kstars/opscolors.h @@ -40,7 +40,7 @@ class KStars; class OpsColors : public OpsColorsUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/opsguides.cpp b/kstars/kstars/opsguides.cpp index 7b554280..48a9bee0 100644 --- a/kstars/kstars/opsguides.cpp +++ b/kstars/kstars/opsguides.cpp @@ -21,10 +21,10 @@ OpsGuides::OpsGuides( TQWidget* parent, const char* name, WFlags fl ) : OpsGuidesUI( parent, name, fl ) { - connect( kcfg_ShowCNames, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotToggleConstellOptions() ) ); - connect( kcfg_ShowMilkyWay, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotToggleMilkyWayOptions() ) ); + connect( kcfg_ShowCNames, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotToggleConstellOptions() ) ); + connect( kcfg_ShowMilkyWay, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotToggleMilkyWayOptions() ) ); } OpsGuides::~OpsGuides() diff --git a/kstars/kstars/opsguides.h b/kstars/kstars/opsguides.h index 3658d3be..b7a6b9e2 100644 --- a/kstars/kstars/opsguides.h +++ b/kstars/kstars/opsguides.h @@ -21,7 +21,7 @@ class OpsGuides : public OpsGuidesUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/opssolarsystem.cpp b/kstars/kstars/opssolarsystem.cpp index 90202a56..e9426c46 100644 --- a/kstars/kstars/opssolarsystem.cpp +++ b/kstars/kstars/opssolarsystem.cpp @@ -26,11 +26,11 @@ OpsSolarSystem::OpsSolarSystem( TQWidget *parent, const char *name, WFlags fl ) { ksw = (KStars *)parent; - connect( kcfg_ShowAsteroids, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAsteroidWidgets(bool) ) ); - connect( kcfg_ShowComets, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotCometWidgets(bool) ) ); - connect( ClearAllTrails, TQT_SIGNAL( clicked() ), ksw, TQT_SLOT( slotClearAllTrails() ) ); - connect( showAllPlanets, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectPlanets() ) ); - connect( showNonePlanets, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectPlanets() ) ); + connect( kcfg_ShowAsteroids, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAsteroidWidgets(bool) ) ); + connect( kcfg_ShowComets, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotCometWidgets(bool) ) ); + connect( ClearAllTrails, TQ_SIGNAL( clicked() ), ksw, TQ_SLOT( slotClearAllTrails() ) ); + connect( showAllPlanets, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectPlanets() ) ); + connect( showNonePlanets, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectPlanets() ) ); slotAsteroidWidgets( kcfg_ShowAsteroids->isChecked() ); slotCometWidgets( kcfg_ShowComets->isChecked() ); @@ -58,7 +58,7 @@ void OpsSolarSystem::slotCometWidgets( bool on ) { void OpsSolarSystem::slotSelectPlanets() { bool b=true; - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "showNonePlanets" ) ) b = false; + if ( sender()->name() == TQString( "showNonePlanets" ) ) b = false; kcfg_ShowSun->setChecked( b ); kcfg_ShowMoon->setChecked( b ); diff --git a/kstars/kstars/opssolarsystem.h b/kstars/kstars/opssolarsystem.h index 97fbb87c..5fd964d3 100644 --- a/kstars/kstars/opssolarsystem.h +++ b/kstars/kstars/opssolarsystem.h @@ -31,7 +31,7 @@ class KStars; */ class OpsSolarSystem : public OpsSolarSystemUI { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/planetcatalog.cpp b/kstars/kstars/planetcatalog.cpp index 3367f35c..34579fea 100644 --- a/kstars/kstars/planetcatalog.cpp +++ b/kstars/kstars/planetcatalog.cpp @@ -35,7 +35,7 @@ PlanetCatalog::PlanetCatalog(KStarsData *dat) : Earth(0), Sun(0), kd(dat) { PlanetCatalog::~PlanetCatalog() { // - // do NOT delete Sun. It is also in the TQList + // do NOT delete Sun. It is also in the TQPtrList // and will be deleted automatically. // delete Earth; diff --git a/kstars/kstars/planetcatalog.h b/kstars/kstars/planetcatalog.h index 0a7f4556..c6337b2a 100644 --- a/kstars/kstars/planetcatalog.h +++ b/kstars/kstars/planetcatalog.h @@ -47,7 +47,7 @@ class ObjectNameList; class dms; class PlanetCatalog : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/simclock.cpp b/kstars/kstars/simclock.cpp index 25fe72d9..2bb5ae3b 100644 --- a/kstars/kstars/simclock.cpp +++ b/kstars/kstars/simclock.cpp @@ -38,7 +38,7 @@ SimClock::SimClock(TQObject *parent, const KStarsDateTime &when) : ManualMode = false; ManualActive = false; - TQObject::connect(&tmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(tick())); + TQObject::connect(&tmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(tick())); } SimClock::SimClock (const SimClock &old) : @@ -54,7 +54,7 @@ SimClock::SimClock (const SimClock &old) : ManualMode = old.ManualMode; ManualActive = old.ManualActive; - TQObject::connect(&tmr, TQT_SIGNAL(timeout()), this, TQT_SLOT(tick())); + TQObject::connect(&tmr, TQ_SIGNAL(timeout()), this, TQ_SLOT(tick())); } void SimClock::tick() { diff --git a/kstars/kstars/simclock.h b/kstars/kstars/simclock.h index 51ac4576..5a81f008 100644 --- a/kstars/kstars/simclock.h +++ b/kstars/kstars/simclock.h @@ -31,7 +31,7 @@ */ class SimClock : public TQObject, public SimClockInterface { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp index f236be0a..16150d16 100644 --- a/kstars/kstars/skymap.cpp +++ b/kstars/kstars/skymap.cpp @@ -21,7 +21,7 @@ #include <kstatusbar.h> #include <tdemessagebox.h> #include <tdeaction.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqmemarray.h> #include <tqpointarray.h> @@ -72,7 +72,7 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) setBackgroundColor( TQColor( data->colorScheme()->colorNamed( "SkyColor" ) ) ); setBackgroundMode( TQWidget::NoBackground ); - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setMinimumSize( 380, 250 ); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); @@ -91,8 +91,8 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) //Initialize Transient label stuff TransientTimeout = 100; //fade label color every 0.2 sec - connect( &HoverTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTransientLabel() ) ); - connect( &TransientTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTransientTimeout() ) ); + connect( &HoverTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTransientLabel() ) ); + connect( &TransientTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTransientTimeout() ) ); IBoxes = new InfoBoxes( Options::windowWidth(), Options::windowHeight(), Options::positionTimeBox(), Options::shadeTimeBox(), @@ -111,14 +111,14 @@ SkyMap::SkyMap(KStarsData *d, TQWidget *parent, const char *name ) IBoxes->geoChanged( data->geo() ); - connect( IBoxes->timeBox(), TQT_SIGNAL( shaded(bool) ), data, TQT_SLOT( saveTimeBoxShaded(bool) ) ); - connect( IBoxes->geoBox(), TQT_SIGNAL( shaded(bool) ), data, TQT_SLOT( saveGeoBoxShaded(bool) ) ); - connect( IBoxes->focusBox(), TQT_SIGNAL( shaded(bool) ), data, TQT_SLOT( saveFocusBoxShaded(bool) ) ); - connect( IBoxes->timeBox(), TQT_SIGNAL( moved(TQPoint) ), data, TQT_SLOT( saveTimeBoxPos(TQPoint) ) ); - connect( IBoxes->geoBox(), TQT_SIGNAL( moved(TQPoint) ), data, TQT_SLOT( saveGeoBoxPos(TQPoint) ) ); - connect( IBoxes->focusBox(), TQT_SIGNAL( moved(TQPoint) ), data, TQT_SLOT( saveFocusBoxPos(TQPoint) ) ); + connect( IBoxes->timeBox(), TQ_SIGNAL( shaded(bool) ), data, TQ_SLOT( saveTimeBoxShaded(bool) ) ); + connect( IBoxes->geoBox(), TQ_SIGNAL( shaded(bool) ), data, TQ_SLOT( saveGeoBoxShaded(bool) ) ); + connect( IBoxes->focusBox(), TQ_SIGNAL( shaded(bool) ), data, TQ_SLOT( saveFocusBoxShaded(bool) ) ); + connect( IBoxes->timeBox(), TQ_SIGNAL( moved(TQPoint) ), data, TQ_SLOT( saveTimeBoxPos(TQPoint) ) ); + connect( IBoxes->geoBox(), TQ_SIGNAL( moved(TQPoint) ), data, TQ_SLOT( saveGeoBoxPos(TQPoint) ) ); + connect( IBoxes->focusBox(), TQ_SIGNAL( moved(TQPoint) ), data, TQ_SLOT( saveFocusBoxPos(TQPoint) ) ); - connect( this, TQT_SIGNAL( destinationChanged() ), this, TQT_SLOT( slewFocus() ) ); + connect( this, TQ_SIGNAL( destinationChanged() ), this, TQ_SLOT( slewFocus() ) ); //Initialize Refraction correction lookup table arrays. RefractCorr1 is for calculating //the apparent altitude from the true altitude, and RefractCorr2 is for the reverse. @@ -650,7 +650,7 @@ void SkyMap::slotInfo( int id ) { TQString sURL = (*it); KURL url ( sURL ); if (!url.isEmpty()) - kapp->invokeBrowser(sURL); + tdeApp->invokeBrowser(sURL); } void SkyMap::slotBeginAngularDistance(void) { @@ -925,7 +925,7 @@ void SkyMap::slewFocus( void ) { fadeTransientLabel(); forceUpdate(); - kapp->processEvents(10); //keep up with other stuff + tdeApp->processEvents(10); //keep up with other stuff if ( Options::useAltAz() ) { dX = destination()->az()->Degrees() - focus()->az()->Degrees(); diff --git a/kstars/kstars/skymap.h b/kstars/kstars/skymap.h index 3f199d7a..55c4da2e 100644 --- a/kstars/kstars/skymap.h +++ b/kstars/kstars/skymap.h @@ -57,7 +57,7 @@ class DeepSkyObject; */ class SkyMap : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /** @@ -161,8 +161,8 @@ public: void setFocusAltAz(double alt, double az); /**@short sets the destination point of the sky map. - *@note setDestination() emits the destinationChanged() SIGNAL, - *which triggers the TQT_SLOT function SkyMap::slewFocus(). This + *@note setDestination() emits the destinationChanged() signal, + *which triggers the slot function SkyMap::slewFocus(). This *function iteratively steps the Focus point toward Destination, *repainting the sky at each step (if Options::useAnimatedSlewing()==true). *@param f a pointer to the SkyPoint the map should slew to @@ -353,7 +353,7 @@ public: *so we save a lot of time by bringing the code which sets their values outside of checkVisibility() *(which must be run for each and every SkyPoint). setMapGeometry() is called once in paintEvent(). *The variables set by setMapGeometry are: - *@li isPoleVisible TRUE if a coordinate Pole is on-screen + *@li isPoleVisible true if a coordinate Pole is on-screen *@li XMax the horizontal center-to-edge angular distance *@li guideXMax a version of XMax used for guide lines (same as XMax at low zoom; 2x XMAX otherwise) *@li guideFOV similar to guideXMax, but for the vertical direction. @@ -431,7 +431,7 @@ public slots: *There are two cases: the true altitude is known, and the apparent altitude is needed; *or the apparent altitude is known and the true altitude is needed. *@param alt The input altitude - *@param findApparent if TRUE, then alt is the true altitude, and we'll find the apparent alt. + *@param findApparent if true, then alt is the true altitude, and we'll find the apparent alt. *@return the corrected altitude, as a dms object. */ dms refract( const dms *alt, bool findApparent ); @@ -445,7 +445,7 @@ public slots: /**@short Center the display at the point ClickedPoint. * *The essential part of the function is to simply set the Destination point, which will emit - *the destinationChanged() SIGNAL, which triggers the slewFocus() SLOT. Additionally, this + *the destinationChanged() signal, which triggers the slewFocus() slot. Additionally, this *function performs some bookkeeping tasks, such updating whether we are tracking the new *object/position, adding a Planet Trail if required, etc. * @@ -699,8 +699,8 @@ private: *@param psky reference to the TQPainter on which to draw (either the sky pixmap or printer device) *@param catalog List of pointers to the objects in a particular deep-sky catalog. *@param color The color to be used when drawing the symbols for this catalog. - *@param drawObject if TRUE, the object symbols will be drawn - *@param drawImage if TRUE, the object images will be drawn + *@param drawObject if true, the object symbols will be drawn + *@param drawImage if true, the object images will be drawn *@param scale the scaling factor. We use the default value (1.0) everywhere, except when printing. */ void drawDeepSkyCatalog( TQPainter& psky, TQPtrList<DeepSkyObject>& catalog, TQColor& color, bool drawObject, bool drawImage, double scale = 1.0 ); @@ -717,14 +717,14 @@ private: /**@short Draw all solar system bodies: Sun, Moon, 8 planets, comets, asteroids. *@param psky reference to the TQPainter on which to draw (either the sky pixmap or printer device) - *@param drawPlanets if FALSE, do nothing + *@param drawPlanets if false, do nothing *@param scale the scaling factor. We use the default value (1.0) everywhere, except when printing. */ void drawSolarSystem( TQPainter& psky, bool drawPlanets, double scale = 1.0 ); /**@short Draw "User Labels". User labels are name labels attached to objects manually with *the right-click popup menu. Also adds a label to the FocusObject if the Option UseAutoLabel - *is TRUE. + *is true. *@param psky reference to the TQPainter on which to draw (either the sky pixmap or printer device) *@param scale the scaling factor. We use the default value (1.0) everywhere, except when printing. */ @@ -815,8 +815,8 @@ private: *pixel coordinates in the SkyMap. *@return TQPoint containing screen pixel x, y coordinates of SkyPoint. *@param o pointer to the SkyPoint for which to calculate x, y coordinates. - *@param Horiz if TRUE, use Alt/Az coordinates. - *@param doRefraction if TRUE, correct for atmospheric refraction + *@param Horiz if true, use Alt/Az coordinates. + *@param doRefraction if true, correct for atmospheric refraction *@param scale scaling factor (unused?) */ TQPoint getXY( SkyPoint *o, bool Horiz, bool doRefraction=true, double scale = 1.0 ); @@ -825,10 +825,10 @@ private: *screen pixel coordinate offsets from the center of the Sky pixmap. *@param dx horizontal pixel offset from center of SkyMap. *@param dy vertical pixel offset from center of SkyMap. - *@param Horiz if TRUE, the SkyMap is displayed using the Horizontal coordinate system + *@param Horiz if true, the SkyMap is displayed using the Horizontal coordinate system *@param LSTh pointer to the local sidereal time, as a dms object. *@param lat pointer to the current geographic laitude, as a dms object - *@param doRefraction if TRUE, correct for atmospheric refraction + *@param doRefraction if true, correct for atmospheric refraction */ SkyPoint dXdYToRaDec( double dx, double dy, bool Horiz, dms *LST, const dms *lat, bool doRefraction=true ); @@ -849,7 +849,7 @@ private: * *The function first checks the difference between the Declination/Altitude *coordinate of the Focus position, and that of the point p. If the absolute - *value of this difference is larger than fov, then the function returns FALSE. + *value of this difference is larger than fov, then the function returns false. *For most configurations of the sky map window, this simple check is enough to *exclude a large number of objects. * @@ -857,7 +857,7 @@ private: *(Equatorial or Horizontal) is currently inside the sky map window. This is *stored in the member variable 'bool SkyMap::isPoleVisible, and is set by the *function SkyMap::setMapGeometry(), which is called by SkyMap::paintEvent(). - *If a Pole is visible, then it will return TRUE immediately. The idea is that + *If a Pole is visible, then it will return true immediately. The idea is that *when a pole is on-screen it is computationally expensive to determine whether *a particular position is on-screen or not: for many valid Dec/Alt values, *all* *values of RA/Az will indeed be onscreen, but for other valid Dec/Alt values, @@ -867,8 +867,8 @@ private: * *Finally, if no Pole is onscreen, it checks the difference between the Focus *position's RA/Az coordinate and that of the point p. If the absolute value of - *this difference is larger than XMax, the function returns FALSE. Otherwise, - *it returns TRUE. + *this difference is larger than XMax, the function returns false. Otherwise, + *it returns true. *@param p pointer to the skypoint to be checked. *@param fov the vertical center-to-edge angle of the window, in degrees @@ -885,8 +885,8 @@ private: *NULL pointer, and the TransientTimer is not already active. These conditions *are met when the mouse did not move for HOVER_INTERVAL msec (triggering a *TransientLabel), but the mouse has since been moved, thus ending the Hover event. - *This function merely starts the TransientTimer, whose timeout TQT_SIGNAL is - *connected to the slotTransientTimeout() SLOT, which handles the actual fading + *This function merely starts the TransientTimer, whose timeout signal is + *connected to the slotTransientTimeout() slot, which handles the actual fading *of the transient label, and eventually resets TransientObject to NULL. *@sa SkyMap::slotTransientLabel(), SkyMap::slotTransientTimeout() */ diff --git a/kstars/kstars/skymapdraw.cpp b/kstars/kstars/skymapdraw.cpp index ff7150f8..d9a2a25d 100644 --- a/kstars/kstars/skymapdraw.cpp +++ b/kstars/kstars/skymapdraw.cpp @@ -1578,7 +1578,7 @@ void SkyMap::drawPlanetTrail( TQPainter& psky, KSPlanetBase *ksp, double scale ) if ( ( o.x() >= -1000 && o.x() <= Width+1000 && o.y() >=-1000 && o.y() <= Height+1000 ) ) { //Want to disable line-drawing if this point and the last are both outside bounds of display. - if ( ! TQT_TQRECT_OBJECT(rect()).contains( o ) && ! TQT_TQRECT_OBJECT(rect()).contains( cur ) ) doDrawLine = false; + if ( ! rect().contains( o ) && ! rect().contains( cur ) ) doDrawLine = false; cur = o; if ( doDrawLine ) { diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp index 8bc88002..8e4d0220 100644 --- a/kstars/kstars/skymapevents.cpp +++ b/kstars/kstars/skymapevents.cpp @@ -250,7 +250,7 @@ void SkyMap::keyPressEvent( TQKeyEvent *e ) { data->clock()->manualTick( true ); data->clock()->setScale( -1.0 * data->clock()->scale() ); //reset original sign of time step update(); - kapp->processEvents(); + tdeApp->processEvents(); break; case Key_Period: //advance one step forward in time @@ -258,7 +258,7 @@ void SkyMap::keyPressEvent( TQKeyEvent *e ) { if ( data->clock()->isActive() ) data->clock()->stop(); data->clock()->manualTick( true ); update(); - kapp->processEvents(); + tdeApp->processEvents(); break; //FIXME: Uncomment after feature thaw! @@ -629,12 +629,12 @@ void SkyMap::mouseReleaseEvent( TQMouseEvent * ) { void SkyMap::mousePressEvent( TQMouseEvent *e ) { //did we Grab an infoBox? - if ( e->button() == Qt::LeftButton && infoBoxes()->grabBox( e ) ) { + if ( e->button() == TQt::LeftButton && infoBoxes()->grabBox( e ) ) { update(); //refresh without redrawing skymap return; } - if ( (e->state() & ControlButton) && (e->button() == Qt::LeftButton) ) { + if ( (e->state() & ControlButton) && (e->button() == TQt::LeftButton) ) { ZoomRect.moveCenter( e->pos() ); setZoomMouseCursor(); update(); //refresh without redrawing skymap @@ -643,19 +643,19 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { // if button is down and cursor is not moved set the move cursor after 500 ms TQTimer t; - t.singleShot (500, this, TQT_SLOT (setMouseMoveCursor())); + t.singleShot (500, this, TQ_SLOT (setMouseMoveCursor())); double dx = ( 0.5*width() - e->x() )/Options::zoomFactor(); double dy = ( 0.5*height() - e->y() )/Options::zoomFactor(); if (unusablePoint (dx, dy)) return; // break if point is unusable - if ( !midMouseButtonDown && e->button() == Qt::MidButton ) { + if ( !midMouseButtonDown && e->button() == TQt::MidButton ) { y0 = 0.5*height() - e->y(); //record y pixel coordinate for middle-button zooming midMouseButtonDown = true; } if ( !mouseButtonDown ) { - if ( e->button()==Qt::LeftButton ) { + if ( e->button()==TQt::LeftButton ) { mouseButtonDown = true; scrollCount = 0; } @@ -671,11 +671,11 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { if ( clickedObject() ) { setClickedPoint( clickedObject() ); - if ( e->button() == Qt::RightButton ) { + if ( e->button() == TQt::RightButton ) { clickedObject()->showPopupMenu( pmenu, TQCursor::pos() ); } - if ( ksw && e->button() == Qt::LeftButton ) { + if ( ksw && e->button() == TQt::LeftButton ) { ksw->statusBar()->changeItem( clickedObject()->translatedLongName(), 0 ); } } else { @@ -684,10 +684,10 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { setClickedObject( NULL ); switch (e->button()) { - case Qt::LeftButton: + case TQt::LeftButton: if ( ksw ) ksw->statusBar()->changeItem( i18n( "Empty sky" ), 0 ); break; - case Qt::RightButton: + case TQt::RightButton: { SkyObject *nullObj = new SkyObject( SkyObject::TYPE_UNKNOWN, clickedPoint()->ra()->Hours(), clickedPoint()->dec()->Degrees() ); pmenu->createEmptyMenu( nullObj ); @@ -706,7 +706,7 @@ void SkyMap::mousePressEvent( TQMouseEvent *e ) { void SkyMap::mouseDoubleClickEvent( TQMouseEvent *e ) { //Was the event inside an infoBox? If so, shade the box. - if ( e->button() == Qt::LeftButton ) { + if ( e->button() == TQt::LeftButton ) { if ( infoBoxes()->shadeBox( e ) ) { update(); return; diff --git a/kstars/kstars/skyobject.cpp b/kstars/kstars/skyobject.cpp index 0f4e4d18..d6e07991 100644 --- a/kstars/kstars/skyobject.cpp +++ b/kstars/kstars/skyobject.cpp @@ -18,7 +18,7 @@ #include <iostream> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqpoint.h> #include <tqregexp.h> #include <tqfile.h> diff --git a/kstars/kstars/skyobject.h b/kstars/kstars/skyobject.h index b0742d9f..da86b5d8 100644 --- a/kstars/kstars/skyobject.h +++ b/kstars/kstars/skyobject.h @@ -172,14 +172,14 @@ public: *@return the local time that the object will rise *@param dt current UT date/time *@param geo current geographic location - *@param rst If TRUE, compute rise time. If FALSE, compute set time. + *@param rst If true, compute rise time. If false, compute set time. */ TQTime riseSetTime( const KStarsDateTime &dt, const GeoLocation *geo, bool rst ); /**@return the UT time when the object will rise or set *@param dt target date/time *@param geo pointer to Geographic location - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. */ TQTime riseSetTimeUT( const KStarsDateTime &dt, const GeoLocation *geo, bool rst); @@ -187,7 +187,7 @@ public: /**@return the LST time when the object will rise or set *@param dt target date/time *@param geo pointer to Geographic location - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. */ dms riseSetTimeLST( const KStarsDateTime &dt, const GeoLocation *geo, bool rst); @@ -196,7 +196,7 @@ public: *recomputes set or rise UT times. *@param dt target date/time *@param geo GeoLocation object - *@param rst Boolen. If TRUE will compute rise time. If FALSE + *@param rst Boolen. If true will compute rise time. If false * will compute set time. */ dms riseSetTimeAz( const KStarsDateTime &dt, const GeoLocation *geo, bool rst); @@ -262,7 +262,7 @@ private: *@param geo pointer to Geographic location *@param righta pointer to Right ascention of the object *@param decl pointer to Declination of the object - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. *@return the time at which the given position will rise or set. */ @@ -276,7 +276,7 @@ private: *@param gLt Geographic latitude *@param rga Right ascention of the object *@param decl Declination of the object - *@param rst Boolean. If TRUE will compute rise time. If FALSE + *@param rst Boolean. If true will compute rise time. If false * will compute set time. */ dms auxRiseSetTimeLST( const dms *gLt, const dms *rga, const dms *decl, bool rst ); diff --git a/kstars/kstars/stardatasink.h b/kstars/kstars/stardatasink.h index abfa23ee..59efb9eb 100644 --- a/kstars/kstars/stardatasink.h +++ b/kstars/kstars/stardatasink.h @@ -21,7 +21,7 @@ /**@class StarDataSink *StarDataSink receives data from an FileSource object and appends these data - *to a TQList of star data. It's an asynchronous io class. + *to a TQPtrList of star data. It's an asynchronous io class. *@author Thomas Kabelmann *@version 1.0 */ @@ -37,7 +37,7 @@ class StarDataSink : public TQObject, public TQDataSink { /** *class needs signals */ - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp index 696f3468..a8a2a9fb 100644 --- a/kstars/kstars/streamwg.cpp +++ b/kstars/kstars/streamwg.cpp @@ -63,8 +63,8 @@ FILE *wfp; imgFormatCombo->insertStrList(TQImage::outputFormats()); - connect(playB, TQT_SIGNAL(clicked()), this, TQT_SLOT(playPressed())); - connect(captureB, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureImage())); + connect(playB, TQ_SIGNAL(clicked()), this, TQ_SLOT(playPressed())); + connect(captureB, TQ_SIGNAL(clicked()), this, TQ_SLOT(captureImage())); } @@ -112,7 +112,7 @@ void StreamWG::setColorFrame(bool color) // callback notified sNotifier = new TQSocketNotifier( streamFD, TQSocketNotifier::Read, this); - TQObject::connect( sNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(streamReceived())); + TQObject::connect( sNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(streamReceived())); }*/ void StreamWG::enableStream(bool enable) diff --git a/kstars/kstars/streamwg.h b/kstars/kstars/streamwg.h index 8d0f684c..1e1ca1c2 100644 --- a/kstars/kstars/streamwg.h +++ b/kstars/kstars/streamwg.h @@ -28,7 +28,7 @@ class StreamWG : public streamForm { - Q_OBJECT + TQ_OBJECT public: @@ -66,7 +66,7 @@ class VideoWG : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/telescopeprop.cpp b/kstars/kstars/telescopeprop.cpp index 93d15861..28cd1313 100644 --- a/kstars/kstars/telescopeprop.cpp +++ b/kstars/kstars/telescopeprop.cpp @@ -39,11 +39,11 @@ telescopeProp::telescopeProp(TQWidget* parent, const char* name, bool modal, WFl indi_driver = ksw->getINDIDriver(); newScopePending = false; - connect (newB, TQT_SIGNAL(clicked()), this, TQT_SLOT(newScope())); - connect (saveB, TQT_SIGNAL(clicked()), this, TQT_SLOT(saveScope())); - connect (removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeScope())); - connect (telescopeListBox, TQT_SIGNAL(highlighted(int)),this, TQT_SLOT(updateScopeDetails(int))); - connect(closeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); + connect (newB, TQ_SIGNAL(clicked()), this, TQ_SLOT(newScope())); + connect (saveB, TQ_SIGNAL(clicked()), this, TQ_SLOT(saveScope())); + connect (removeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeScope())); + connect (telescopeListBox, TQ_SIGNAL(highlighted(int)),this, TQ_SLOT(updateScopeDetails(int))); + connect(closeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); // Fill the combo box with drivers driverCombo->insertStringList(indi_driver->driversList); diff --git a/kstars/kstars/telescopeprop.h b/kstars/kstars/telescopeprop.h index 1e7ae171..c2404230 100644 --- a/kstars/kstars/telescopeprop.h +++ b/kstars/kstars/telescopeprop.h @@ -25,11 +25,11 @@ class INDIDriver; class telescopeProp : public scopeProp { - Q_OBJECT + TQ_OBJECT public: - telescopeProp(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + telescopeProp(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~telescopeProp(); /*$PUBLIC_FUNCTIONS$*/ diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp index d7eb6bd5..becd8ade 100644 --- a/kstars/kstars/telescopewizardprocess.cpp +++ b/kstars/kstars/telescopewizardprocess.cpp @@ -91,14 +91,14 @@ telescopeWizardProcess::telescopeWizardProcess( TQWidget* parent, const char* na portList << "/dev/ttyS0" << "/dev/ttyS1" << "/dev/ttyS2" << "/dev/ttyS3" << "/dev/ttyS4" << "/dev/ttyUSB0" << "/dev/ttyUSB1" << "/dev/ttyUSB2" << "/dev/ttyUSB3";// << "/dev/ttyUSB4"; - connect(helpB, TQT_SIGNAL(clicked()), parent, TQT_SLOT(appHelpActivated())); - connect(nextB, TQT_SIGNAL(clicked()), this, TQT_SLOT(processNext())); - connect(backB, TQT_SIGNAL(clicked()), this, TQT_SLOT(processBack())); - connect(setTimeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(newTime())); - connect(setLocationB, TQT_SIGNAL(clicked()), this, TQT_SLOT(newLocation())); + connect(helpB, TQ_SIGNAL(clicked()), parent, TQ_SLOT(appHelpActivated())); + connect(nextB, TQ_SIGNAL(clicked()), this, TQ_SLOT(processNext())); + connect(backB, TQ_SIGNAL(clicked()), this, TQ_SLOT(processBack())); + connect(setTimeB, TQ_SIGNAL(clicked()), this, TQ_SLOT(newTime())); + connect(setLocationB, TQ_SIGNAL(clicked()), this, TQ_SLOT(newLocation())); newDeviceTimer = new TQTimer(this); - TQObject::connect( newDeviceTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processPort()) ); + TQObject::connect( newDeviceTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processPort()) ); } @@ -289,8 +289,8 @@ void telescopeWizardProcess::processPort() { newDeviceTimer->stop(); linkRejected = false; - connect(indiDev->stdDev, TQT_SIGNAL(linkRejected()), this, TQT_SLOT(scanPorts())); - connect(indiDev->stdDev, TQT_SIGNAL(linkAccepted()), this, TQT_SLOT(linkSuccess())); + connect(indiDev->stdDev, TQ_SIGNAL(linkRejected()), this, TQ_SLOT(scanPorts())); + connect(indiDev->stdDev, TQ_SIGNAL(linkAccepted()), this, TQ_SLOT(linkSuccess())); scanPorts(); return; } diff --git a/kstars/kstars/telescopewizardprocess.h b/kstars/kstars/telescopewizardprocess.h index 232cd29b..04c24054 100644 --- a/kstars/kstars/telescopewizardprocess.h +++ b/kstars/kstars/telescopewizardprocess.h @@ -25,7 +25,7 @@ class KProgressDialog; class telescopeWizardProcess : public telescopeWizard { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp index cfef5bf4..f5049e92 100644 --- a/kstars/kstars/thumbnaileditor.cpp +++ b/kstars/kstars/thumbnaileditor.cpp @@ -43,7 +43,7 @@ ThumbnailEditor::ThumbnailEditor( TQWidget *parent, const char *name ) tp->imageRect()->width(), tp->imageRect()->height() ); ui->ImageCanvas->setImage( tp->currentListImage() ); - connect( ui->ImageCanvas, TQT_SIGNAL(cropRegionModified()), TQT_SLOT( slotUpdateCropLabel() ) ); + connect( ui->ImageCanvas, TQ_SIGNAL(cropRegionModified()), TQ_SLOT( slotUpdateCropLabel() ) ); slotUpdateCropLabel(); update(); @@ -130,7 +130,7 @@ void ThumbImage::paintEvent( TQPaintEvent* ) { } void ThumbImage::mousePressEvent( TQMouseEvent *e ) { - if ( e->button() == Qt::LeftButton && CropRect->contains( e->pos() ) ) { + if ( e->button() == TQt::LeftButton && CropRect->contains( e->pos() ) ) { bMouseButtonDown = true; //The Anchor tells how far from the CropRect corner we clicked diff --git a/kstars/kstars/thumbnaileditor.h b/kstars/kstars/thumbnaileditor.h index 4a4484d9..4e82cb72 100644 --- a/kstars/kstars/thumbnaileditor.h +++ b/kstars/kstars/thumbnaileditor.h @@ -27,7 +27,7 @@ class TQPoint; class ThumbImage : public TQLabel { -Q_OBJECT +TQ_OBJECT public: ThumbImage( TQWidget *parent, const char *name = 0 ); @@ -62,7 +62,7 @@ private: class ThumbnailEditor : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: ThumbnailEditor( TQWidget *parent, const char *name=0 ); diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp index 08fd3328..229052dc 100644 --- a/kstars/kstars/thumbnailpicker.cpp +++ b/kstars/kstars/thumbnailpicker.cpp @@ -59,14 +59,14 @@ ThumbnailPicker::ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidge PixList.setAutoDelete( true ); - connect( ui->EditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditImage() ) ); - connect( ui->UnsetButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUnsetImage() ) ); - connect( ui->ImageList, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( slotSetFromList( int ) ) ); - connect( ui->ImageURLBox, TQT_SIGNAL( urlSelected( const TQString& ) ), - this, TQT_SLOT( slotSetFromURL() ) ); - connect( ui->ImageURLBox, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotSetFromURL() ) ); + connect( ui->EditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditImage() ) ); + connect( ui->UnsetButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUnsetImage() ) ); + connect( ui->ImageList, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( slotSetFromList( int ) ) ); + connect( ui->ImageURLBox, TQ_SIGNAL( urlSelected( const TQString& ) ), + this, TQ_SLOT( slotSetFromURL() ) ); + connect( ui->ImageURLBox, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotSetFromURL() ) ); ui->ImageURLBox->lineEdit()->setTrapReturnKey( true ); ui->EditButton->setEnabled( false ); @@ -115,7 +115,7 @@ void ThumbnailPicker::slotFillList() { #if KDE_IS_VERSION( 3, 3, 90 ) ((TDEIO::CopyJob*)JobList.current())->setInteractive( false ); // suppress error dialogs #endif - connect (JobList.current(), TQT_SIGNAL (result(TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (JobList.current(), TQ_SIGNAL (result(TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); } } @@ -176,7 +176,7 @@ void ThumbnailPicker::downloadReady(TDEIO::Job *job) { //Add image to list //If image is taller than desktop, rescale it. - //I tried to use kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) + //I tried to use tdeApp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) //for the titlebar height, but this returned zero. //Hard-coding 25 instead :( if ( tmp.exists() ) { @@ -191,11 +191,11 @@ void ThumbnailPicker::downloadReady(TDEIO::Job *job) { uint w = im.width(); uint h = im.height(); uint pad = 4*marginHint() + 2*ui->SearchLabel->height() + actionButton( Ok )->height() + 25; - uint hDesk = kapp->desktop()->availableGeometry().height() - pad; + uint hDesk = tdeApp->desktop()->availableGeometry().height() - pad; // this returns zero... // //DEBUG -// kdDebug() << "Title bar height: " << kapp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl; +// kdDebug() << "Title bar height: " << tdeApp->style().pixelMetric( TQStyle::PM_TitleBarHeight ) << endl; if ( h > hDesk ) im = im.smoothScale( w*hDesk/h, hDesk ); @@ -321,7 +321,7 @@ void ThumbnailPicker::slotSetFromURL() { uint w = im.width(); uint h = im.height(); uint pad = 4*marginHint() + 2*ui->SearchLabel->height() + actionButton( Ok )->height() + 25; - uint hDesk = kapp->desktop()->availableGeometry().height() - pad; + uint hDesk = tdeApp->desktop()->availableGeometry().height() - pad; if ( h > hDesk ) im = im.smoothScale( w*hDesk/h, hDesk ); @@ -343,7 +343,7 @@ void ThumbnailPicker::slotSetFromURL() { #if KDE_IS_VERSION( 3, 3, 90 ) ((TDEIO::CopyJob*)JobList.current())->setInteractive( false ); // suppress error dialogs #endif - connect (JobList.current(), TQT_SIGNAL (result(TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (JobList.current(), TQ_SIGNAL (result(TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); // } diff --git a/kstars/kstars/thumbnailpicker.h b/kstars/kstars/thumbnailpicker.h index 9f060ade..4396e189 100644 --- a/kstars/kstars/thumbnailpicker.h +++ b/kstars/kstars/thumbnailpicker.h @@ -36,7 +36,7 @@ class SkyObject; class ThumbnailPicker : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: ThumbnailPicker( SkyObject *o, const TQPixmap ¤t, TQWidget *parent=0, const char *name=0 ); diff --git a/kstars/kstars/timebox.h b/kstars/kstars/timebox.h index 7e515731..3632b169 100644 --- a/kstars/kstars/timebox.h +++ b/kstars/kstars/timebox.h @@ -43,7 +43,7 @@ public: * @param tt boolean. true means that the object will hold a Time. * false means that the object will hold a Date. */ - timeBox(TQWidget *parent, const char *n, bool tt=TRUE); + timeBox(TQWidget *parent, const char *n, bool tt=true); ~timeBox(); diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp index fec1d1c1..e7bfacc7 100644 --- a/kstars/kstars/timedialog.cpp +++ b/kstars/kstars/timedialog.cpp @@ -42,9 +42,9 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) HourBox = new TQSpinBox( page, "HourBox" ); TQFont Box_font( HourBox->font() ); - Box_font.setBold( TRUE ); + Box_font.setBold( true ); HourBox->setFont( Box_font ); - HourBox->setWrapping( TRUE ); + HourBox->setWrapping( true ); HourBox->setMaxValue( 23 ); HourBox->setButtonSymbols( TQSpinBox::PlusMinus ); HourBox->setValue( now.time().hour() ); @@ -56,7 +56,7 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) MinuteBox = new TQSpinBox( page, "MinuteBox" ); TQFont MinuteBox_font( MinuteBox->font() ); MinuteBox->setFont( Box_font ); - MinuteBox->setWrapping( TRUE ); + MinuteBox->setWrapping( true ); MinuteBox->setMaxValue( 59 ); MinuteBox->setButtonSymbols( TQSpinBox::PlusMinus ); MinuteBox->setValue( now.time().minute() ); @@ -67,7 +67,7 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) SecondBox = new TQSpinBox( page, "SecondBox" ); SecondBox->setFont( Box_font ); SecondBox->setMaxValue( 59 ); - SecondBox->setWrapping( TRUE ); + SecondBox->setWrapping( true ); SecondBox->setButtonSymbols( TQSpinBox::PlusMinus ); SecondBox->setValue( now.time().second() ); @@ -87,12 +87,12 @@ TimeDialog::TimeDialog( const KStarsDateTime &now, TQWidget* parent ) vlay->activate(); - TQObject::connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( accept() )); - TQObject::connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( reject() )); - TQObject::connect( NowButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( setNow() )); - TQObject::connect( HourBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( HourPrefix( int ) )); - TQObject::connect( MinuteBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( MinutePrefix( int ) )); - TQObject::connect( SecondBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( SecondPrefix( int ) )); + TQObject::connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( accept() )); + TQObject::connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( reject() )); + TQObject::connect( NowButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( setNow() )); + TQObject::connect( HourBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( HourPrefix( int ) )); + TQObject::connect( MinuteBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( MinutePrefix( int ) )); + TQObject::connect( SecondBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( SecondPrefix( int ) )); } //Add handler for Escape key to close window diff --git a/kstars/kstars/timedialog.h b/kstars/kstars/timedialog.h index f1657c94..18d0558b 100644 --- a/kstars/kstars/timedialog.h +++ b/kstars/kstars/timedialog.h @@ -42,7 +42,7 @@ class KStars; */ class TimeDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kstars/kstars/timespinbox.cpp b/kstars/kstars/timespinbox.cpp index 40e0b94f..df3fa775 100644 --- a/kstars/kstars/timespinbox.cpp +++ b/kstars/kstars/timespinbox.cpp @@ -56,7 +56,7 @@ TimeSpinBox::TimeSpinBox( TQWidget *parent, const char *name, bool _daysonly ) } setFixedWidth( wmax + extra ); - connect( this, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( reportChange() ) ); + connect( this, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( reportChange() ) ); updateDisplay(); } diff --git a/kstars/kstars/timespinbox.h b/kstars/kstars/timespinbox.h index bfba1ee5..2498c516 100644 --- a/kstars/kstars/timespinbox.h +++ b/kstars/kstars/timespinbox.h @@ -29,7 +29,7 @@ */ class TimeSpinBox : public TQSpinBox { -Q_OBJECT +TQ_OBJECT public: /**Constructor */ @@ -46,7 +46,7 @@ public: /**Convert the displayed string to an internal value. *@note reimplemented from TQSpinBox - *@p ok bool pointer set to TRUE if conversion was successful + *@p ok bool pointer set to true if conversion was successful *@return internal value converted from displayed text */ virtual int mapTextToValue( bool *ok); diff --git a/kstars/kstars/timestepbox.cpp b/kstars/kstars/timestepbox.cpp index 4941d56d..8b728768 100644 --- a/kstars/kstars/timestepbox.cpp +++ b/kstars/kstars/timestepbox.cpp @@ -42,9 +42,9 @@ TimeStepBox::TimeStepBox( TQWidget *parent, const char* name, bool daysonly ) timeBox->setValue( 4 ); //real-time - connect( unitBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeUnits() ) ); - connect( timeBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( syncUnits( int ) ) ); - connect( timeBox, TQT_SIGNAL( scaleChanged( float ) ), this, TQT_SIGNAL( scaleChanged( float ) ) ); + connect( unitBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeUnits() ) ); + connect( timeBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( syncUnits( int ) ) ); + connect( timeBox, TQ_SIGNAL( scaleChanged( float ) ), this, TQ_SIGNAL( scaleChanged( float ) ) ); } @@ -58,9 +58,9 @@ void TimeStepBox::syncUnits( int tstep ) { if ( abs(tstep) >= unitBox->getUnitValue( i ) ) break; //don't want setValue to trigger changeUnits()... - disconnect( unitBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeUnits() ) ); + disconnect( unitBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeUnits() ) ); unitBox->setValue( tstep < 0 ? -i : i ); - connect( unitBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( changeUnits() ) ); + connect( unitBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( changeUnits() ) ); } void TimeStepBox::setDaysOnly( bool daysonly ) { diff --git a/kstars/kstars/timestepbox.h b/kstars/kstars/timestepbox.h index c05ec1d3..e8a1c6ba 100644 --- a/kstars/kstars/timestepbox.h +++ b/kstars/kstars/timestepbox.h @@ -34,7 +34,7 @@ */ class TimeStepBox : public TQFrame { -Q_OBJECT +TQ_OBJECT public: /**Constructor. */ diff --git a/kstars/kstars/timeunitbox.cpp b/kstars/kstars/timeunitbox.cpp index 0b89f057..4305fbd0 100644 --- a/kstars/kstars/timeunitbox.cpp +++ b/kstars/kstars/timeunitbox.cpp @@ -34,8 +34,8 @@ TimeUnitBox::TimeUnitBox(TQWidget *parent, const char *name, bool daysonly ) setDaysOnly( daysonly ); - connect( UpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( increase() ) ); - connect( DownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( decrease() ) ); + connect( UpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( increase() ) ); + connect( DownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( decrease() ) ); } TimeUnitBox::~TimeUnitBox(){ diff --git a/kstars/kstars/timeunitbox.h b/kstars/kstars/timeunitbox.h index d93ec215..ae57e2b0 100644 --- a/kstars/kstars/timeunitbox.h +++ b/kstars/kstars/timeunitbox.h @@ -44,7 +44,7 @@ class TQPushButton; class TimeUnitBox : public TQVBox { - Q_OBJECT + TQ_OBJECT public: /**Constructor*/ diff --git a/kstars/kstars/timezonerule.h b/kstars/kstars/timezonerule.h index 3cadb4e5..fc2ec80e 100644 --- a/kstars/kstars/timezonerule.h +++ b/kstars/kstars/timezonerule.h @@ -78,11 +78,11 @@ public: */ bool isDSTActive( const KStarsDateTime &date ); - /**@return TRUE if the rule is the "empty" TZ rule. */ + /**@return true if the rule is the "empty" TZ rule. */ bool isEmptyRule() { return ( HourOffset == 0.0 ); } /** Toggle DST on/off. The @p activate argument should probably be isDSTActive() - *@param activate if TRUE, then set DST active; otherwise, deactivate DST + *@param activate if true, then set DST active; otherwise, deactivate DST */ void setDST( bool activate=true ); @@ -110,7 +110,7 @@ public: */ KStarsDateTime nextDSTChange_LTime() { return next_change_ltime; } - /**@return TRUE if this rule is the same as the argument. + /**@return true if this rule is the same as the argument. *@p r the rule to check for equivalence */ bool equals( TimeZoneRule *r ); @@ -144,7 +144,7 @@ private: *be 1-3 (1st/2nd/third weekday of the month), or 5 (last weekday of the month) *@p day the day integer is returned by reference through this value *@p week the week integer is returned by reference through this value - *@return TRUE if the day string was successfully parsed + *@return true if the day string was successfully parsed */ bool initDay( const TQString &d, int &day, int &week ); diff --git a/kstars/kstars/toggleaction.h b/kstars/kstars/toggleaction.h index 5c62909d..b4ee9441 100644 --- a/kstars/kstars/toggleaction.h +++ b/kstars/kstars/toggleaction.h @@ -30,7 +30,7 @@ #include <tdeaction.h> class ToggleAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp index 9a95e188..869fa888 100644 --- a/kstars/kstars/tools/altvstime.cpp +++ b/kstars/kstars/tools/altvstime.cpp @@ -87,21 +87,21 @@ AltVsTime::AltVsTime( TQWidget* parent) : setLSTLimits(); View->updateTickmarks(); - connect( avtUI->browseButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseObject() ) ); - connect( avtUI->cityButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChooseCity() ) ); - connect( avtUI->updateButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpdateDateLoc() ) ); - connect( avtUI->clearButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClear() ) ); - connect( avtUI->addButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->nameBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->raBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->decBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAddSource() ) ); - connect( avtUI->clearFieldsButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearBoxes() ) ); - connect( avtUI->longBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAdvanceFocus() ) ); - connect( avtUI->latBox, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotAdvanceFocus() ) ); - connect( avtUI->PlotList, TQT_SIGNAL( highlighted(int) ), this, TQT_SLOT( slotHighlight() ) ); - - pList.setAutoDelete(FALSE); - deleteList.setAutoDelete(TRUE); //needed for skypoints which may be created in this class + connect( avtUI->browseButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseObject() ) ); + connect( avtUI->cityButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChooseCity() ) ); + connect( avtUI->updateButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpdateDateLoc() ) ); + connect( avtUI->clearButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClear() ) ); + connect( avtUI->addButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->nameBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->raBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->decBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAddSource() ) ); + connect( avtUI->clearFieldsButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClearBoxes() ) ); + connect( avtUI->longBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAdvanceFocus() ) ); + connect( avtUI->latBox, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotAdvanceFocus() ) ); + connect( avtUI->PlotList, TQ_SIGNAL( highlighted(int) ), this, TQ_SLOT( slotHighlight() ) ); + + pList.setAutoDelete(false); + deleteList.setAutoDelete(true); //needed for skypoints which may be created in this class //ther edit boxes should not pass on the return key! avtUI->nameBox->setTrapReturnKey( true ); @@ -307,11 +307,11 @@ void AltVsTime::slotHighlight(void) { //move input focus to the next logical widget void AltVsTime::slotAdvanceFocus(void) { - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "nameBox" ) ) avtUI->addButton->setFocus(); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "raBox" ) ) avtUI->decBox->setFocus(); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "decbox" ) ) avtUI->addButton->setFocus(); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "longBox" ) ) avtUI->latBox->setFocus(); - if ( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() == TQString( "latBox" ) ) avtUI->updateButton->setFocus(); + if ( sender()->name() == TQString( "nameBox" ) ) avtUI->addButton->setFocus(); + if ( sender()->name() == TQString( "raBox" ) ) avtUI->decBox->setFocus(); + if ( sender()->name() == TQString( "decbox" ) ) avtUI->addButton->setFocus(); + if ( sender()->name() == TQString( "longBox" ) ) avtUI->latBox->setFocus(); + if ( sender()->name() == TQString( "latBox" ) ) avtUI->updateButton->setFocus(); } void AltVsTime::slotClear(void) { diff --git a/kstars/kstars/tools/altvstime.h b/kstars/kstars/tools/altvstime.h index f68d1612..952d9bea 100644 --- a/kstars/kstars/tools/altvstime.h +++ b/kstars/kstars/tools/altvstime.h @@ -47,7 +47,7 @@ class AltVsTimeUI; */ class AVTPlotWidget : public KStarsPlotWidget { - Q_OBJECT + TQ_OBJECT public: /**Constructor @@ -93,7 +93,7 @@ private: class AltVsTime : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/argsetgeolocation.ui b/kstars/kstars/tools/argsetgeolocation.ui index 2f8088b6..25e6a7a8 100644 --- a/kstars/kstars/tools/argsetgeolocation.ui +++ b/kstars/kstars/tools/argsetgeolocation.ui @@ -188,9 +188,9 @@ <tabstop>CountryName</tabstop> <tabstop>FindCityButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotFindCity()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp index bd9d2037..7ff8e73a 100644 --- a/kstars/kstars/tools/astrocalc.cpp +++ b/kstars/kstars/tools/astrocalc.cpp @@ -92,8 +92,8 @@ AstroCalc::AstroCalc( TQWidget* parent ) : solarItem->setPixmap(0,solarIcon); /*TQListViewItem * planetsItem = */new TQListViewItem(solarItem,i18n("Planets Coordinates")); - connect(navigationPanel, TQT_SIGNAL(clicked(TQListViewItem *)), this, - TQT_SLOT(slotItemSelection(TQListViewItem *))); + connect(navigationPanel, TQ_SIGNAL(clicked(TQListViewItem *)), this, + TQ_SLOT(slotItemSelection(TQListViewItem *))); } AstroCalc::~AstroCalc() diff --git a/kstars/kstars/tools/astrocalc.h b/kstars/kstars/tools/astrocalc.h index 6d56bdd7..ebb70d4c 100644 --- a/kstars/kstars/tools/astrocalc.h +++ b/kstars/kstars/tools/astrocalc.h @@ -56,7 +56,7 @@ class modCalcVlsr; class AstroCalc : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: /** construtor */ diff --git a/kstars/kstars/tools/jmoontool.h b/kstars/kstars/tools/jmoontool.h index e7a7e0b6..0b3d9f29 100644 --- a/kstars/kstars/tools/jmoontool.h +++ b/kstars/kstars/tools/jmoontool.h @@ -29,7 +29,7 @@ class KStars; */ class JMoonTool : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: JMoonTool(TQWidget *parent = 0, const char *name = 0); diff --git a/kstars/kstars/tools/kstarsplotwidget.h b/kstars/kstars/tools/kstarsplotwidget.h index 03339f93..29ce890e 100644 --- a/kstars/kstars/tools/kstarsplotwidget.h +++ b/kstars/kstars/tools/kstarsplotwidget.h @@ -37,7 +37,7 @@ class TQPixmap; */ class KStarsPlotWidget : public KPlotWidget { - Q_OBJECT + TQ_OBJECT public: /**Constructor diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp index ff86b542..63cd0720 100644 --- a/kstars/kstars/tools/lcgenerator.cpp +++ b/kstars/kstars/tools/lcgenerator.cpp @@ -30,7 +30,7 @@ #include <tdeio/netaccess.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "lcgenerator.h" #include "imageviewer.h" @@ -68,7 +68,7 @@ void LCGenerator::createGUI() SDLayout = new TQHBoxLayout( 0, 0, 6, "SDLayout"); StarInfoBox = new TQGroupBox( page, "StarInfoBox" ); - StarInfoBox->setColumnLayout(0, Qt::Vertical ); + StarInfoBox->setColumnLayout(0, TQt::Vertical ); StarInfoBox->layout()->setSpacing( 6 ); StarInfoBox->layout()->setMargin( 11 ); StarInfoBoxLayout = new TQVBoxLayout( StarInfoBox->layout() ); @@ -124,37 +124,37 @@ void LCGenerator::createGUI() SDLayout->addWidget( StarInfoBox ); DataSelectBox = new TQGroupBox( page, "DataSelectBox" ); - DataSelectBox->setColumnLayout(0, Qt::Vertical ); + DataSelectBox->setColumnLayout(0, TQt::Vertical ); DataSelectBox->layout()->setSpacing( 6 ); DataSelectBox->layout()->setMargin( 11 ); DataSelectBoxLayout = new TQVBoxLayout( DataSelectBox->layout() ); DataSelectBoxLayout->setAlignment( TQt::AlignTop ); VisualCheck = new TQCheckBox( DataSelectBox, "VisualCheck" ); - VisualCheck->setChecked( TRUE ); + VisualCheck->setChecked( true ); DataSelectBoxLayout->addWidget( VisualCheck ); FainterCheck = new TQCheckBox( DataSelectBox, "FainterCheck" ); - FainterCheck->setChecked( TRUE ); + FainterCheck->setChecked( true ); DataSelectBoxLayout->addWidget( FainterCheck ); DiscrepantCheck = new TQCheckBox( DataSelectBox, "DiscrepantCheck" ); DataSelectBoxLayout->addWidget( DiscrepantCheck ); CCDBCheck = new TQCheckBox( DataSelectBox, "CCDBCheck" ); - CCDBCheck->setChecked( TRUE ); + CCDBCheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDBCheck ); CCDVCheck = new TQCheckBox( DataSelectBox, "CCDVCheck" ); - CCDVCheck->setChecked( TRUE ); + CCDVCheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDVCheck ); CCDRCheck = new TQCheckBox( DataSelectBox, "CCDRCheck" ); - CCDRCheck->setChecked( TRUE ); + CCDRCheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDRCheck ); CCDICheck = new TQCheckBox( DataSelectBox, "CCDICheck" ); - CCDICheck->setChecked( TRUE ); + CCDICheck->setChecked( true ); DataSelectBoxLayout->addWidget( CCDICheck ); PlotHLayout = new TQHBoxLayout( 0, 0, 6, "PlotHLayout"); @@ -212,11 +212,11 @@ void LCGenerator::createGUI() resize( TQSize(500, 360) ); // Signals/Slots - TQObject::connect(CloseButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(close())); - TQObject::connect(GetCurveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(VerifyData())); - TQObject::connect(UpdateListButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(updateStarList())); - TQObject::connect(DesignationIn, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(updateNameList(int))); - TQObject::connect(NameIn, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(updateDesigList(int))); + TQObject::connect(CloseButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(close())); + TQObject::connect(GetCurveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(VerifyData())); + TQObject::connect(UpdateListButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(updateStarList())); + TQObject::connect(DesignationIn, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(updateNameList(int))); + TQObject::connect(NameIn, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(updateDesigList(int))); } @@ -427,7 +427,7 @@ void LCGenerator::updateStarList() KURL saveFile (file->name()); downloadJob = TDEIO::file_copy (AAVSOFile, saveFile, -1, true); - connect (downloadJob, TQT_SIGNAL (result (TDEIO::Job *)), TQT_SLOT (downloadReady (TDEIO::Job *))); + connect (downloadJob, TQ_SIGNAL (result (TDEIO::Job *)), TQ_SLOT (downloadReady (TDEIO::Job *))); } void LCGenerator::downloadReady(TDEIO::Job * job) diff --git a/kstars/kstars/tools/lcgenerator.h b/kstars/kstars/tools/lcgenerator.h index c0faacbe..f74d46b0 100644 --- a/kstars/kstars/tools/lcgenerator.h +++ b/kstars/kstars/tools/lcgenerator.h @@ -53,7 +53,7 @@ struct VariableStarInfo class LCGenerator : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcangdist.cpp b/kstars/kstars/tools/modcalcangdist.cpp index 1a13ddf1..7c9185e2 100644 --- a/kstars/kstars/tools/modcalcangdist.cpp +++ b/kstars/kstars/tools/modcalcangdist.cpp @@ -32,8 +32,8 @@ modCalcAngDist::modCalcAngDist(TQWidget *parentSplit, const char *name) : modCalcAngDistDlg(parentSplit,name) { - ra0Box->setDegType(FALSE); - ra1Box->setDegType(FALSE); + ra0Box->setDegType(false); + ra1Box->setDegType(false); show(); } @@ -44,7 +44,7 @@ modCalcAngDist::~modCalcAngDist(){ SkyPoint modCalcAngDist::getCoords (dmsBox* rBox, dmsBox* dBox) { dms raCoord, decCoord; - raCoord = rBox->createDms(FALSE); + raCoord = rBox->createDms(false); decCoord = dBox->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -149,10 +149,10 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(ra0CheckBatch->isChecked() ) { - ra0B = dms::fromString( fields[i],FALSE); + ra0B = dms::fromString( fields[i],false); i++; } else - ra0B = ra0BoxBatch->createDms(FALSE); + ra0B = ra0BoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << ra0B.toHMSString() << space; @@ -163,7 +163,7 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(dec0CheckBatch->isChecked() ) { - dec0B = dms::fromString( fields[i], TRUE); + dec0B = dms::fromString( fields[i], true); i++; } else dec0B = dec0BoxBatch->createDms(); @@ -177,10 +177,10 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(ra1CheckBatch->isChecked() ) { - ra1B = dms::fromString( fields[i],FALSE); + ra1B = dms::fromString( fields[i],false); i++; } else - ra1B = ra1BoxBatch->createDms(FALSE); + ra1B = ra1BoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << ra1B.toHMSString() << space; @@ -191,7 +191,7 @@ void modCalcAngDist::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(dec1CheckBatch->isChecked() ) { - dec1B = dms::fromString( fields[i], TRUE); + dec1B = dms::fromString( fields[i], true); i++; } else dec1B = dec1BoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcangdist.h b/kstars/kstars/tools/modcalcangdist.h index 0d938b58..af66f566 100644 --- a/kstars/kstars/tools/modcalcangdist.h +++ b/kstars/kstars/tools/modcalcangdist.h @@ -33,7 +33,7 @@ class TQTextStream; class modCalcAngDist : public modCalcAngDistDlg { -Q_OBJECT +TQ_OBJECT public: /**Constructor. */ diff --git a/kstars/kstars/tools/modcalcangdistdlg.ui b/kstars/kstars/tools/modcalcangdistdlg.ui index 33bfc084..aed9a174 100644 --- a/kstars/kstars/tools/modcalcangdistdlg.ui +++ b/kstars/kstars/tools/modcalcangdistdlg.ui @@ -660,13 +660,13 @@ <slot>slotOutputFile()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotComputeDist()</slot> <slot>slotClearCoords()</slot> <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp index c50b7b9c..0b718ef3 100644 --- a/kstars/kstars/tools/modcalcapcoord.cpp +++ b/kstars/kstars/tools/modcalcapcoord.cpp @@ -40,8 +40,8 @@ modCalcApCoord::modCalcApCoord(TQWidget *parentSplit, const char *name) : modCalcApCoordDlg(parentSplit,name) { showCurrentTime(); - ra0Box->setDegType(FALSE); - rafBox->setDegType(FALSE); + ra0Box->setDegType(false); + rafBox->setDegType(false); show(); } @@ -52,7 +52,7 @@ modCalcApCoord::~modCalcApCoord(){ SkyPoint modCalcApCoord::getEquCoords (void) { dms raCoord, decCoord; - raCoord = ra0Box->createDms(FALSE); + raCoord = ra0Box->createDms(false); decCoord = dec0Box->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -87,7 +87,7 @@ double modCalcApCoord::getEpoch (TQString eName) { } void modCalcApCoord::showEquCoords ( SkyPoint sp ) { - rafBox->show( sp.ra() , FALSE); + rafBox->show( sp.ra() , false); decfBox->show( sp.dec() ); } @@ -265,10 +265,10 @@ void modCalcApCoord::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -279,7 +279,7 @@ void modCalcApCoord::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcapcoord.h b/kstars/kstars/tools/modcalcapcoord.h index f99bc418..06c5fec1 100644 --- a/kstars/kstars/tools/modcalcapcoord.h +++ b/kstars/kstars/tools/modcalcapcoord.h @@ -35,7 +35,7 @@ class TQTextStream; class modCalcApCoord : public modCalcApCoordDlg { -Q_OBJECT +TQ_OBJECT public: /**Constructor. */ diff --git a/kstars/kstars/tools/modcalcapcoorddlg.ui b/kstars/kstars/tools/modcalcapcoorddlg.ui index ac79690f..f8b9502c 100644 --- a/kstars/kstars/tools/modcalcapcoorddlg.ui +++ b/kstars/kstars/tools/modcalcapcoorddlg.ui @@ -842,7 +842,7 @@ <tabstop>OutputLineEditBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeCoords()</slot> <slot>slotRadioBatch()</slot> <slot>slotUtCheckedBatch()</slot> @@ -854,7 +854,7 @@ <slot>slotRunBatch()</slot> <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp index 04a03904..0d7cfcbe 100644 --- a/kstars/kstars/tools/modcalcazel.cpp +++ b/kstars/kstars/tools/modcalcazel.cpp @@ -41,8 +41,8 @@ modCalcAzel::modCalcAzel(TQWidget *parentSplit, const char *name) : modCalcAzelD showCurrentDateTime(); initGeo(); showLongLat(); - horInputCoords = FALSE; - raBox->setDegType(FALSE); + horInputCoords = false; + raBox->setDegType(false); show(); } @@ -54,7 +54,7 @@ SkyPoint modCalcAzel::getEquCoords (void) { dms raCoord, decCoord; - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -156,7 +156,7 @@ void modCalcAzel::showHorCoords ( SkyPoint sp ) void modCalcAzel::showEquCoords ( SkyPoint sp ) { - raBox->show( sp.ra(), FALSE ); + raBox->show( sp.ra(), false ); decBox->show( sp.dec() ); showEpoch( getDateTime() ); } @@ -293,7 +293,7 @@ void modCalcAzel::horNoCheck() { azBoxBatch->setEnabled(false); elCheckBatch->setChecked(false); elBoxBatch->setEnabled(false); - horInputCoords = FALSE; + horInputCoords = false; } @@ -302,7 +302,7 @@ void modCalcAzel::equNoCheck() { raBoxBatch->setEnabled(false); decCheckBatch->setChecked(false); decBoxBatch->setEnabled(false); - horInputCoords = TRUE; + horInputCoords = true; } @@ -410,10 +410,10 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; @@ -425,10 +425,10 @@ void modCalcAzel::processLines( TQTextStream &istream ) { if (latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << latB.toDMSString() << space; else @@ -462,10 +462,10 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -476,7 +476,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); @@ -496,7 +496,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { } else { if(azCheckBatch->isChecked() ) { - azB = dms::fromString( fields[i],FALSE); + azB = dms::fromString( fields[i],false); i++; } else azB = azBoxBatch->createDms(); @@ -510,7 +510,7 @@ void modCalcAzel::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(elCheckBatch->isChecked() ) { - elB = dms::fromString( fields[i], TRUE); + elB = dms::fromString( fields[i], true); i++; } else elB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcazel.h b/kstars/kstars/tools/modcalcazel.h index c6b0ad25..022dae12 100644 --- a/kstars/kstars/tools/modcalcazel.h +++ b/kstars/kstars/tools/modcalcazel.h @@ -34,7 +34,7 @@ class dms; class modCalcAzel : public modCalcAzelDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcazeldlg.ui b/kstars/kstars/tools/modcalcazeldlg.ui index eff053a8..3b81c72c 100644 --- a/kstars/kstars/tools/modcalcazeldlg.ui +++ b/kstars/kstars/tools/modcalcazeldlg.ui @@ -1041,7 +1041,7 @@ <tabstop>OutButtonBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotClearCoords()</slot> <slot>slotComputeCoords()</slot> <slot>slotInputFile()</slot> @@ -1057,7 +1057,7 @@ <slot>slotAzChecked()</slot> <slot>slotElChecked()</slot> <slot>newSlot()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcdaylength.h b/kstars/kstars/tools/modcalcdaylength.h index 268491db..db9055c4 100644 --- a/kstars/kstars/tools/modcalcdaylength.h +++ b/kstars/kstars/tools/modcalcdaylength.h @@ -29,7 +29,7 @@ class KStarsDateTime; class GeoLocation; class modCalcDayLength : public modCalcDayLengthDlg { -Q_OBJECT +TQ_OBJECT public: /**Constructor. */ diff --git a/kstars/kstars/tools/modcalcdaylengthdlg.ui b/kstars/kstars/tools/modcalcdaylengthdlg.ui index 2f58bbd4..10d3a9e0 100644 --- a/kstars/kstars/tools/modcalcdaylengthdlg.ui +++ b/kstars/kstars/tools/modcalcdaylengthdlg.ui @@ -635,10 +635,10 @@ <tabstop>azSetBox</tabstop> <tabstop>azRiseBox</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputePosTime()</slot> <slot>slotClearCoords()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalceclipticcoords.cpp b/kstars/kstars/tools/modcalceclipticcoords.cpp index 33aa83ae..f3b88036 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.cpp +++ b/kstars/kstars/tools/modcalceclipticcoords.cpp @@ -37,8 +37,8 @@ modCalcEclCoords::modCalcEclCoords(TQWidget *parentSplit, const char *name) : modCalcEclCoordsDlg(parentSplit,name) { - equRadio->setChecked(TRUE); - raBox->setDegType(FALSE); + equRadio->setChecked(true); + raBox->setDegType(false); this->show(); } @@ -54,7 +54,7 @@ void modCalcEclCoords::getEclCoords (void) { void modCalcEclCoords::getEquCoords (void) { - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); epoch = getEpoch( epochName->text() ); } @@ -90,7 +90,7 @@ void modCalcEclCoords::slotComputeCoords (void) { } void modCalcEclCoords::showEquCoords(void) { - raBox->show( raCoord , FALSE); + raBox->show( raCoord , false); decBox->show( decCoord ); } @@ -135,7 +135,7 @@ void modCalcEclCoords::eclCheck() { eclLatBoxBatch->setEnabled(false); eclLongCheckBatch->setChecked(false); eclLongBoxBatch->setEnabled(false); - eclInputCoords = FALSE; + eclInputCoords = false; } @@ -146,7 +146,7 @@ void modCalcEclCoords::equCheck() { decCheckBatch->setChecked(false); decBoxBatch->setEnabled(false); //epochCheckBatch->setChecked(false); - eclInputCoords = TRUE; + eclInputCoords = true; } @@ -278,10 +278,10 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read Ecliptic Longitude and write in ostream if corresponds if(eclLongCheckBatch->isChecked() ) { - eclLongB = dms::fromString( fields[i], TRUE); + eclLongB = dms::fromString( fields[i], true); i++; } else - eclLongB = eclLongBoxBatch->createDms(TRUE); + eclLongB = eclLongBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << eclLongB.toDMSString() << space; @@ -292,7 +292,7 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read Ecliptic Latitude and write in ostream if corresponds if(eclLatCheckBatch->isChecked() ) { - eclLatB = dms::fromString( fields[i], TRUE); + eclLatB = dms::fromString( fields[i], true); i++; } else if ( allRadioBatch->isChecked() ) @@ -329,10 +329,10 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -343,7 +343,7 @@ void modCalcEclCoords::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalceclipticcoords.h b/kstars/kstars/tools/modcalceclipticcoords.h index b8a4cf65..c6c40277 100644 --- a/kstars/kstars/tools/modcalceclipticcoords.h +++ b/kstars/kstars/tools/modcalceclipticcoords.h @@ -33,7 +33,7 @@ class TQString; class modCalcEclCoords : public modCalcEclCoordsDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui index 1615a7c0..2908c5a8 100644 --- a/kstars/kstars/tools/modcalceclipticcoordsdlg.ui +++ b/kstars/kstars/tools/modcalceclipticcoordsdlg.ui @@ -891,7 +891,7 @@ <slot>slotOutputFile()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotComputeCoords()</slot> <slot>slotClearCoords()</slot> <slot>slotEclLatCheckedBatch()</slot> @@ -902,7 +902,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp index 50fbd979..3f72a1fe 100644 --- a/kstars/kstars/tools/modcalcequinox.cpp +++ b/kstars/kstars/tools/modcalcequinox.cpp @@ -44,7 +44,7 @@ modCalcEquinox::~modCalcEquinox(){ int modCalcEquinox::getYear (TQString eName) { - bool ok = FALSE; + bool ok = false; int equinoxYear = eName.toInt(&ok); if ( ok ) return equinoxYear; @@ -212,10 +212,10 @@ void modCalcEquinox::processLines( TQTextStream &istream ) { KStarsDateTime dta( jdau ); KStarsDateTime dtw( jdwin ); - ostream << dts.toString(Qt::ISODate) << space << (float)(jdsu - jdsp) << space - << dtu.toString(Qt::ISODate) << space << (float)(jdau - jdsu) << space - << dta.toString(Qt::ISODate) << space << (float)(jdwin - jdau) << space - << dtw.toString(Qt::ISODate) << space << (float)(jdsp1 - jdwin) << endl; + ostream << dts.toString(TQt::ISODate) << space << (float)(jdsu - jdsp) << space + << dtu.toString(TQt::ISODate) << space << (float)(jdau - jdsu) << space + << dta.toString(TQt::ISODate) << space << (float)(jdwin - jdau) << space + << dtw.toString(TQt::ISODate) << space << (float)(jdsp1 - jdwin) << endl; } diff --git a/kstars/kstars/tools/modcalcequinox.h b/kstars/kstars/tools/modcalcequinox.h index 03fdf30d..35220ed1 100644 --- a/kstars/kstars/tools/modcalcequinox.h +++ b/kstars/kstars/tools/modcalcequinox.h @@ -31,7 +31,7 @@ class TQTextStream; class modCalcEquinox : public modCalcEquinoxDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcequinoxdlg.ui b/kstars/kstars/tools/modcalcequinoxdlg.ui index 4924f7bd..bac4f242 100644 --- a/kstars/kstars/tools/modcalcequinoxdlg.ui +++ b/kstars/kstars/tools/modcalcequinoxdlg.ui @@ -559,12 +559,12 @@ <slot>slotRunBatch()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotComputeEquinoxesAndSolstices()</slot> <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcgalcoord.cpp b/kstars/kstars/tools/modcalcgalcoord.cpp index 8c555b68..6ed71bb3 100644 --- a/kstars/kstars/tools/modcalcgalcoord.cpp +++ b/kstars/kstars/tools/modcalcgalcoord.cpp @@ -36,8 +36,8 @@ modCalcGalCoord::modCalcGalCoord(TQWidget *parentSplit, const char *name) : modCalcGalCoordDlg(parentSplit,name) { - equRadio->setChecked(TRUE); - raBox->setDegType(FALSE); + equRadio->setChecked(true); + raBox->setDegType(false); show(); } @@ -53,7 +53,7 @@ void modCalcGalCoord::getGalCoords (void) { void modCalcGalCoord::getEquCoords (void) { - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); epoch = getEpoch( epochName->text() ); } @@ -91,7 +91,7 @@ void modCalcGalCoord::slotComputeCoords (void) { } void modCalcGalCoord::showEquCoords(void) { - raBox->show( raCoord , FALSE); + raBox->show( raCoord , false); decBox->show( decCoord ); } @@ -135,7 +135,7 @@ void modCalcGalCoord::galCheck() { galLatBoxBatch->setEnabled(false); galLongCheckBatch->setChecked(false); galLongBoxBatch->setEnabled(false); - galInputCoords = FALSE; + galInputCoords = false; } @@ -146,7 +146,7 @@ void modCalcGalCoord::equCheck() { decCheckBatch->setChecked(false); decBoxBatch->setEnabled(false); epochCheckBatch->setChecked(false); - galInputCoords = TRUE; + galInputCoords = true; } @@ -281,10 +281,10 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read Galactic Longitude and write in ostream if corresponds if(galLongCheckBatch->isChecked() ) { - galLongB = dms::fromString( fields[i], TRUE); + galLongB = dms::fromString( fields[i], true); i++; } else - galLongB = galLongBoxBatch->createDms(TRUE); + galLongB = galLongBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << galLongB.toDMSString() << space; @@ -295,10 +295,10 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read Galactic Latitude and write in ostream if corresponds if(galLatCheckBatch->isChecked() ) { - galLatB = dms::fromString( fields[i], TRUE); + galLatB = dms::fromString( fields[i], true); i++; } else - galLatB = galLatBoxBatch->createDms(TRUE); + galLatB = galLatBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << galLatB.toDMSString() << space; @@ -316,10 +316,10 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -330,7 +330,7 @@ void modCalcGalCoord::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcgalcoord.h b/kstars/kstars/tools/modcalcgalcoord.h index 93793d83..2dad8602 100644 --- a/kstars/kstars/tools/modcalcgalcoord.h +++ b/kstars/kstars/tools/modcalcgalcoord.h @@ -32,7 +32,7 @@ class modCalcGalCoord : public modCalcGalCoordDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcgalcoorddlg.ui b/kstars/kstars/tools/modcalcgalcoorddlg.ui index 3486d18a..60cda815 100644 --- a/kstars/kstars/tools/modcalcgalcoorddlg.ui +++ b/kstars/kstars/tools/modcalcgalcoorddlg.ui @@ -902,7 +902,7 @@ <tabstop>OutButtonBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeCoords()</slot> <slot>slotClearCoords()</slot> <slot>slotInputFile()</slot> @@ -913,7 +913,7 @@ <slot>slotGalLatCheckedBatch()</slot> <slot>slotGalLongCheckedBatch()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp index fb54a23b..c9dd1e05 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.cpp +++ b/kstars/kstars/tools/modcalcgeodcoord.cpp @@ -42,7 +42,7 @@ modCalcGeodCoord::modCalcGeodCoord(TQWidget *parentSplit, const char *name) : mo static const char *ellipsoidList[] = { "IAU76", "GRS80", "MERIT83", "WGS84", "IERS89"}; - spheRadio->setChecked(TRUE); + spheRadio->setChecked(true); ellipsoidBox->insertStrList (ellipsoidList,5); geoPlace = new GeoLocation(); showLongLat(); @@ -137,7 +137,7 @@ void modCalcGeodCoord::geoCheck(void) { yCheckBatch->setChecked( false ); zBoxBatch->setEnabled( false ); zCheckBatch->setChecked( false ); - xyzInputCoords = FALSE; + xyzInputCoords = false; } void modCalcGeodCoord::xyzCheck(void) { @@ -148,7 +148,7 @@ void modCalcGeodCoord::xyzCheck(void) { latCheckBatch->setChecked( false ); elevBoxBatch->setEnabled( false ); elevCheckBatch->setChecked( false ); - xyzInputCoords = TRUE; + xyzInputCoords = true; } @@ -346,10 +346,10 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if(longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; @@ -360,10 +360,10 @@ void modCalcGeodCoord::processLines( TQTextStream &istream ) { // Read Latitude and write in ostream if corresponds if(latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << latB.toDMSString() << space; diff --git a/kstars/kstars/tools/modcalcgeodcoord.h b/kstars/kstars/tools/modcalcgeodcoord.h index b8bd7927..93b4a416 100644 --- a/kstars/kstars/tools/modcalcgeodcoord.h +++ b/kstars/kstars/tools/modcalcgeodcoord.h @@ -37,7 +37,7 @@ class GeoLocation; class modCalcGeodCoord : public modCalcGeodCoordDlg { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcgeoddlg.ui b/kstars/kstars/tools/modcalcgeoddlg.ui index c4b294fe..387408cd 100644 --- a/kstars/kstars/tools/modcalcgeoddlg.ui +++ b/kstars/kstars/tools/modcalcgeoddlg.ui @@ -787,7 +787,7 @@ <tabstop>OutputLineEditBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeGeoCoords()</slot> <slot>slotClearGeoCoords()</slot> <slot>slotInputFile()</slot> @@ -799,7 +799,7 @@ <slot>slotXCheckedBatch()</slot> <slot>slotYCheckedBatch()</slot> <slot>slotZCheckedBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcjd.h b/kstars/kstars/tools/modcalcjd.h index 3fb80ccb..5522d784 100644 --- a/kstars/kstars/tools/modcalcjd.h +++ b/kstars/kstars/tools/modcalcjd.h @@ -38,7 +38,7 @@ class KStarsDateTime; class modCalcJD : public modCalcJdDlg { -Q_OBJECT +TQ_OBJECT public: modCalcJD(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcjddlg.ui b/kstars/kstars/tools/modcalcjddlg.ui index 9db090eb..bf9ddf3f 100644 --- a/kstars/kstars/tools/modcalcjddlg.ui +++ b/kstars/kstars/tools/modcalcjddlg.ui @@ -494,11 +494,11 @@ <slot>slotComputeTime()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotClearTime()</slot> <slot>slotComputeTime()</slot> <slot>showCurrentTime()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp index e1c8b070..474fda8a 100644 --- a/kstars/kstars/tools/modcalcplanets.cpp +++ b/kstars/kstars/tools/modcalcplanets.cpp @@ -41,7 +41,7 @@ modCalcPlanets::modCalcPlanets(TQWidget *parentSplit, const char *name) : modCalcPlanetsDlg (parentSplit,name) { showCurrentDateTime(); showLongLat(); - raBox->setDegType(FALSE); + raBox->setDegType(false); show(); } @@ -232,7 +232,7 @@ void modCalcPlanets::showGeocentricEclipticCoords(const dms *eLong, const dms *e void modCalcPlanets::showEquatorialCoords(const dms *ra, const dms *dec) { - raBox->show( ra, FALSE ); + raBox->show( ra, false ); decBox->show( dec ); } @@ -459,7 +459,7 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { // Read date and write in ostream if corresponds if(dateCheckBatch->isChecked() ) { - dtB = ExtDate::fromString( fields[i], Qt::ISODate ); + dtB = ExtDate::fromString( fields[i], TQt::ISODate ); if ( !dtB.isValid() ) { kdWarning() << i18n( "Line %1 contains an invalid date: " ).arg(nline) << fields[i] << endl ; @@ -479,10 +479,10 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) lineToWrite += longB.toDMSString() + space; @@ -493,10 +493,10 @@ void modCalcPlanets::processLines( TQTextStream &istream ) { // Read Latitude if (latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) lineToWrite += latB.toDMSString() + space; else diff --git a/kstars/kstars/tools/modcalcplanets.h b/kstars/kstars/tools/modcalcplanets.h index 0eaf8776..8b3621b8 100644 --- a/kstars/kstars/tools/modcalcplanets.h +++ b/kstars/kstars/tools/modcalcplanets.h @@ -37,7 +37,7 @@ class KSPluto; class modCalcPlanets : public modCalcPlanetsDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcplanetsdlg.ui b/kstars/kstars/tools/modcalcplanetsdlg.ui index 9b9f6099..04a878dc 100644 --- a/kstars/kstars/tools/modcalcplanetsdlg.ui +++ b/kstars/kstars/tools/modcalcplanetsdlg.ui @@ -1358,7 +1358,7 @@ <tabstop>OutButtonBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputePosition()</slot> <slot>slotClear()</slot> <slot>slotInputFile()</slot> @@ -1369,7 +1369,7 @@ <slot>slotLatCheckedBatch()</slot> <slot>slotRunBatch()</slot> <slot>slotPlanetsCheckedBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp index d489f1b0..efa7de5c 100644 --- a/kstars/kstars/tools/modcalcprec.cpp +++ b/kstars/kstars/tools/modcalcprec.cpp @@ -33,8 +33,8 @@ modCalcPrec::modCalcPrec(TQWidget *parentSplit, const char *name) : modCalcPrecDlg(parentSplit,name) { - ra0Box->setDegType(FALSE); - rafBox->setDegType(FALSE); + ra0Box->setDegType(false); + rafBox->setDegType(false); show(); } @@ -46,7 +46,7 @@ modCalcPrec::~modCalcPrec(){ SkyPoint modCalcPrec::getEquCoords (void) { dms raCoord, decCoord; - raCoord = ra0Box->createDms(FALSE); + raCoord = ra0Box->createDms(false); decCoord = dec0Box->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -111,7 +111,7 @@ void modCalcPrec::slotComputeCoords (void) { } void modCalcPrec::showEquCoords ( SkyPoint sp ) { - rafBox->show( sp.ra(),FALSE ); + rafBox->show( sp.ra(),false ); decfBox->show( sp.dec() ); } @@ -229,10 +229,10 @@ void modCalcPrec::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -243,7 +243,7 @@ void modCalcPrec::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); diff --git a/kstars/kstars/tools/modcalcprec.h b/kstars/kstars/tools/modcalcprec.h index 7447871a..21a42c24 100644 --- a/kstars/kstars/tools/modcalcprec.h +++ b/kstars/kstars/tools/modcalcprec.h @@ -37,7 +37,7 @@ class SkyPoint; class modCalcPrec : public modCalcPrecDlg { -Q_OBJECT +TQ_OBJECT public: modCalcPrec(TQWidget *p, const char *n); diff --git a/kstars/kstars/tools/modcalcprecdlg.ui b/kstars/kstars/tools/modcalcprecdlg.ui index 0c749118..19e8a394 100644 --- a/kstars/kstars/tools/modcalcprecdlg.ui +++ b/kstars/kstars/tools/modcalcprecdlg.ui @@ -729,7 +729,7 @@ <tabstop>OutputLineEditBatch</tabstop> <tabstop>runButtonBatch_2</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeCoords()</slot> <slot>slotClearCoords()</slot> <slot>slotRaCheckedBatch()</slot> @@ -741,7 +741,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp index 8d38f257..aa7ad586 100644 --- a/kstars/kstars/tools/modcalcsidtime.cpp +++ b/kstars/kstars/tools/modcalcsidtime.cpp @@ -158,14 +158,14 @@ void modCalcSidTime::slotLongChecked(){ void modCalcSidTime::sidNoCheck() { stBoxBatch->setEnabled(false); - stInputTime = FALSE; + stInputTime = false; } void modCalcSidTime::utNoCheck() { utBoxBatch->setEnabled(false); - stInputTime = TRUE; + stInputTime = true; } void modCalcSidTime::slotInputFile() { @@ -245,10 +245,10 @@ void modCalcSidTime::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; diff --git a/kstars/kstars/tools/modcalcsidtime.h b/kstars/kstars/tools/modcalcsidtime.h index 83740efa..e0b4b356 100644 --- a/kstars/kstars/tools/modcalcsidtime.h +++ b/kstars/kstars/tools/modcalcsidtime.h @@ -36,7 +36,7 @@ class ExtDate; class modCalcSidTime : public modCalcSidTimeDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcsidtimedlg.ui b/kstars/kstars/tools/modcalcsidtimedlg.ui index 7469390a..b4e4706b 100644 --- a/kstars/kstars/tools/modcalcsidtimedlg.ui +++ b/kstars/kstars/tools/modcalcsidtimedlg.ui @@ -849,7 +849,7 @@ <tabstop>OutButtonBatch</tabstop> <tabstop>runButtonBatch</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeTime()</slot> <slot>slotClearFields()</slot> <slot>slotLongChecked()</slot> @@ -859,7 +859,7 @@ <slot>slotRunBatch()</slot> <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp index ffe6ed29..d69a143a 100644 --- a/kstars/kstars/tools/modcalcvlsr.cpp +++ b/kstars/kstars/tools/modcalcvlsr.cpp @@ -42,7 +42,7 @@ modCalcVlsr::modCalcVlsr(TQWidget *parentSplit, const char *name) : modCalcVlsrD showCurrentDateTime(); initGeo(); showLongLat(); - raBox->setDegType(FALSE); + raBox->setDegType(false); show(); } @@ -54,7 +54,7 @@ SkyPoint modCalcVlsr::getEquCoords (void) { dms raCoord, decCoord; - raCoord = raBox->createDms(FALSE); + raCoord = raBox->createDms(false); decCoord = decBox->createDms(); SkyPoint sp = SkyPoint (raCoord, decCoord); @@ -457,10 +457,10 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { // Read RA and write in ostream if corresponds if(raCheckBatch->isChecked() ) { - raB = dms::fromString( fields[i],FALSE); + raB = dms::fromString( fields[i],false); i++; } else - raB = raBoxBatch->createDms(FALSE); + raB = raBoxBatch->createDms(false); if ( allRadioBatch->isChecked() ) ostream << raB.toHMSString() << space; @@ -471,7 +471,7 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { // Read DEC and write in ostream if corresponds if(decCheckBatch->isChecked() ) { - decB = dms::fromString( fields[i], TRUE); + decB = dms::fromString( fields[i], true); i++; } else decB = decBoxBatch->createDms(); @@ -513,10 +513,10 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { // Read Longitude and write in ostream if corresponds if (longCheckBatch->isChecked() ) { - longB = dms::fromString( fields[i],TRUE); + longB = dms::fromString( fields[i],true); i++; } else - longB = longBoxBatch->createDms(TRUE); + longB = longBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << longB.toDMSString() << space; @@ -528,10 +528,10 @@ void modCalcVlsr::processLines( TQTextStream &istream ) { if (latCheckBatch->isChecked() ) { - latB = dms::fromString( fields[i], TRUE); + latB = dms::fromString( fields[i], true); i++; } else - latB = latBoxBatch->createDms(TRUE); + latB = latBoxBatch->createDms(true); if ( allRadioBatch->isChecked() ) ostream << latB.toDMSString() << space; else diff --git a/kstars/kstars/tools/modcalcvlsr.h b/kstars/kstars/tools/modcalcvlsr.h index 182fc690..de6d739a 100644 --- a/kstars/kstars/tools/modcalcvlsr.h +++ b/kstars/kstars/tools/modcalcvlsr.h @@ -37,7 +37,7 @@ class dms; class modCalcVlsr : public modCalcVlsrDlg { -Q_OBJECT +TQ_OBJECT public: diff --git a/kstars/kstars/tools/modcalcvlsrdlg.ui b/kstars/kstars/tools/modcalcvlsrdlg.ui index d223ca0a..6eccbb84 100644 --- a/kstars/kstars/tools/modcalcvlsrdlg.ui +++ b/kstars/kstars/tools/modcalcvlsrdlg.ui @@ -1171,7 +1171,7 @@ <tabstop>runButtonBatch</tabstop> <tabstop>kTextBrowser1</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotComputeVelocities()</slot> <slot>slotClearCoords()</slot> <slot>slotUtChecked()</slot> @@ -1186,7 +1186,7 @@ <slot>slotInputFile()</slot> <slot>slotOutputFile()</slot> <slot>slotRunBatch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp index e67f933c..5aae1f0c 100644 --- a/kstars/kstars/tools/observinglist.cpp +++ b/kstars/kstars/tools/observinglist.cpp @@ -67,40 +67,40 @@ ObservingList::ObservingList( KStars *_ks, TQWidget* parent ) ui->MiniButton->hide(); //Connections - connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotClose() ) ); - connect( ui->TableStack, TQT_SIGNAL( aboutToShow( TQWidget* ) ), - this, TQT_SLOT( slotPrepTable( TQWidget* ) ) ); - connect( ui->FullTable, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotNewSelection() ) ); - connect( ui->TinyTable, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotNewSelection() ) ); - connect( ui->FullTable, TQT_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int) ), - this, TQT_SLOT( slotCenterObject() ) ); - connect( ui->TinyTable, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - this, TQT_SLOT( slotCenterObject() ) ); - connect( ui->RemoveButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotRemoveObjects() ) ); - connect( ui->CenterButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotCenterObject() ) ); - connect( ui->ScopeButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSlewToObject() ) ); - connect( ui->DetailsButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDetails() ) ); - connect( ui->AVTButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAVT() ) ); - - connect( ui->OpenButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotOpenList() ) ); - connect( ui->SaveButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSaveList() ) ); - connect( ui->SaveAsButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSaveListAs() ) ); - connect( ui->WizardButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotWizard() ) ); + connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotClose() ) ); + connect( ui->TableStack, TQ_SIGNAL( aboutToShow( TQWidget* ) ), + this, TQ_SLOT( slotPrepTable( TQWidget* ) ) ); + connect( ui->FullTable, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotNewSelection() ) ); + connect( ui->TinyTable, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotNewSelection() ) ); + connect( ui->FullTable, TQ_SIGNAL( doubleClicked( TQListViewItem*, const TQPoint&, int) ), + this, TQ_SLOT( slotCenterObject() ) ); + connect( ui->TinyTable, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + this, TQ_SLOT( slotCenterObject() ) ); + connect( ui->RemoveButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotRemoveObjects() ) ); + connect( ui->CenterButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotCenterObject() ) ); + connect( ui->ScopeButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSlewToObject() ) ); + connect( ui->DetailsButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDetails() ) ); + connect( ui->AVTButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotAVT() ) ); + + connect( ui->OpenButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotOpenList() ) ); + connect( ui->SaveButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSaveList() ) ); + connect( ui->SaveAsButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSaveListAs() ) ); + connect( ui->WizardButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotWizard() ) ); //FIXME: enable MiniButton -// connect( ui->MiniButton, TQT_SIGNAL( clicked() ), -// this, TQT_SLOT( slotToggleSize() ) ); +// connect( ui->MiniButton, TQ_SIGNAL( clicked() ), +// this, TQ_SLOT( slotToggleSize() ) ); obsList.setAutoDelete( false ); //do NOT delete removed pointers! diff --git a/kstars/kstars/tools/observinglist.h b/kstars/kstars/tools/observinglist.h index 62f5d27e..719c4850 100644 --- a/kstars/kstars/tools/observinglist.h +++ b/kstars/kstars/tools/observinglist.h @@ -57,7 +57,7 @@ class TQStringList; class ObservingList : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui index 583a6ea6..6d00cabd 100644 --- a/kstars/kstars/tools/observinglistui.ui +++ b/kstars/kstars/tools/observinglistui.ui @@ -261,9 +261,6 @@ <property name="text"> <string>Scope</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Point telescope at highlighted object</string> </property> @@ -286,9 +283,6 @@ <property name="text"> <string>Details</string> </property> - <property name="accel"> - <string></string> - </property> <property name="toolTip" stdset="0"> <string>Show details for highlighted object</string> </property> diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp index cf6c64d1..13864ece 100644 --- a/kstars/kstars/tools/obslistwizard.cpp +++ b/kstars/kstars/tools/obslistwizard.cpp @@ -44,35 +44,35 @@ ObsListWizard::ObsListWizard( TQWidget *parent, const char *name ) olw = new ObsListWizardUI( page ); vlay->addWidget( olw ); - connect( olw->AllButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAllButton() ) ); - connect( olw->NoneButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNoneButton() ) ); - connect( olw->DeepSkyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDeepSkyButton() ) ); - connect( olw->SolarSystemButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSolarSystemButton() ) ); - connect( olw->LocationButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChangeLocation() ) ); + connect( olw->AllButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAllButton() ) ); + connect( olw->NoneButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNoneButton() ) ); + connect( olw->DeepSkyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeepSkyButton() ) ); + connect( olw->SolarSystemButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSolarSystemButton() ) ); + connect( olw->LocationButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChangeLocation() ) ); - connect( olw->FilterList, TQT_SIGNAL( clicked(TQListViewItem*) ), this, TQT_SLOT( slotShowStackWidget(TQListViewItem*) ) ); + connect( olw->FilterList, TQ_SIGNAL( clicked(TQListViewItem*) ), this, TQ_SLOT( slotShowStackWidget(TQListViewItem*) ) ); //Update the selected observing list when certain UI elements are modified - connect( olw->TypeList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->ConstellationList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->RAMin, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->RAMax, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->DecMin, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->DecMax, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->RA, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->Dec, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->Radius, TQT_SIGNAL( valueChanged(double) ), this, TQT_SLOT( slotUpdateObjectCount() ) ); -// connect( olw->Date, TQT_SIGNAL( valueChanged( const ExtDate& ) ), this, TQT_SLOT( slotApplyFilters() ) ); - connect( olw->Mag, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - connect( olw->ExcludeNoMag, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpdateObjectCount() ) ); - - connect( olw->SelectByConstellation, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableConstellationPage(bool) ) ); - connect( olw->SelectByRect, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableRectPage(bool) ) ); - connect( olw->SelectByCirc, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableCircPage(bool) ) ); -// connect( olw->SelectByDate, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableDatePage(bool) ) ); - connect( olw->SelectByMag, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotEnableMagPage(bool) ) ); - - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotApplyFilters() ) ); + connect( olw->TypeList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->ConstellationList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->RAMin, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->RAMax, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->DecMin, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->DecMax, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->RA, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->Dec, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->Radius, TQ_SIGNAL( valueChanged(double) ), this, TQ_SLOT( slotUpdateObjectCount() ) ); +// connect( olw->Date, TQ_SIGNAL( valueChanged( const ExtDate& ) ), this, TQ_SLOT( slotApplyFilters() ) ); + connect( olw->Mag, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + connect( olw->ExcludeNoMag, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpdateObjectCount() ) ); + + connect( olw->SelectByConstellation, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableConstellationPage(bool) ) ); + connect( olw->SelectByRect, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableRectPage(bool) ) ); + connect( olw->SelectByCirc, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableCircPage(bool) ) ); +// connect( olw->SelectByDate, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableDatePage(bool) ) ); + connect( olw->SelectByMag, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotEnableMagPage(bool) ) ); + + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotApplyFilters() ) ); initialize(); } diff --git a/kstars/kstars/tools/obslistwizard.h b/kstars/kstars/tools/obslistwizard.h index c4552f2c..ca6ca609 100644 --- a/kstars/kstars/tools/obslistwizard.h +++ b/kstars/kstars/tools/obslistwizard.h @@ -30,7 +30,7 @@ class TQListViewItem; class ObsListWizard : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: /**@short Constructor diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui index 7c6b2938..d1123754 100644 --- a/kstars/kstars/tools/obslistwizardui.ui +++ b/kstars/kstars/tools/obslistwizardui.ui @@ -336,9 +336,6 @@ <property name="text"> <string>Select objects in region:</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> @@ -523,9 +520,6 @@ <property name="text"> <string>Select objects within circle:</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp index a3f00266..178a0722 100644 --- a/kstars/kstars/tools/planetviewer.cpp +++ b/kstars/kstars/tools/planetviewer.cpp @@ -86,13 +86,13 @@ PlanetViewer::PlanetViewer(TQWidget *parent, const char *name) UpdateInterval[7] = 75; UpdateInterval[8] = 113; - TQTimer::singleShot( 0, this, TQT_SLOT( initPlotObjects() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( initPlotObjects() ) ); - connect( &tmr, TQT_SIGNAL( timeout() ), TQT_SLOT( tick() ) ); - connect( pw->timeStep, TQT_SIGNAL( scaleChanged(float) ), TQT_SLOT( setTimeScale(float) ) ); - connect( pw->RunButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRunClock() ) ); - connect( pw->dateBox, TQT_SIGNAL( valueChanged( const ExtDate & ) ), TQT_SLOT( slotChangeDate( const ExtDate & ) ) ); - connect( pw->TodayButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotToday() ) ); + connect( &tmr, TQ_SIGNAL( timeout() ), TQ_SLOT( tick() ) ); + connect( pw->timeStep, TQ_SIGNAL( scaleChanged(float) ), TQ_SLOT( setTimeScale(float) ) ); + connect( pw->RunButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRunClock() ) ); + connect( pw->dateBox, TQ_SIGNAL( valueChanged( const ExtDate & ) ), TQ_SLOT( slotChangeDate( const ExtDate & ) ) ); + connect( pw->TodayButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotToday() ) ); } PlanetViewer::~PlanetViewer() @@ -231,7 +231,7 @@ void PlanetViewer::keyPressEvent( TQKeyEvent *e ) { PVPlotWidget::PVPlotWidget( double x1, double x2, double y1, double y2, TQWidget *par, const char *name ) : KStarsPlotWidget( x1, x2, y1, y2, par, name ), mouseButtonDown(false), oldx(0), oldy(0) { - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setMouseTracking (true); pv = (PlanetViewer*)topLevelWidget(); } @@ -239,7 +239,7 @@ PVPlotWidget::PVPlotWidget( double x1, double x2, double y1, double y2, TQWidget PVPlotWidget::PVPlotWidget( TQWidget *parent, const char *name ) : KStarsPlotWidget( 0.0, 1.0, 0.0, 1.0, parent, name ), mouseButtonDown(false), oldx(0), oldy(0) { - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setMouseTracking (true); pv = (PlanetViewer*)topLevelWidget(); } @@ -416,7 +416,7 @@ void PVPlotWidget::mouseMoveEvent( TQMouseEvent *e ) { setLimits( xc - 0.5*dataWidth(), xc + 0.5*dataWidth(), yc - 0.5*dataHeight(), yc + 0.5*dataHeight() ); update(); - kapp->processEvents(20); + tdeApp->processEvents(20); } oldx = e->x(); diff --git a/kstars/kstars/tools/planetviewer.h b/kstars/kstars/tools/planetviewer.h index a4be70f8..315621e0 100644 --- a/kstars/kstars/tools/planetviewer.h +++ b/kstars/kstars/tools/planetviewer.h @@ -33,7 +33,7 @@ */ class PlanetViewer : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: PlanetViewer(TQWidget *parent = 0, const char *name = 0); @@ -77,7 +77,7 @@ private: class PVPlotWidget : public KStarsPlotWidget { -Q_OBJECT +TQ_OBJECT public: PVPlotWidget( double x1, double x2, double y1, double y2, diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp index b9f480f7..df3cfff1 100644 --- a/kstars/kstars/tools/scriptbuilder.cpp +++ b/kstars/kstars/tools/scriptbuilder.cpp @@ -28,14 +28,14 @@ #include <tdeio/netaccess.h> #include <tdelistbox.h> #include <tdelistview.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <ktextedit.h> #include <tdetempfile.h> #include <kdatewidget.h> #include <tdemessagebox.h> #include <tdefiledialog.h> #include <kstdguiitem.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kurlrequester.h> #include <knuminput.h> @@ -112,13 +112,13 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) sb = new ScriptBuilderUI( page ); vlay->addWidget( sb ); - KStarsFunctionList.setAutoDelete( TRUE ); - INDIFunctionList.setAutoDelete( TRUE); - ScriptList.setAutoDelete( TRUE ); + KStarsFunctionList.setAutoDelete( true ); + INDIFunctionList.setAutoDelete( true); + ScriptList.setAutoDelete( true ); //Initialize function templates and descriptions KStarsFunctionList.append( new ScriptFunction( "lookTowards", i18n( "Point the display at the specified location. %1 can be the name of an object, a cardinal point on the compass, or 'zenith'." ), - false, TQSTRING_OBJECT_NAME_STRING, "dir" ) ); + false, "TQString", "dir" ) ); KStarsFunctionList.append( new ScriptFunction( "setRaDec", i18n( "Point the display at the specified RA/Dec coordinates. %1 is expressed in Hours; %2 is expressed in Degrees." ), false, "double", "ra", "double", "dec" ) ); KStarsFunctionList.append( new ScriptFunction( "setAltAz", i18n( "Point the display at the specified Alt/Az coordinates. %1 and %2 are expressed in Degrees." ), @@ -131,14 +131,14 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) false, "int", "year", "int", "month", "int", "day", "int", "hour", "int", "minute", "int", "second" ) ); KStarsFunctionList.append( new ScriptFunction( "waitFor", i18n( "Pause script execution for %1 seconds." ), false, "double", "sec" ) ); KStarsFunctionList.append( new ScriptFunction( "waitForKey", i18n( "Halt script execution until the key %1 is pressed. Only single-key strokes are possible; use 'space' for the spacebar." ), - false, TQSTRING_OBJECT_NAME_STRING, "key" ) ); + false, "TQString", "key" ) ); KStarsFunctionList.append( new ScriptFunction( "setTracking", i18n( "Set whether the display is tracking the current location." ), false, "bool", "track" ) ); - KStarsFunctionList.append( new ScriptFunction( "changeViewOption", i18n( "Change view option named %1 to value %2." ), false, TQSTRING_OBJECT_NAME_STRING, "opName", TQSTRING_OBJECT_NAME_STRING, "opValue" ) ); + KStarsFunctionList.append( new ScriptFunction( "changeViewOption", i18n( "Change view option named %1 to value %2." ), false, "TQString", "opName", "TQString", "opValue" ) ); KStarsFunctionList.append( new ScriptFunction( "setGeoLocation", i18n( "Set the geographic location to the city specified by %1, %2 and %3." ), - false, TQSTRING_OBJECT_NAME_STRING, "cityName", TQSTRING_OBJECT_NAME_STRING, "provinceName", TQSTRING_OBJECT_NAME_STRING, "countryName" ) ); - KStarsFunctionList.append( new ScriptFunction( "setColor", i18n( "Set the color named %1 to the value %2." ), false, TQSTRING_OBJECT_NAME_STRING, "colorName", TQSTRING_OBJECT_NAME_STRING, "value" ) ); - KStarsFunctionList.append( new ScriptFunction( "loadColorScheme", i18n( "Load the color scheme named %1." ), false, TQSTRING_OBJECT_NAME_STRING, "name" ) ); - KStarsFunctionList.append( new ScriptFunction( "exportImage", i18n( "Export the sky image to the file %1, with width %2 and height %3." ), false, TQSTRING_OBJECT_NAME_STRING, "fileName", "int", "width", "int", "height" ) ); + false, "TQString", "cityName", "TQString", "provinceName", "TQString", "countryName" ) ); + KStarsFunctionList.append( new ScriptFunction( "setColor", i18n( "Set the color named %1 to the value %2." ), false, "TQString", "colorName", "TQString", "value" ) ); + KStarsFunctionList.append( new ScriptFunction( "loadColorScheme", i18n( "Load the color scheme named %1." ), false, "TQString", "name" ) ); + KStarsFunctionList.append( new ScriptFunction( "exportImage", i18n( "Export the sky image to the file %1, with width %2 and height %3." ), false, "TQString", "fileName", "int", "width", "int", "height" ) ); KStarsFunctionList.append( new ScriptFunction( "printImage", i18n( "Print the sky image to a printer or file. If %1 is true, it will show the print dialog. If %2 is true, it will use the Star Chart color scheme for printing." ), false, "bool", "usePrintDialog", "bool", "useChartColors" ) ); KStarsFunctionList.append( new ScriptFunction( "stop", i18n( "Halt the simulation clock." ), true ) ); KStarsFunctionList.append( new ScriptFunction( "start", i18n( "Start the simulation clock." ), true ) ); @@ -147,71 +147,71 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) // INDI fuctions ScriptFunction *startINDIFunc(NULL), *shutdownINDIFunc(NULL), *switchINDIFunc(NULL), *setINDIPortFunc(NULL), *setINDIScopeActionFunc(NULL), *setINDITargetCoordFunc(NULL), *setINDITargetNameFunc(NULL), *setINDIGeoLocationFunc(NULL), *setINDIUTCFunc(NULL), *setINDIActionFunc(NULL), *waitForINDIActionFunc(NULL), *setINDIFocusSpeedFunc(NULL), *startINDIFocusFunc(NULL), *setINDIFocusTimeoutFunc(NULL), *setINDICCDTempFunc(NULL), *setINDIFilterNumFunc(NULL), *setINDIFrameTypeFunc(NULL), *startINDIExposureFunc(NULL); - startINDIFunc = new ScriptFunction( "startINDI", i18n("Establish an INDI device either in local mode or server mode."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "bool", "useLocal"); + startINDIFunc = new ScriptFunction( "startINDI", i18n("Establish an INDI device either in local mode or server mode."), false, "TQString", "deviceName", "bool", "useLocal"); INDIFunctionList.append ( startINDIFunc ); - shutdownINDIFunc = new ScriptFunction( "shutdownINDI", i18n("Shutdown an INDI device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName"); + shutdownINDIFunc = new ScriptFunction( "shutdownINDI", i18n("Shutdown an INDI device."), false, "TQString", "deviceName"); INDIFunctionList.append ( shutdownINDIFunc); - switchINDIFunc = new ScriptFunction( "switchINDI", i18n("Connect or Disconnect an INDI device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "bool", "turnOn"); + switchINDIFunc = new ScriptFunction( "switchINDI", i18n("Connect or Disconnect an INDI device."), false, "TQString", "deviceName", "bool", "turnOn"); switchINDIFunc->setINDIProperty("CONNECTION"); INDIFunctionList.append ( switchINDIFunc); - setINDIPortFunc = new ScriptFunction( "setINDIPort", i18n("Set INDI's device connection port."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "port"); + setINDIPortFunc = new ScriptFunction( "setINDIPort", i18n("Set INDI's device connection port."), false, "TQString", "deviceName", "TQString", "port"); setINDIPortFunc->setINDIProperty("DEVICE_PORT"); INDIFunctionList.append ( setINDIPortFunc); - setINDIScopeActionFunc = new ScriptFunction( "setINDIScopeAction", i18n("Set the telescope action. Available actions are SLEW, TRACK, SYNC, PARK, and ABORT."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "action"); + setINDIScopeActionFunc = new ScriptFunction( "setINDIScopeAction", i18n("Set the telescope action. Available actions are SLEW, TRACK, SYNC, PARK, and ABORT."), false, "TQString", "deviceName", "TQString", "action"); setINDIScopeActionFunc->setINDIProperty("CHECK"); INDIFunctionList.append( setINDIScopeActionFunc); - setINDITargetCoordFunc = new ScriptFunction ( "setINDITargetCoord", i18n( "Set the telescope target coordinates to the RA/Dec coordinates. RA is expressed in Hours; DEC is expressed in Degrees." ), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "double", "RA", "double", "DEC" ); + setINDITargetCoordFunc = new ScriptFunction ( "setINDITargetCoord", i18n( "Set the telescope target coordinates to the RA/Dec coordinates. RA is expressed in Hours; DEC is expressed in Degrees." ), false, "TQString", "deviceName", "double", "RA", "double", "DEC" ); setINDITargetCoordFunc->setINDIProperty("EQUATORIAL_EOD_COORD"); INDIFunctionList.append ( setINDITargetCoordFunc ); - setINDITargetNameFunc = new ScriptFunction( "setINDITargetName", i18n("Set the telescope target coorinates to the RA/Dec coordinates of the selected object."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "objectName"); + setINDITargetNameFunc = new ScriptFunction( "setINDITargetName", i18n("Set the telescope target coorinates to the RA/Dec coordinates of the selected object."), false, "TQString", "deviceName", "TQString", "objectName"); setINDITargetNameFunc->setINDIProperty("EQUATORIAL_EOD_COORD"); INDIFunctionList.append( setINDITargetNameFunc); - setINDIGeoLocationFunc = new ScriptFunction ( "setINDIGeoLocation", i18n("Set the telescope longitude and latitude. The longitude is E of N."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "double", "long", "double", "lat"); + setINDIGeoLocationFunc = new ScriptFunction ( "setINDIGeoLocation", i18n("Set the telescope longitude and latitude. The longitude is E of N."), false, "TQString", "deviceName", "double", "long", "double", "lat"); setINDIGeoLocationFunc->setINDIProperty("GEOGRAPHIC_COORD"); INDIFunctionList.append( setINDIGeoLocationFunc); - setINDIUTCFunc = new ScriptFunction ( "setINDIUTC", i18n("Set the device UTC time in ISO 8601 format YYYY/MM/DDTHH:MM:SS."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "UTCDateTime"); + setINDIUTCFunc = new ScriptFunction ( "setINDIUTC", i18n("Set the device UTC time in ISO 8601 format YYYY/MM/DDTHH:MM:SS."), false, "TQString", "deviceName", "TQString", "UTCDateTime"); setINDIUTCFunc->setINDIProperty("TIME"); INDIFunctionList.append( setINDIUTCFunc); - setINDIActionFunc = new ScriptFunction( "setINDIAction", i18n("Activate an INDI action. The action is the name of any INDI switch property element supported by the device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "actionName"); + setINDIActionFunc = new ScriptFunction( "setINDIAction", i18n("Activate an INDI action. The action is the name of any INDI switch property element supported by the device."), false, "TQString", "deviceName", "TQString", "actionName"); INDIFunctionList.append( setINDIActionFunc); - waitForINDIActionFunc = new ScriptFunction ("waitForINDIAction", i18n("Pause script execution until action returns with OK status. The action can be the name of any INDI property supported by the device."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "actionName"); + waitForINDIActionFunc = new ScriptFunction ("waitForINDIAction", i18n("Pause script execution until action returns with OK status. The action can be the name of any INDI property supported by the device."), false, "TQString", "deviceName", "TQString", "actionName"); INDIFunctionList.append( waitForINDIActionFunc ); - setINDIFocusSpeedFunc = new ScriptFunction ("setINDIFocusSpeed", i18n("Set the telescope focuser speed. Set speed to 0 to halt the focuser. 1-3 correspond to slow, medium, and fast speeds respectively."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "unsigned int", "speed"); + setINDIFocusSpeedFunc = new ScriptFunction ("setINDIFocusSpeed", i18n("Set the telescope focuser speed. Set speed to 0 to halt the focuser. 1-3 correspond to slow, medium, and fast speeds respectively."), false, "TQString", "deviceName", "unsigned int", "speed"); setINDIFocusSpeedFunc->setINDIProperty("FOCUS_SPEED"); INDIFunctionList.append( setINDIFocusSpeedFunc ); - startINDIFocusFunc = new ScriptFunction ("startINDIFocus", i18n("Start moving the focuser in the direction Dir, and for the duration specified by setINDIFocusTimeout."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "Dir"); + startINDIFocusFunc = new ScriptFunction ("startINDIFocus", i18n("Start moving the focuser in the direction Dir, and for the duration specified by setINDIFocusTimeout."), false, "TQString", "deviceName", "TQString", "Dir"); startINDIFocusFunc->setINDIProperty("FOCUS_MOTION"); INDIFunctionList.append( startINDIFocusFunc); - setINDIFocusTimeoutFunc = new ScriptFunction ( "setINDIFocusTimeout", i18n("Set the telescope focuser timer in seconds. This is the duration of any focusing procedure performed by calling startINDIFocus."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "timeout"); + setINDIFocusTimeoutFunc = new ScriptFunction ( "setINDIFocusTimeout", i18n("Set the telescope focuser timer in seconds. This is the duration of any focusing procedure performed by calling startINDIFocus."), false, "TQString", "deviceName", "int", "timeout"); setINDIFocusTimeoutFunc->setINDIProperty("FOCUS_TIMER"); INDIFunctionList.append( setINDIFocusTimeoutFunc); - setINDICCDTempFunc = new ScriptFunction( "setINDICCDTemp", i18n("Set the target CCD chip temperature."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "temp"); + setINDICCDTempFunc = new ScriptFunction( "setINDICCDTemp", i18n("Set the target CCD chip temperature."), false, "TQString", "deviceName", "int", "temp"); setINDICCDTempFunc->setINDIProperty("CCD_TEMPERATURE"); INDIFunctionList.append( setINDICCDTempFunc); - setINDIFilterNumFunc = new ScriptFunction( "setINDIFilterNum", i18n("Set the target filter position."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "filter_num"); + setINDIFilterNumFunc = new ScriptFunction( "setINDIFilterNum", i18n("Set the target filter position."), false, "TQString", "deviceName", "int", "filter_num"); setINDIFilterNumFunc->setINDIProperty("FILTER_SLOT"); INDIFunctionList.append ( setINDIFilterNumFunc); - setINDIFrameTypeFunc = new ScriptFunction( "setINDIFrameType", i18n("Set the CCD camera frame type. Available options are FRAME_LIGHT, FRAME_BIAS, FRAME_DARK, and FRAME_FLAT."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", TQSTRING_OBJECT_NAME_STRING, "type"); + setINDIFrameTypeFunc = new ScriptFunction( "setINDIFrameType", i18n("Set the CCD camera frame type. Available options are FRAME_LIGHT, FRAME_BIAS, FRAME_DARK, and FRAME_FLAT."), false, "TQString", "deviceName", "TQString", "type"); setINDIFrameTypeFunc->setINDIProperty("FRAME_TYPE"); INDIFunctionList.append( setINDIFrameTypeFunc); - startINDIExposureFunc = new ScriptFunction ( "startINDIExposure", i18n("Start Camera/CCD exposure. The duration is in seconds."), false, TQSTRING_OBJECT_NAME_STRING, "deviceName", "int", "timeout"); + startINDIExposureFunc = new ScriptFunction ( "startINDIExposure", i18n("Start Camera/CCD exposure. The duration is in seconds."), false, "TQString", "deviceName", "int", "timeout"); startINDIExposureFunc->setINDIProperty("CCD_EXPOSE_DURATION"); INDIFunctionList.append( startINDIExposureFunc); @@ -371,129 +371,129 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name ) initViewOptions(); //connect widgets in ScriptBuilderUI - connect( sb->FunctionListView, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT( slotAddFunction() ) ); - connect( sb->FunctionListView, TQT_SIGNAL( currentChanged(TQListViewItem*) ), this, TQT_SLOT( slotShowDoc() ) ); - connect( sb->UpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveFunctionUp() ) ); - connect( sb->ScriptListBox, TQT_SIGNAL( currentChanged(TQListBoxItem*) ), this, TQT_SLOT( slotArgWidget() ) ); - connect( sb->DownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveFunctionDown() ) ); - connect( sb->CopyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopyFunction() ) ); - connect( sb->RemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveFunction() ) ); - connect( sb->NewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNew() ) ); - connect( sb->OpenButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpen() ) ); - connect( sb->SaveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSave() ) ); - connect( sb->SaveAsButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveAs() ) ); - connect( sb->AddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddFunction() ) ); - connect( sb->RunButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRunScript() ) ); + connect( sb->FunctionListView, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT( slotAddFunction() ) ); + connect( sb->FunctionListView, TQ_SIGNAL( currentChanged(TQListViewItem*) ), this, TQ_SLOT( slotShowDoc() ) ); + connect( sb->UpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveFunctionUp() ) ); + connect( sb->ScriptListBox, TQ_SIGNAL( currentChanged(TQListBoxItem*) ), this, TQ_SLOT( slotArgWidget() ) ); + connect( sb->DownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveFunctionDown() ) ); + connect( sb->CopyButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopyFunction() ) ); + connect( sb->RemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveFunction() ) ); + connect( sb->NewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNew() ) ); + connect( sb->OpenButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpen() ) ); + connect( sb->SaveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSave() ) ); + connect( sb->SaveAsButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSaveAs() ) ); + connect( sb->AddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddFunction() ) ); + connect( sb->RunButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRunScript() ) ); //Connections for Arg Widgets - connect( argSetGeoLocation->FindCityButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotFindCity() ) ); - connect( argLookToward->FindButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotFindObject() ) ); - connect( argChangeViewOption->TreeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowOptions() ) ); - - connect( argLookToward->FocusEdit, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotLookToward() ) ); - connect( argSetRaDec->RaBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotRa() ) ); - connect( argSetRaDec->DecBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotDec() ) ); - connect( argSetAltAz->AltBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotAlt() ) ); - connect( argSetAltAz->AzBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotAz() ) ); - connect( argSetLocalTime->DateBox, TQT_SIGNAL( changed(ExtDate) ), this, TQT_SLOT( slotChangeDate() ) ); - connect( argSetLocalTime->TimeBox, TQT_SIGNAL( valueChanged(const TQTime&) ), this, TQT_SLOT( slotChangeTime() ) ); - connect( argWaitFor->DelayBox, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotWaitFor() ) ); - connect( argWaitForKey->WaitKeyEdit, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotWaitForKey() ) ); - connect( argSetTracking->CheckTrack, TQT_SIGNAL( stateChanged(int) ), this, TQT_SLOT( slotTracking() ) ); - connect( argChangeViewOption->OptionName, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT( slotViewOption() ) ); - connect( argChangeViewOption->OptionValue, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotViewOption() ) ); - connect( argSetGeoLocation->CityName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotChangeCity() ) ); - connect( argSetGeoLocation->ProvinceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotChangeProvince() ) ); - connect( argSetGeoLocation->CountryName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotChangeCountry() ) ); - connect( argTimeScale->TimeScale, TQT_SIGNAL( scaleChanged(float) ), this, TQT_SLOT( slotTimeScale() ) ); - connect( argZoom->ZoomBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotZoom() ) ); - connect( argExportImage->ExportFileName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotExportImage() ) ); - connect( argExportImage->ExportWidth, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotExportImage() ) ); - connect( argExportImage->ExportHeight, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotExportImage() ) ); - connect( argPrintImage->UsePrintDialog, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotPrintImage() ) ); - connect( argPrintImage->UseChartColors, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotPrintImage() ) ); - connect( argSetColor->ColorName, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT( slotChangeColorName() ) ); - connect( argSetColor->ColorValue, TQT_SIGNAL( changed(const TQColor &) ), this, TQT_SLOT( slotChangeColor() ) ); - connect( argLoadColorScheme->SchemeList, TQT_SIGNAL( clicked( TQListBoxItem* ) ), this, TQT_SLOT( slotLoadColorScheme( TQListBoxItem* ) ) ); - connect( snd->ScriptName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotEnableScriptNameOK() ) ); - - connect( sb->AppendINDIWait, TQT_SIGNAL ( toggled(bool) ), this, TQT_SLOT(slotINDIWaitCheck(bool))); + connect( argSetGeoLocation->FindCityButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotFindCity() ) ); + connect( argLookToward->FindButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotFindObject() ) ); + connect( argChangeViewOption->TreeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowOptions() ) ); + + connect( argLookToward->FocusEdit, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotLookToward() ) ); + connect( argSetRaDec->RaBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotRa() ) ); + connect( argSetRaDec->DecBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotDec() ) ); + connect( argSetAltAz->AltBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotAlt() ) ); + connect( argSetAltAz->AzBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotAz() ) ); + connect( argSetLocalTime->DateBox, TQ_SIGNAL( changed(ExtDate) ), this, TQ_SLOT( slotChangeDate() ) ); + connect( argSetLocalTime->TimeBox, TQ_SIGNAL( valueChanged(const TQTime&) ), this, TQ_SLOT( slotChangeTime() ) ); + connect( argWaitFor->DelayBox, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotWaitFor() ) ); + connect( argWaitForKey->WaitKeyEdit, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotWaitForKey() ) ); + connect( argSetTracking->CheckTrack, TQ_SIGNAL( stateChanged(int) ), this, TQ_SLOT( slotTracking() ) ); + connect( argChangeViewOption->OptionName, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT( slotViewOption() ) ); + connect( argChangeViewOption->OptionValue, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotViewOption() ) ); + connect( argSetGeoLocation->CityName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotChangeCity() ) ); + connect( argSetGeoLocation->ProvinceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotChangeProvince() ) ); + connect( argSetGeoLocation->CountryName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotChangeCountry() ) ); + connect( argTimeScale->TimeScale, TQ_SIGNAL( scaleChanged(float) ), this, TQ_SLOT( slotTimeScale() ) ); + connect( argZoom->ZoomBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotZoom() ) ); + connect( argExportImage->ExportFileName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotExportImage() ) ); + connect( argExportImage->ExportWidth, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotExportImage() ) ); + connect( argExportImage->ExportHeight, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotExportImage() ) ); + connect( argPrintImage->UsePrintDialog, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotPrintImage() ) ); + connect( argPrintImage->UseChartColors, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotPrintImage() ) ); + connect( argSetColor->ColorName, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT( slotChangeColorName() ) ); + connect( argSetColor->ColorValue, TQ_SIGNAL( changed(const TQColor &) ), this, TQ_SLOT( slotChangeColor() ) ); + connect( argLoadColorScheme->SchemeList, TQ_SIGNAL( clicked( TQListBoxItem* ) ), this, TQ_SLOT( slotLoadColorScheme( TQListBoxItem* ) ) ); + connect( snd->ScriptName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotEnableScriptNameOK() ) ); + + connect( sb->AppendINDIWait, TQ_SIGNAL ( toggled(bool) ), this, TQ_SLOT(slotINDIWaitCheck(bool))); // Connections for INDI's Arg widgets // INDI Start Device - connect (argStartINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIStartDeviceName())); - connect (argStartINDI->INDIMode, TQT_SIGNAL ( clicked( int)), this, TQT_SLOT (slotINDIStartDeviceMode())); + connect (argStartINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIStartDeviceName())); + connect (argStartINDI->INDIMode, TQ_SIGNAL ( clicked( int)), this, TQ_SLOT (slotINDIStartDeviceMode())); // INDI Shutdown Device - connect (argShutdownINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIShutdown())); + connect (argShutdownINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIShutdown())); // INDI Swtich Device - connect (argSwitchINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISwitchDeviceName())); - connect (argSwitchINDI->INDIConnection, TQT_SIGNAL ( clicked( int)), this, TQT_SLOT (slotINDISwitchDeviceConnection())); + connect (argSwitchINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISwitchDeviceName())); + connect (argSwitchINDI->INDIConnection, TQ_SIGNAL ( clicked( int)), this, TQ_SLOT (slotINDISwitchDeviceConnection())); // INDI Set Device Port - connect (argSetPortINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetPortDeviceName())); - connect (argSetPortINDI->devicePort, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetPortDevicePort())); + connect (argSetPortINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetPortDeviceName())); + connect (argSetPortINDI->devicePort, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetPortDevicePort())); // INDI Set Target Coord - connect (argSetTargetCoordINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetTargetCoordDeviceName())); - connect( argSetTargetCoordINDI->RaBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetTargetCoordDeviceRA() ) ); - connect( argSetTargetCoordINDI->DecBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetTargetCoordDeviceDEC() ) ); + connect (argSetTargetCoordINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetTargetCoordDeviceName())); + connect( argSetTargetCoordINDI->RaBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetTargetCoordDeviceRA() ) ); + connect( argSetTargetCoordINDI->DecBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetTargetCoordDeviceDEC() ) ); // INDI Set Target Name - connect( argSetTargetNameINDI->FindButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotINDIFindObject() ) ); - connect (argSetTargetNameINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetTargetNameDeviceName())); - connect (argSetTargetNameINDI->objectName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetTargetNameObjectName())); + connect( argSetTargetNameINDI->FindButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotINDIFindObject() ) ); + connect (argSetTargetNameINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetTargetNameDeviceName())); + connect (argSetTargetNameINDI->objectName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetTargetNameObjectName())); // INDI Set Action - connect (argSetActionINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetActionDeviceName())); - connect (argSetActionINDI->actionName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetActionName())); + connect (argSetActionINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetActionDeviceName())); + connect (argSetActionINDI->actionName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetActionName())); // INDI Wait For Action - connect (argWaitForActionINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIWaitForActionDeviceName())); - connect (argWaitForActionINDI->actionName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIWaitForActionName())); + connect (argWaitForActionINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIWaitForActionDeviceName())); + connect (argWaitForActionINDI->actionName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIWaitForActionName())); // INDI Set Focus Speed - connect (argSetFocusSpeedINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFocusSpeedDeviceName())); - connect (argSetFocusSpeedINDI->speedIN, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetFocusSpeed())); + connect (argSetFocusSpeedINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFocusSpeedDeviceName())); + connect (argSetFocusSpeedINDI->speedIN, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetFocusSpeed())); // INDI Start Focus - connect (argStartFocusINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIStartFocusDeviceName())); - connect (argStartFocusINDI->directionCombo, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT(slotINDIStartFocusDirection())); + connect (argStartFocusINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIStartFocusDeviceName())); + connect (argStartFocusINDI->directionCombo, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT(slotINDIStartFocusDirection())); // INDI Set Focus Timeout - connect (argSetFocusTimeoutINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFocusTimeoutDeviceName())); - connect (argSetFocusTimeoutINDI->timeOut, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetFocusTimeout())); + connect (argSetFocusTimeoutINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFocusTimeoutDeviceName())); + connect (argSetFocusTimeoutINDI->timeOut, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetFocusTimeout())); // INDI Set Geo Location - connect (argSetGeoLocationINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetGeoLocationDeviceName())); - connect( argSetGeoLocationINDI->longBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetGeoLocationDeviceLong() ) ); - connect( argSetGeoLocationINDI->latBox, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( slotINDISetGeoLocationDeviceLat() ) ); + connect (argSetGeoLocationINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetGeoLocationDeviceName())); + connect( argSetGeoLocationINDI->longBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetGeoLocationDeviceLong() ) ); + connect( argSetGeoLocationINDI->latBox, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( slotINDISetGeoLocationDeviceLat() ) ); // INDI Start Exposure - connect (argStartExposureINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDIStartExposureDeviceName())); - connect (argStartExposureINDI->timeOut, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDIStartExposureTimeout())); + connect (argStartExposureINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDIStartExposureDeviceName())); + connect (argStartExposureINDI->timeOut, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDIStartExposureTimeout())); // INDI Set UTC - connect (argSetUTCINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetUTCDeviceName())); - connect (argSetUTCINDI->UTC, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetUTC())); + connect (argSetUTCINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetUTCDeviceName())); + connect (argSetUTCINDI->UTC, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetUTC())); // INDI Set Scope Action - connect (argSetScopeActionINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetScopeActionDeviceName())); - connect (argSetScopeActionINDI->actionCombo, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT(slotINDISetScopeAction())); + connect (argSetScopeActionINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetScopeActionDeviceName())); + connect (argSetScopeActionINDI->actionCombo, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT(slotINDISetScopeAction())); // INDI Set Frame type - connect (argSetFrameTypeINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFrameTypeDeviceName())); - connect (argSetFrameTypeINDI->typeCombo, TQT_SIGNAL( activated(const TQString &) ), this, TQT_SLOT(slotINDISetFrameType())); + connect (argSetFrameTypeINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFrameTypeDeviceName())); + connect (argSetFrameTypeINDI->typeCombo, TQ_SIGNAL( activated(const TQString &) ), this, TQ_SLOT(slotINDISetFrameType())); // INDI Set CCD Temp - connect (argSetCCDTempINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetCCDTempDeviceName())); - connect (argSetCCDTempINDI->temp, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetCCDTemp())); + connect (argSetCCDTempINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetCCDTempDeviceName())); + connect (argSetCCDTempINDI->temp, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetCCDTemp())); // INDI Set Filter Num - connect (argSetFilterNumINDI->deviceName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT(slotINDISetFilterNumDeviceName())); - connect (argSetFilterNumINDI->filter_num, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT(slotINDISetFilterNum())); + connect (argSetFilterNumINDI->deviceName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT(slotINDISetFilterNumDeviceName())); + connect (argSetFilterNumINDI->filter_num, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT(slotINDISetFilterNum())); //disbale some buttons @@ -803,7 +803,7 @@ void ScriptBuilder::slotSave() { //Warn user if file exists if (TQFile::exists(currentFileURL.path())) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), + int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).arg(currentFileURL.fileName()), i18n( "Overwrite File?" ), @@ -903,7 +903,7 @@ void ScriptBuilder::slotRunScript() { if ( ! p.start( TDEProcess::DontCare ) ) kdDebug() << "Process did not start." << endl; - while ( p.isRunning() ) kapp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. + while ( p.isRunning() ) tdeApp->processEvents( 50 ); //otherwise tempfile may get deleted before script completes. //delete temp file if ( f.exists() ) f.remove(); diff --git a/kstars/kstars/tools/scriptbuilder.h b/kstars/kstars/tools/scriptbuilder.h index d491ffb1..3ae58b86 100644 --- a/kstars/kstars/tools/scriptbuilder.h +++ b/kstars/kstars/tools/scriptbuilder.h @@ -67,7 +67,7 @@ class ArgSetFilterNumINDI; */ class ScriptBuilder : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: ScriptBuilder( TQWidget *parent, const char *name=0 ); diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui index 12470945..31c36ba5 100644 --- a/kstars/kstars/tools/scriptbuilderui.ui +++ b/kstars/kstars/tools/scriptbuilderui.ui @@ -613,7 +613,7 @@ </widget> </grid> </widget> -<Q_SLOTS> +<slots> <slot>slotAddFunction()</slot> <slot>slotMoveFunctionUp()</slot> <slot>slotMoveFunctionDown()</slot> @@ -626,7 +626,7 @@ <slot>slotCopyFunction()</slot> <slot>slotRemoveFunction()</slot> <slot>slotRunScript()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="4"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kstars/kstars/tools/wutdialog.cpp b/kstars/kstars/tools/wutdialog.cpp index 632f6254..d326ae06 100644 --- a/kstars/kstars/tools/wutdialog.cpp +++ b/kstars/kstars/tools/wutdialog.cpp @@ -82,27 +82,27 @@ WUTDialog::WUTDialog(KStars *ks) : if ( ! geo->translatedProvince().isEmpty() ) sGeo += ", " + geo->translatedProvince(); sGeo += ", " + geo->translatedCountry(); WUT->LocationLabel->setText( i18n( "at %1" ).arg( sGeo ) ); - WUT->DateLabel->setText( i18n( "The night of %1" ).arg( Evening.date().toString( Qt::LocalDate ) ) ); + WUT->DateLabel->setText( i18n( "The night of %1" ).arg( Evening.date().toString( TQt::LocalDate ) ) ); initCategories(); makeConnections(); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } WUTDialog::~WUTDialog(){ } void WUTDialog::makeConnections() { - connect( WUT->DateButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotChangeDate() ) ); - connect( WUT->LocationButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotChangeLocation() ) ); - connect( WUT->CenterButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCenter() ) ); - connect( WUT->DetailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDetails() ) ); - connect( WUT->CategoryListBox, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotLoadList(int) ) ); - connect( WUT->ObjectListBox, TQT_SIGNAL( selectionChanged(TQListBoxItem*) ), - TQT_SLOT( slotDisplayObject(TQListBoxItem*) ) ); - connect( WUT->EveningMorningBox, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotEveningMorning(int) ) ); + connect( WUT->DateButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotChangeDate() ) ); + connect( WUT->LocationButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotChangeLocation() ) ); + connect( WUT->CenterButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCenter() ) ); + connect( WUT->DetailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDetails() ) ); + connect( WUT->CategoryListBox, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotLoadList(int) ) ); + connect( WUT->ObjectListBox, TQ_SIGNAL( selectionChanged(TQListBoxItem*) ), + TQ_SLOT( slotDisplayObject(TQListBoxItem*) ) ); + connect( WUT->EveningMorningBox, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotEveningMorning(int) ) ); } void WUTDialog::initCategories() { diff --git a/kstars/kstars/tools/wutdialog.h b/kstars/kstars/tools/wutdialog.h index 1806b7f0..95f83b90 100644 --- a/kstars/kstars/tools/wutdialog.h +++ b/kstars/kstars/tools/wutdialog.h @@ -40,7 +40,7 @@ class TQFrame; */ class WUTDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -97,7 +97,7 @@ class WUTDialog : public KDialogBase { KStars *kstars; WUTDialogUI *WUT; - /**@short Initialize all SIGNAL/TQT_SLOT connections, used in constructor */ + /**@short Initialize all signal/slot connections, used in constructor */ void makeConnections(); /**@short Initialize catgory list, used in constructor */ diff --git a/ktouch/src/Makefile.am b/ktouch/src/Makefile.am index f7b33145..5a05aa28 100644 --- a/ktouch/src/Makefile.am +++ b/ktouch/src/Makefile.am @@ -50,7 +50,7 @@ ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \ ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp # the library search path. -ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/ktouch/src/ktouch.cpp b/ktouch/src/ktouch.cpp index e1e3e172..01792d3a 100644 --- a/ktouch/src/ktouch.cpp +++ b/ktouch/src/ktouch.cpp @@ -29,7 +29,7 @@ #include <kstatusbar.h> #include <tdefiledialog.h> #include <tdeaction.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kdebug.h> #include <tdepopupmenu.h> @@ -64,7 +64,7 @@ KTouch::KTouch() m_keyboardWidget(NULL), m_trainer(NULL) { - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); setInputMethodEnabled(true); // Set global KTouchPtr to the main KTouch Object @@ -88,7 +88,7 @@ KTouch::KTouch() initTrainingSession(); // If session was restored, the function readProperties() was already called - if (kapp->isRestored()) { + if (tdeApp->isRestored()) { kdDebug() << "[KTouch::KTouch] restoring session..." << endl; /// \todo Rewrite all the session management stuff. /// For now we just do the same as for the standard startup. @@ -374,7 +374,7 @@ void KTouch::fileEditKeyboard() { // ---------------------------------------------------------------------------- void KTouch::fileQuit() { - kapp->quit(); + tdeApp->quit(); } // ---------------------------------------------------------------------------- @@ -431,16 +431,16 @@ void KTouch::optionsPreferences() { dialog->addPage(m_pageKeyboard, i18n("Keyboard Settings"), "keyboard_layout"); m_pageColors = new KTouchPrefColorsLayout(0, "Colors"); dialog->addPage(m_pageColors, i18n("Color Settings"), "applications-graphics"); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(applyPreferences())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(applyPreferences())); // TODO : Connect some other buttons/check boxes of the dialog - connect(m_pageGeneral->kcfg_OverrideLectureFont, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(configOverrideLectureFontToggled(bool))); - connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(configOverrideKeyboardFontToggled(bool))); - connect(m_pageTraining->kcfg_AutoLevelChange, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(configAutoLevelChangeToggled(bool))); - connect(m_pageColors->kcfg_CommonTypingLineColors, TQT_SIGNAL(toggled(bool)), - TQT_TQOBJECT(this), TQT_SLOT(configCommonColorsToggled(bool))); + connect(m_pageGeneral->kcfg_OverrideLectureFont, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configOverrideLectureFontToggled(bool))); + connect(m_pageKeyboard->kcfg_OverrideKeyboardFont, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configOverrideKeyboardFontToggled(bool))); + connect(m_pageTraining->kcfg_AutoLevelChange, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configAutoLevelChangeToggled(bool))); + connect(m_pageColors->kcfg_CommonTypingLineColors, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(configCommonColorsToggled(bool))); // call the functions to enable/disable controls depending on settings configOverrideLectureFontToggled(Prefs::overrideLectureFont()); configOverrideKeyboardFontToggled(Prefs::overrideKeyboardFont()); @@ -684,40 +684,40 @@ void KTouch::initTrainingSession() { void KTouch::setupActions() { // *** File menu *** new TDEAction(i18n("&Open lecture..."), "open_lecture", 0, - TQT_TQOBJECT(this), TQT_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture"); + this, TQ_SLOT(fileOpenLecture()), actionCollection(), "file_openlecture"); new TDEAction(i18n("&Edit lecture..."), "edit_lecture", 0, - TQT_TQOBJECT(this), TQT_SLOT(fileEditLecture()), actionCollection(), "file_editlecture"); + this, TQ_SLOT(fileEditLecture()), actionCollection(), "file_editlecture"); new TDEAction(i18n("&Edit color scheme..."), "edit_colors", 0, - TQT_TQOBJECT(this), TQT_SLOT(fileEditColors()), actionCollection(), "file_editcolors"); + this, TQ_SLOT(fileEditColors()), actionCollection(), "file_editcolors"); // new TDEAction(i18n("&Edit Keyboard..."), "edit_keyboard", 0, -// TQT_TQOBJECT(this), TQT_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard"); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(fileQuit()), actionCollection()); +// this, TQ_SLOT(fileEditKeyboard()), actionCollection(), "file_editkeyboard"); + KStdAction::quit(this, TQ_SLOT(fileQuit()), actionCollection()); // *** Training menu *** new TDEAction(i18n("&Start New Session"), "launch", 0, - TQT_TQOBJECT(this), TQT_SLOT(trainingNewSession()), actionCollection(), "training_newsession"); + this, TQ_SLOT(trainingNewSession()), actionCollection(), "training_newsession"); m_trainingPause = new TDEAction(i18n("&Pause Session"), "media-playback-pause", 0, - TQT_TQOBJECT(this), TQT_SLOT(trainingPause()), actionCollection(), "training_pause"); + this, TQ_SLOT(trainingPause()), actionCollection(), "training_pause"); new TDEAction(i18n("&Lecture Statistics"), "kalarm", 0, - TQT_TQOBJECT(this), TQT_SLOT(trainingStatistics()), actionCollection(), "training_stats"); + this, TQ_SLOT(trainingStatistics()), actionCollection(), "training_stats"); // Setup menu entries for the training lectures - m_defaultLectureAction = new TDESelectAction(i18n("Default &Lectures"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "default_lectures"); + m_defaultLectureAction = new TDESelectAction(i18n("Default &Lectures"), 0, this, 0, actionCollection(), "default_lectures"); m_defaultLectureAction->setMenuAccelsEnabled(false); m_defaultLectureAction->setItems(m_lectureTitles); m_defaultLectureAction->setCurrentItem(0); - connect (m_defaultLectureAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeLecture(int))); + connect (m_defaultLectureAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeLecture(int))); // *** Settings menu *** - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // Setup menu entries for keyboard layouts - m_keyboardLayoutAction= new TDESelectAction(i18n("&Keyboard Layouts"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_layouts"); + m_keyboardLayoutAction= new TDESelectAction(i18n("&Keyboard Layouts"), 0, this, 0, actionCollection(), "keyboard_layouts"); m_keyboardLayoutAction->setMenuAccelsEnabled(false); m_keyboardLayoutAction->setItems(m_keyboardTitles); - connect (m_keyboardLayoutAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeKeyboard(int))); + connect (m_keyboardLayoutAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeKeyboard(int))); // Setup menu entries for colour schemes - m_keyboardColorAction = new TDESelectAction(i18n("&Color Schemes"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "keyboard_schemes"); + m_keyboardColorAction = new TDESelectAction(i18n("&Color Schemes"), 0, this, 0, actionCollection(), "keyboard_schemes"); TQStringList schemes_list; for (unsigned int i=0; i<KTouchColorScheme::m_colorSchemes.count(); ++i) schemes_list.append(KTouchColorScheme::m_colorSchemes[i].m_name); @@ -726,7 +726,7 @@ void KTouch::setupActions() { if (static_cast<unsigned int>(Prefs::currentColorScheme()) >= schemes_list.count()) Prefs::setCurrentColorScheme(1); m_keyboardColorAction->setCurrentItem(Prefs::currentColorScheme()); - connect (m_keyboardColorAction, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(changeColor(int))); + connect (m_keyboardColorAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changeColor(int))); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouch.h b/ktouch/src/ktouch.h index 7b58b411..85addef3 100644 --- a/ktouch/src/ktouch.h +++ b/ktouch/src/ktouch.h @@ -57,7 +57,7 @@ class KTouchPrefColorsLayout; /// (KTouchTrainer), which will then process it. So the heavy work lies in the trainer /// object and all the widgets. class KTouch : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: /// Constructor, creates the KTouch proggy. diff --git a/ktouch/src/ktouchchartwidget.h b/ktouch/src/ktouchchartwidget.h index 87120703..9d40b660 100644 --- a/ktouch/src/ktouchchartwidget.h +++ b/ktouch/src/ktouchchartwidget.h @@ -23,7 +23,7 @@ class KTouchTrainer; /// This is the chart widget and contains all chart drawing code. class KTouchChartWidget : public KPlotWidget { - Q_OBJECT + TQ_OBJECT public: /// Constructor. diff --git a/ktouch/src/ktouchcoloreditor.h b/ktouch/src/ktouchcoloreditor.h index dfd77cf6..731eb57a 100644 --- a/ktouch/src/ktouchcoloreditor.h +++ b/ktouch/src/ktouchcoloreditor.h @@ -26,12 +26,12 @@ /// Implementation of the KTouch Color Scheme Editor. class KTouchColorEditor : public KTouchColorEditorDlg { - Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchColorEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchColorEditor(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /// Destructor ~KTouchColorEditor(); diff --git a/ktouch/src/ktouchcoloreditor_dlg.ui b/ktouch/src/ktouchcoloreditor_dlg.ui index 5f1918c3..c5554ee1 100644 --- a/ktouch/src/ktouchcoloreditor_dlg.ui +++ b/ktouch/src/ktouchcoloreditor_dlg.ui @@ -785,13 +785,13 @@ <slot>updateClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>closeQuery()</slot> <slot>addBtnClicked()</slot> <slot>removeBtnClicked()</slot> <slot>updateClicked()</slot> <slot>colorSchemeChanged(TQListBoxItem * item)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/ktouch/src/ktouchkeyboardeditor.h b/ktouch/src/ktouchkeyboardeditor.h index 6ba58f67..f473ab2d 100644 --- a/ktouch/src/ktouchkeyboardeditor.h +++ b/ktouch/src/ktouchkeyboardeditor.h @@ -40,12 +40,12 @@ /// @endcode /// @see startEditor() for details on the return value. class KTouchKeyboardEditor : public KTouchKeyboardEditorDlg { - Q_OBJECT + TQ_OBJECT public: /// Constructor. - KTouchKeyboardEditor(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchKeyboardEditor(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /// Default destructor. ~KTouchKeyboardEditor() {} /// Shows and executes the dialog (argument is the url to the default or diff --git a/ktouch/src/ktouchkeyboardeditor_dlg.ui b/ktouch/src/ktouchkeyboardeditor_dlg.ui index 741f4e20..919673d1 100644 --- a/ktouch/src/ktouchkeyboardeditor_dlg.ui +++ b/ktouch/src/ktouchkeyboardeditor_dlg.ui @@ -378,7 +378,7 @@ <slot>keySelectionChanged(TQListBoxItem*)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>openBtnClicked()</slot> <slot>saveBtnClicked()</slot> <slot>saveAsBtnClicked()</slot> @@ -388,7 +388,7 @@ <slot>editBtnClicked()</slot> <slot>removeBtnClicked()</slot> <slot>keySelectionChanged(TQListBoxItem*)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/ktouch/src/ktouchkeyboardwidget.cpp b/ktouch/src/ktouchkeyboardwidget.cpp index 9b29233e..bf13c0e7 100644 --- a/ktouch/src/ktouchkeyboardwidget.cpp +++ b/ktouch/src/ktouchkeyboardwidget.cpp @@ -22,7 +22,7 @@ #include <tdetempfile.h> #include <tdelocale.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include "prefs.h" diff --git a/ktouch/src/ktouchkeyboardwidget.h b/ktouch/src/ktouchkeyboardwidget.h index 8888e27b..a629e44c 100644 --- a/ktouch/src/ktouchkeyboardwidget.h +++ b/ktouch/src/ktouchkeyboardwidget.h @@ -40,7 +40,7 @@ class KURL; * activated keys and finger key animations etc.) */ class KTouchKeyboardWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /// Constructor diff --git a/ktouch/src/ktouchlectureeditor.cpp b/ktouch/src/ktouchlectureeditor.cpp index 513a740a..66f6aead 100644 --- a/ktouch/src/ktouchlectureeditor.cpp +++ b/ktouch/src/ktouchlectureeditor.cpp @@ -46,18 +46,18 @@ KTouchLectureEditor::KTouchLectureEditor(TQWidget *parent, const char* name, boo { levelListView->setSorting(-1); // don't sort my level list view! - connect(levelListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),this, TQT_SLOT(newSelection(TQListViewItem*)) ); - connect(newCharsEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(newCharsChanged(const TQString&)) ); - connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(newLevel()) ); - connect(deleteBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteLevel()) ); - connect(upBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveUp()) ); - connect(downBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveDown()) ); + connect(levelListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),this, TQ_SLOT(newSelection(TQListViewItem*)) ); + connect(newCharsEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(newCharsChanged(const TQString&)) ); + connect(newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(newLevel()) ); + connect(deleteBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteLevel()) ); + connect(upBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveUp()) ); + connect(downBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(moveDown()) ); // make the connections for making the lecture modified - connect(titleEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(setModified()) ); - connect(lectureCommentEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setModified()) ); - connect(levelCommentEdit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(setModified()) ); - connect(linesTextEdit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setModified()) ); + connect(titleEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(setModified()) ); + connect(lectureCommentEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setModified()) ); + connect(levelCommentEdit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(setModified()) ); + connect(linesTextEdit, TQ_SIGNAL(textChanged()), this, TQ_SLOT(setModified()) ); // The font, open, save, saveas and close buttons are already connected } diff --git a/ktouch/src/ktouchlectureeditor.h b/ktouch/src/ktouchlectureeditor.h index 4b2e44c8..972357e6 100644 --- a/ktouch/src/ktouchlectureeditor.h +++ b/ktouch/src/ktouchlectureeditor.h @@ -40,11 +40,11 @@ /// @endcode /// @see startEditor() for details on the return value. class KTouchLectureEditor : public KTouchLectureEditorDlg { - Q_OBJECT + TQ_OBJECT public: /// Constructor - KTouchLectureEditor(TQWidget *parent, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + KTouchLectureEditor(TQWidget *parent, const char* name = 0, bool modal = false, WFlags fl = 0); /// Destructor ~KTouchLectureEditor() {} /// Shows and executes the dialog (argument is the url to the default or diff --git a/ktouch/src/ktouchlectureeditor_dlg.ui b/ktouch/src/ktouchlectureeditor_dlg.ui index d5f0f888..f2624444 100644 --- a/ktouch/src/ktouchlectureeditor_dlg.ui +++ b/ktouch/src/ktouchlectureeditor_dlg.ui @@ -524,9 +524,6 @@ <property name="text"> <string>&Open...</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton"> <property name="name"> @@ -535,9 +532,6 @@ <property name="text"> <string>&Save</string> </property> - <property name="accel"> - <string></string> - </property> <property name="default"> <bool>true</bool> </property> @@ -549,9 +543,6 @@ <property name="text"> <string>Save &As...</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton"> <property name="name"> @@ -560,9 +551,6 @@ <property name="text"> <string>&Close</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </hbox> </widget> @@ -656,14 +644,14 @@ <tabstop>saveAsButton</tabstop> <tabstop>quitButton</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>openBtnClicked()</slot> <slot>saveBtnClicked()</slot> <slot>saveAsBtnClicked()</slot> <slot>closeQuery()</slot> <slot>setModified()</slot> <slot>fontBtnClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/ktouch/src/ktouchopenrequest.h b/ktouch/src/ktouchopenrequest.h index ee8b3bdb..849c157a 100644 --- a/ktouch/src/ktouchopenrequest.h +++ b/ktouch/src/ktouchopenrequest.h @@ -51,12 +51,12 @@ /// the user). /// class KTouchOpenRequest : public KTouchOpenRequestDlg { - Q_OBJECT + TQ_OBJECT public: /// Default constructor. - KTouchOpenRequest(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KTouchOpenRequest(TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); /// Default destructor. ~KTouchOpenRequest() {} /// Sets up the dialog and runs it. diff --git a/ktouch/src/ktouchopenrequest_dlg.ui b/ktouch/src/ktouchopenrequest_dlg.ui index 410353dc..46746f28 100644 --- a/ktouch/src/ktouchopenrequest_dlg.ui +++ b/ktouch/src/ktouchopenrequest_dlg.ui @@ -273,11 +273,11 @@ <tabstop>okBtn</tabstop> <tabstop>cancelBtn</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>okBtnClicked()</slot> <slot>radioBtnChanged()</slot> <slot>browseBtnClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/ktouch/src/ktouchprefkeyboardlayout.ui b/ktouch/src/ktouchprefkeyboardlayout.ui index 75cef9e1..ad0f7db7 100644 --- a/ktouch/src/ktouchprefkeyboardlayout.ui +++ b/ktouch/src/ktouchprefkeyboardlayout.ui @@ -132,9 +132,9 @@ </widget> <customwidgets> </customwidgets> -<Q_SLOTS> +<slots> <slot>fontChooseBtnClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">tdefontrequester.h</include> diff --git a/ktouch/src/ktouchslideline.cpp b/ktouch/src/ktouchslideline.cpp index d7eff3fd..366fbd77 100644 --- a/ktouch/src/ktouchslideline.cpp +++ b/ktouch/src/ktouchslideline.cpp @@ -77,8 +77,8 @@ KTouchSlideLine::KTouchSlideLine(TQWidget *parent) m_xFrameStudent = 0; m_xFrameStudentCurrent = 0; - connect( &m_cursorTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(toggleCursor()) ); - connect( &m_slideTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slide()) ); + connect( &m_cursorTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(toggleCursor()) ); + connect( &m_slideTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slide()) ); } // ---------------------------------------------------------------------------- @@ -411,7 +411,7 @@ void KTouchSlideLine::updateSlidingLines() { // draw the teacher pixmap text TQPainter painter; - painter.begin (TQT_TQPAINTDEVICE(m_teacherPixmap), this); + painter.begin (m_teacherPixmap, this); painter.setFont( m_font ); TQColor col_tt = Prefs::commonTypingLineColors() ? @@ -532,7 +532,7 @@ void KTouchSlideLine::updateStudentLine() { // now let's draw the students pixmap TQPainter painter; - painter.begin (TQT_TQPAINTDEVICE(m_studentPixmap), this); + painter.begin (m_studentPixmap, this); if (Prefs::colorOnError()) { // draw the student line depending on the colour settings if (error) { diff --git a/ktouch/src/ktouchslideline.h b/ktouch/src/ktouchslideline.h index 2f8178c4..97c1e51e 100644 --- a/ktouch/src/ktouchslideline.h +++ b/ktouch/src/ktouchslideline.h @@ -32,7 +32,7 @@ class TQPainter; /// /// Please refer to the documentation 'sliding_line_widget.pdf' in the doc folder. class KTouchSlideLine : public TQWidget { - Q_OBJECT + TQ_OBJECT public: /// Constructor @@ -121,8 +121,8 @@ class KTouchSlideLine : public TQWidget { TQColor m_cursorBackground; ///< Defines the background colour of the cursor (when turned off). // variables depending on size of widget, will be updated in resizeEvent() - int m_marginVerWidget; ///<Qt::Vertical margin between widget boundary and sliding line in pixels. - int m_slideLineDist; ///<Qt::Vertical distance between sliding lines in pixels. + int m_marginVerWidget; ///< Vertical margin between widget boundary and sliding line in pixels. + int m_slideLineDist; ///< Vertical distance between sliding lines in pixels. int m_slideLineHeight; ///< Height of a sliding line in pixels. int m_marginCursor; ///< The margin for cursor movement (minimum distance from left and right ends of slide line boundaries). @@ -133,7 +133,7 @@ class KTouchSlideLine : public TQWidget { int m_yCursorStudent; ///< Cursor top y coordinate (from top of visible area) in the student line. // newly defined variables, will be updated on the setNewText() and partially in setStudentText() - int m_marginHorWidget; ///<Qt::Horizontal margin between widget boundary and sliding line in pixels. + int m_marginHorWidget; ///< Horizontal margin between widget boundary and sliding line in pixels. int m_slideLineWidth; ///< The length of the sliding line in pixels. int m_cursorRangeLen; ///< Length (in pixel) that the cursor can move between left and right margin. diff --git a/ktouch/src/ktouchstatistics.cpp b/ktouch/src/ktouchstatistics.cpp index 0cfdeb2e..488ab6b0 100644 --- a/ktouch/src/ktouchstatistics.cpp +++ b/ktouch/src/ktouchstatistics.cpp @@ -40,13 +40,13 @@ KTouchStatistics::KTouchStatistics(TQWidget* parent) sessionsRadio->setChecked(true); WPMRadio->setChecked(true); eventRadio->setChecked(true); - connect(closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect(lectureCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(lectureActivated(int)) ); - connect(clearButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(clearHistory()) ); + connect(closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect(lectureCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(lectureActivated(int)) ); + connect(clearButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(clearHistory()) ); // connect the radio buttons with the chart update function - connect(buttonGroup1, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) ); - connect(buttonGroup2, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) ); - connect(buttonGroup3, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateChartTab()) ); + connect(buttonGroup1, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) ); + connect(buttonGroup2, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) ); + connect(buttonGroup3, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateChartTab()) ); // TODO : temporarily remove detailed stats page and deactivate options levelsRadio->setEnabled(false); diff --git a/ktouch/src/ktouchstatistics.h b/ktouch/src/ktouchstatistics.h index ae136dd6..5adce58e 100644 --- a/ktouch/src/ktouchstatistics.h +++ b/ktouch/src/ktouchstatistics.h @@ -26,7 +26,7 @@ class KURL; /// Implementation of the statistics widget class KTouchStatistics : public KTouchStatisticsDlg { - Q_OBJECT + TQ_OBJECT public: /// Constructor, takes a pointer to the trainer object. diff --git a/ktouch/src/ktouchstatisticsdata.cpp b/ktouch/src/ktouchstatisticsdata.cpp index 6bf98716..cf7c723b 100644 --- a/ktouch/src/ktouchstatisticsdata.cpp +++ b/ktouch/src/ktouchstatisticsdata.cpp @@ -94,7 +94,7 @@ bool KTouchLevelStats::read(TQDomNode in) { if (!n.isNull()) { TQString timestring = n.firstChild().nodeValue(); if (timestring != TQString()) - m_timeRecorded = TQDateTime::fromString(timestring, Qt::ISODate); + m_timeRecorded = TQDateTime::fromString(timestring, TQt::ISODate); } // read characters n = in.namedItem("CharStats"); @@ -121,7 +121,7 @@ void KTouchLevelStats::write(TQDomDocument& doc, TQDomElement& root) const { level.setAttribute("Words", m_words); // add time TQDomElement e = doc.createElement("Time"); - TQDomText tn = doc.createTextNode(m_timeRecorded.toString(Qt::ISODate)); + TQDomText tn = doc.createTextNode(m_timeRecorded.toString(TQt::ISODate)); e.appendChild(tn); level.appendChild(e); // add char stats @@ -236,7 +236,7 @@ bool KTouchSessionStats::read(TQDomNode in) { if (!n.isNull()) { TQString timestring = n.firstChild().nodeValue(); if (timestring != TQString()) - m_timeRecorded = TQDateTime::fromString(timestring, Qt::ISODate); + m_timeRecorded = TQDateTime::fromString(timestring, TQt::ISODate); } // read level numbers n = in.namedItem("LevelNums"); @@ -272,7 +272,7 @@ void KTouchSessionStats::write(TQDomDocument& doc, TQDomElement& root) const { session.setAttribute("Words", m_words); // add time TQDomElement e = doc.createElement("Time"); - TQDomText tn = doc.createTextNode(m_timeRecorded.toString(Qt::ISODate)); + TQDomText tn = doc.createTextNode(m_timeRecorded.toString(TQt::ISODate)); e.appendChild(tn); session.appendChild(e); // add levels diff --git a/ktouch/src/ktouchstatus.h b/ktouch/src/ktouchstatus.h index 00a95d77..a01c1e4e 100644 --- a/ktouch/src/ktouchstatus.h +++ b/ktouch/src/ktouchstatus.h @@ -26,7 +26,7 @@ * The "new characters" string is set using the member function setNewChars(). */ class KTouchStatus : public KTouchStatusLayout { - Q_OBJECT + TQ_OBJECT public: /// Constructor diff --git a/ktouch/src/ktouchstatuslayout.ui b/ktouch/src/ktouchstatuslayout.ui index b2625d23..d17fc8db 100644 --- a/ktouch/src/ktouchstatuslayout.ui +++ b/ktouch/src/ktouchstatuslayout.ui @@ -348,13 +348,13 @@ </widget> </hbox> </widget> -<Q_SLOTS> +<slots> <slot>levelForcedDown()</slot> <slot>levelForcedUp()</slot> <slot>showStatChanged(int)</slot> <slot>runningStateChanged(int)</slot> <slot>startKTouch()</slot> <slot>stopKTouch()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ktouch/src/ktouchtrainer.cpp b/ktouch/src/ktouchtrainer.cpp index 568e25c5..412c53e4 100644 --- a/ktouch/src/ktouchtrainer.cpp +++ b/ktouch/src/ktouchtrainer.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <kpushbutton.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kaudioplayer.h> #include <tqmessagebox.h> @@ -55,9 +55,9 @@ KTouchTrainer::KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, K m_levelDownSound = TDEGlobal::dirs()->findResource("appdata","down.wav"); m_typeWriterSound = TDEGlobal::dirs()->findResource("appdata","typewriter.wav"); - connect(m_statusWidget->levelUpBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelUp()) ); - connect(m_statusWidget->levelDownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(levelDown()) ); - connect(m_trainingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerTick()) ); + connect(m_statusWidget->levelUpBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(levelUp()) ); + connect(m_statusWidget->levelDownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(levelDown()) ); + connect(m_trainingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerTick()) ); } // ---------------------------------------------------------------------------- diff --git a/ktouch/src/ktouchtrainer.h b/ktouch/src/ktouchtrainer.h index 009594b8..fd4c516d 100644 --- a/ktouch/src/ktouchtrainer.h +++ b/ktouch/src/ktouchtrainer.h @@ -58,7 +58,7 @@ class KTouchLecture; /// and the statusbar of the main window). In this member function also the word count of the current line /// is updated. class KTouchTrainer : public TQObject { - Q_OBJECT + TQ_OBJECT public: /// Constructor. diff --git a/ktouch/src/main.cpp b/ktouch/src/main.cpp index cebc0a0d..0e5ad898 100644 --- a/ktouch/src/main.cpp +++ b/ktouch/src/main.cpp @@ -61,7 +61,7 @@ int main(int argc, char **argv) splash.setHideEnabled( true ); // allow user to click the splash screen away splash.show(); // show it TQTimer splashTimer; - splashTimer.connect(&splashTimer, TQT_SIGNAL(timeout()), &splash, TQT_SLOT(hide())); + splashTimer.connect(&splashTimer, TQ_SIGNAL(timeout()), &splash, TQ_SLOT(hide())); splashTimer.start(2000, true); // start singleshot timer to hide the splashscreen */ diff --git a/ktouch/training/german2.ktouch.xml b/ktouch/training/german2.ktouch.xml index e201a0ce..0c3af5ee 100644 --- a/ktouch/training/german2.ktouch.xml +++ b/ktouch/training/german2.ktouch.xml @@ -1026,7 +1026,7 @@ Version: 0.1 beta <Line>Info_Dialog::Info_Dialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition,</Line> <Line>const wxSize& size =wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE, const wxString& name = "dialogBox") : wxDialog(parent, id, title, pos, size, style, name)</Line> <Line>{</Line> - <Line> SetAutoLayout(TRUE);</Line> + <Line> SetAutoLayout(true);</Line> <Line> #ifdef __WXMSW__</Line> <Line> wxBitmap::AddHandler(new wxPNGFileHandler);</Line> <Line> #endif</Line> @@ -1099,7 +1099,7 @@ Version: 0.1 beta <Line> wxPaintDC dc(this);</Line> <Line> wxMemoryDC memDC;</Line> <Line> memDC.SelectObject(* logo);</Line> - <Line> dc.Blit(5, 25, logo->GetWidth(), logo->GetHeight(), & memDC, 0, 0, wxCOPY, TRUE);</Line> + <Line> dc.Blit(5, 25, logo->GetWidth(), logo->GetHeight(), & memDC, 0, 0, wxCOPY, true);</Line> <Line> memDC.SelectObject(wxNullBitmap);</Line> <Line>}</Line> </Level> diff --git a/kturtle/TODO b/kturtle/TODO index 30e5189d..f7883e31 100644 --- a/kturtle/TODO +++ b/kturtle/TODO @@ -185,7 +185,7 @@ Translating data in the tdenewstuff.xml file: how would the translators access t -After a conversiation with lypanov I came to the conclusion that making the executer 'statefull' is a very by thing! So I take the cheap approach using kapp->processEvents();... Maybe someday, later, I'll do it neatly -- the lypanov pointed out. FIXED +After a conversiation with lypanov I came to the conclusion that making the executer 'statefull' is a very by thing! So I take the cheap approach using tdeApp->processEvents();... Maybe someday, later, I'll do it neatly -- the lypanov pointed out. FIXED @@ -230,7 +230,7 @@ cies: That is a good plan! I have tux allready in my sprites dir (I'm a fan too - crash on quitting after Opening files DONE annma 02/04/2004 -- cies: Make the interpreter (stolen from wsbasic.sf.net) (executer, parser, lexer, number and treenode) more native Qt. Right now they are a mixture of standard-CLI-C++ and Qt thingies (i put the Qt thingies there). I tried do that but i found that i'm not comfortable with the concept of streams -- which are used a lot in the interpreter. Especially streaming QString was an obstacle i couldnt take. DONE +- cies: Make the interpreter (stolen from wsbasic.sf.net) (executer, parser, lexer, number and treenode) more native Qt. Right now they are a mixture of standard-CLI-C++ and Qt thingies (i put the Qt thingies there). I tried do that but i found that i'm not comfortable with the concept of streams -- which are used a lot in the interpreter. Especially streaming TQString was an obstacle i couldnt take. DONE >>>>> after this is done we can also make the ()[],.""-configurable With long lines and wrapping the canvas can get into a endless loop -> 100%CPU, i tried a lot to fix this allready, maybe my solution needs some tuning :). @@ -292,8 +292,8 @@ dcop khelpcenter KHelpCenterIface openUrl "help:/kate/index.html#kate-part-selec Im tryered of this... I can fix it; too much for me. Sorry -in tdelibs/tdecore/kapp... : -url = QString("help:/%1?anchor=%2").arg(appname).arg(anchor); +in tdelibs/tdecore/tdeapp... : +url = TQString("help:/%1?anchor=%2").arg(appname).arg(anchor); and DCOPRef( "khelpcenter", "KHelpCenterIface" ).send( "openUrl", url, startup_id ); diff --git a/kturtle/file.txt b/kturtle/file.txt index e2f39a42..041b85d7 100644 --- a/kturtle/file.txt +++ b/kturtle/file.txt @@ -4,12 +4,12 @@ Correcting dependencies... Done The following extra packages will be installed: alsa-headers libasound2-dev libaudio-dev libaudiofile-dev libfontconfig1-dev libfreetype6-dev libglib2.0-dev libjpeg62-dev liblcms1-dev libmad0-dev - libogg-dev libpng12-dev libqt3-headers libvorbis-dev libxcursor-dev + libogg-dev libpng12-dev libtqt3-headers libvorbis-dev libxcursor-dev pkg-config qt3-dev-tools xlibmesa3-gl xlibmesa3-glu zlib1g-dev Suggested packages: libasound2-doc libglib2.0-doc libgnome-dev libglide3 Recommended packages: - libqt3-mt-dev libqt3-dev + libtqt3-mt-dev libtqt3-dev The following packages will be REMOVED: arts gideon gideon-data gideon-plugins kaddressbook kalarm kalarmd kandy kappfinder karm kate kcontrol kde-cvs-snapshot tdeartwork tdeartwork-misc @@ -25,7 +25,7 @@ The following packages will be REMOVED: The following NEW packages will be installed: alsa-headers libasound2-dev libaudio-dev libaudiofile-dev libfontconfig1-dev libfreetype6-dev libglib2.0-dev libjpeg62-dev liblcms1-dev libmad0-dev - libogg-dev libpng12-dev libqt3-headers libvorbis-dev libxcursor-dev + libogg-dev libpng12-dev libtqt3-headers libvorbis-dev libxcursor-dev pkg-config qt3-dev-tools xlibmesa3-gl xlibmesa3-glu zlib1g-dev 0 upgraded, 20 newly installed, 74 to remove and 9 not upgraded. 1 not fully installed or removed. diff --git a/kturtle/kturtle.kdevses b/kturtle/kturtle.kdevses deleted file mode 100644 index 1864d53d..00000000 --- a/kturtle/kturtle.kdevses +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version = '1.0' encoding = 'UTF-8'?> -<!DOCTYPE KDevPrjSession> -<KDevPrjSession> - <DocsAndViews NumberOfDocuments="16" > - <Doc0 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/TODO" > - <View0 Type="Source" /> - </Doc0> - <Doc1 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/main.cpp" > - <View0 Type="Source" /> - </Doc1> - <Doc2 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/kturtle.h" > - <View0 Type="Source" /> - </Doc2> - <Doc3 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/kturtle.cpp" > - <View0 Type="Source" /> - </Doc3> - <Doc4 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/dialogs.h" > - <View0 Type="Source" /> - </Doc4> - <Doc5 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/dialogs.cpp" > - <View0 Type="Source" /> - </Doc5> - <Doc6 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/executer.cpp" > - <View0 Type="Source" /> - </Doc6> - <Doc7 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/translate.h" > - <View0 line="0" Type="Source" /> - </Doc7> - <Doc8 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/lexer.cpp" > - <View0 line="408" Type="Source" /> - </Doc8> - <Doc9 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/translate.cpp" > - <View0 line="104" Type="Source" /> - </Doc9> - <Doc10 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/canvas.cpp" > - <View0 line="390" Type="Source" /> - </Doc10> - <Doc11 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/parser.cpp" > - <View0 line="1052" Type="Source" /> - </Doc11> - <Doc12 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/settings.cpp" > - <View0 line="50" Type="Source" /> - </Doc12> - <Doc13 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/token.cpp" > - <View0 line="0" Type="Source" /> - </Doc13> - <Doc14 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/treenode.cpp" > - <View0 line="219" Type="Source" /> - </Doc14> - <Doc15 NumberOfViews="1" URL="file:/home/cies/kdecvs/tdeedu/kturtle/src/value.cpp" > - <View0 line="247" Type="Source" /> - </Doc15> - </DocsAndViews> - <pluginList> - <kdevbookmarks> - <bookmarks/> - </kdevbookmarks> - <kdevsubversion> - <subversion recurseresolve="1" recurserelocate="1" recursemerge="1" recursecommit="1" base="" recursepropget="1" recurseswitch="1" recurseupdate="1" recursepropset="1" recursediff="1" recurserevert="1" forcemove="1" recursecheckout="1" forceremove="1" recurseadd="1" recurseproplist="1" forcemerge="1" /> - </kdevsubversion> - <kdevdebugger> - <breakpointList/> - </kdevdebugger> - </pluginList> -</KDevPrjSession> diff --git a/kturtle/kturtle.tdevelop b/kturtle/kturtle.tdevelop deleted file mode 100644 index 2cddc3cd..00000000 --- a/kturtle/kturtle.tdevelop +++ /dev/null @@ -1,160 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author>Cies Breijs</author> - <email>cies # showroommama ! nl</email> - <version>0.01</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>C++</keyword> - <keyword>Code</keyword> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - <secondaryLanguages/> - </general> - <kdevautoproject> - <general> - <activetarget>src/kturtle</activetarget> - <useconfiguration>default</useconfiguration> - </general> - <run> - <mainprogram>src/kturtle</mainprogram> - <directoryradio>executable</directoryradio> - <customdirectory>/</customdirectory> - <programargs/> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars/> - </run> - <configurations> - <optimized> - <builddir>optimized</builddir> - <ccompiler>GccOptions</ccompiler> - <cxxcompiler>GppOptions</cxxcompiler> - <f77compiler>G77Options</f77compiler> - <cxxflags>-O2 -g0</cxxflags> - </optimized> - <debug> - <configargs>--enable-debug=full</configargs> - <builddir>debug</builddir> - <ccompiler>GccOptions</ccompiler> - <cxxcompiler>GppOptions</cxxcompiler> - <f77compiler>G77Options</f77compiler> - <cxxflags>-O0 -g3</cxxflags> - </debug> - </configurations> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>false</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - </make> - </kdevautoproject> - <kdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <hidepatterns></hidepatterns> - <hidenonprojectfiles>false</hidenonprojectfiles> - <showvcsfields>true</showvcsfields> - </tree> - </kdevfileview> - <kdevdoctreeview> - <ignoretocs> - <toc>gtk</toc> - <toc>gnustep</toc> - <toc>python</toc> - <toc>php</toc> - <toc>perl</toc> - </ignoretocs> - <projectdoc> - <userdocDir>/home/cies/src/kturtle/html/</userdocDir> - <apidocDir>/home/cies/src/kturtle/html/</apidocDir> - </projectdoc> - <ignoreqt_xml/> - <ignoredoxygen/> - <ignorekdocs/> - <ignoredevhelp/> - </kdevdoctreeview> - <kdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - </display> - </kdevdebugger> - <kdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </kdevfilecreate> - <kdevcvs> - <cvsoptions>-z3 -d:ext:cies@cvs.sourceforge.net:/cvsroot/kturtle co kturtle </cvsoptions> - <commitoptions/> - <addoptions/> - <logoptions/> - <updateoptions>-dP</updateoptions> - <removeoptions>-f</removeoptions> - <revertoptions>-C -d -P</revertoptions> - <diffoptions>-u3 -p</diffoptions> - <rshoptions>ssh</rshoptions> - </kdevcvs> - <kdevcvsservice> - <recursivewhenupdate>true</recursivewhenupdate> - <prunedirswhenupdate>true</prunedirswhenupdate> - <createdirswhenupdate>true</createdirswhenupdate> - <recursivewhencommitremove>true</recursivewhencommitremove> - <revertoptions>-C</revertoptions> - </kdevcvsservice> - <kdevcppsupport> - <references/> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - </kdevcppsupport> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> -</tdevelop> diff --git a/kturtle/src/Makefile.am b/kturtle/src/Makefile.am index a5706a23..83d7eef5 100644 --- a/kturtle/src/Makefile.am +++ b/kturtle/src/Makefile.am @@ -4,9 +4,9 @@ INCLUDES = $(all_includes) SUBDIRS = pics # added from kjots -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kturtle_LDADD = $(LIB_TDEUI) $(LIB_TDEIO) $(LIB_TDEPRINT) $(LIB_TDEPARTS) -lkatepartinterfaces KDE_ICON = kturtle diff --git a/kturtle/src/canvas.cpp b/kturtle/src/canvas.cpp index 5d14ead3..8564d6ae 100644 --- a/kturtle/src/canvas.cpp +++ b/kturtle/src/canvas.cpp @@ -78,7 +78,7 @@ const double DEG2RAD = 3.14159265358979323846/180; Canvas::Canvas(TQWidget *parent, const char *name) : TQCanvasView(0, parent, name) { // Create a new canvas for this view - canvas = new TQCanvas(TQT_TQOBJECT(parent)); + canvas = new TQCanvas(parent); canvas->setAdvancePeriod(250); // refresh-rate in [ms] // set initial values @@ -403,7 +403,7 @@ void Canvas::line(double xa, double ya, double xb, double yb) xb + translation.x() * canvasWidth, yb + translation.y() * canvasHeight); if (cutLoop == true) { - // kdDebug(0)<<"Canvas::line(): cutLoop is set to TRUE! ABORT LINE MISSION"<<endl; + // kdDebug(0)<<"Canvas::line(): cutLoop is set to true! ABORT LINE MISSION"<<endl; return; } } @@ -418,7 +418,7 @@ bool Canvas::endlessLoop(TQPoint begin, TQPoint end) // this is to break the horrible endless loop bug that i cannot fix... // i need more simple reproductions of this bug to really find it // for now i say it is something with TQCanvas but i'm likely wrong on thisone - // kdDebug(0)<<"Canvas::endlessLoop TRUE!!"<<endl; + // kdDebug(0)<<"Canvas::endlessLoop true!!"<<endl; return true; } else diff --git a/kturtle/src/canvas.h b/kturtle/src/canvas.h index b5ad54a1..c2fb7c27 100644 --- a/kturtle/src/canvas.h +++ b/kturtle/src/canvas.h @@ -24,7 +24,7 @@ class Canvas : public TQCanvasView { - Q_OBJECT + TQ_OBJECT public: diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp index 1690ca02..0499b7db 100644 --- a/kturtle/src/dialogs.cpp +++ b/kturtle/src/dialogs.cpp @@ -28,8 +28,8 @@ ErrorMessage::ErrorMessage (TQWidget *parent) : KDialogBase (parent, "errorDialog", false, 0, KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true, i18n("Help on &Error") ) { - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( showHelpOnError() ) ); - connect( this, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( errorMessageHelp() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( showHelpOnError() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), this, TQ_SLOT( errorMessageHelp() ) ); setCaption( i18n("Error Dialog") ); setButtonWhatsThis( KDialogBase::Close, i18n("Closes this error dialog") ); setButtonWhatsThis( KDialogBase::Help, i18n("Click here to read more on this error dialog in KTurtle's Handbook.") ); @@ -107,7 +107,7 @@ void ErrorMessage::display() enableButton (KDialogBase::User1, false); errTable->sortColumn(0, true, true); show(); - connect( errTable, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( updateSelection() ) ); + connect( errTable, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateSelection() ) ); } void ErrorMessage::updateSelection() @@ -125,13 +125,13 @@ void ErrorMessage::updateSelection() void ErrorMessage::showHelpOnError() { // #if 0 // FIXME -// kapp->invokeHelp(tokenTypeNames[currentError.tok.type], "", ""); +// tdeApp->invokeHelp(tokenTypeNames[currentError.tok.type], "", ""); // #endif } void ErrorMessage::errorMessageHelp() { - kapp->invokeHelp("anchorname", "", ""); + tdeApp->invokeHelp("anchorname", "", ""); } // END @@ -144,10 +144,10 @@ ColorPicker::ColorPicker(TQWidget *parent) : KDialogBase(parent, "colorpicker", false, i18n("Color Picker"), KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true ) { // connect to help - connect( this, TQT_SIGNAL( helpClicked() ), TQT_SLOT( slotColorPickerHelp() ) ); + connect( this, TQ_SIGNAL( helpClicked() ), TQ_SLOT( slotColorPickerHelp() ) ); // for toggling convenience - connect( this, TQT_SIGNAL( finished() ), TQT_SLOT( slotEmitVisibility() ) ); + connect( this, TQ_SIGNAL( finished() ), TQ_SLOT( slotEmitVisibility() ) ); // Create the top level page and its layout BaseWidget = new TQWidget(this); @@ -155,7 +155,7 @@ ColorPicker::ColorPicker(TQWidget *parent) // the User1 button: setButtonText( KDialogBase::User1, i18n("Insert Color Code at Cursor") ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotEmitColorCode() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotEmitColorCode() ) ); TQVBoxLayout *vlayout = new TQVBoxLayout(BaseWidget); @@ -170,14 +170,14 @@ ColorPicker::ColorPicker(TQWidget *parent) hsSelector = new KHSSelector(BaseWidget); // the color (SH) selector hsSelector->setMinimumSize(300, 150); h1layout->addWidget(hsSelector); - connect( hsSelector, TQT_SIGNAL( valueChanged(int, int) ), TQT_SLOT( slotSelectorChanged(int, int) ) ); + connect( hsSelector, TQ_SIGNAL( valueChanged(int, int) ), TQ_SLOT( slotSelectorChanged(int, int) ) ); h1layout->addSpacing(5); // space in between valuePal = new KValueSelector(BaseWidget); // the darkness (V) pal valuePal->setFixedWidth(30); h1layout->addWidget(valuePal); - connect( valuePal, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotPalChanged(int) ) ); + connect( valuePal, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotPalChanged(int) ) ); vlayout->addSpacing(15); // space in between the top and the bottom widgets @@ -203,7 +203,7 @@ ColorPicker::ColorPicker(TQWidget *parent) colorcode = new TQLineEdit(BaseWidget); // the code generator colorcode->setReadOnly(true); v2layout->addWidget(colorcode); - connect( colorcode, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotReselect() ) ); + connect( colorcode, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotReselect() ) ); h2layout->addSpacing(5); // spacing on the right border @@ -269,9 +269,9 @@ void ColorPicker::slotPalChanged(int v_) void ColorPicker::slotReselect() { // reselect by selectAll(), but make sure no looping occurs - disconnect( colorcode, TQT_SIGNAL( selectionChanged() ), 0, 0 ); + disconnect( colorcode, TQ_SIGNAL( selectionChanged() ), 0, 0 ); colorcode->selectAll(); - connect( colorcode, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotReselect() ) ); + connect( colorcode, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotReselect() ) ); } void ColorPicker::slotEmitVisibility() @@ -288,7 +288,7 @@ void ColorPicker::slotEmitColorCode() void ColorPicker::slotColorPickerHelp() { - kapp->invokeHelp("tools-color-picker", "", ""); + tdeApp->invokeHelp("tools-color-picker", "", ""); } // END diff --git a/kturtle/src/dialogs.h b/kturtle/src/dialogs.h index bd4431c8..d652dd5f 100644 --- a/kturtle/src/dialogs.h +++ b/kturtle/src/dialogs.h @@ -52,7 +52,7 @@ struct errorData class ErrorMessage : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -97,7 +97,7 @@ class ErrorMessage : public KDialogBase class ColorPicker : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -150,7 +150,7 @@ class ColorPicker : public KDialogBase class RestartOrBack : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kturtle/src/executer.cpp b/kturtle/src/executer.cpp index 9268eab1..d98f5df8 100644 --- a/kturtle/src/executer.cpp +++ b/kturtle/src/executer.cpp @@ -61,7 +61,7 @@ bool Executer::run() for (i = tree->begin(); i != tree->end(); ++i) { if (bAbort) return false; - kapp->processEvents(); + tdeApp->processEvents(); execute(*i); symbolTables.pop(); //free up stack @@ -103,7 +103,7 @@ void Executer::pause() // The next line is within all loops of the Executer // if (bAbort) return; // mostly before - // kapp->processEvents(); + // tdeApp->processEvents(); // this to keep the GUI of KTurtle accessible while executing the logo code // so the Abort button can be clicked, and will function bPause = true; @@ -114,7 +114,7 @@ void Executer::abort() // The next line is within all loops of the Executer // if(bAbort) return; // mostly before - // kapp->processEvents(); + // tdeApp->processEvents(); // this to keep the GUI of KTurtle accessible while executing the logo code // so the Abort button can be clicked, and will function bAbort = true; @@ -244,7 +244,7 @@ void Executer::execFunction(TreeNode* node) { if (bAbort) return; if (bPause) startPausing(); - kapp->processEvents(); + tdeApp->processEvents(); // execute the parameters which can be expressions execute(*pfrom); @@ -305,7 +305,7 @@ void Executer::execBlock(TreeNode* node) if (runSpeed != 0) slowDown(*i); if (bAbort) return; if (bPause) startPausing(); - kapp->processEvents(); + tdeApp->processEvents(); execute(*i); @@ -334,7 +334,7 @@ void Executer::execForEach(TreeNode* node) { if (bAbort) return; if (bPause) startPausing(); - kapp->processEvents(); + tdeApp->processEvents(); execute(statements); if (bBreak || bReturn) break; //jump out loop @@ -369,7 +369,7 @@ void Executer::execFor(TreeNode* node) { if (bAbort) return; if (bPause) startPausing(); - kapp->processEvents(); + tdeApp->processEvents(); ( symbolTables.top() )[name] = d; execute( statements ); if (bBreak || bReturn) break; //jump out loop @@ -390,7 +390,7 @@ void Executer::execFor(TreeNode* node) { if (bAbort) return; if (bPause) startPausing(); - kapp->processEvents(); + tdeApp->processEvents(); (symbolTables.top() )[name] = d; execute( statements ); @@ -403,7 +403,7 @@ void Executer::execFor(TreeNode* node) { if (bAbort) return; if (bPause) startPausing(); - kapp->processEvents(); + tdeApp->processEvents(); ( symbolTables.top() )[name] = d; execute(statements); @@ -427,7 +427,7 @@ void Executer::execRepeat(TreeNode* node) { if (bAbort) return; if (bPause) startPausing(); - kapp->processEvents(); + tdeApp->processEvents(); execute(statements); if (bBreak || bReturn) break; //jump out loop @@ -447,7 +447,7 @@ void Executer::execWhile(TreeNode* node) { if (bAbort) return; if (bPause) startPausing(); - kapp->processEvents(); + tdeApp->processEvents(); execute(statements); if (bBreak || bReturn) break; //jump out loop @@ -647,7 +647,7 @@ TQString Executer::runCommand(const TQString& command) while( fgets(buf, sizeof(buf), pstream) !=NULL) { if (bAbort) return (""); - kapp->processEvents(); + tdeApp->processEvents(); Line += buf; } @@ -1015,12 +1015,12 @@ void Executer::startWaiting(int msec) { bStopWaiting = false; // call a timer that sets stopWaiting to true when it runs - TQTimer::singleShot( msec, this, TQT_SLOT( slotStopWaiting() ) ); + TQTimer::singleShot( msec, this, TQ_SLOT( slotStopWaiting() ) ); while (bStopWaiting == false) { if (bAbort) return; // waits need to be interrupted by the stop action if (bPause) startPausing(); - kapp->processEvents(); + tdeApp->processEvents(); // only 10 times per second is enough... else the CPU gets 100% loaded ( not nice :) usleep(100000); @@ -1037,7 +1037,7 @@ void Executer::startPausing() while (bPause == true) { if (bAbort) return; // waits need to be interrupted by the stop action - kapp->processEvents(); + tdeApp->processEvents(); // only 10 times per second is enough... else the CPU gets 100% loaded ( not nice :) usleep(100000); } diff --git a/kturtle/src/executer.h b/kturtle/src/executer.h index 7cf48ddd..6a892285 100644 --- a/kturtle/src/executer.h +++ b/kturtle/src/executer.h @@ -34,7 +34,7 @@ typedef stack<Value> runstack; class Executer : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kturtle/src/kturtle.cpp b/kturtle/src/kturtle.cpp index 74b33300..04416053 100644 --- a/kturtle/src/kturtle.cpp +++ b/kturtle/src/kturtle.cpp @@ -86,7 +86,7 @@ MainWindow::MainWindow(KTextEditor::Document *document) : editor(0) { KMessageBox::error( this, i18n("A TDE text-editor component could not be found;\n" "please check your TDE installation.") ); - kapp->exit(1); + tdeApp->exit(1); } // docList.append(doc); } @@ -101,9 +101,9 @@ MainWindow::MainWindow(KTextEditor::Document *document) : editor(0) setMinimumSize(200,200); // init with more usefull size, stolen from kwite (they stole it from konq) - if ( !initialGeometrySet() && !kapp->config()->hasGroup("MainWindow Settings") ) resize(640, 480); + if ( !initialGeometrySet() && !tdeApp->config()->hasGroup("MainWindow Settings") ) resize(640, 480); - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); readConfig(config); } @@ -123,59 +123,59 @@ void MainWindow::setupActions() TDEActionCollection *ac = actionCollection(); // abbreviation // File actions - KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotNewFile()), ac); - openExAction = new TDEAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotOpenExample()), ac, "open_examples"); - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile()), ac); - m_recentFiles = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotOpenFile(const KURL&)), ac); - KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSaveFile()), ac); - KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), ac); - new TDEAction(i18n("Save &Canvas..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveCanvas()), ac, "save_canvas"); - speed = new TDESelectAction(i18n("Execution Speed"), 0, ALT+Key_S, TQT_TQOBJECT(this), TQT_SLOT( slotChangeSpeed() ), ac, "speed"); + KStdAction::openNew(this, TQ_SLOT(slotNewFile()), ac); + openExAction = new TDEAction(i18n("Open Exa&mples..."), "bookmark_folder", CTRL+Key_E, this, TQ_SLOT(slotOpenExample()), ac, "open_examples"); + KStdAction::open(this, TQ_SLOT(slotOpenFile()), ac); + m_recentFiles = KStdAction::openRecent(this, TQ_SLOT(slotOpenFile(const KURL&)), ac); + KStdAction::save(this, TQ_SLOT(slotSaveFile()), ac); + KStdAction::saveAs(this, TQ_SLOT(slotSaveAs()), ac); + new TDEAction(i18n("Save &Canvas..."), 0, 0, this, TQ_SLOT(slotSaveCanvas()), ac, "save_canvas"); + speed = new TDESelectAction(i18n("Execution Speed"), 0, ALT+Key_S, this, TQ_SLOT( slotChangeSpeed() ), ac, "speed"); TQStringList speeds; speeds << i18n("Full Speed") << i18n("Slow") << i18n("Slower") << i18n("Slowest"); speed->setItems(speeds); speed->setCurrentItem(0); - run = new TDEAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, TQT_TQOBJECT(this), TQT_SLOT( slotExecute() ), ac, "run"); - pause = new TDEToggleAction(i18n("Pause E&xecution"), "media-playback-pause", Key_Pause, TQT_TQOBJECT(this), TQT_SLOT( slotPauseExecution() ), ac, "pause"); + run = new TDEAction(i18n("&Execute Commands"), "gear", ALT+Key_Return, this, TQ_SLOT( slotExecute() ), ac, "run"); + pause = new TDEToggleAction(i18n("Pause E&xecution"), "media-playback-pause", Key_Pause, this, TQ_SLOT( slotPauseExecution() ), ac, "pause"); pause->setChecked(false); pause->setEnabled(false); - stop = new TDEAction(i18n("Stop E&xecution"), "process-stop", Key_Escape, TQT_TQOBJECT(this), TQT_SLOT( slotAbortExecution() ), ac, "stop"); + stop = new TDEAction(i18n("Stop E&xecution"), "process-stop", Key_Escape, this, TQ_SLOT( slotAbortExecution() ), ac, "stop"); stop->setEnabled(false); - KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), ac); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), ac); + KStdAction::print(this, TQ_SLOT(slotPrint()), ac); + KStdAction::quit(this, TQ_SLOT(close()), ac); // Edit actions - KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), ac); - KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), ac); - KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), ac); - KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac); - KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), ac); - KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), ac); - KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(slotClearSelection()), ac); - new TDEToggleAction(i18n("Toggle Insert"), Key_Insert, TQT_TQOBJECT(this), TQT_SLOT(slotToggleInsert()), ac, "set_insert"); - KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotFind()), ac); - KStdAction::findNext(TQT_TQOBJECT(this), TQT_SLOT(slotFindNext()), ac); - KStdAction::findPrev(TQT_TQOBJECT(this), TQT_SLOT(slotFindPrevious()), ac); - KStdAction::replace(TQT_TQOBJECT(this), TQT_SLOT(slotReplace()), ac); + KStdAction::undo(this, TQ_SLOT(slotUndo()), ac); + KStdAction::redo(this, TQ_SLOT(slotRedo()), ac); + KStdAction::cut(this, TQ_SLOT(slotCut()), ac); + KStdAction::copy(this, TQ_SLOT(slotCopy()), ac); + KStdAction::paste(this, TQ_SLOT(slotPaste()), ac); + KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), ac); + KStdAction::deselect(this, TQ_SLOT(slotClearSelection()), ac); + new TDEToggleAction(i18n("Toggle Insert"), Key_Insert, this, TQ_SLOT(slotToggleInsert()), ac, "set_insert"); + KStdAction::find(this, TQ_SLOT(slotFind()), ac); + KStdAction::findNext(this, TQ_SLOT(slotFindNext()), ac); + KStdAction::findPrev(this, TQ_SLOT(slotFindPrevious()), ac); + KStdAction::replace(this, TQ_SLOT(slotReplace()), ac); // View actions - new TDEToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, TQT_TQOBJECT(this), TQT_SLOT(slotToggleLineNumbers()), ac, "line_numbers"); - m_fullscreen = KStdAction::fullScreen(TQT_TQOBJECT(this), TQT_SLOT(slotToggleFullscreen()), ac, this, "full_screen"); + new TDEToggleAction(i18n("Show &Line Numbers"), 0, Key_F11, this, TQ_SLOT(slotToggleLineNumbers()), ac, "line_numbers"); + m_fullscreen = KStdAction::fullScreen(this, TQ_SLOT(slotToggleFullscreen()), ac, this, "full_screen"); m_fullscreen->setChecked(b_fullscreen); // Tools actions - colorpicker = new TDEToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotColorPicker()), ac, "color_picker"); - new TDEAction(i18n("&Indent"), "format-indent-more", CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotIndent()), ac, "edit_indent"); - new TDEAction(i18n("&Unindent"), "format-indent-less", CTRL+SHIFT+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotUnIndent()), ac, "edit_unindent"); - new TDEAction(i18n("Cl&ean Indentation"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanIndent()), ac, "edit_cleanIndent"); - new TDEAction(i18n("Co&mment"), 0, CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotComment()), ac, "edit_comment"); - new TDEAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotUnComment()), ac, "edit_uncomment"); + colorpicker = new TDEToggleAction(i18n("&Color Picker"), "colorize", ALT+Key_C, this, TQ_SLOT(slotColorPicker()), ac, "color_picker"); + new TDEAction(i18n("&Indent"), "format-indent-more", CTRL+Key_I, this, TQ_SLOT(slotIndent()), ac, "edit_indent"); + new TDEAction(i18n("&Unindent"), "format-indent-less", CTRL+SHIFT+Key_I, this, TQ_SLOT(slotUnIndent()), ac, "edit_unindent"); + new TDEAction(i18n("Cl&ean Indentation"), 0, 0, this, TQ_SLOT(slotCleanIndent()), ac, "edit_cleanIndent"); + new TDEAction(i18n("Co&mment"), 0, CTRL+Key_D, this, TQ_SLOT(slotComment()), ac, "edit_comment"); + new TDEAction(i18n("Unc&omment"), 0, CTRL+SHIFT+Key_D, this, TQ_SLOT(slotUnComment()), ac, "edit_uncomment"); // Settings actions - KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT(slotSettings()), ac ); - new TDEAction(i18n("&Configure Editor..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditor()), ac, "set_confdlg"); + KStdAction::preferences( this, TQ_SLOT(slotSettings()), ac ); + new TDEAction(i18n("&Configure Editor..."), "configure", 0, this, TQ_SLOT(slotEditor()), ac, "set_confdlg"); // Help actions - ContextHelp = new TDEAction(0, 0, Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotContextHelp()), ac, "context_help"); + ContextHelp = new TDEAction(0, 0, Key_F2, this, TQ_SLOT(slotContextHelp()), ac, "context_help"); slotContextHelpUpdate(); // this sets the label of this action // other @@ -204,9 +204,9 @@ void MainWindow::setupEditor() slotSetHighlightstyle( Settings::logoLanguage() ); // allow the cursor position to be indicated in the statusbar - connect( editor, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(slotCursorStatusBar()) ); + connect( editor, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(slotCursorStatusBar()) ); // and update the context help menu item - connect( editor, TQT_SIGNAL(cursorPositionChanged()), this, TQT_SLOT(slotContextHelpUpdate()) ); + connect( editor, TQ_SIGNAL(cursorPositionChanged()), this, TQ_SLOT(slotContextHelpUpdate()) ); translate = new Translate(); } @@ -236,7 +236,7 @@ void MainWindow::setupCanvas() baseLayout->setColStretch(0, 1); TQWhatsThis::add( canvasView, i18n("This is the canvas, here the turtle draws a picture.") ); canvasView->show(); - connect( canvasView, TQT_SIGNAL( CanvasResized() ), this, TQT_SLOT( slotUpdateCanvas() ) ); + connect( canvasView, TQ_SIGNAL( CanvasResized() ), this, TQ_SLOT( slotUpdateCanvas() ) ); } // END @@ -490,7 +490,7 @@ bool MainWindow::queryClose() } } } - TDEConfig *config = kapp->config(); + TDEConfig *config = tdeApp->config(); config->setGroup("General Options"); m_recentFiles->saveEntries(config, "Recent Files"); config->sync(); @@ -520,15 +520,15 @@ void MainWindow::slotExecute() // start paring slotStatusBar(i18n("Parsing commands..."), IDS_STATUS); kdDebug(0)<<"############## PARSING STARTED ##############"<<endl; - kapp->processEvents(); + tdeApp->processEvents(); errMsg = new ErrorMessage(this); // create an empty errorDialog TQString txt = editorInterface->text() + "\x0a\x0a"; // parser expects input to have 2 delimiting newlines TQTextIStream in(&txt); // create the stream Parser parser(in); // pass the reference to the stream to the parse object - connect(&parser, TQT_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ), - errMsg, TQT_SLOT( slotAddError(Token&, const TQString&, uint) ) ); - connect( errMsg, TQT_SIGNAL(setSelection(uint, uint, uint, uint) ), - this, TQT_SLOT(slotSetSelection(uint, uint, uint, uint) ) ); + connect(&parser, TQ_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ), + errMsg, TQ_SLOT( slotAddError(Token&, const TQString&, uint) ) ); + connect( errMsg, TQ_SIGNAL(setSelection(uint, uint, uint, uint) ), + this, TQ_SLOT(slotSetSelection(uint, uint, uint, uint) ) ); parser.parse(); // and GO! TreeNode* root = parser.getTree(); // when finished parsing get the nodeTree kdDebug(0)<<"############## PARSING FINISHED ##############"<<endl; @@ -541,42 +541,42 @@ void MainWindow::slotExecute() kdDebug(0)<<"############## EXECUTION STARTED ##############"<<endl; exe = new Executer(root); // make Executer object, 'exe', and pass it the nodeTree - connect(this, TQT_SIGNAL( changeSpeed(int) ), exe, TQT_SLOT(slotChangeSpeed(int) ) ); - connect(this, TQT_SIGNAL( unpauseExecution() ), exe, TQT_SLOT( slotStopPausing() ) ); - connect( exe, TQT_SIGNAL( setSelection(uint, uint, uint, uint) ), - this, TQT_SLOT ( slotSetSelection(uint, uint, uint, uint) ) ); - connect( exe, TQT_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ), - errMsg, TQT_SLOT ( slotAddError(Token&, const TQString&, uint) ) ); - connect( exe, TQT_SIGNAL( InputDialog(TQString&) ), this, TQT_SLOT( slotInputDialog(TQString&) ) ); - connect( exe, TQT_SIGNAL( MessageDialog(TQString) ), this, TQT_SLOT( slotMessageDialog(TQString) ) ); + connect(this, TQ_SIGNAL( changeSpeed(int) ), exe, TQ_SLOT(slotChangeSpeed(int) ) ); + connect(this, TQ_SIGNAL( unpauseExecution() ), exe, TQ_SLOT( slotStopPausing() ) ); + connect( exe, TQ_SIGNAL( setSelection(uint, uint, uint, uint) ), + this, TQ_SLOT ( slotSetSelection(uint, uint, uint, uint) ) ); + connect( exe, TQ_SIGNAL( ErrorMsg(Token&, const TQString&, uint) ), + errMsg, TQ_SLOT ( slotAddError(Token&, const TQString&, uint) ) ); + connect( exe, TQ_SIGNAL( InputDialog(TQString&) ), this, TQ_SLOT( slotInputDialog(TQString&) ) ); + connect( exe, TQ_SIGNAL( MessageDialog(TQString) ), this, TQ_SLOT( slotMessageDialog(TQString) ) ); // Connect the signals form Executer to the slots from Canvas: - connect( exe, TQT_SIGNAL( Clear() ), canvasView, TQT_SLOT( slotClear() ) ); - connect( exe, TQT_SIGNAL( Go(double, double) ), canvasView, TQT_SLOT( slotGo(double, double) ) ); - connect( exe, TQT_SIGNAL( GoX(double) ), canvasView, TQT_SLOT( slotGoX(double) ) ); - connect( exe, TQT_SIGNAL( GoY(double) ), canvasView, TQT_SLOT( slotGoY(double) ) ); - connect( exe, TQT_SIGNAL( Forward(double) ), canvasView, TQT_SLOT( slotForward(double) ) ); - connect( exe, TQT_SIGNAL( Backward(double) ), canvasView, TQT_SLOT( slotBackward(double) ) ); - connect( exe, TQT_SIGNAL( Direction(double) ), canvasView, TQT_SLOT( slotDirection(double) ) ); - connect( exe, TQT_SIGNAL( TurnLeft(double) ), canvasView, TQT_SLOT( slotTurnLeft(double) ) ); - connect( exe, TQT_SIGNAL( TurnRight(double) ), canvasView, TQT_SLOT( slotTurnRight(double) ) ); - connect( exe, TQT_SIGNAL( Center() ), canvasView, TQT_SLOT( slotCenter() ) ); - connect( exe, TQT_SIGNAL( SetPenWidth(int) ), canvasView, TQT_SLOT( slotSetPenWidth(int) ) ); - connect( exe, TQT_SIGNAL( PenUp() ), canvasView, TQT_SLOT( slotPenUp() ) ); - connect( exe, TQT_SIGNAL( PenDown() ), canvasView, TQT_SLOT( slotPenDown() ) ); - connect( exe, TQT_SIGNAL( SetFgColor(int, int, int) ), canvasView, TQT_SLOT( slotSetFgColor(int, int, int) ) ); - connect( exe, TQT_SIGNAL( SetBgColor(int, int, int) ), canvasView, TQT_SLOT( slotSetBgColor(int, int, int) ) ); - connect( exe, TQT_SIGNAL( ResizeCanvas(int, int) ), canvasView, TQT_SLOT( slotResizeCanvas(int, int) ) ); - connect( exe, TQT_SIGNAL( SpriteShow() ), canvasView, TQT_SLOT( slotSpriteShow() ) ); - connect( exe, TQT_SIGNAL( SpriteHide() ), canvasView, TQT_SLOT( slotSpriteHide() ) ); - connect( exe, TQT_SIGNAL( SpritePress() ), canvasView, TQT_SLOT( slotSpritePress() ) ); - connect( exe, TQT_SIGNAL( SpriteChange(int) ), canvasView, TQT_SLOT( slotSpriteChange(int) ) ); - connect( exe, TQT_SIGNAL( Print(TQString) ), canvasView, TQT_SLOT( slotPrint(TQString) ) ); - connect( exe, TQT_SIGNAL( FontType(TQString, TQString) ), canvasView, TQT_SLOT( slotFontType(TQString, TQString) ) ); - connect( exe, TQT_SIGNAL( FontSize(int) ), canvasView, TQT_SLOT( slotFontSize(int) ) ); - connect( exe, TQT_SIGNAL( WrapOn() ), canvasView, TQT_SLOT( slotWrapOn() ) ); - connect( exe, TQT_SIGNAL( WrapOff() ), canvasView, TQT_SLOT( slotWrapOff() ) ); - connect( exe, TQT_SIGNAL( Reset() ), canvasView, TQT_SLOT( slotReset() ) ); + connect( exe, TQ_SIGNAL( Clear() ), canvasView, TQ_SLOT( slotClear() ) ); + connect( exe, TQ_SIGNAL( Go(double, double) ), canvasView, TQ_SLOT( slotGo(double, double) ) ); + connect( exe, TQ_SIGNAL( GoX(double) ), canvasView, TQ_SLOT( slotGoX(double) ) ); + connect( exe, TQ_SIGNAL( GoY(double) ), canvasView, TQ_SLOT( slotGoY(double) ) ); + connect( exe, TQ_SIGNAL( Forward(double) ), canvasView, TQ_SLOT( slotForward(double) ) ); + connect( exe, TQ_SIGNAL( Backward(double) ), canvasView, TQ_SLOT( slotBackward(double) ) ); + connect( exe, TQ_SIGNAL( Direction(double) ), canvasView, TQ_SLOT( slotDirection(double) ) ); + connect( exe, TQ_SIGNAL( TurnLeft(double) ), canvasView, TQ_SLOT( slotTurnLeft(double) ) ); + connect( exe, TQ_SIGNAL( TurnRight(double) ), canvasView, TQ_SLOT( slotTurnRight(double) ) ); + connect( exe, TQ_SIGNAL( Center() ), canvasView, TQ_SLOT( slotCenter() ) ); + connect( exe, TQ_SIGNAL( SetPenWidth(int) ), canvasView, TQ_SLOT( slotSetPenWidth(int) ) ); + connect( exe, TQ_SIGNAL( PenUp() ), canvasView, TQ_SLOT( slotPenUp() ) ); + connect( exe, TQ_SIGNAL( PenDown() ), canvasView, TQ_SLOT( slotPenDown() ) ); + connect( exe, TQ_SIGNAL( SetFgColor(int, int, int) ), canvasView, TQ_SLOT( slotSetFgColor(int, int, int) ) ); + connect( exe, TQ_SIGNAL( SetBgColor(int, int, int) ), canvasView, TQ_SLOT( slotSetBgColor(int, int, int) ) ); + connect( exe, TQ_SIGNAL( ResizeCanvas(int, int) ), canvasView, TQ_SLOT( slotResizeCanvas(int, int) ) ); + connect( exe, TQ_SIGNAL( SpriteShow() ), canvasView, TQ_SLOT( slotSpriteShow() ) ); + connect( exe, TQ_SIGNAL( SpriteHide() ), canvasView, TQ_SLOT( slotSpriteHide() ) ); + connect( exe, TQ_SIGNAL( SpritePress() ), canvasView, TQ_SLOT( slotSpritePress() ) ); + connect( exe, TQ_SIGNAL( SpriteChange(int) ), canvasView, TQ_SLOT( slotSpriteChange(int) ) ); + connect( exe, TQ_SIGNAL( Print(TQString) ), canvasView, TQ_SLOT( slotPrint(TQString) ) ); + connect( exe, TQ_SIGNAL( FontType(TQString, TQString) ), canvasView, TQ_SLOT( slotFontType(TQString, TQString) ) ); + connect( exe, TQ_SIGNAL( FontSize(int) ), canvasView, TQ_SLOT( slotFontSize(int) ) ); + connect( exe, TQ_SIGNAL( WrapOn() ), canvasView, TQ_SLOT( slotWrapOn() ) ); + connect( exe, TQ_SIGNAL( WrapOff() ), canvasView, TQ_SLOT( slotWrapOff() ) ); + connect( exe, TQ_SIGNAL( Reset() ), canvasView, TQ_SLOT( slotReset() ) ); // START EXECUTION on the selected speed, and use the feedbacked boolean value slotChangeSpeed(); @@ -625,7 +625,7 @@ void MainWindow::finishExecution() if (speed->currentItem() == 0) slotClearSelection(); // if coming from fullscreen-mode show the editor, menu- and statusbar - if (b_fullscreen) TQTimer::singleShot( 1000, this, TQT_SLOT( slotFinishedFullScreenExecution() ) ); + if (b_fullscreen) TQTimer::singleShot( 1000, this, TQ_SLOT( slotFinishedFullScreenExecution() ) ); } void MainWindow::slotChangeSpeed() @@ -833,9 +833,9 @@ void MainWindow::slotFinishedFullScreenExecution() if ( errMsg->containsErrors() ) slotBackToFullScreen(); // straight back to edit if there where errors else { - connect( restartOrBackDialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotRestartFullScreen() ) ); - connect( restartOrBackDialog, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( slotBackToFullScreen() ) ); - connect( restartOrBackDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotBackToFullScreen() ) ); + connect( restartOrBackDialog, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotRestartFullScreen() ) ); + connect( restartOrBackDialog, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT( slotBackToFullScreen() ) ); + connect( restartOrBackDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotBackToFullScreen() ) ); restartOrBackDialog->show(); restartOrBackDialog->move(50, 50); } @@ -870,13 +870,13 @@ void MainWindow::slotSettings() // Create a new dialog with the same name as the above checking code. TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", Settings::self() ); // connect the help - connect( dialog, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( slotSettingsHelp() ) ); + connect( dialog, TQ_SIGNAL( helpClicked() ), this, TQ_SLOT( slotSettingsHelp() ) ); // making the filling for the 'General' settings dept. general = new TQWidget(); TQGridLayout *generalLayout = new TQGridLayout( general, 1, 1, 11, 6, "generalLayout"); WidthHeightBox = new TQGroupBox( i18n("Initial Canvas Size"), general ); - WidthHeightBox->setColumnLayout(0, Qt::Vertical ); + WidthHeightBox->setColumnLayout(0, TQt::Vertical ); WidthHeightBox->layout()->setSpacing( 6 ); WidthHeightBox->layout()->setMargin( 11 ); TQVBoxLayout *WidthHeightBoxLayout = new TQVBoxLayout( WidthHeightBox->layout() ); @@ -917,7 +917,7 @@ void MainWindow::slotSettings() TQWidget *language = new TQWidget(); TQGridLayout *languageLayout = new TQGridLayout( language, 1, 1, 11, 6, "Form1Layout"); TQGroupBox *groupBox1 = new TQGroupBox( language, "groupBox1" ); - groupBox1->setColumnLayout(0, Qt::Vertical ); + groupBox1->setColumnLayout(0, TQt::Vertical ); groupBox1->layout()->setSpacing( 6 ); groupBox1->layout()->setMargin( 11 ); TQGridLayout *groupBox1Layout = new TQGridLayout( groupBox1->layout() ); @@ -946,7 +946,7 @@ void MainWindow::slotSettings() dialog->addPage( language, i18n("Language"), "locale", i18n("Language Settings") ); // When the user clicks OK or Apply we want to update our settings. - connect( dialog, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotUpdateSettings() ) ); + connect( dialog, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotUpdateSettings() ) ); // Display the dialog is there where errors. dialog->setInitialSize( TQSize(550, 300) ); @@ -984,7 +984,7 @@ void MainWindow::readConfig(TDEConfig *config) void MainWindow::slotSettingsHelp() { - kapp->invokeHelp("settings-configure", "", ""); + tdeApp->invokeHelp("settings-configure", "", ""); } // END @@ -1040,7 +1040,7 @@ void MainWindow::slotContextHelp() kdDebug(0)<<"trying to open a help page using this keyword: "<<helpWord<<endl; - kapp->invokeHelp(helpWord, "", ""); + tdeApp->invokeHelp(helpWord, "", ""); TQString help2statusBar; if ( helpKeyword.startsWith("<") ) help2statusBar = helpKeyword; @@ -1150,8 +1150,8 @@ void MainWindow::slotColorPicker() { picker = new ColorPicker(this); if(picker == 0) return; // safety - connect( picker, TQT_SIGNAL( visible(bool) ), colorpicker, TQT_SLOT( setChecked(bool) ) ); - connect( picker, TQT_SIGNAL( ColorCode(TQString) ), this, TQT_SLOT( slotInsertText(TQString) ) ); + connect( picker, TQ_SIGNAL( visible(bool) ), colorpicker, TQ_SLOT( setChecked(bool) ) ); + connect( picker, TQ_SIGNAL( ColorCode(TQString) ), this, TQ_SLOT( slotInsertText(TQString) ) ); } // if picker is not 0, there is a colorpickerdialog which only needs to be shown OR hidden if ( picker->isHidden() ) diff --git a/kturtle/src/kturtle.h b/kturtle/src/kturtle.h index b9dfd00c..f42cbe81 100644 --- a/kturtle/src/kturtle.h +++ b/kturtle/src/kturtle.h @@ -45,7 +45,7 @@ class TDERecentFilesAction; class MainWindow : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kturtle/src/parser.h b/kturtle/src/parser.h index d1baf5d1..b05a354b 100644 --- a/kturtle/src/parser.h +++ b/kturtle/src/parser.h @@ -28,7 +28,7 @@ class Parser : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kturtle/src/settings.kcfgc b/kturtle/src/settings.kcfgc index d6aa84aa..90c57632 100644 --- a/kturtle/src/settings.kcfgc +++ b/kturtle/src/settings.kcfgc @@ -1,5 +1,5 @@ File=kturtle.kcfg -IncludeFiles=kstandarddirs.h,kdebug.h +IncludeFiles=tdestandarddirs.h,kdebug.h ClassName=Settings Singleton=true Mutators=true diff --git a/kverbos/kverbos/Makefile.am b/kverbos/kverbos/Makefile.am index a6b79650..a1ffa6c0 100644 --- a/kverbos/kverbos/Makefile.am +++ b/kverbos/kverbos/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = icons data bin_PROGRAMS = kverbos kverbos_SOURCES = kfeedercontrol.cpp kresult.cpp qresult.ui verbspanish.cpp kverbosuser.cpp kerfassen.cpp qerfassen.ui kverbedit.cpp qverbedit.ui qverbosoptions.ui kverbosoptions.cpp qlernen.ui kstartuplogo.cpp kverbosview.cpp kverbosdoc.cpp kverbos.cpp main.cpp prefs.kcfgc -kverbos_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) +kverbos_LDADD = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) $(LIBSOCKET) EXTRA_DIST = kfeedercontrol.cpp kfeedercontrol.h main.cpp kverbos.cpp kverbos.h kverbosdoc.cpp kverbosdoc.h kverbosview.cpp kverbosview.h kverbosui.rc kverbos.desktop kstartuplogo.cpp kstartuplogo.h startuplogo.png qlernen.ui kverbosoptions.cpp kverbosoptions.h qverbosoptions.ui qverbedit.ui kverbedit.cpp kverbedit.h qerfassen.ui kerfassen.cpp kerfassen.h deu16.png span16.png kverbosuser.cpp kverbosuser.h verbspanish.cpp verbspanish.h qresult.ui kverbosuser.png kresult.cpp kresult.h @@ -19,7 +19,7 @@ INCLUDES= $(all_includes) METASOURCES = AUTO # the library search path. -kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor rcdir = $(kde_datadir)/kverbos rc_DATA = kverbosui.rc diff --git a/kverbos/kverbos/kerfassen.h b/kverbos/kverbos/kerfassen.h index 8e264986..eb99ded1 100644 --- a/kverbos/kverbos/kerfassen.h +++ b/kverbos/kverbos/kerfassen.h @@ -38,7 +38,7 @@ public: * Verben in die Liste eingef�gt werden k�nnen. Es wird auch ein Iterator �bergeben, der * anzeigt, wo mit dem editieren begonnen werden soll. */ - KErfassen(spanishVerbList& l, int pos = -1, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + KErfassen(spanishVerbList& l, int pos = -1, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0); /** der Destruktor */ virtual ~KErfassen(); /** Gibt zur�ck, ob durch den Ablauf des Dialoges eine �nderung an der diff --git a/kverbos/kverbos/kfeedercontrol.cpp b/kverbos/kverbos/kfeedercontrol.cpp index 614a9699..d49769bc 100644 --- a/kverbos/kverbos/kfeedercontrol.cpp +++ b/kverbos/kverbos/kfeedercontrol.cpp @@ -18,7 +18,7 @@ #include "kfeedercontrol.h" #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> KFeederControl::KFeederControl(int ID, bool splash, bool automatic) { @@ -41,7 +41,7 @@ KFeederControl::KFeederControl(int ID, bool splash, bool automatic) feederID.setNum(childFeeder.pid()); feederID = "KFeeder-" + feederID; - dcop = kapp->dcopClient(); + dcop = tdeApp->dcopClient(); dcop->attach(); appId = dcop->registerAs("KVerbos"); active = true; diff --git a/kverbos/kverbos/kfeedercontrol.h b/kverbos/kverbos/kfeedercontrol.h index 79a02cc0..537b0f27 100644 --- a/kverbos/kverbos/kfeedercontrol.h +++ b/kverbos/kverbos/kfeedercontrol.h @@ -18,7 +18,7 @@ #ifndef KFEEDERCONTROL_H #define KFEEDERCONTROL_H -#include <kprocess.h> +#include <tdeprocess.h> #include <dcopclient.h> diff --git a/kverbos/kverbos/kresult.h b/kverbos/kverbos/kresult.h index e4aee250..6f10ec42 100644 --- a/kverbos/kverbos/kresult.h +++ b/kverbos/kverbos/kresult.h @@ -28,7 +28,7 @@ class KResult : public QResult { public: - KResult(KVerbosUser* pU, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KResult(KVerbosUser* pU, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~KResult(); public slots: /** Wird durch den OK-Button aufgerufen und beendet den Dialog. diff --git a/kverbos/kverbos/kstartuplogo.cpp b/kverbos/kverbos/kstartuplogo.cpp index 4b95c3f5..978ea902 100644 --- a/kverbos/kverbos/kstartuplogo.cpp +++ b/kverbos/kverbos/kstartuplogo.cpp @@ -17,7 +17,7 @@ #include "kstartuplogo.h" #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobalsettings.h> TDEStartupLogo::TDEStartupLogo(TQWidget * parent, const char *name) diff --git a/kverbos/kverbos/kstartuplogo.h b/kverbos/kverbos/kstartuplogo.h index 39445dea..a50f19da 100644 --- a/kverbos/kverbos/kstartuplogo.h +++ b/kverbos/kverbos/kstartuplogo.h @@ -25,7 +25,7 @@ */ class TDEStartupLogo : public TQWidget { - Q_OBJECT + TQ_OBJECT public: TDEStartupLogo(TQWidget *parent=0, const char *name=0); diff --git a/kverbos/kverbos/kverbedit.cpp b/kverbos/kverbos/kverbedit.cpp index 7e7bcde8..1c1b9bec 100644 --- a/kverbos/kverbos/kverbedit.cpp +++ b/kverbos/kverbos/kverbedit.cpp @@ -24,7 +24,7 @@ * die Liste der Verben bearbeitet werden kann. Zu Beginn mssen alle Verben * aus der Liste in eine dialogeigene Liste und die TQListView bertragen werden. */ -KVerbEdit::KVerbEdit(spanishVerbList& l, TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/) +KVerbEdit::KVerbEdit(spanishVerbList& l, TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= false*/, WFlags fl /*= 0*/) : QVerbEdit(parent, name, modal, fl), list(l) { // Die Spaltenbreiten anpassen diff --git a/kverbos/kverbos/kverbedit.h b/kverbos/kverbos/kverbedit.h index 54b1a6bd..f7c8e01e 100644 --- a/kverbos/kverbos/kverbedit.h +++ b/kverbos/kverbos/kverbedit.h @@ -34,7 +34,7 @@ public: /** An die Dialogklasse wird direkt die Verbliste �bergeben, damit * die Liste der Verben bearbeitet werden kann. */ - KVerbEdit(spanishVerbList& l, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + KVerbEdit(spanishVerbList& l, TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0); ~KVerbEdit(); /** kopiert die Liste in die ListView. */ void listToView(); diff --git a/kverbos/kverbos/kverbos.cpp b/kverbos/kverbos/kverbos.cpp index 58af2410..57a18235 100644 --- a/kverbos/kverbos/kverbos.cpp +++ b/kverbos/kverbos/kverbos.cpp @@ -24,7 +24,7 @@ #include <tdefiledialog.h> #include <kinputdialog.h> #include "kstartuplogo.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> // application specific includes @@ -58,7 +58,7 @@ KVerbosApp::KVerbosApp(TQWidget* , const char* name):TDEMainWindow (0, name) // die Instanzen von kverbos z�hlen kverbosCounter++; - config=kapp->config(); + config=tdeApp->config(); /////////////////////////////////////////////////////////////////// // call inits to invoke all other construction parts @@ -108,7 +108,7 @@ KVerbosApp::~KVerbosApp() kverbosCounter--; if (kfeederControl) { - disconnect(view, TQT_SIGNAL(informKFeeder(int)), TQT_TQOBJECT(this), TQT_SLOT(slotFeedIt(int))); + disconnect(view, TQ_SIGNAL(informKFeeder(int)), this, TQ_SLOT(slotFeedIt(int))); delete kfeederControl; kfeederControl = 0; }; @@ -116,25 +116,25 @@ KVerbosApp::~KVerbosApp() void KVerbosApp::initActions() { - fileNewWindow = new TDEAction(i18n("New &Window"), "window_new.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window"); - fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); - fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); - fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileOpenStandard = new TDEAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard"); - fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); - fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); - fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); - filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); - fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); - editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); - editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); - editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); - editErfassen = new TDEAction(i18n("E&nter New Verb..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen"); - editBearbeiten = new TDEAction(i18n("&Edit Verb List..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten"); - - settingOptions = new TDEAction(i18n("&Configure KVerbos..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsOptions()), actionCollection(), "settings_options"); - userUsername = new TDEAction(i18n("&Username..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettingsUsername()), actionCollection(), "user_username"); - userResults = new TDEAction(i18n("&Results"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotUserResults()), actionCollection(), "user_results"); + fileNewWindow = new TDEAction(i18n("New &Window"), "window_new.png", 0, this, TQ_SLOT(slotFileNewWindow()), actionCollection(),"file_new_window"); + fileNew = KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); + fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenStandard = new TDEAction(i18n("Open &Standard Verb File"), "fileopen.png", 0, this, TQ_SLOT(slotFileOpenStandard()), actionCollection(),"file_open_standard"); + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); + fileClose = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); + editCut = KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); + editErfassen = new TDEAction(i18n("E&nter New Verb..."), 0, 0, this, TQ_SLOT(slotEditErfassen()), actionCollection(),"edit_erfassen"); + editBearbeiten = new TDEAction(i18n("&Edit Verb List..."), 0, 0, this, TQ_SLOT(slotEditBearbeiten()), actionCollection(), "edit_bearbeiten"); + + settingOptions = new TDEAction(i18n("&Configure KVerbos..."), 0, 0, this, TQ_SLOT(slotSettingsOptions()), actionCollection(), "settings_options"); + userUsername = new TDEAction(i18n("&Username..."), 0, 0, this, TQ_SLOT(slotSettingsUsername()), actionCollection(), "user_username"); + userResults = new TDEAction(i18n("&Results"), 0, 0, this, TQ_SLOT(slotUserResults()), actionCollection(), "user_results"); fileNewWindow->setToolTip(i18n("Opens a new application window")); fileOpenStandard->setToolTip(i18n("Opens the standard KVerbos verb file")); @@ -182,8 +182,8 @@ void KVerbosApp::initDocument() { doc = new KVerbosDoc(this); doc->newDocument(); - connect(doc, TQT_SIGNAL(anzahlVerbenGeaendert(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusVerbMsg(int))); - connect(this, TQT_SIGNAL(testAnzahl(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusVerbMsg(int))); + connect(doc, TQ_SIGNAL(anzahlVerbenGeaendert(int)), this, TQ_SLOT(slotStatusVerbMsg(int))); + connect(this, TQ_SIGNAL(testAnzahl(int)), this, TQ_SLOT(slotStatusVerbMsg(int))); } void KVerbosApp::initView() @@ -197,9 +197,9 @@ void KVerbosApp::initView() setCentralWidget(view); setCaption(doc->URL().fileName(),false); // - connect(view, TQT_SIGNAL(numberTrainedChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusTrainedMsg(int))); - connect(view, TQT_SIGNAL(numberCorrectChanged(int)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusCorrectMsg(int))); - connect(view, TQT_SIGNAL(informKFeeder(int)), TQT_TQOBJECT(this), TQT_SLOT(slotFeedIt(int))); + connect(view, TQ_SIGNAL(numberTrainedChanged(int)), this, TQ_SLOT(slotStatusTrainedMsg(int))); + connect(view, TQ_SIGNAL(numberCorrectChanged(int)), this, TQ_SLOT(slotStatusCorrectMsg(int))); + connect(view, TQ_SIGNAL(informKFeeder(int)), this, TQ_SLOT(slotFeedIt(int))); } void KVerbosApp::openDocumentFile(const KURL& url) @@ -295,7 +295,7 @@ void KVerbosApp::saveProperties(TDEConfig *_cfg) KURL url=doc->URL(); _cfg->writePathEntry("filename", url.url()); _cfg->writeEntry("modified", doc->isModified()); - TQString tempname = kapp->tempSaveName(url.url()); + TQString tempname = tdeApp->tempSaveName(url.url()); TQString tempurl= KURL::encode_string(tempname); KURL _url(tempurl); doc->saveDocument(_url); @@ -311,7 +311,7 @@ void KVerbosApp::readProperties(TDEConfig* _cfg) if(modified) { bool canRecover; - TQString tempname = kapp->checkRecoverFile(filename, canRecover); + TQString tempname = tdeApp->checkRecoverFile(filename, canRecover); KURL _url(tempname); if(canRecover) { @@ -343,7 +343,7 @@ bool KVerbosApp::queryExit() } ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void KVerbosApp::slotFileNewWindow() @@ -710,7 +710,7 @@ void KVerbosApp::slotSettingsOptions() if ((pDlgEdit->CheckBoxKFeeder->isChecked() == false) && (useKFeeder)) { // kfeeder anhalten - disconnect(view, TQT_SIGNAL(informKFeeder(int)), TQT_TQOBJECT(this), TQT_SLOT(slotFeedIt(int))); + disconnect(view, TQ_SIGNAL(informKFeeder(int)), this, TQ_SLOT(slotFeedIt(int))); delete kfeederControl; kfeederControl = 0; }; diff --git a/kverbos/kverbos/kverbos.h b/kverbos/kverbos/kverbos.h index a052d9ed..0690fd81 100644 --- a/kverbos/kverbos/kverbos.h +++ b/kverbos/kverbos/kverbos.h @@ -56,7 +56,7 @@ class KFeederControl; */ class KVerbosApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT friend class KVerbosView; diff --git a/kverbos/kverbos/kverbosdoc.cpp b/kverbos/kverbos/kverbosdoc.cpp index 608f6b33..33e9b865 100644 --- a/kverbos/kverbos/kverbosdoc.cpp +++ b/kverbos/kverbos/kverbosdoc.cpp @@ -68,7 +68,7 @@ KVerbosDoc::~KVerbosDoc() void KVerbosDoc::addView(KVerbosView *view) { pViewList->append(view); - connect(this, TQT_SIGNAL(changeView()), view, TQT_SLOT(zeigeVerb())); + connect(this, TQ_SIGNAL(changeView()), view, TQ_SLOT(zeigeVerb())); } void KVerbosDoc::removeView(KVerbosView *view) diff --git a/kverbos/kverbos/kverbosdoc.h b/kverbos/kverbos/kverbosdoc.h index 24bbab7b..2541d9cf 100644 --- a/kverbos/kverbos/kverbosdoc.h +++ b/kverbos/kverbos/kverbosdoc.h @@ -60,7 +60,7 @@ class KVerbosUser; */ class KVerbosDoc : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/kverbos/kverbos/kverbosoptions.cpp b/kverbos/kverbos/kverbosoptions.cpp index 381e058b..35d4f9c1 100644 --- a/kverbos/kverbos/kverbosoptions.cpp +++ b/kverbos/kverbos/kverbosoptions.cpp @@ -19,7 +19,7 @@ #include "tqcheckbox.h" #include "kverbosoptions.h" -KVerbosOptions::KVerbosOptions( TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= FALSE*/, WFlags fl /*= 0*/ ) +KVerbosOptions::KVerbosOptions( TQWidget* parent /*= 0*/, const char* name /*= 0*/, bool modal /*= false*/, WFlags fl /*= 0*/ ) : QVerbosOptions(parent, name, modal, fl) { // some times are disabled because they aren't ready yet. diff --git a/kverbos/kverbos/kverbosoptions.h b/kverbos/kverbos/kverbosoptions.h index dfd80855..69b18047 100644 --- a/kverbos/kverbos/kverbosoptions.h +++ b/kverbos/kverbos/kverbosoptions.h @@ -27,7 +27,7 @@ class KVerbosOptions : public QVerbosOptions { public: - KVerbosOptions( TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + KVerbosOptions( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 ); ~KVerbosOptions(); public slots: diff --git a/kverbos/kverbos/kverbosuser.cpp b/kverbos/kverbos/kverbosuser.cpp index 6088e90b..b318c854 100644 --- a/kverbos/kverbos/kverbosuser.cpp +++ b/kverbos/kverbos/kverbosuser.cpp @@ -21,7 +21,7 @@ #include <tqfile.h> #include <tqdatetime.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> bool eintrag::operator== (const eintrag& e) const diff --git a/kverbos/kverbos/kverbosview.h b/kverbos/kverbos/kverbosview.h index 2e30d321..ae503d44 100644 --- a/kverbos/kverbos/kverbosview.h +++ b/kverbos/kverbos/kverbosview.h @@ -59,7 +59,7 @@ */ class KVerbosView : public QLernen /*TQWidget*/ { - Q_OBJECT + TQ_OBJECT public: /** Constructor for the main view */ diff --git a/kverbos/kverbos/qerfassen.ui b/kverbos/kverbos/qerfassen.ui index 3b6b770b..d35759ea 100644 --- a/kverbos/kverbos/qerfassen.ui +++ b/kverbos/kverbos/qerfassen.ui @@ -2770,7 +2770,7 @@ und in die Liste aufgenommen wird. <includes> <include location="local" impldecl="in implementation">qerfassen.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot>slotNewVerb()</slot> <slot>slotA()</slot> <slot>slotClearAll()</slot> @@ -2791,6 +2791,6 @@ und in die Liste aufgenommen wird. <slot>slotU()</slot> <slot>slotWeiter()</slot> <slot>slotZurueck()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qlernen.ui b/kverbos/kverbos/qlernen.ui index 0a4a8784..4b418aa2 100644 --- a/kverbos/kverbos/qlernen.ui +++ b/kverbos/kverbos/qlernen.ui @@ -1002,7 +1002,7 @@ The user learns with this GUI.</comment> <tabstop>ButtonSolution</tabstop> <tabstop>ButtonWeiter</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotA()</slot> <slot>slotClearAll()</slot> <slot>slotCopyText()</slot> @@ -1016,6 +1016,6 @@ The user learns with this GUI.</comment> <slot>slotTextCopy(TQString)</slot> <slot>slotU()</slot> <slot>slotWeiter()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qresult.ui b/kverbos/kverbos/qresult.ui index 83aed35d..9b4ba2a4 100644 --- a/kverbos/kverbos/qresult.ui +++ b/kverbos/kverbos/qresult.ui @@ -268,8 +268,8 @@ <slot>slotDlgEnde()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotDlgEnde()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qverbedit.ui b/kverbos/kverbos/qverbedit.ui index 83e0f644..a243ceb8 100644 --- a/kverbos/kverbos/qverbedit.ui +++ b/kverbos/kverbos/qverbedit.ui @@ -186,11 +186,11 @@ und können bearbeitet werden.</comment> <slot>slotEditVerb()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotEditVerb()</slot> <slot>slotCancel()</slot> <slot>slotDelete()</slot> <slot>slotDlgEnde()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kverbos/kverbos/qverbosoptions.ui b/kverbos/kverbos/qverbosoptions.ui index 455f292c..ecea34f1 100644 --- a/kverbos/kverbos/qverbosoptions.ui +++ b/kverbos/kverbos/qverbosoptions.ui @@ -1220,9 +1220,9 @@ Zeiten geübt werden sollen und welche nicht.</comment> <slot>setEnabled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotDlgEnde()</slot> <slot>slotCancel()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kvoctrain/kvoctrain/Makefile.am b/kvoctrain/kvoctrain/Makefile.am index 24aa6427..f053f0b7 100644 --- a/kvoctrain/kvoctrain/Makefile.am +++ b/kvoctrain/kvoctrain/Makefile.am @@ -40,8 +40,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/kvt-core -Icommon-dialogs \ bin_PROGRAMS = kvoctrain spotlight2kvtml # the library search path. -kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor CLEANFILES = *.i.c diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp index 7bdfe888..b00278a3 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.cpp @@ -31,7 +31,7 @@ #include <tqprogressbar.h> #include <tqlabel.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> ProgressDlg::ProgressDlg(const TQString &doctitle, const TQString &filename, const TQString &title, TQWidget* parent, const char* name) diff --git a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h index a6eff85c..80e78aa5 100644 --- a/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h +++ b/kvoctrain/kvoctrain/common-dialogs/ProgressDlg.h @@ -34,7 +34,7 @@ class kvoctrainDoc; class ProgressDlg : public ProgressDlgForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp index 5ca5de2f..1d39a821 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.cpp @@ -77,23 +77,23 @@ static ListRef date_itemlist [] = BlockOptions::BlockOptions(TQWidget* parent, const char* name, WFlags fl) : BlockOptionsBase(parent, name, fl) { - connect(expire1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block1, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire2, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block2, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire3, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block3, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire4, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block4, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire6, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block6, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(expire7, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - connect(block7, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotComboBoxActivated(int))); - - connect(kcfg_Block, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotBlockToggled(bool))); - connect(kcfg_Expire, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExpireToggled(bool))); + connect(expire1, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block1, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire2, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block2, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire3, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block3, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire4, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block4, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire6, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block6, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(expire7, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + connect(block7, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotComboBoxActivated(int))); + + connect(kcfg_Block, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotBlockToggled(bool))); + connect(kcfg_Expire, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotExpireToggled(bool))); fillWidgets(); updateWidgets(); diff --git a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h index 4c051e87..b77fe2a0 100644 --- a/kvoctrain/kvoctrain/common-dialogs/blockoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/blockoptions.h @@ -35,7 +35,7 @@ class TQComboBox; class BlockOptions : public BlockOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/generaloptions.h b/kvoctrain/kvoctrain/common-dialogs/generaloptions.h index d685cd58..e008b013 100644 --- a/kvoctrain/kvoctrain/common-dialogs/generaloptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/generaloptions.h @@ -30,7 +30,7 @@ class GeneralOptions : public GeneralOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h index 0c221344..da504aaf 100644 --- a/kvoctrain/kvoctrain/common-dialogs/groupoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/groupoptions.h @@ -30,7 +30,7 @@ class GroupOptions : public GroupOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg index dd8732a5..f4c87806 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg @@ -27,7 +27,7 @@ </entry> <entry name="Separator" type="String"> <label>This sets the separator used when copying/pasting text, default is Tab</label> - <default code="true">QChar('\t')</default> + <default code="true">TQChar('\t')</default> </entry> <entry name="PasteOrder" type="StringList"> <label>The order in which languages get pasted</label> diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp index 05f9e590..ac7e1906 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.cpp @@ -24,7 +24,7 @@ #include <tqlabel.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <krestrictedline.h> #include <tdemessagebox.h> @@ -67,26 +67,26 @@ KVocTrainPrefs::KVocTrainPrefs(LangSet & ls, kvoctrainDoc * doc, KComboBox * les m_languageOptions = new LanguageOptions(m_langSet, 0, "Language Settings"); addPage(m_languageOptions, i18n("Languages"), "set_language", i18n("Language Settings"), true); - connect(m_languageOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(m_languageOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); m_viewOptions = new ViewOptions(0, "View Settings"); addPage(m_viewOptions, i18n("View"), "view_choose", i18n("View Settings"), true); m_pasteOptions = new PasteOptions(m_langSet, doc, 0, "Copy & Paste Settings"); addPage(m_pasteOptions, i18n("Copy & Paste"), "edit-paste", i18n("Copy & Paste Settings"), true); - connect(m_pasteOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(m_pasteOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); m_queryOptions = new QueryOptions(0, "Query Settings"); addPage(m_queryOptions, i18n("Query"), "run_query", i18n("Query Settings"), true); m_thresholdOptions = new ThresholdOptions(lessons, m_queryManager, 0, "Threshold Settings"); addPage(m_thresholdOptions, i18n("Thresholds"), "configure", i18n("Threshold Settings"), true); - connect(m_thresholdOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(m_thresholdOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); m_blockOptions = new BlockOptions(0, "Blocking Settings"); addPage(m_blockOptions, i18n("Blocking"), "configure", i18n("Blocking Settings"), true); - connect(m_blockOptions, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); - connect(m_blockOptions, TQT_SIGNAL(blockExpireChanged(bool, bool)), m_thresholdOptions, TQT_SLOT(slotBlockExpire(bool, bool))); + connect(m_blockOptions, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); + connect(m_blockOptions, TQ_SIGNAL(blockExpireChanged(bool, bool)), m_thresholdOptions, TQ_SLOT(slotBlockExpire(bool, bool))); setButtonGuiItem(KDialogBase::User1, KGuiItem(i18n("&Profiles..."))); setButtonTip(KDialogBase::User1, i18n("Save or load specific Query settings which consist in a profile")); @@ -143,7 +143,7 @@ void KVocTrainPrefs::slotUser1() if (showDlg) { ProfilesDialog * dlg = new ProfilesDialog(m_queryManager, this, 0, true); - connect(dlg, TQT_SIGNAL(profileActivated()), this, TQT_SLOT(updateWidgets())); + connect(dlg, TQ_SIGNAL(profileActivated()), this, TQ_SLOT(updateWidgets())); dlg->show(); } } diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h index ff4ac9e7..7e200aeb 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrainprefs.h @@ -40,7 +40,7 @@ class KComboBox; class KVocTrainPrefs : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index 197208d5..b04f1b9e 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -34,7 +34,7 @@ #include <tdelocale.h> #include <kcombobox.h> #include <dcopclient.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdefiledialog.h> #include <tdemessagebox.h> @@ -682,14 +682,14 @@ LanguageOptions::LanguageOptions(LangSet & langset, TQWidget* parent, const char { langset_popup = 0; - connect(b_langDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteClicked())); - connect(b_langNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewClicked())); - connect(b_langPixmap, TQT_SIGNAL(clicked()), TQT_SLOT(slotPixmapClicked())); - connect(e_newName, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotNewNameChanged(const TQString&))); - connect(d_shortName, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotShortActivated(const TQString&))); - connect(e_langLong, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotLangChanged(const TQString&))); - connect(e_shortName2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotShort2Changed(const TQString&))); - connect(d_kblayout, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotKeyboardLayoutChanged(const TQString&))); + connect(b_langDel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteClicked())); + connect(b_langNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewClicked())); + connect(b_langPixmap, TQ_SIGNAL(clicked()), TQ_SLOT(slotPixmapClicked())); + connect(e_newName, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotNewNameChanged(const TQString&))); + connect(d_shortName, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotShortActivated(const TQString&))); + connect(e_langLong, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotLangChanged(const TQString&))); + connect(e_shortName2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotShort2Changed(const TQString&))); + connect(d_kblayout, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotKeyboardLayoutChanged(const TQString&))); // Load the languages first, then the countries and create the // menus for the languages last, so they will have flags @@ -812,7 +812,7 @@ void LanguageOptions::enableLangWidgets() } else { - if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) + if (replyType == "TQStringList") { TQStringList layouts; TQDataStream stream(replyData, IO_ReadOnly); @@ -1032,7 +1032,7 @@ void LanguageOptions::loadCountryData() index = tag.findRev('.'); if (index != -1) tag.truncate(index); - KSimpleConfig entry(*it); + TDESimpleConfig entry(*it); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); @@ -1045,7 +1045,7 @@ void LanguageOptions::loadCountryData() int idx = 0; for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit) { - KSimpleConfig entry(*sit); + TDESimpleConfig entry(*sit); entry.setGroup(TQString::fromLatin1("KCM Locale")); TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); TQString submenu = entry.readEntry(TQString::fromLatin1("Region")); @@ -1099,11 +1099,11 @@ void LanguageOptions::loadCountryData() for (TQMap<TQString, Region>::Iterator it = regions.begin(); it != regions.end(); ++it) regmap.insert(it.data().region, it.data()); - connect(langset_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromGlobalActivated(int))); + connect(langset_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromGlobalActivated(int))); for (TQMap<TQString, Region>::Iterator it = regmap.begin(); it != regmap.end(); ++it) { TQPopupMenu *regpop = new TQPopupMenu(); - connect(regpop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromGlobalActivated(int))); + connect(regpop, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromGlobalActivated(int))); langset_popup->insertItem(it.key(), regpop); Region r = it.data(); @@ -1201,7 +1201,7 @@ void LanguageOptions::createISO6391Menus() if (it.key()[0].upper() != lang[0].upper()) { pop = new TQPopupMenu(); - connect(pop, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotLangFromISO6391Activated(int))); + connect(pop, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotLangFromISO6391Activated(int))); iso6391_popup->insertItem(it.key()[0].upper(), pop, 1); } diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h index dbe5c83c..49ecfa41 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.h @@ -33,7 +33,7 @@ class LanguageOptions : public LanguageOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui index 070f3308..1bc154cb 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptionsbase.ui @@ -268,9 +268,6 @@ <property name="text"> <string>Add Language Data From ISO639-&1</string> </property> - <property name="accel"> - <string>Alt+1</string> - </property> <property name="toolTip" stdset="0"> <string>List of languages covered by ISO639-1</string> </property> diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp index 31a5f768..a009e0bf 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.cpp @@ -58,13 +58,13 @@ PasteOptions::PasteOptions(LangSet & langset, kvoctrainDoc * doc, TQWidget* pare SkipButton->setEnabled(!kcfg_UseCurrent->isChecked()); DownButton->setEnabled(!kcfg_UseCurrent->isChecked()); - connect(OrderList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(syncButtons())); - connect(DownButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownButtonClicked())); - connect(SkipButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSkipButtonClicked())); - connect(UpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpButtonClicked())); + connect(OrderList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(syncButtons())); + connect(DownButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownButtonClicked())); + connect(SkipButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSkipButtonClicked())); + connect(UpButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpButtonClicked())); - connect(SeparatorCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSeparatorComboActivated(int))); - connect(kcfg_UseCurrent, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotUseCurrentDocToggled(bool))); + connect(SeparatorCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSeparatorComboActivated(int))); + connect(kcfg_UseCurrent, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotUseCurrentDocToggled(bool))); m_doc = doc; fillWidgets(); diff --git a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h index 9c404cbe..f804ecd4 100644 --- a/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/pasteoptions.h @@ -33,7 +33,7 @@ class kvoctrainDoc; class PasteOptions : public PasteOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc b/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc index 6aeff9c7..8a5732e8 100644 --- a/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc +++ b/kvoctrain/kvoctrain/common-dialogs/prefs.kcfgc @@ -4,4 +4,4 @@ File=kvoctrain.kcfg ClassName=Prefs Singleton=true Mutators=true -Visibility=KDE_EXPORT
\ No newline at end of file +Visibility=TDE_EXPORT
\ No newline at end of file diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp index f898f754..c38a2065 100644 --- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.cpp @@ -46,10 +46,10 @@ ProfilesDialog::ProfilesDialog(QueryManager * m, TQWidget *parent, const char *n mw = new GroupOptions(this); setMainWidget(mw); - connect(mw->ps_del, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteGroup())); - connect(mw->ps_new, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewGroup())); - connect(mw->ps_recall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRecallGroup())); - connect(mw->ps_store, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStoreGroup())); + connect(mw->ps_del, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteGroup())); + connect(mw->ps_new, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewGroup())); + connect(mw->ps_recall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRecallGroup())); + connect(mw->ps_store, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStoreGroup())); int ls = Prefs::numPreSetting(); for (int i = 0 ; i < ls; i++) diff --git a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h index 6f00c0d3..7a131d9b 100644 --- a/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h +++ b/kvoctrain/kvoctrain/common-dialogs/profilesdialog.h @@ -31,7 +31,7 @@ class QueryManager; class GroupOptions; -class KDE_EXPORT SettingsProfile +class TDE_EXPORT SettingsProfile { public: SettingsProfile(); @@ -43,9 +43,9 @@ public: TQString block_set; }; -class KDE_EXPORT ProfilesDialog : public KDialogBase +class TDE_EXPORT ProfilesDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h index 7fd5ab72..e54bf906 100644 --- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h @@ -30,7 +30,7 @@ class QueryOptions : public QueryOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp index 271bde65..5b81c32a 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.cpp @@ -104,20 +104,20 @@ static ThreshListRef Threshdate_itemlist [] = ThresholdOptions::ThresholdOptions(KComboBox * lessons, QueryManager * m, TQWidget* parent, const char* name, WFlags fl) : ThresholdOptionsBase(parent, name, fl), m_lessons(lessons) { - connect(lessoncomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetLessonComp(int))); - connect(lessonlist, TQT_SIGNAL(selectionChanged()), TQT_SIGNAL(widgetModified())); - connect(b_all_less, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectAll())); - connect(b_none_less, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectNone())); - connect(typecomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetTypeComp(int))); - connect(typelist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(gradecomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetGradeComp(int))); - connect(gradelist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(querycomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetQueryComp(int))); - connect(querylist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(badcomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetBadComp(int))); - connect(badlist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); - connect(datecomp, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSetDateComp(int))); - connect(datelist, TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); + connect(lessoncomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetLessonComp(int))); + connect(lessonlist, TQ_SIGNAL(selectionChanged()), TQ_SIGNAL(widgetModified())); + connect(b_all_less, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectAll())); + connect(b_none_less, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectNone())); + connect(typecomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetTypeComp(int))); + connect(typelist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(gradecomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetGradeComp(int))); + connect(gradelist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(querycomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetQueryComp(int))); + connect(querylist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(badcomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetBadComp(int))); + connect(badlist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); + connect(datecomp, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSetDateComp(int))); + connect(datelist, TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); m_queryManager = m; fillWidgets(); diff --git a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h index 781fe36b..b796c9ed 100644 --- a/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/thresholdoptions.h @@ -33,7 +33,7 @@ class KComboBox; class ThresholdOptions : public ThresholdOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h index 7c0bd29c..d40ac072 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptions.h +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptions.h @@ -30,7 +30,7 @@ class ViewOptions : public ViewOptionsBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui index 7e77e918..ec3cdc54 100644 --- a/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui +++ b/kvoctrain/kvoctrain/common-dialogs/viewoptionsbase.ui @@ -205,9 +205,6 @@ <property name="text"> <string>&1</string> </property> - <property name="accel"> - <string>Alt+1</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 1</string> </property> @@ -268,9 +265,6 @@ <property name="text"> <string>&2</string> </property> - <property name="accel"> - <string>Alt+2</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 2</string> </property> @@ -312,9 +306,6 @@ <property name="text"> <string>&3</string> </property> - <property name="accel"> - <string>Alt+3</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 3</string> </property> @@ -337,9 +328,6 @@ <property name="text"> <string>&4</string> </property> - <property name="accel"> - <string>Alt+4</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 4</string> </property> @@ -362,9 +350,6 @@ <property name="text"> <string>&5</string> </property> - <property name="accel"> - <string>Alt+5</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 5</string> </property> @@ -387,9 +372,6 @@ <property name="text"> <string>&6</string> </property> - <property name="accel"> - <string>Alt+6</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 6</string> </property> @@ -412,9 +394,6 @@ <property name="text"> <string>&7</string> </property> - <property name="accel"> - <string>Alt+7</string> - </property> <property name="toolTip" stdset="0"> <string>Color for the grade 7</string> </property> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp index f1c8d62d..5d62f334 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.cpp @@ -33,7 +33,7 @@ DocOptionsPage::DocOptionsPage(bool sort, TQWidget *parent, const char *name):Do sorter = sort; docsort->setChecked(sort); - connect( docsort, TQT_SIGNAL(toggled(bool)), TQT_SLOT(docSortToggled(bool)) ); + connect( docsort, TQ_SIGNAL(toggled(bool)), TQ_SLOT(docSortToggled(bool)) ); } void DocOptionsPage::docSortToggled(bool state) diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h index 5d1cc3fa..51c3e66a 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocOptionsPage.h @@ -31,7 +31,7 @@ class DocOptionsPage : public DocOptionsPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp index 9fcb088d..916e164b 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.cpp @@ -26,7 +26,7 @@ #include <tqlayout.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> #include "DocPropDlg.h" diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h index 0c34e403..e6e95b01 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropDlg.h @@ -43,7 +43,7 @@ class LangPropPage; class DocPropsDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp index 48692758..187b6048 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.cpp @@ -34,7 +34,7 @@ #include <tdeapplication.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kvoctraindoc.h> #include <langset.h> diff --git a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h index 49140478..921c6a77 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/DocPropLangDlg.h @@ -38,7 +38,7 @@ class LangSet; class DocPropsLangDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp index 646358f1..f17b68bd 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.cpp @@ -51,25 +51,25 @@ LangPropPage::LangPropPage { l_langcode->setText(curr_lang); - connect( indef_female, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefFemaleChanged(const TQString&)) ); - connect( def_female, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defFemaleChanged(const TQString&)) ); - connect( def_male, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defMaleChanged(const TQString&)) ); - connect( indef_male, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefMaleChanged(const TQString&)) ); - connect( def_natural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(defNaturalChanged(const TQString&)) ); - connect( indef_natural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(indefNaturalChanged(const TQString&)) ); - connect( first_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstSingularChanged(const TQString&)) ); - connect( first_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstPluralChanged(const TQString&)) ); - connect( second_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondSingularChanged(const TQString&)) ); - connect( second_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondPluralChanged(const TQString&)) ); - connect( thirdF_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFSingularChanged(const TQString&)) ); - connect( thirdF_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFPluralChanged(const TQString&)) ); - connect( thirdM_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMSingularChanged(const TQString&)) ); - connect( thirdM_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMPluralChanged(const TQString&)) ); - connect( thirdN_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNSingularChanged(const TQString&)) ); - connect( thirdN_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNPluralChanged(const TQString&)) ); - - connect( thirdS_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdSCommonToggled(bool)) ); - connect( thirdP_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) ); + connect( indef_female, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefFemaleChanged(const TQString&)) ); + connect( def_female, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defFemaleChanged(const TQString&)) ); + connect( def_male, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defMaleChanged(const TQString&)) ); + connect( indef_male, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefMaleChanged(const TQString&)) ); + connect( def_natural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(defNaturalChanged(const TQString&)) ); + connect( indef_natural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(indefNaturalChanged(const TQString&)) ); + connect( first_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstSingularChanged(const TQString&)) ); + connect( first_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstPluralChanged(const TQString&)) ); + connect( second_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondSingularChanged(const TQString&)) ); + connect( second_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondPluralChanged(const TQString&)) ); + connect( thirdF_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFSingularChanged(const TQString&)) ); + connect( thirdF_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFPluralChanged(const TQString&)) ); + connect( thirdM_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMSingularChanged(const TQString&)) ); + connect( thirdM_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMPluralChanged(const TQString&)) ); + connect( thirdN_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNSingularChanged(const TQString&)) ); + connect( thirdN_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNPluralChanged(const TQString&)) ); + + connect( thirdS_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdSCommonToggled(bool)) ); + connect( thirdP_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdPCommonToggled(bool)) ); conjugations = conjug; diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h index f5934ac9..055f5673 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/LangPropPage.h @@ -35,7 +35,7 @@ class kvoctrainDoc; class LangPropPage : public LangPropPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp index 7d90f04b..b9457dd3 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.cpp @@ -48,11 +48,11 @@ LessOptPage::LessOptPage : LessOptPageForm( parent, name ) { - connect( lessonList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotLessonChosen(int)) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewLesson()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyLesson()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteLesson()) ); - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); + connect( lessonList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotLessonChosen(int)) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewLesson()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyLesson()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteLesson()) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); doc = _doc; @@ -150,7 +150,7 @@ void LessOptPage::slotDeleteLesson() if (doc->getEntry(ent)->getLesson() == lessonIndex[act_lesson]+1) { KMessageBox::information(this, i18n("This lesson could not be deleted\nbecause it is in use."), - kapp->makeStdCaption(i18n("Deleting Lesson"))); + tdeApp->makeStdCaption(i18n("Deleting Lesson"))); return; } } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h index c834c242..8fbaabeb 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/LessOptPage.h @@ -36,7 +36,7 @@ class TQComboBox; class LessOptPage : public LessOptPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp index 2e6e893c..6b3921b0 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.cpp @@ -46,11 +46,11 @@ TenseOptPage::TenseOptPage : TenseOptPageForm( parent, name ) { - connect( tenseList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTenseChosen(int)) ); - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteTense()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyTense()) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewTense()) ); + connect( tenseList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotTenseChosen(int)) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteTense()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyTense()) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewTense()) ); TQString str; for (int i = 0; i < (int) tenses.size(); i++) { @@ -156,7 +156,7 @@ void TenseOptPage::slotDeleteTense() if (conj.getType(con) == t) { KMessageBox::information(this, i18n("This user defined tense could not be deleted\nbecause it is in use."), - kapp->makeStdCaption(i18n("Deleting Tense Description"))); + tdeApp->makeStdCaption(i18n("Deleting Tense Description"))); return; } } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h index 524016dc..a6d9dccf 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TenseOptPage.h @@ -37,7 +37,7 @@ class TQStrList; class TenseOptPage : public TenseOptPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp index f7a30bf3..9292827a 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.cpp @@ -64,10 +64,10 @@ TitlePage::TitlePage e_remark->setText (doc_remark); label_remark->setBuddy(e_remark); - connect( e_author, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAuthorChanged()) ); - connect( e_title, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTitleChanged(const TQString&)) ); - connect( e_license, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotLicenseChanged(const TQString&)) ); - connect( e_remark, TQT_SIGNAL(textChanged()), TQT_SLOT(slotDocRemarkChanged()) ); + connect( e_author, TQ_SIGNAL(textChanged()), TQ_SLOT(slotAuthorChanged()) ); + connect( e_title, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTitleChanged(const TQString&)) ); + connect( e_license, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotLicenseChanged(const TQString&)) ); + connect( e_remark, TQ_SIGNAL(textChanged()), TQ_SLOT(slotDocRemarkChanged()) ); } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h index 90b11260..997b4213 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TitlePage.h @@ -31,7 +31,7 @@ class TitlePage : public TitlePageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp index 9b126b17..bb025e94 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.cpp @@ -47,11 +47,11 @@ TypeOptPage::TypeOptPage TypeOptPageForm( parent, name ), doc(_doc) { - connect( typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotTypeChosen(int)) ); - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteType()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyType()) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewType()) ); + connect( typeList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotTypeChosen(int)) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteType()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyType()) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewType()) ); TQString str; for (int i = 0; i < (int) types.size(); i++) { @@ -152,7 +152,7 @@ void TypeOptPage::slotDeleteType() if (exp->getType(lang) == t) { KMessageBox::information(this, i18n("This user defined type could not be deleted\nbecause it is in use."), - kapp->makeStdCaption(i18n("Deleting Type Description"))); + tdeApp->makeStdCaption(i18n("Deleting Type Description"))); return; } } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h index 0f9daa13..bb591bb5 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/TypeOptPage.h @@ -36,7 +36,7 @@ class TQStrList; class TypeOptPage : public TypeOptPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp index 7e6dad66..1e36d74b 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.cpp @@ -48,11 +48,11 @@ UsageOptPage::UsageOptPage UsageOptPageForm( parent, name ), doc(_doc) { - connect( b_cleanup, TQT_SIGNAL(clicked()), TQT_SLOT(slotCleanup()) ); - connect( b_delete, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteUsage()) ); - connect( b_modify, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyUsage()) ); - connect( b_new, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewUsage()) ); - connect( usageList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotUsageChosen(int)) ); + connect( b_cleanup, TQ_SIGNAL(clicked()), TQ_SLOT(slotCleanup()) ); + connect( b_delete, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteUsage()) ); + connect( b_modify, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyUsage()) ); + connect( b_new, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewUsage()) ); + connect( usageList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotUsageChosen(int)) ); TQString str; for (int i = 0; i < (int) usages.size(); i++) { @@ -158,7 +158,7 @@ void UsageOptPage::slotDeleteUsage() i18n("usage (area) of an expression", "This user-defined usage label could not be deleted " "because it is in use."), - kapp->makeStdCaption(i18n("usage (area) of an expression", + tdeApp->makeStdCaption(i18n("usage (area) of an expression", "Deleting Usage Label"))); return; } diff --git a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h index e7e1a2b1..8cf78607 100644 --- a/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h +++ b/kvoctrain/kvoctrain/docprop-dialogs/UsageOptPage.h @@ -38,7 +38,7 @@ class TQStrList; class UsageOptPage : public UsageOptPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp index 0bdae252..8a136d73 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.cpp @@ -37,9 +37,9 @@ AdjEntryPage::AdjEntryPage(EntryDlg *_dlgbook, bool multi_sel, const Comparison { comparisons = comp; - connect( lev1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev1Changed(const TQString&)) ); - connect( lev2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev2Changed(const TQString&)) ); - connect( lev3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev3Changed(const TQString&)) ); + connect( lev1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev1Changed(const TQString&)) ); + connect( lev2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev2Changed(const TQString&)) ); + connect( lev3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev3Changed(const TQString&)) ); setData(multi_sel, comp); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h index 5e802ae9..659286b7 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/AdjEntryPage.h @@ -34,7 +34,7 @@ class EntryDlg; class AdjEntryPage : public AdjEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp index 87e0fe59..f75f4703 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.cpp @@ -56,11 +56,11 @@ AuxInfoEntryPage::AuxInfoEntryPage remark_line->setMaximumHeight(sz*3); examp_line->setMaximumHeight(sz*3); - connect( para_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotParaSelected()) ); - connect( remark_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotRemarkSelected()) ); - connect( examp_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotExampSelected()) ); - connect( antonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAntonymSelected()) ); - connect( synonym_line, TQT_SIGNAL(textChanged()), TQT_SLOT(slotSynonymSelected()) ); + connect( para_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotParaSelected()) ); + connect( remark_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotRemarkSelected()) ); + connect( examp_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotExampSelected()) ); + connect( antonym_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotAntonymSelected()) ); + connect( synonym_line, TQ_SIGNAL(textChanged()), TQ_SLOT(slotSynonymSelected()) ); setData(multi_sel, syno, anto, exam, rem, para); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h index fff6da8a..42d23f83 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/AuxInfoEntryPage.h @@ -32,7 +32,7 @@ class EntryDlg; class AuxInfoEntryPage : public AuxInfoEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp index e4ce0679..254886bc 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.cpp @@ -80,18 +80,18 @@ CommonEntryPage::CommonEntryPage ipafont(_ipafont) { - connect( b_usageDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeUsageDlg()) ); - connect( b_LessDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeLessDlg()) ); - connect( b_pronDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokePronDlg()) ); - connect( b_TypeDlg, TQT_SIGNAL(clicked()), TQT_SLOT(invokeTypeDlg()) ); - connect( usage_box, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotUsageChanged()) ); - connect( lesson_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotLessonSelected(int)) ); - connect( subtype_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSubTypeSelected(int)) ); - connect( type_box, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeSelected(int)) ); - connect( c_active, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotActiveChanged(bool)) ); - - connect( pronunce_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotPronunceSelected(const TQString&)) ); - connect( expr_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotExprSelected(const TQString&)) ); + connect( b_usageDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeUsageDlg()) ); + connect( b_LessDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeLessDlg()) ); + connect( b_pronDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokePronDlg()) ); + connect( b_TypeDlg, TQ_SIGNAL(clicked()), TQ_SLOT(invokeTypeDlg()) ); + connect( usage_box, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotUsageChanged()) ); + connect( lesson_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotLessonSelected(int)) ); + connect( subtype_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSubTypeSelected(int)) ); + connect( type_box, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeSelected(int)) ); + connect( c_active, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotActiveChanged(bool)) ); + + connect( pronunce_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotPronunceSelected(const TQString&)) ); + connect( expr_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotExprSelected(const TQString&)) ); usage_label->setTitle(i18n("Usage (area) of an Expression", "&Usage Labels")); pronunce_line->setFont(ipafont); @@ -329,7 +329,7 @@ void CommonEntryPage::invokePronDlg() { //if (phoneticDlg == 0) { PhoneticEntryPage * phoneticDlg = new PhoneticEntryPage (ipafont, this); - connect (phoneticDlg, TQT_SIGNAL(charSelected(wchar_t)), TQT_SLOT(phoneticSelected(wchar_t)) ); + connect (phoneticDlg, TQ_SIGNAL(charSelected(wchar_t)), TQ_SLOT(phoneticSelected(wchar_t)) ); phoneticDlg->show(); //} //else diff --git a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h index 4cbb8265..5021832a 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/CommonEntryPage.h @@ -36,7 +36,7 @@ class EntryDlg; class CommonEntryPage : public CommonEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp index 5fbcc71f..2bbee94e 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.cpp @@ -176,23 +176,23 @@ EntryDlg::EntryDlg( updatePages (type); - connect(comm_page, TQT_SIGNAL(typeSelected(const TQString&)), TQT_SLOT(updatePages(const TQString&)) ); + connect(comm_page, TQ_SIGNAL(typeSelected(const TQString&)), TQ_SLOT(updatePages(const TQString&)) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotUndo()) ); - connect( this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApply()) ); - connect( this, TQT_SIGNAL(user2Clicked()), this, TQT_SLOT(slotDockVertical()) ); - connect( this, TQT_SIGNAL(user3Clicked()), this, TQT_SLOT(slotDockHorizontal()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotUndo()) ); + connect( this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApply()) ); + connect( this, TQ_SIGNAL(user2Clicked()), this, TQ_SLOT(slotDockVertical()) ); + connect( this, TQ_SIGNAL(user3Clicked()), this, TQ_SLOT(slotDockHorizontal()) ); - connect (comm_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (aux_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (adj_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (mc_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); - connect (tense_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (comm_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (aux_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (adj_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (mc_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); + connect (tense_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); if (from_page != 0) - connect (from_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (from_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); if (to_page != 0) - connect (to_page, TQT_SIGNAL(sigModified()), this, TQT_SLOT(slotDisplayModified() )); + connect (to_page, TQ_SIGNAL(sigModified()), this, TQ_SLOT(slotDisplayModified() )); enableButtonApply(false); enableButton(User1, false); @@ -236,7 +236,7 @@ void EntryDlg::setData( const TQString &title, bool active) { - setCaption (kapp->makeStdCaption(title)); + setCaption (tdeApp->makeStdCaption(title)); TQString s; if (langset.findLongId(lang).isEmpty() ) diff --git a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h index 14f263bc..8d64542e 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h +++ b/kvoctrain/kvoctrain/entry-dialogs/EntryDlg.h @@ -44,7 +44,7 @@ class kvoctrainDoc; class EntryDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp index a4bb55f1..8fc70db0 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.cpp @@ -75,17 +75,17 @@ FromToEntryPage::FromToEntryPage monthnames.append (i18n("November")); monthnames.append (i18n("December")); - connect( bcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotBCount(const TQString&)) ); - connect( qcount_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotQCount(const TQString&)) ); - connect( fauxami_line, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotFauxAmiSelected(const TQString&)) ); + connect( bcount_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotBCount(const TQString&)) ); + connect( qcount_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotQCount(const TQString&)) ); + connect( fauxami_line, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotFauxAmiSelected(const TQString&)) ); - connect( never, TQT_SIGNAL(clicked()), TQT_SLOT(slotNever()) ); - connect( today, TQT_SIGNAL(clicked()), TQT_SLOT(slotToday()) ); - connect( gradebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotGradeSelected(int)) ); + connect( never, TQ_SIGNAL(clicked()), TQ_SLOT(slotNever()) ); + connect( today, TQ_SIGNAL(clicked()), TQ_SLOT(slotToday()) ); + connect( gradebox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotGradeSelected(int)) ); - connect( year_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotYearChanged(int)) ); - connect( month_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotMonthChanged(int)) ); - connect( day_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotDayChanged(int)) ); + connect( year_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotYearChanged(int)) ); + connect( month_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotMonthChanged(int)) ); + connect( day_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotDayChanged(int)) ); year_spin->setData ((TQStringList *) 0, 1980, 2100); month_spin->setData (&monthnames, 1, 12); diff --git a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h index 6c2db738..2326b860 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/FromToEntryPage.h @@ -37,7 +37,7 @@ class EntryDlg; class FromToEntryPage : public FromToEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp index a6967704..1c028345 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.cpp @@ -37,11 +37,11 @@ MCEntryPage::MCEntryPage(EntryDlg *_dlgbook, bool multi_sel, const MultipleChoic { multiplechoice = mc; - connect( mc1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc1Changed(const TQString&)) ); - connect( mc2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc2Changed(const TQString&)) ); - connect( mc3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc3Changed(const TQString&)) ); - connect( mc4Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc4Changed(const TQString&)) ); - connect( mc5Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(mc5Changed(const TQString&)) ); + connect( mc1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc1Changed(const TQString&)) ); + connect( mc2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc2Changed(const TQString&)) ); + connect( mc3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc3Changed(const TQString&)) ); + connect( mc4Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc4Changed(const TQString&)) ); + connect( mc5Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(mc5Changed(const TQString&)) ); setData(multi_sel, mc); } diff --git a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h index fe38ddc5..476a3694 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/MCEntryPage.h @@ -34,7 +34,7 @@ class EntryDlg; class MCEntryPage : public MCEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp index a7661be0..e710d2ef 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp @@ -189,7 +189,7 @@ PhoneticEntryPage::PhoneticEntryPage(const TQFont &ipafont, TQWidget *parent, co TQChar qc = uni_ref->code; TQString text = qc; PhoneticButton *butt = new PhoneticButton(text, phoneticbox, this); - connect (butt, TQT_SIGNAL(clicked()), butt, TQT_SLOT(slotClicked()) ); + connect (butt, TQ_SIGNAL(clicked()), butt, TQ_SLOT(slotClicked()) ); TQString tip = i18n("Unicode name: "); tip += TQString::fromLatin1(uni_ref->unicodename); tip += "\n"; diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h index 6c3e0aec..34f91e3d 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.h @@ -33,7 +33,7 @@ class PhoneticEntryPage : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -51,7 +51,7 @@ protected: class PhoneticButton : public TQPushButton { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp index c8c7d41e..e9f2f7c0 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.cpp @@ -45,21 +45,21 @@ TenseEntryPage::TenseEntryPage : TenseEntryPageForm( parent, name ), multi_mode(multi_sel), dlgbook(_dlgbook) { - connect( third_p_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdPCommonToggled(bool)) ); - connect( third_s_common, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotThirdSCommonToggled(bool)) ); - connect( b_next, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextConj()) ); - connect( tensebox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTenseSelected(int)) ); - - connect( thirdN_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNPluralChanged(const TQString&)) ); - connect( thirdN_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdNSingularChanged(const TQString&)) ); - connect( thirdM_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMPluralChanged(const TQString&)) ); - connect( thirdM_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdMSingularChanged(const TQString&)) ); - connect( thirdF_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFPluralChanged(const TQString&)) ); - connect( thirdF_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(thirdFSingularChanged(const TQString&)) ); - connect( second_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondPluralChanged(const TQString&)) ); - connect( second_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(secondSingularChanged(const TQString&)) ); - connect( first_plural, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstPluralChanged(const TQString&)) ); - connect( first_singular, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(firstSingularChanged(const TQString&)) ); + connect( third_p_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdPCommonToggled(bool)) ); + connect( third_s_common, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotThirdSCommonToggled(bool)) ); + connect( b_next, TQ_SIGNAL(clicked()), TQ_SLOT(slotNextConj()) ); + connect( tensebox, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTenseSelected(int)) ); + + connect( thirdN_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNPluralChanged(const TQString&)) ); + connect( thirdN_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdNSingularChanged(const TQString&)) ); + connect( thirdM_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMPluralChanged(const TQString&)) ); + connect( thirdM_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdMSingularChanged(const TQString&)) ); + connect( thirdF_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFPluralChanged(const TQString&)) ); + connect( thirdF_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(thirdFSingularChanged(const TQString&)) ); + connect( second_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondPluralChanged(const TQString&)) ); + connect( second_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(secondSingularChanged(const TQString&)) ); + connect( first_plural, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstPluralChanged(const TQString&)) ); + connect( first_singular, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(firstSingularChanged(const TQString&)) ); prefix = con_prefix; selection = ""; diff --git a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h index fdd7b347..9bfa4219 100644 --- a/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h +++ b/kvoctrain/kvoctrain/entry-dialogs/TenseEntryPage.h @@ -34,7 +34,7 @@ class EntryDlg; class TenseEntryPage : public TenseEntryPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/kva_clip.cpp b/kvoctrain/kvoctrain/kva_clip.cpp index 66e1ca9a..a3a5860e 100644 --- a/kvoctrain/kvoctrain/kva_clip.cpp +++ b/kvoctrain/kvoctrain/kva_clip.cpp @@ -106,11 +106,11 @@ void kvoctrainApp::slotEditCopy() } if (!exp.isEmpty()) { #if defined(_WS_X11_) -// disconnect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()),this,0); +// disconnect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()),this,0); #endif TQApplication::clipboard()->setText(exp); #if defined(_WS_X11_) -// connect(TQApplication::clipboard(),TQT_SIGNAL(dataChanged()), this,TQT_SLOT(clipboardChanged())); +// connect(TQApplication::clipboard(),TQ_SIGNAL(dataChanged()), this,TQ_SLOT(clipboardChanged())); #endif } diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp index 3df5d285..c729e172 100644 --- a/kvoctrain/kvoctrain/kva_config.cpp +++ b/kvoctrain/kvoctrain/kva_config.cpp @@ -34,7 +34,7 @@ void kvoctrainApp::saveOptions() { - TDEConfig *config = TDEApplication::kApplication()->config(); + TDEConfig *config = tdeApp->config(); fileOpenRecent->saveEntries(config, "Recent Files"); if (view) @@ -75,7 +75,7 @@ void kvoctrainApp::saveLanguages() void kvoctrainApp::readOptions() { - TDEConfig *config = TDEApplication::kApplication()->config(); + TDEConfig *config = tdeApp->config(); fileOpenRecent->loadEntries(config, "Recent Files"); /* int ls = Prefs::numPreSetting(); @@ -126,9 +126,9 @@ void kvoctrainApp::saveProperties(TDEConfig *config ) config->writeEntry(CFG_QUERYMODE, querymode); TQString filename=doc->URL().path(); - TQString tempname = kapp->tempSaveName(filename); + TQString tempname = tdeApp->tempSaveName(filename); saveDocProps(doc); - doc->saveAs(TQT_TQOBJECT(this), KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic); + doc->saveAs(this, KURL(tempname), doc->getTitle(), kvoctrainDoc::automatic); } } @@ -142,31 +142,31 @@ void kvoctrainApp::readProperties(TDEConfig *config) bool modified = config->readBoolEntry(CFG_MODIFIED,false); if( modified ){ bool b_canRecover; - TQString tempname = kapp->checkRecoverFile(filename,b_canRecover); + TQString tempname = tdeApp->checkRecoverFile(filename,b_canRecover); if(b_canRecover){ - pdlg = new ProgressDlg(TQString(), TQString(), kapp->makeStdCaption("")); + pdlg = new ProgressDlg(TQString(), TQString(), tdeApp->makeStdCaption("")); pdlg->show(); - doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL(tempname)); + doc = new kvoctrainDoc(this, KURL(tempname)); removeProgressBar(); doc->setModified(); doc->setTitle(title); doc->setURL(KURL(filename)); - setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); + setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified())); TQFile::remove(tempname); } } else if(!filename.isEmpty()){ pdlg = new ProgressDlg (TQString(), TQString(), - kapp->makeStdCaption("")); + tdeApp->makeStdCaption("")); pdlg->show(); - doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL(filename)); + doc = new kvoctrainDoc(this, KURL(filename)); removeProgressBar(); - setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); + setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified())); } show(); - kapp->setTopWidget(this); - kapp->setMainWidget( this ); + tdeApp->setTopWidget(this); + tdeApp->setMainWidget( this ); } diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp index e7e716a8..0856a02c 100644 --- a/kvoctrain/kvoctrain/kva_header.cpp +++ b/kvoctrain/kvoctrain/kva_header.cpp @@ -36,7 +36,7 @@ #include <kcombobox.h> #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> static const char *SORT_ALPHA = I18N_NOOP("&Sort alphabetically"); @@ -52,8 +52,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header << 16) | IDH_SORT_COL_ALPHA); header_m->insertItem(SmallIconSet("sort_num"), i18n(SORT_NUM), (header << 16) | IDH_SORT_COL_NUM); - connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m->exec(TQPoint (x, y)); return; @@ -89,8 +89,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ langs_m->insertItem(names[i], (header << 16) | (i << (16+8)) | IDH_SET_LANG); } - connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int))); - connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (langs_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetHeaderProp(int))); + connect (langs_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m = new TQPopupMenu(); @@ -142,8 +142,8 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ } } header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL); - connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (query_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (query_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available int j; @@ -167,16 +167,16 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/ header_m->insertItem(i18n("&Antonyms"), (header << 16) | IDH_START_ANTONYM); header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE); header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE); - connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (multiple_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (multiple_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m->insertSeparator(); header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA); header_m->insertItem(SmallIconSet("set_language"), i18n("Set &Language"), langs_m, (2 << 16) | IDH_NULL); } - connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); header_m->exec(TQPoint(x, y)); } @@ -446,7 +446,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ msg = format.arg(name); int exit = KMessageBox::warningContinueCancel(this, msg, - kapp->makeStdCaption(""),KStdGuiItem::del()); + tdeApp->makeStdCaption(""),KStdGuiItem::del()); if(exit==KMessageBox::Continue) { doc->removeIdent(header1); view->setView (doc, langset); @@ -551,7 +551,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/ msg = format.arg(name); int exit = KMessageBox::warningContinueCancel(this, msg, - kapp->makeStdCaption(""),i18n("Reset")); + tdeApp->makeStdCaption(""),i18n("Reset")); if(exit==KMessageBox::Continue) { doc->resetEntry (header1, act_lesson); doc->setModified(); diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index f4f36e70..67f4d97c 100644 --- a/kvoctrain/kvoctrain/kva_init.cpp +++ b/kvoctrain/kvoctrain/kva_init.cpp @@ -35,7 +35,7 @@ #include <kstatusbar.h> #include <tdepopupmenu.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include "prefs.h" @@ -90,159 +90,159 @@ kvoctrainApp::kvoctrainApp(TQWidget *parent, const char *name) querying = false; btimer = new TQTimer( this ); - connect( btimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeOutBackup()) ); + connect( btimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeOutBackup()) ); if (Prefs::autoBackup()) - btimer->start(Prefs::backupTime() * 60 * 1000, TRUE); + btimer->start(Prefs::backupTime() * 60 * 1000, true); } void kvoctrainApp::initActions() { - fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); + fileNew = KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); fileNew->setToolTip(fileNew->whatsThis()); - fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileOpenExample = new TDEAction(i18n("Open &Example..."), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example"); + fileOpenExample = new TDEAction(i18n("Open &Example..."), "document-open", 0, this, TQ_SLOT(slotFileOpenExample()), actionCollection(), "file_open_example"); fileOpen->setWhatsThis(i18n("Open a vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotGHNS()), actionCollection(), "file_ghns"); + fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", CTRL+Key_G, this, TQ_SLOT(slotGHNS()), actionCollection(), "file_ghns"); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setToolTip(fileGHNS->whatsThis()); - fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileMerge()), actionCollection(), "file_merge"); + fileMerge = new TDEAction(i18n("&Merge..."), 0, 0, this, TQ_SLOT(slotFileMerge()), actionCollection(), "file_merge"); fileMerge->setWhatsThis(i18n("Merge an existing vocabulary document with the current one")); fileMerge->setToolTip(fileOpen->whatsThis()); - fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); fileSave->setWhatsThis(i18n("Save the active vocabulary document")); fileSave->setToolTip(fileSave->whatsThis()); - fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs->setWhatsThis(i18n("Save the active vocabulary document with a different name")); fileSaveAs->setToolTip(fileSaveAs->whatsThis()); - filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); filePrint->setWhatsThis(i18n("Print the active vocabulary document")); filePrint->setToolTip(filePrint->whatsThis()); - fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); fileQuit->setWhatsThis(i18n("Quit KVocTrain")); fileQuit->setToolTip(fileQuit->whatsThis()); - editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); editCopy->setWhatsThis(i18n("Copy")); editCopy->setToolTip(editCopy->whatsThis()); - editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); editPaste->setWhatsThis(i18n("Paste")); editPaste->setToolTip(editPaste->whatsThis()); - editSelectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); + editSelectAll = KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection()); editSelectAll->setWhatsThis(i18n("Select all rows")); editSelectAll->setToolTip(editSelectAll->whatsThis()); - editClearSelection = KStdAction::deselect(TQT_TQOBJECT(this), TQT_SLOT(slotCancelSelection()), actionCollection()); + editClearSelection = KStdAction::deselect(this, TQ_SLOT(slotCancelSelection()), actionCollection()); editClearSelection->setWhatsThis(i18n("Deselect all rows")); editClearSelection->setToolTip(editClearSelection->whatsThis()); - editSearchFromClipboard = KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(slotSmartSearchClip()), actionCollection()); + editSearchFromClipboard = KStdAction::find(this, TQ_SLOT(slotSmartSearchClip()), actionCollection()); editSearchFromClipboard->setWhatsThis(i18n("Search for the clipboard contents in the vocabulary")); editSearchFromClipboard->setToolTip(editSearchFromClipboard->whatsThis()); - editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", TQT_TQOBJECT(this), TQT_SLOT(slotAppendRow()), actionCollection(),"edit_append"); + editAppend = new TDEAction(i18n("&Append New Entry"), "insert_table_row", "Insert", this, TQ_SLOT(slotAppendRow()), actionCollection(),"edit_append"); editAppend->setWhatsThis(i18n("Append a new row to the vocabulary")); editAppend->setToolTip(editAppend->whatsThis()); - editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", TQT_TQOBJECT(this), TQT_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area"); + editEditSelectedArea = new TDEAction(i18n("&Edit Selected Area..."), "edit_table_row", "Ctrl+Return", this, TQ_SLOT(slotEditRow()), actionCollection(),"edit_edit_selected_area"); editEditSelectedArea->setWhatsThis(i18n("Edit the entries in the selected rows")); editEditSelectedArea->setToolTip(editEditSelectedArea->whatsThis()); - editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", TQT_TQOBJECT(this), TQT_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area"); + editRemoveSelectedArea = new TDEAction(i18n("&Remove Selected Area"), "delete_table_row", "Delete", this, TQ_SLOT(slotRemoveRow()), actionCollection(),"edit_remove_selected_area"); editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows")); editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis()); - editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("document-save-as", TDEIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); + editSaveSelectedArea = new TDEAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("document-save-as", TDEIcon::Small), 0, this, TQ_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary")); editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis()); - vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics"); + vocabShowStatistics = new TDEAction(i18n("Show &Statistics"), "statistics", 0, this, TQ_SLOT(slotShowStatist()), actionCollection(),"vocab_show_statistics"); vocabShowStatistics->setWhatsThis(i18n("Show statistics for the current vocabulary")); vocabShowStatistics->setToolTip(vocabShowStatistics->whatsThis()); - vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons"); + vocabAssignLessons = new TDEAction(i18n("Assign L&essons..."), "rand_less", 0, this, TQ_SLOT(slotCreateRandom()), actionCollection(),"vocab_assign_lessons"); vocabAssignLessons->setWhatsThis(i18n("Create random lessons with unassigned entries")); vocabAssignLessons->setToolTip(vocabAssignLessons->whatsThis()); - vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up"); + vocabCleanUp = new TDEAction(i18n("&Clean Up"), "cleanup", 0, this, TQ_SLOT(slotCleanVocabulary()), actionCollection(),"vocab_clean_up"); vocabCleanUp->setWhatsThis(i18n("Remove entries with same content from vocabulary")); vocabCleanUp->setToolTip(vocabCleanUp->whatsThis()); vocabAppendLanguage = new TDESelectAction(i18n("&Append Language"), "insert_table_col", 0, actionCollection(), "vocab_append_language"); - connect(vocabAppendLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabAppendLanguage())); - connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotAppendLang(int))); - connect (vocabAppendLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int))); + connect(vocabAppendLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabAppendLanguage())); + connect (vocabAppendLanguage->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotAppendLang(int))); + connect (vocabAppendLanguage->popupMenu(), TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); vocabSetLanguage = new TDESelectAction(i18n("Set &Language"), "set_language", 0, actionCollection(), "vocab_set_language"); - connect(vocabSetLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabSetLanguage())); + connect(vocabSetLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabSetLanguage())); vocabRemoveLanguage = new TDESelectAction(i18n("&Remove Language"), "delete_table_col", 0, actionCollection(), "vocab_remove_language"); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowVocabRemoveLanguage())); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderCallBack(int))); - connect(vocabRemoveLanguage->popupMenu(), TQT_SIGNAL(highlighted(int)), TQT_TQOBJECT(this), TQT_SLOT(slotHeaderStatus(int))); + connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowVocabRemoveLanguage())); + connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect(vocabRemoveLanguage->popupMenu(), TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); - vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); + vocabDocumentProperties = new TDEAction(i18n("Document &Properties"), 0, 0, this, TQ_SLOT(slotDocProps()), actionCollection(), "vocab_document_properties"); vocabDocumentProperties->setWhatsThis(i18n("Edit document properties")); vocabDocumentProperties->setToolTip(vocabAppendLanguage->whatsThis()); - vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties"); + vocabLanguageProperties = new TDEAction(i18n("Lan&guage Properties"), 0, 0, this, TQ_SLOT(slotDocPropsLang()), actionCollection(), "vocab_language_properties"); vocabLanguageProperties->setWhatsThis(i18n("Edit language properties in current document")); vocabLanguageProperties->setToolTip(vocabSetLanguage->whatsThis()); lessons = new KComboBox(this); lessons->setMinimumWidth(160); - connect(lessons, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotChooseLesson(int))); - lessons->setFocusPolicy(TQ_NoFocus); + connect(lessons, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotChooseLesson(int))); + lessons->setFocusPolicy(TQWidget::NoFocus); - vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "vocab_lessons"); + vocabLessons = new KWidgetAction(lessons, i18n("Lessons"), 0, this, 0, actionCollection(), "vocab_lessons"); vocabLessons->setWhatsThis(i18n("Choose current lesson")); vocabLessons->setToolTip(vocabLessons->whatsThis()); searchLine = new KLineEdit(this); - searchLine->setFocusPolicy(TQ_ClickFocus); - connect (searchLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearchNext())); - connect (searchLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotResumeSearch(const TQString&))); + searchLine->setFocusPolicy(TQWidget::ClickFocus); + connect (searchLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSearchNext())); + connect (searchLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotResumeSearch(const TQString&))); - vocabSearch = new KWidgetAction(searchLine, i18n("Smart Search"), 0, TQT_TQOBJECT(this), 0, actionCollection(), "vocab_search"); + vocabSearch = new KWidgetAction(searchLine, i18n("Smart Search"), 0, this, 0, actionCollection(), "vocab_search"); vocabSearch->setAutoSized(true); vocabSearch->setWhatsThis(i18n("Search vocabulary for specified text ")); vocabSearch->setToolTip(vocabSearch->whatsThis()); /* - learningResumeQuery = new TDEAction(i18n("Resume &Query..."), "run_query", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query"); + learningResumeQuery = new TDEAction(i18n("Resume &Query..."), "run_query", 0, this, TQ_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_query"); //learningResumeQuery->setWhatsThis(i18n("")); learningResumeQuery->setToolTip(learningResumeQuery->whatsThis()); - learningResumeMultipleChoice = new TDEAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQT_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice"); + learningResumeMultipleChoice = new TDEAction(i18n("&Resume Multiple Choice..."), "run_multi", 0, this, TQ_SLOT(slotRestartQuery()), actionCollection(),"learning_resume_multiple_choice"); //learningResumeMultipleChoice->setWhatsThis(i18n("")); learningResumeMultipleChoice->setToolTip(learningResumeMultipleChoice->whatsThis()); */ - configApp = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotGeneralOptions()), actionCollection()); + configApp = KStdAction::preferences(this, TQ_SLOT( slotGeneralOptions()), actionCollection()); configApp->setWhatsThis(i18n("Show the configuration dialog")); configApp->setToolTip(configApp->whatsThis()); - /*configQueryOptions = new TDEAction(i18n("Configure &Query..."), "configure_query", 0, this, TQT_SLOT(slotQueryOptions()), actionCollection(),"config_query_options"); + /*configQueryOptions = new TDEAction(i18n("Configure &Query..."), "configure_query", 0, this, TQ_SLOT(slotQueryOptions()), actionCollection(),"config_query_options"); configQueryOptions->setWhatsThis(i18n("Show the query configuration dialog")); configQueryOptions->setToolTip(configQueryOptions->whatsThis());*/ actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), this, TQT_SLOT(slotStatusHelpMsg(const TQString &))); - //connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQT_SLOT(slotActionHighlighted(TDEAction *, bool))); + connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString &)), this, TQ_SLOT(slotStatusHelpMsg(const TQString &))); + //connect(actionCollection(), TQ_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQ_SLOT(slotActionHighlighted(TDEAction *, bool))); if (!initialGeometrySet()) resize( TQSize(550, 400).expandedTo(minimumSizeHint())); @@ -254,9 +254,9 @@ void kvoctrainApp::initActions() configToolbar->setToolTip(configToolbar->whatsThis()); learn_menu = (TQPopupMenu*) child( "learning", "TDEPopupMenu" ); - connect(learn_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect(learn_menu, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); - connect(learn_menu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShowLearn())); + connect(learn_menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect(learn_menu, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); + connect(learn_menu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShowLearn())); } @@ -280,14 +280,14 @@ void kvoctrainApp::initStatusBar() void kvoctrainApp::initDoc( ) { if (fileOpenRecent->items().count() > 0) - doc = new kvoctrainDoc(TQT_TQOBJECT(this), fileOpenRecent->items()[0]); + doc = new kvoctrainDoc(this, fileOpenRecent->items()[0]); else - doc = new kvoctrainDoc(TQT_TQOBJECT(this), KURL("")); + doc = new kvoctrainDoc(this, KURL("")); loadDocProps(doc); if (doc->numLangs() == 0) doc->appendLang("en"); - connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); } diff --git a/kvoctrain/kvoctrain/kva_io.cpp b/kvoctrain/kvoctrain/kva_io.cpp index f227b4ac..4ffeff2b 100644 --- a/kvoctrain/kvoctrain/kva_io.cpp +++ b/kvoctrain/kvoctrain/kva_io.cpp @@ -33,7 +33,7 @@ #include <tderecentdocument.h> #include <kstatusbar.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdenewstuff/downloaddialog.h> @@ -65,7 +65,7 @@ void kvoctrainApp::slotTimeOutBackup() slotFileSave(); } if (Prefs::backupTime() > 0) - btimer->start(Prefs::backupTime() * 60 * 1000, TRUE); + btimer->start(Prefs::backupTime() * 60 * 1000, true); slotStatusMsg(IDS_DEFAULT); } @@ -90,7 +90,7 @@ bool kvoctrainApp::queryExit() { int exit = KMessageBox::warningYesNoCancel(this, i18n("Vocabulary is modified.\n\nSave file before exit?\n"), - kapp->makeStdCaption(""), + tdeApp->makeStdCaption(""), KStdGuiItem::save(), KStdGuiItem::discard()); if (exit==KMessageBox::Yes) { save = true; // save and exit @@ -123,7 +123,7 @@ void kvoctrainApp::slotFileQuit() if(queryExit()) { doc->setModified(false); // Make sure not to bother about saving again. - kapp->quit(); + tdeApp->quit(); } else slotStatusMsg(IDS_DEFAULT); @@ -136,7 +136,7 @@ void kvoctrainApp::slotProgress(kvoctrainDoc *curr_doc, int percent) pdlg->setValue (curr_doc, percent); else if (pbar != 0) pbar->setValue (percent); - kapp->processEvents(); + tdeApp->processEvents(); } @@ -160,7 +160,7 @@ void kvoctrainApp::slotFileNew() view->setView (0, langset); delete doc; TQString name = ""; - doc = new kvoctrainDoc (TQT_TQOBJECT(this), 0 /*KURL(name)*/); + doc = new kvoctrainDoc (this, 0 /*KURL(name)*/); loadDocProps(doc); if (doc->numLangs() == 0) { TQString l = "en"; @@ -169,7 +169,7 @@ void kvoctrainApp::slotFileNew() view->setView(doc, langset); view->getTable()->setFont(Prefs::tableFont()); view->adjustContent(); - connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); } slotStatusMsg(IDS_DEFAULT); @@ -202,7 +202,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent) slotStatusMsg(msg); prepareProgressBar(); - doc = new kvoctrainDoc (TQT_TQOBJECT(this), url); + doc = new kvoctrainDoc (this, url); removeProgressBar(); loadDocProps(doc); view->setView(doc, langset); @@ -210,7 +210,7 @@ void kvoctrainApp::loadfileFromPath(const KURL & url, bool addRecent) view->adjustContent(); if (addRecent) fileOpenRecent->addURL(url) /*addRecentFile (url.path())*/; - connect (doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + connect (doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); } } @@ -253,8 +253,8 @@ void kvoctrainApp::slotFileMerge() slotStatusMsg(msg); prepareProgressBar(); - kvoctrainDoc *new_doc = new kvoctrainDoc (TQT_TQOBJECT(this), url); - connect (new_doc, TQT_SIGNAL (docModified(bool)), this, TQT_SLOT(slotModifiedDoc(bool))); + kvoctrainDoc *new_doc = new kvoctrainDoc (this, url); + connect (new_doc, TQ_SIGNAL (docModified(bool)), this, TQ_SLOT(slotModifiedDoc(bool))); doc->setModified(false); removeProgressBar(); @@ -510,7 +510,7 @@ void kvoctrainApp::slotFileSave() prepareProgressBar(); saveDocProps(doc); - doc->saveAs(TQT_TQOBJECT(this), doc->URL(), doc->getTitle(), kvoctrainDoc::automatic); + doc->saveAs(this, doc->URL(), doc->getTitle(), kvoctrainDoc::automatic); fileOpenRecent->addURL(doc->URL()); removeProgressBar(); @@ -614,7 +614,7 @@ void kvoctrainApp::slotFileSaveAs() saveDocProps(doc); prepareProgressBar(); - doc->saveAs(TQT_TQOBJECT(this), url, doc->getTitle(), kvoctrainDoc::automatic); + doc->saveAs(this, url, doc->getTitle(), kvoctrainDoc::automatic); fileOpenRecent->addURL(doc->URL()); removeProgressBar(); } @@ -631,7 +631,7 @@ void kvoctrainApp::slotSaveSelection () slotStatusMsg(i18n("Saving selected area under new filename...")); TQString save_separator = Prefs::separator(); Prefs::setSeparator("\t"); - kvoctrainDoc seldoc(TQT_TQOBJECT(this), ""); + kvoctrainDoc seldoc(this, ""); // transfer most important parts seldoc.appendLang(doc->getOriginalIdent()); for (int i = 1; i < doc->numLangs(); i++) @@ -667,7 +667,7 @@ void kvoctrainApp::slotSaveSelection () saveDocProps(&seldoc); prepareProgressBar(); - seldoc.saveAs(TQT_TQOBJECT(this), url, i18n ("Part of: ") + doc->getTitle(), kvoctrainDoc::automatic); + seldoc.saveAs(this, url, i18n ("Part of: ") + doc->getTitle(), kvoctrainDoc::automatic); removeProgressBar(); } } diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp index 48c024f0..273b97f1 100644 --- a/kvoctrain/kvoctrain/kva_query.cpp +++ b/kvoctrain/kvoctrain/kva_query.cpp @@ -158,7 +158,7 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property) if (query_startnum == 0) { if( KMessageBox::Yes == KMessageBox::questionYesNo(this, i18n(not_contain), - kapp->makeStdCaption(i18n("Starting Query")))) + tdeApp->makeStdCaption(i18n("Starting Query")))) slotGeneralOptionsPage(5); return; } @@ -179,11 +179,11 @@ void kvoctrainApp::slotStartPropertyQuery(int col, QueryType property) exp, doc); - connect( simpleQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); + connect( simpleQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); - connect( simpleQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutProperty(QueryDlgBase::Result))); + connect( simpleQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutProperty(QueryDlgBase::Result))); simpleQueryDlg->initFocus(); simpleQueryDlg->show(); @@ -208,7 +208,7 @@ void kvoctrainApp::slotTimeOutProperty(QueryDlgBase::Result res) if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), - kapp->makeStdCaption(i18n("Stopping Query"))); + tdeApp->makeStdCaption(i18n("Stopping Query"))); return; } else { @@ -329,7 +329,7 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) if (query_startnum == 0) { if( KMessageBox::Yes == KMessageBox::questionYesNo(this, i18n(not_contain), - kapp->makeStdCaption(i18n("Starting Query")))) + tdeApp->makeStdCaption(i18n("Starting Query")))) slotGeneralOptionsPage(5); return; } @@ -352,11 +352,11 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) exp->getConjugation(act_query_col)); verbQueryDlg->initFocus(); - connect( verbQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); + connect( verbQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); - connect(verbQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result))); + connect(verbQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result))); verbQueryDlg->show(); } else if (queryType == TQT_Articles) { @@ -370,10 +370,10 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) doc, doc->getArticle(act_query_col)); artQueryDlg->initFocus(); - connect( artQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); - connect(artQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result))); + connect( artQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); + connect(artQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result))); artQueryDlg->show(); } else if (queryType == TQT_Comparison) { @@ -387,11 +387,11 @@ void kvoctrainApp::slotStartTypeQuery(int col, const TQString & type) doc, exp->getComparison(act_query_col)); adjQueryDlg->initFocus(); - connect( adjQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); + connect( adjQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); - connect(adjQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutType(QueryDlgBase::Result))); + connect(adjQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutType(QueryDlgBase::Result))); adjQueryDlg->show(); } else { @@ -414,7 +414,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res) if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), - kapp->makeStdCaption(i18n("Stopping Query"))); + tdeApp->makeStdCaption(i18n("Stopping Query"))); return; } else { @@ -606,7 +606,7 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o if (query_startnum == 0) { if( KMessageBox::Yes == KMessageBox::questionYesNo(this, i18n(not_contain), - kapp->makeStdCaption(i18n("Starting Query")))) + tdeApp->makeStdCaption(i18n("Starting Query")))) slotGeneralOptionsPage(5); return; } @@ -642,10 +642,10 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o exp, doc); randomQueryDlg->initFocus(); - connect( randomQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); - connect(randomQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result))); + connect( randomQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); + connect(randomQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutRandomQuery(QueryDlgBase::Result))); randomQueryDlg->show(); } else if (queryType == TQT_Multiple) { @@ -661,10 +661,10 @@ void kvoctrainApp::slotStartQuery(const TQString & translang, const TQString & o exp, doc); mcQueryDlg->initFocus(); - connect( mcQueryDlg, TQT_SIGNAL(sigEditEntry(int,int)), - this, TQT_SLOT(slotEditEntry(int,int))); - connect(mcQueryDlg, TQT_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), - this, TQT_SLOT(slotTimeOutMultipleChoice(QueryDlgBase::Result))); + connect( mcQueryDlg, TQ_SIGNAL(sigEditEntry(int,int)), + this, TQ_SLOT(slotEditEntry(int,int))); + connect(mcQueryDlg, TQ_SIGNAL(sigQueryChoice(QueryDlgBase::Result)), + this, TQ_SLOT(slotTimeOutMultipleChoice(QueryDlgBase::Result))); mcQueryDlg->show(); } else { @@ -718,7 +718,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res) if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) { slotStopQuery(true); KMessageBox::information(this, i18n(not_answered), - kapp->makeStdCaption(i18n("Stopping Query"))); + tdeApp->makeStdCaption(i18n("Stopping Query"))); return; } else { @@ -1016,6 +1016,6 @@ void kvoctrainApp::slotStopQuery(bool ) querying = false; querymode = false; show(); - kapp->setTopWidget(this); - kapp->setMainWidget( this ); + tdeApp->setTopWidget(this); + tdeApp->setMainWidget( this ); } diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp index 5bcd011f..0b7dc77c 100644 --- a/kvoctrain/kvoctrain/kvoctrain.cpp +++ b/kvoctrain/kvoctrain/kvoctrain.cpp @@ -28,7 +28,7 @@ #include <kcombobox.h> #include <kprogress.h> #include <tdeconfig.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> @@ -180,7 +180,7 @@ void kvoctrainApp::commitEntryDlg(bool force) if( KMessageBox::No == KMessageBox::warningYesNo(this, i18n("The entry dialog contains unsaved changes.\n" "Do you want to apply or discard your changes?"), - kapp->makeStdCaption(i18n("Unsaved Changes")), + tdeApp->makeStdCaption(i18n("Unsaved Changes")), KStdGuiItem::apply(), KStdGuiItem::discard())) { return; } @@ -410,8 +410,8 @@ void kvoctrainApp::createEntryDlg(int row, int col) doc->getEntry(row)->isActive(), Prefs::iPAFont()); } - connect( entryDlg, TQT_SIGNAL(sigEditChoice(int)), - this, TQT_SLOT(slotEditCallBack(int))); + connect( entryDlg, TQ_SIGNAL(sigEditChoice(int)), + this, TQ_SLOT(slotEditCallBack(int))); view->getTable()->setReadOnly(true); @@ -651,7 +651,7 @@ void kvoctrainApp::slotDocProps () doc->setModified(); view->getTable()->updateContents(); - setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); + setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified())); TQApplication::restoreOverrideCursor(); slotStatusMsg(IDS_DEFAULT); @@ -672,7 +672,7 @@ void kvoctrainApp::slotDocPropsLang () doc->setModified(); view->getTable()->updateContents(); - setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); + setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified())); slotStatusMsg(IDS_DEFAULT); } @@ -681,7 +681,7 @@ void kvoctrainApp::slotDocPropsLang () void kvoctrainApp::slotModifiedDoc(bool mod) { - setCaption(kapp->makeStdCaption(doc->getTitle(), false, doc->isModified())); + setCaption(tdeApp->makeStdCaption(doc->getTitle(), false, doc->isModified())); slotStatusMsg(IDS_DEFAULT); } @@ -701,7 +701,7 @@ void kvoctrainApp::slotRemoveRow() if (!hasSelection()) { if( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the selected entry?\n"), - kapp->makeStdCaption(""),KStdGuiItem::del())) + tdeApp->makeStdCaption(""),KStdGuiItem::del())) { KVocTrainTable *table = view->getTable(); doc->removeEntry(table->currentRow()); @@ -712,7 +712,7 @@ void kvoctrainApp::slotRemoveRow() else { if(KMessageBox::Continue == KMessageBox::warningContinueCancel(this, i18n("Do you really want to delete the selected range?\n"), - kapp->makeStdCaption(""),KStdGuiItem::del())) + tdeApp->makeStdCaption(""),KStdGuiItem::del())) { KVocTrainTable *table = view->getTable(); @@ -895,14 +895,14 @@ void kvoctrainApp::slotCleanVocabulary () KMessageBox::information(this, s, - kapp->makeStdCaption(i18n("Clean Up"))); + tdeApp->makeStdCaption(i18n("Clean Up"))); } } void kvoctrainApp::slotCreateRandom() { - bool ok = FALSE; + bool ok = false; int res = KInputDialog::getInteger(i18n( "Entries in Lesson" ), i18n( "Enter number of entries in lesson:" ), Prefs::entriesPerLesson(), 1, 1000, 1, &ok, this ); if (!ok) @@ -961,7 +961,7 @@ void kvoctrainApp::slotGeneralOptions() void kvoctrainApp::slotGeneralOptionsPage(int index) { KVocTrainPrefs* dialog = new KVocTrainPrefs(langset, doc, lessons, &querymanager, this, "settings", Prefs::self() ); - connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotApplyPreferences())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyPreferences())); if (index >= 0) dialog->selectPage(index); dialog->show(); @@ -1005,7 +1005,7 @@ void kvoctrainApp::slotAppendLang(int header_and_cmd) "Should this dialog be invoked now?"); if( KMessageBox::Yes == KMessageBox::questionYesNo(this, msg, - kapp->makeStdCaption(""),i18n("Invoke Dialog"), i18n("Do Not Invoke"))) + tdeApp->makeStdCaption(""),i18n("Invoke Dialog"), i18n("Do Not Invoke"))) { slotGeneralOptionsPage(1); } @@ -1149,8 +1149,8 @@ void kvoctrainApp::aboutToShowLearn() } header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL); - connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (query_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (query_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); for (int i = 1; i < (int) doc->numLangs(); i++) { // show pixmap and long name if available @@ -1177,12 +1177,12 @@ void kvoctrainApp::aboutToShowLearn() header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE); header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE); - connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (multiple_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (multiple_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); } - connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int))); - connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (header_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHeaderCallBack(int))); + connect (header_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); TQString id = header == 0 ? doc->getOriginalIdent() : doc->getIdent(header); @@ -1263,8 +1263,8 @@ void kvoctrainApp::aboutToShowVocabSetLanguage() langs_m->insertItem(names[i], (header << 16) | (i << (16+8)) | IDH_SET_LANG); } - connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int))); - connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int))); + connect (langs_m, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSetHeaderProp(int))); + connect (langs_m, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHeaderStatus(int))); if (header == 0) set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL); diff --git a/kvoctrain/kvoctrain/kvoctrain.h b/kvoctrain/kvoctrain/kvoctrain.h index 689ab22d..48ad8b56 100644 --- a/kvoctrain/kvoctrain/kvoctrain.h +++ b/kvoctrain/kvoctrain/kvoctrain.h @@ -75,7 +75,7 @@ class KVTNewStuff; */ class kvoctrainApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp index e9447654..5462c709 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.cpp +++ b/kvoctrain/kvoctrain/kvoctraintable.cpp @@ -32,7 +32,7 @@ #include <dcopclient.h> #include <tdelocale.h> #include <tdeglobalsettings.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include "kvoctraintable.h" @@ -61,13 +61,13 @@ KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *p m_pixInactive = TQPixmap(TDEGlobal::iconLoader()->loadIcon("no", TDEIcon::Small)); delayTimer = new TQTimer(this); - connect(delayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(menuTriggerTimeout())); + connect(delayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(menuTriggerTimeout())); TQHeader *header = horizontalHeader(); - connect(header, TQT_SIGNAL(pressed(int)), this, TQT_SLOT(headerPressEvent(int))); - connect(header, TQT_SIGNAL(released(int)), this, TQT_SLOT(headerReleaseEvent(int))); + connect(header, TQ_SIGNAL(pressed(int)), this, TQ_SLOT(headerPressEvent(int))); + connect(header, TQ_SIGNAL(released(int)), this, TQ_SLOT(headerReleaseEvent(int))); - connect(this, TQT_SIGNAL(currentChanged(int, int)), this, TQT_SLOT(slotCurrentChanged(int, int))); + connect(this, TQ_SIGNAL(currentChanged(int, int)), this, TQ_SLOT(slotCurrentChanged(int, int))); } @@ -122,7 +122,7 @@ void KVocTrainTable::sortByColumn(int header, bool alpha) { if (m_doc && !m_doc->isAllowedSorting()) { KMessageBox::information(this, i18n("Sorting is currently turned off for this document.\n" - "\nUse the document properties dialog to turn sorting on."), kapp->makeStdCaption("")); + "\nUse the document properties dialog to turn sorting on."), tdeApp->makeStdCaption("")); return; } @@ -263,7 +263,7 @@ void KVocTrainTable::menuTriggerTimeout() if (mt != KV_COL_MARK) emit rightButtonClicked(mt, mpos.x(), mpos.y()); - TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0, 0), Qt::LeftButton, Qt::LeftButton); + TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0, 0), TQt::LeftButton, TQt::LeftButton); TQApplication::sendEvent(header, &me); } @@ -538,7 +538,7 @@ void KVocTrainTable::contentsMousePressEvent(TQMouseEvent * e) for (int i = topCell; i <= lastRowVisible; i++) updateCell(i, KV_COL_ORG); } - if(e->button() == Qt::LeftButton) + if(e->button() == TQt::LeftButton) setCurrentCell(cr, cc); } diff --git a/kvoctrain/kvoctrain/kvoctraintable.h b/kvoctrain/kvoctrain/kvoctraintable.h index 5281ec7d..bd941179 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.h +++ b/kvoctrain/kvoctrain/kvoctraintable.h @@ -39,7 +39,7 @@ */ class KVocTrainTable : public TQTable { -Q_OBJECT +TQ_OBJECT public: public: diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp index 641a6852..565af26f 100644 --- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp +++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp @@ -106,7 +106,7 @@ TQWidget *KVocTrainTableItem::createEditor() const void KVocTrainTableItem::setContentFromEditor( TQWidget *w ) { if (m_doc != 0) { - if ( w->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) { + if ( w->inherits( "TQComboBox" ) ) { if (col() == KV_COL_MARK) { TQComboBox *statebox = (TQComboBox*) w; kvoctrainExpr *expr = m_doc->getEntry(row()); diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp index 600f27a7..ac73193d 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.cpp +++ b/kvoctrain/kvoctrain/kvoctrainview.cpp @@ -30,7 +30,7 @@ #include "prefs.h" #include "langset.h" -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeconfig.h> #include <tdelocale.h> #include <kdebug.h> @@ -59,13 +59,13 @@ kvoctrainView::kvoctrainView(kvoctrainDoc* doc, const LangSet &ls, kvoctrainApp if (m_doc->numLangs() == 0) m_doc->appendLang(i18n("Original")); - connect(m_table, TQT_SIGNAL(selected(int)), m_table, TQT_SLOT(sortByColumn_alpha(int))); - connect(m_table, TQT_SIGNAL(rightButtonClicked(int, int, int)), parent, TQT_SLOT(slotHeaderMenu(int, int, int))); - connect(m_table, TQT_SIGNAL(edited(int, int)), parent, TQT_SLOT(slotEditEntry(int, int))); - connect(m_table, TQT_SIGNAL(currentChanged(int, int)), parent, TQT_SLOT(slotCurrentCellChanged(int, int))); - connect(m_table, TQT_SIGNAL(selectionChanged()), m_table, TQT_SLOT(slotSelectionChanged())); - connect(m_table, TQT_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQT_SLOT(keyPressEvent(TQKeyEvent *))); - connect(m_table, TQT_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQT_SLOT(keyReleaseEvent(TQKeyEvent *))); + connect(m_table, TQ_SIGNAL(selected(int)), m_table, TQ_SLOT(sortByColumn_alpha(int))); + connect(m_table, TQ_SIGNAL(rightButtonClicked(int, int, int)), parent, TQ_SLOT(slotHeaderMenu(int, int, int))); + connect(m_table, TQ_SIGNAL(edited(int, int)), parent, TQ_SLOT(slotEditEntry(int, int))); + connect(m_table, TQ_SIGNAL(currentChanged(int, int)), parent, TQ_SLOT(slotCurrentCellChanged(int, int))); + connect(m_table, TQ_SIGNAL(selectionChanged()), m_table, TQ_SLOT(slotSelectionChanged())); + connect(m_table, TQ_SIGNAL(forwardKeyPressEvent(TQKeyEvent*)), parent, TQ_SLOT(keyPressEvent(TQKeyEvent *))); + connect(m_table, TQ_SIGNAL(forwardKeyReleaseEvent(TQKeyEvent*)), parent, TQ_SLOT(keyReleaseEvent(TQKeyEvent *))); list_layout = new TQGridLayout( this, 2, 1/*, 4 */); list_layout->addWidget(m_table, 1, 0); diff --git a/kvoctrain/kvoctrain/kvoctrainview.h b/kvoctrain/kvoctrain/kvoctrainview.h index 9630ffee..6e441111 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.h +++ b/kvoctrain/kvoctrain/kvoctrainview.h @@ -50,7 +50,7 @@ class LangSet; class kvoctrainView : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/kvt-core/LineList.h b/kvoctrain/kvoctrain/kvt-core/LineList.h index a0bb1b24..323df053 100644 --- a/kvoctrain/kvoctrain/kvt-core/LineList.h +++ b/kvoctrain/kvoctrain/kvt-core/LineList.h @@ -28,12 +28,12 @@ #define LineList_h #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <vector> using namespace std; -class KDE_EXPORT LineList { +class TDE_EXPORT LineList { public: LineList (const TQString &multilines = ""); diff --git a/kvoctrain/kvoctrain/kvt-core/Makefile.am b/kvoctrain/kvoctrain/kvt-core/Makefile.am index e31da775..947a6c57 100644 --- a/kvoctrain/kvoctrain/kvt-core/Makefile.am +++ b/kvoctrain/kvoctrain/kvt-core/Makefile.am @@ -12,6 +12,6 @@ libkvoctraincore_la_SOURCES = langset.cpp LineList.cpp kvoctrainexpr.cpp \ SUBDIRS = kvt-xml -libkvoctraincore_la_LIBADD= $(all_libraries) $(KDE_RPATH) kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP +libkvoctraincore_la_LIBADD= $(all_libraries) $(KDE_RPATH) kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) -lDCOP noinst_HEADERS = grammarmanager.h diff --git a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h index c1fddd8c..e6776f29 100644 --- a/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h +++ b/kvoctrain/kvoctrain/kvt-core/MultipleChoice.h @@ -28,11 +28,11 @@ #define MultipleChoice_included #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> #define MAX_MULTIPLE_CHOICE 5 // select one out of x -class KDE_EXPORT MultipleChoice +class TDE_EXPORT MultipleChoice { public: diff --git a/kvoctrain/kvoctrain/kvt-core/QueryManager.h b/kvoctrain/kvoctrain/kvt-core/QueryManager.h index 4c2f2175..124e4dad 100644 --- a/kvoctrain/kvoctrain/kvt-core/QueryManager.h +++ b/kvoctrain/kvoctrain/kvt-core/QueryManager.h @@ -105,7 +105,7 @@ struct QueryEntryRef { typedef vector<vector<QueryEntryRef> > QuerySelection; -class KDE_EXPORT QueryManager +class TDE_EXPORT QueryManager { public: // dont change the order/remove one of these, diff --git a/kvoctrain/kvoctrain/kvt-core/UsageManager.h b/kvoctrain/kvoctrain/kvt-core/UsageManager.h index 522c4ae8..2f674808 100644 --- a/kvoctrain/kvoctrain/kvt-core/UsageManager.h +++ b/kvoctrain/kvoctrain/kvt-core/UsageManager.h @@ -108,7 +108,7 @@ struct UsageRelation }; -class KDE_EXPORT UsageManager +class TDE_EXPORT UsageManager { public: diff --git a/kvoctrain/kvoctrain/kvt-core/grammarmanager.h b/kvoctrain/kvoctrain/kvt-core/grammarmanager.h index c37b0dbb..eea13bae 100644 --- a/kvoctrain/kvoctrain/kvt-core/grammarmanager.h +++ b/kvoctrain/kvoctrain/kvt-core/grammarmanager.h @@ -28,7 +28,7 @@ #define grammarmanager_included #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <vector> using namespace std; @@ -47,7 +47,7 @@ using namespace std; #define UL_USER_TENSE "#" // designates number of user tense -class KDE_EXPORT Article +class TDE_EXPORT Article { public: @@ -76,7 +76,7 @@ protected: }; -class KDE_EXPORT Comparison +class TDE_EXPORT Comparison { public: @@ -106,7 +106,7 @@ protected: }; -class KDE_EXPORT TenseRelation +class TDE_EXPORT TenseRelation { public: @@ -122,7 +122,7 @@ class KDE_EXPORT TenseRelation }; -class KDE_EXPORT Conjugation +class TDE_EXPORT Conjugation { public: diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp index 067fe6bd..af029b9e 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp @@ -33,7 +33,7 @@ #include <algorithm> using namespace std; -KDE_EXPORT vector<int> getCsvOrderStatic(kvoctrainDoc *doc) +TDE_EXPORT vector<int> getCsvOrderStatic(kvoctrainDoc *doc) { vector<int> csv_order; TQStringList lang_order = Prefs::pasteOrder(); @@ -286,7 +286,7 @@ void kvoctrainDoc::errorCsv (int /*line*/, const TQString &text ) { unknown_elem = true; TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Error in csv file")); + TQString s = tdeApp->makeStdCaption(i18n("Error in csv file")); TQString msg = text; KMessageBox::error( 0, msg, s); TQApplication::restoreOverrideCursor(); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp index aa158466..7e6b59e8 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_lex.cpp @@ -388,7 +388,7 @@ void kvoctrainDoc::errorLex (int /*line*/, const TQString &text ) { unknown_elem = true; TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Error in lex file")); + TQString s = tdeApp->makeStdCaption(i18n("Error in lex file")); TQString msg = text; KMessageBox::error(0, msg, s); TQApplication::restoreOverrideCursor(); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp index 3f33b25f..55973e75 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp @@ -837,7 +837,7 @@ bool kvoctrainDoc::unknownAttribute (int line, const TQString &name, TQString msg = format.arg(attr).arg(name); TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Unknown attribute")); + TQString s = tdeApp->makeStdCaption(i18n("Unknown attribute")); bool result = (KMessageBox::warningContinueCancel(0, ln+msg, s) == KMessageBox::Continue); TQApplication::restoreOverrideCursor(); return result; @@ -859,7 +859,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem ) ); TQString msg = format.arg(elem); TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Unknown element")); + TQString s = tdeApp->makeStdCaption(i18n("Unknown element")); KMessageBox::sorry(0, ln+msg, s); TQApplication::restoreOverrideCursor(); } @@ -868,7 +868,7 @@ void kvoctrainDoc::unknownElement (int line, const TQString &elem ) void kvoctrainDoc::errorKvtMl (int line, const TQString &text ) { TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Error")); + TQString s = tdeApp->makeStdCaption(i18n("Error")); TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); TQString msg = text; @@ -880,7 +880,7 @@ void kvoctrainDoc::errorKvtMl (int line, const TQString &text ) void kvoctrainDoc::warningKvtMl (int line, const TQString &text ) { TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Warning")); + TQString s = tdeApp->makeStdCaption(i18n("Warning")); TQString ln = i18n("File:\t%1\nLine:\t%2\n").arg(URL().path()).arg(line); TQString msg = text; KMessageBox::information(0, ln+msg, s); diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp index a3eca8e4..43ad8b7e 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_vcb.cpp @@ -192,7 +192,7 @@ void kvoctrainDoc::errorVcb (int /*line*/, const TQString &text ) { unknown_elem = true; TQApplication::setOverrideCursor( arrowCursor, true ); - TQString s = kapp->makeStdCaption(i18n("Error in vocabbox file")); + TQString s = tdeApp->makeStdCaption(i18n("Error in vocabbox file")); TQString msg = text; KMessageBox::error(0, msg, s); TQApplication::restoreOverrideCursor(); diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp index 5d0ec824..1139384d 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.cpp @@ -97,7 +97,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url) if (!url.isEmpty()) doc_url = url; - connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) ); + connect( this, TQ_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQ_SLOT(slotProgress(kvoctrainDoc*,int)) ); TQString tmpfile; if (TDEIO::NetAccess::download( url, tmpfile, 0 )) @@ -168,7 +168,7 @@ kvoctrainDoc::kvoctrainDoc(TQObject *parent, const KURL& url) TQString format = i18n("Could not load \"%1\"\nDo you want to try again?"); TQString msg = format.arg(url.path()); int result = KMessageBox::warningContinueCancel(0, msg, - kapp->makeStdCaption(i18n("I/O Failure")), + tdeApp->makeStdCaption(i18n("I/O Failure")), i18n("&Retry")); if ( result == KMessageBox::Cancel ) { Init(); @@ -189,7 +189,7 @@ kvoctrainDoc::~kvoctrainDoc() bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, FileType ft) { - connect( this, TQT_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQT_SLOT(slotProgress(kvoctrainDoc*,int)) ); + connect( this, TQ_SIGNAL(progressChanged(kvoctrainDoc*,int)), parent, TQ_SLOT(slotProgress(kvoctrainDoc*,int)) ); KURL tmp (url); if (title == i18n("Untitled")) @@ -264,7 +264,7 @@ bool kvoctrainDoc::saveAs (TQObject *parent, const KURL & url, TQString title, F TQString format = i18n("Could not save \"%1\"\nDo you want to try again?"); TQString msg = format.arg(tmp.path()); int result = KMessageBox::warningContinueCancel(0, msg, - kapp->makeStdCaption(i18n("I/O Failure")), + tdeApp->makeStdCaption(i18n("I/O Failure")), i18n("&Retry")); if ( result == KMessageBox::Cancel ) return false; } @@ -472,7 +472,7 @@ void kvoctrainDoc::setSizeHint (int idx, const int width) } -class eraseTrans : public unary_function<kvoctrainExpr, void> +class eraseTrans : public function<void(kvoctrainExpr)> { public: @@ -516,7 +516,7 @@ void kvoctrainDoc::setOriginalIdent (const TQString &id) } -class sortByOrg : public binary_function<kvoctrainExpr, kvoctrainExpr, bool> +class sortByOrg : public function<bool(kvoctrainExpr, kvoctrainExpr)> { public: @@ -540,7 +540,7 @@ public: class sortByLessonAndOrg_alpha - : public binary_function<kvoctrainExpr, kvoctrainExpr, bool> + : public function<bool(kvoctrainExpr, kvoctrainExpr)> { public: @@ -573,7 +573,7 @@ public: class sortByLessonAndOrg_index - : public binary_function<kvoctrainExpr, kvoctrainExpr, bool> + : public function<bool(kvoctrainExpr, kvoctrainExpr)> { public: @@ -603,7 +603,7 @@ public: }; -class sortByTrans : public binary_function<kvoctrainExpr, kvoctrainExpr, bool> +class sortByTrans : public function<bool(kvoctrainExpr, kvoctrainExpr)> { public: @@ -675,7 +675,7 @@ bool kvoctrainDoc::sortByLesson_index () } -class resetAll : public unary_function<kvoctrainExpr, void> +class resetAll : public function<void(kvoctrainExpr)> { public: @@ -703,7 +703,7 @@ public: }; -class resetOne : public unary_function<kvoctrainExpr, void> +class resetOne : public function<void(kvoctrainExpr)> { public: diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h index 59c57986..e208a530 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h @@ -250,9 +250,9 @@ class MultipleChoice; * This class contains the expressions of your vocabulary ************************************************************/ -class KDE_EXPORT kvoctrainDoc : public TQObject +class TDE_EXPORT kvoctrainDoc : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h index 72ff266f..21712e71 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h +++ b/kvoctrain/kvoctrain/kvt-core/kvoctrainexpr.h @@ -71,7 +71,7 @@ typedef unsigned short count_t; * translations **************************************************************/ -class KDE_EXPORT kvoctrainExpr +class TDE_EXPORT kvoctrainExpr { public: diff --git a/kvoctrain/kvoctrain/kvt-core/langset.h b/kvoctrain/kvoctrain/kvt-core/langset.h index 26935408..bd91af01 100644 --- a/kvoctrain/kvoctrain/kvt-core/langset.h +++ b/kvoctrain/kvoctrain/kvt-core/langset.h @@ -33,10 +33,10 @@ using namespace std; #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT LangSet +class TDE_EXPORT LangSet { public: diff --git a/kvoctrain/kvoctrain/kvtnewstuff.cpp b/kvoctrain/kvoctrain/kvtnewstuff.cpp index ee680f9c..b4b0d882 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.cpp +++ b/kvoctrain/kvoctrain/kvtnewstuff.cpp @@ -12,9 +12,9 @@ #include <tqdir.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdenewstuff/entry.h> diff --git a/kvoctrain/kvoctrain/kvtnewstuff.h b/kvoctrain/kvoctrain/kvtnewstuff.h index fc7348ab..721af2d1 100644 --- a/kvoctrain/kvoctrain/kvtnewstuff.h +++ b/kvoctrain/kvoctrain/kvtnewstuff.h @@ -21,7 +21,7 @@ class kvoctrainApp; */ class KVTNewStuff : public TQObject, public TDENewStuff { -Q_OBJECT +TQ_OBJECT public: KVTNewStuff(TQWidget *parent = 0, const char *name = 0); diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp index 0fb0ec89..409daa01 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.cpp @@ -30,7 +30,7 @@ #include <langset.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kprogress.h> @@ -55,18 +55,18 @@ AdjQueryDlg::AdjQueryDlg mw = new AdjQueryDlgForm(this); setMainWidget(mw); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); - connect(mw->lev1Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); - connect(mw->lev2Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); - connect(mw->lev3Field, TQT_SIGNAL(returnPressed()), TQT_SLOT(returnPressed()) ); + connect(mw->lev1Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); + connect(mw->lev2Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); + connect(mw->lev3Field, TQ_SIGNAL(returnPressed()), TQ_SLOT(returnPressed()) ); - connect(mw->lev1Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev1Changed(const TQString&)) ); - connect(mw->lev2Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev2Changed(const TQString&)) ); - connect(mw->lev3Field, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(lev3Changed(const TQString&)) ); + connect(mw->lev1Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev1Changed(const TQString&)) ); + connect(mw->lev2Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev2Changed(const TQString&)) ); + connect(mw->lev3Field, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(lev3Changed(const TQString&)) ); qtimer = 0; @@ -137,14 +137,14 @@ void AdjQueryDlg::setQuery(TQString, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -216,7 +216,7 @@ void AdjQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h index 89eba656..a3c81dcb 100644 --- a/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/AdjQueryDlg.h @@ -32,7 +32,7 @@ class AdjQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp index 1912d7b3..5ad656f6 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.cpp @@ -28,7 +28,7 @@ #include <kv_resource.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdeapplication.h> #include <kprogress.h> @@ -61,14 +61,14 @@ ArtQueryDlg::ArtQueryDlg mw->artGroup->insert (mw->male); mw->artGroup->insert (mw->rb_fem); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); - connect(mw->natural, TQT_SIGNAL(clicked()), TQT_SLOT(slotNaturalClicked()) ); - connect(mw->male, TQT_SIGNAL(clicked()), TQT_SLOT(slotMaleClicked()) ); - connect(mw->rb_fem, TQT_SIGNAL(clicked()), TQT_SLOT(slotFemClicked()) ); + connect(mw->natural, TQ_SIGNAL(clicked()), TQ_SLOT(slotNaturalClicked()) ); + connect(mw->male, TQ_SIGNAL(clicked()), TQ_SLOT(slotMaleClicked()) ); + connect(mw->rb_fem, TQ_SIGNAL(clicked()), TQ_SLOT(slotFemClicked()) ); setQuery (type, entry, col, query_cycle, query_num, query_startnum, exp, doc, articles); mw->countbar->setFormat("%v/%m"); @@ -158,14 +158,14 @@ void ArtQueryDlg::setQuery(TQString, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -253,7 +253,7 @@ void ArtQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h index 65f794c9..b801e6f3 100644 --- a/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/ArtQueryDlg.h @@ -32,7 +32,7 @@ class ArtQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp index 42a578f0..98ad7916 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.cpp @@ -28,7 +28,7 @@ #include <kv_resource.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kdebug.h> #include <kprogress.h> @@ -40,6 +40,7 @@ #include <tqpushbutton.h> #include <algorithm> +#include <random> using namespace std; MCQueryDlg::MCQueryDlg( @@ -64,15 +65,15 @@ MCQueryDlg::MCQueryDlg( mw->transgroup->insert(mw->rb_trans4); mw->transgroup->insert(mw->rb_trans5); - connect( mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect( mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); -// connect( verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect( mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showItClicked()) ); - connect( mw->rb_trans5, TQT_SIGNAL(clicked()), TQT_SLOT(trans5clicked()) ); - connect( mw->rb_trans4, TQT_SIGNAL(clicked()), TQT_SLOT(trans4clicked()) ); - connect( mw->rb_trans3, TQT_SIGNAL(clicked()), TQT_SLOT(trans3clicked()) ); - connect( mw->rb_trans2, TQT_SIGNAL(clicked()), TQT_SLOT(trans2clicked()) ); - connect( mw->rb_trans1, TQT_SIGNAL(clicked()), TQT_SLOT(trans1clicked()) ); + connect( mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect( mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); +// connect( verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect( mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showItClicked()) ); + connect( mw->rb_trans5, TQ_SIGNAL(clicked()), TQ_SLOT(trans5clicked()) ); + connect( mw->rb_trans4, TQ_SIGNAL(clicked()), TQ_SLOT(trans4clicked()) ); + connect( mw->rb_trans3, TQ_SIGNAL(clicked()), TQ_SLOT(trans3clicked()) ); + connect( mw->rb_trans2, TQ_SIGNAL(clicked()), TQ_SLOT(trans2clicked()) ); + connect( mw->rb_trans1, TQ_SIGNAL(clicked()), TQ_SLOT(trans1clicked()) ); qtimer = 0; @@ -121,14 +122,14 @@ void MCQueryDlg::setQuery(TQString org, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -137,13 +138,16 @@ void MCQueryDlg::setQuery(TQString org, mw->timebar->setEnabled(false); vector<TQString> strings; + random_device randomDev; + mt19937 randomGenerator(randomDev()); + button_ref.clear(); button_ref.push_back(RB_Label(mw->rb_trans1, mw->trans1)); button_ref.push_back(RB_Label(mw->rb_trans2, mw->trans2)); button_ref.push_back(RB_Label(mw->rb_trans3, mw->trans3)); button_ref.push_back(RB_Label(mw->rb_trans4, mw->trans4)); button_ref.push_back(RB_Label(mw->rb_trans5, mw->trans5)); - random_shuffle(button_ref.begin(), button_ref.end() ); + shuffle(button_ref.begin(), button_ref.end(), randomGenerator); resetButton(button_ref[0].rb, button_ref[0].label); resetButton(button_ref[1].rb, button_ref[1].label); resetButton(button_ref[2].rb, button_ref[2].label); @@ -155,7 +159,7 @@ void MCQueryDlg::setQuery(TQString org, MultipleChoice mc = exp->getMultipleChoice(q_tcol); for (unsigned i = 0; i < TQMIN(MAX_MULTIPLE_CHOICE, mc.size()); ++i) strings.push_back(mc.mc(i)); - std::random_shuffle(strings.begin(), strings.end()); + shuffle(strings.begin(), strings.end(), randomGenerator); // always include false friend TQString ff; @@ -349,7 +353,7 @@ void MCQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h index 86a77e74..4f8001ce 100644 --- a/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/MCQueryDlg.h @@ -32,7 +32,7 @@ class MCQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h index 9e1b6184..b9a32245 100644 --- a/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h +++ b/kvoctrain/kvoctrain/query-dialogs/QueryDlgBase.h @@ -46,7 +46,7 @@ class TQRadioButton; class QueryDlgBase : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp index 42debac2..4accab3e 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.cpp @@ -28,7 +28,7 @@ #include <kv_resource.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdeapplication.h> #include <kprogress.h> @@ -140,14 +140,14 @@ RandomQueryDlg::RandomQueryDlg( mw = new QueryDlgForm(this); setMainWidget(mw); - connect( mw->c_type, TQT_SIGNAL(clicked()), TQT_SLOT(slotTypeClicked()) ); - connect( mw->c_remark, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemClicked()) ); - connect( mw->c_falsefriend, TQT_SIGNAL(clicked()), TQT_SLOT(slotFFClicked()) ); - connect( mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect( mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect( mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect( mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); - connect( mw->show_more, TQT_SIGNAL(clicked()), TQT_SLOT(showMoreClicked()) ); + connect( mw->c_type, TQ_SIGNAL(clicked()), TQ_SLOT(slotTypeClicked()) ); + connect( mw->c_remark, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemClicked()) ); + connect( mw->c_falsefriend, TQ_SIGNAL(clicked()), TQ_SLOT(slotFFClicked()) ); + connect( mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect( mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect( mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect( mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); + connect( mw->show_more, TQ_SIGNAL(clicked()), TQ_SLOT(showMoreClicked()) ); mw->show_more -> setEnabled (Prefs::showMore()); mw->know_it -> setEnabled (Prefs::iKnow()); @@ -173,8 +173,8 @@ RandomQueryDlg::RandomQueryDlg( transCombos.at(i) -> setInsertionPolicy (TQComboBox::NoInsertion); transCombos.at(i) -> setDuplicatesEnabled (false); vb->addWidget(transCombos.at(i)); - connect (transCombos.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&))); - connect (transCombos.at(i) -> lineEdit(), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus())); + connect (transCombos.at(i), TQ_SIGNAL (textChanged (const TQString&)), TQ_SLOT (slotTransChanged (const TQString&))); + connect (transCombos.at(i) -> lineEdit(), TQ_SIGNAL (lostFocus()), TQ_SLOT (slotTransLostFocus())); } } else @@ -184,14 +184,14 @@ RandomQueryDlg::RandomQueryDlg( transFields.append (new TQLineEdit (mw->TranslationFrame, TQCString ("transField") + TQCString().setNum (i))); transFields.at(i) -> setSizePolicy (TQSizePolicy ((TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)1, 0, 0, transFields.at(i) -> sizePolicy().hasHeightForWidth())); vb->addWidget(transFields.at(i)); - connect (transFields.at(i), TQT_SIGNAL (textChanged (const TQString&)), TQT_SLOT (slotTransChanged (const TQString&))); - connect (transFields.at(i), TQT_SIGNAL (lostFocus()), TQT_SLOT (slotTransLostFocus())); + connect (transFields.at(i), TQ_SIGNAL (textChanged (const TQString&)), TQ_SLOT (slotTransChanged (const TQString&))); + connect (transFields.at(i), TQ_SIGNAL (lostFocus()), TQ_SLOT (slotTransLostFocus())); } } kv_doc = 0; qtimer = 0; - //setCaption (kapp->makeStdCaption(i18n("Random Query"))); + //setCaption (tdeApp->makeStdCaption(i18n("Random Query"))); setQuery (org, trans, entry, orgcol, transcol, q_cycle, q_num, q_start, exp, doc); mw->countbar->setFormat("%v/%m"); mw->timebar->setFormat("%v"); @@ -201,10 +201,10 @@ RandomQueryDlg::RandomQueryDlg( ProgressDlg* pdlg = 0; if ( split && kv_doc -> numEntries() >= 500 ) { - pdlg = new ProgressDlg (TQString(), TQString(), kapp -> makeStdCaption (i18n("Loading Random Query"))); + pdlg = new ProgressDlg (TQString(), TQString(), tdeApp -> makeStdCaption (i18n("Loading Random Query"))); pdlg -> resize (pdlg -> width(), pdlg -> minimumSize().height()); pdlg -> show(); - kapp -> processEvents(); + tdeApp -> processEvents(); } for ( i = 0; i < kv_doc -> numEntries(); i ++ ) { @@ -223,7 +223,7 @@ RandomQueryDlg::RandomQueryDlg( if ( pdlg ) { pdlg -> setValue (doc, i * 100 / kv_doc -> numEntries()); - kapp -> processEvents(); + tdeApp -> processEvents(); } } vocabulary.sort(); @@ -316,14 +316,14 @@ void RandomQueryDlg::setQuery(TQString org, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -486,7 +486,7 @@ void RandomQueryDlg::slotTransChanged(const TQString&) { mw->verify->setDefault(true); bool suggestions = Prefs::suggestions(); - if ( suggestions && sender() && TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) -> isA (TQCOMBOBOX_OBJECT_NAME_STRING) ) + if ( suggestions && sender() && sender() -> isA ("TQComboBox") ) { TQLineEdit* edit = ((TQComboBox*) sender()) -> lineEdit(); resetField (edit); @@ -497,7 +497,7 @@ void RandomQueryDlg::slotTransChanged(const TQString&) else mw->status -> clear(); } - else if ( ! suggestions && sender() && TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())) -> isA (TQLINEEDIT_OBJECT_NAME_STRING) ) + else if ( ! suggestions && sender() && sender() -> isA ("TQLineEdit") ) resetField ((TQLineEdit*) sender()); } @@ -522,7 +522,7 @@ void RandomQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h index 0ab283af..dd8df997 100644 --- a/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/RandomQueryDlg.h @@ -37,7 +37,7 @@ class kvoctrainDoc; class RandomQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp index c5b40d09..91464fcb 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.cpp @@ -33,7 +33,7 @@ #include <tqpushbutton.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kprogress.h> @@ -51,12 +51,12 @@ SimpleQueryDlg::SimpleQueryDlg( mw = new SimpleQueryDlgForm(this); setMainWidget(mw); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); - connect(mw->show_more, TQT_SIGNAL(clicked()), TQT_SLOT(showMoreClicked()) ); - connect(mw->answerField, TQT_SIGNAL(textChanged()), TQT_SLOT(slotAnswerChanged()) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); + connect(mw->show_more, TQ_SIGNAL(clicked()), TQ_SLOT(showMoreClicked()) ); + connect(mw->answerField, TQ_SIGNAL(textChanged()), TQ_SLOT(slotAnswerChanged()) ); kv_doc = 0; qtimer = 0; @@ -170,14 +170,14 @@ void SimpleQueryDlg::setQuery(QueryType _querytype, if (mqtime > 0) { if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -200,7 +200,7 @@ void SimpleQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { diff --git a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h index 9027db4d..f32e95b9 100644 --- a/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/SimpleQueryDlg.h @@ -32,7 +32,7 @@ class SimpleQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp index e7868a9e..05208fe4 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.cpp @@ -28,7 +28,7 @@ #include <kv_resource.h> #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kprogress.h> @@ -54,32 +54,32 @@ VerbQueryDlg::VerbQueryDlg mw = new VerbQueryDlgForm(this); setMainWidget(mw); - connect(mw->dont_know, TQT_SIGNAL(clicked()), TQT_SLOT(dontKnowClicked()) ); - connect(mw->know_it, TQT_SIGNAL(clicked()), TQT_SLOT(knowItClicked()) ); - connect(mw->verify, TQT_SIGNAL(clicked()), TQT_SLOT(verifyClicked()) ); - connect(mw->show_all, TQT_SIGNAL(clicked()), TQT_SLOT(showAllClicked()) ); - - connect(mw->p3pmField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3pnField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3snField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3smField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3pfField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p3sfField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p2pField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p2sField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p1pField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - connect(mw->p1sField, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()) ); - - connect(mw->p3pmField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pmChanged(const TQString&)) ); - connect(mw->p3snField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3snChanged(const TQString&)) ); - connect(mw->p3pnField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pnChanged(const TQString&)) ); - connect(mw->p3smField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3smChanged(const TQString&)) ); - connect(mw->p3pfField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3pfChanged(const TQString&)) ); - connect(mw->p3sfField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP3sfChanged(const TQString&)) ); - connect(mw->p2pField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP2pChanged(const TQString&)) ); - connect(mw->p2sField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP2sChanged(const TQString&)) ); - connect(mw->p1pField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP1pChanged(const TQString&)) ); - connect(mw->p1sField, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotP1sChanged(const TQString&)) ); + connect(mw->dont_know, TQ_SIGNAL(clicked()), TQ_SLOT(dontKnowClicked()) ); + connect(mw->know_it, TQ_SIGNAL(clicked()), TQ_SLOT(knowItClicked()) ); + connect(mw->verify, TQ_SIGNAL(clicked()), TQ_SLOT(verifyClicked()) ); + connect(mw->show_all, TQ_SIGNAL(clicked()), TQ_SLOT(showAllClicked()) ); + + connect(mw->p3pmField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3pnField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3snField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3smField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3pfField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p3sfField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p2pField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p2sField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p1pField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + connect(mw->p1sField, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()) ); + + connect(mw->p3pmField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pmChanged(const TQString&)) ); + connect(mw->p3snField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3snChanged(const TQString&)) ); + connect(mw->p3pnField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pnChanged(const TQString&)) ); + connect(mw->p3smField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3smChanged(const TQString&)) ); + connect(mw->p3pfField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3pfChanged(const TQString&)) ); + connect(mw->p3sfField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP3sfChanged(const TQString&)) ); + connect(mw->p2pField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP2pChanged(const TQString&)) ); + connect(mw->p2sField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP2sChanged(const TQString&)) ); + connect(mw->p1pField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP1pChanged(const TQString&)) ); + connect(mw->p1sField, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotP1sChanged(const TQString&)) ); qtimer = 0; @@ -146,14 +146,14 @@ void VerbQueryDlg::setQuery(TQString, if (mqtime > 0) { // more than 1000 milli-seconds if (qtimer == 0) { qtimer = new TQTimer( this ); - connect( qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutReached()) ); + connect( qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutReached()) ); } if (Prefs::queryTimeout() != Prefs::EnumQueryTimeout::NoTimeout) { timercount = mqtime; mw->timebar->setTotalSteps(timercount); mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } else mw->timebar->setEnabled(false); @@ -345,7 +345,7 @@ void VerbQueryDlg::timeoutReached() if (timercount > 0) { timercount--; mw->timebar->setProgress(timercount); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); } if (timercount <= 0) { @@ -367,7 +367,7 @@ void VerbQueryDlg::timeoutReached() } else if (Prefs::queryTimeout() == Prefs::EnumQueryTimeout::Continue) { next(); - qtimer->start(1000, TRUE); + qtimer->start(1000, true); timercount = Prefs::maxTimePer(); } } @@ -395,7 +395,7 @@ void VerbQueryDlg::dontKnowClicked() if (current >= (int) conjugations.numEntries()-1 ) emit sigQueryChoice (Unknown); else { - qtimer->start(1000, TRUE); + qtimer->start(1000, true); timercount = Prefs::maxTimePer(); next(); } diff --git a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h index 5e114aa1..51574291 100644 --- a/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h +++ b/kvoctrain/kvoctrain/query-dialogs/VerbQueryDlg.h @@ -32,7 +32,7 @@ class VerbQueryDlg : public QueryDlgBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h index d01b837e..dc5b796c 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h +++ b/kvoctrain/kvoctrain/statistik-dialogs/GenStatPage.h @@ -33,7 +33,7 @@ class kvoctrainDoc; class GenStatPage : public GenStatPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h index e24272b8..fbe695ea 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikDlg.h @@ -37,7 +37,7 @@ class GradeCols; class StatistikDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp index ae34d191..f6aa5a31 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.cpp @@ -85,8 +85,8 @@ StatistikPage::StatistikPage(int col, kvoctrainDoc *_doc, TQWidget *parent, con } } setupPixmaps(); - connect(StatListView, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint& , int ) ), - this, TQT_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); + connect(StatListView, TQ_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint& , int ) ), + this, TQ_SLOT( slotRMB( TQListViewItem *, const TQPoint &, int ) ) ); } diff --git a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h index f622c16f..a8084a74 100644 --- a/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h +++ b/kvoctrain/kvoctrain/statistik-dialogs/StatistikPage.h @@ -37,7 +37,7 @@ class GradeCols; class StatistikPage : public StatistikPageForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/kvoctrain/kvoctrain/tools/extractlang.mak b/kvoctrain/kvoctrain/tools/extractlang.mak index 740844df..2b4c2670 100755 --- a/kvoctrain/kvoctrain/tools/extractlang.mak +++ b/kvoctrain/kvoctrain/tools/extractlang.mak @@ -1,3 +1,3 @@ #!/bin/sh -g++ -I $QTDIR/include -L $QTDIR/lib extractlang.cpp -o extractlang -lqt +g++ -I $TQTDIR/include -L $TQTDIR/lib extractlang.cpp -o extractlang -lqt cat englangn.html | ./extractlang > languages.txt
\ No newline at end of file diff --git a/kwordquiz/src/Makefile.am b/kwordquiz/src/Makefile.am index b8d820f1..eb9ce2a0 100644 --- a/kwordquiz/src/Makefile.am +++ b/kwordquiz/src/Makefile.am @@ -11,7 +11,7 @@ kwordquiz_SOURCES = kwordquizprefs.cpp kwordquizview.cpp kwordquizdoc.cpp \ kvtmlwriter.cpp dlglanguage.cpp wqprintdialogpage.cpp prefcharacter.cpp \ prefcharacterbase.ui paukerreader.cpp wqlreader.cpp wqlwriter.cpp wqundo.cpp prefs.kcfgc \ prefcardappearance.cpp prefcardappearancebase.ui kwqnewstuff.cpp kwqnewstuff.h -kwordquiz_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) \ +kwordquiz_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) \ $(LIBSOCKET) $(LIB_TDEPRINT) $(LIB_TDENEWSTUFF) @@ -50,7 +50,7 @@ SUBDIRS = . pics examples METASOURCES = AUTO # the library search path. -kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor rcdir = $(kde_datadir)/kwordquiz rc_DATA = kwordquizui.rc eventsrc diff --git a/kwordquiz/src/dlglanguage.h b/kwordquiz/src/dlglanguage.h index 4f9431ce..6c338bf7 100644 --- a/kwordquiz/src/dlglanguage.h +++ b/kwordquiz/src/dlglanguage.h @@ -27,7 +27,7 @@ class TDECompletion; @author Peter Hedlund */ class DlgLanguage : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: DlgLanguage(TQWidget *parent = 0, const char *name = 0, bool modal=true); diff --git a/kwordquiz/src/dlgrc.h b/kwordquiz/src/dlgrc.h index b6cb5e29..8bee9ac8 100644 --- a/kwordquiz/src/dlgrc.h +++ b/kwordquiz/src/dlgrc.h @@ -26,7 +26,7 @@ */ class DlgRC : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: DlgRC(TQWidget *parent = 0, const char *name = 0, bool modal=true); diff --git a/kwordquiz/src/dlgsort.h b/kwordquiz/src/dlgsort.h index 0be0b7db..a6de2768 100644 --- a/kwordquiz/src/dlgsort.h +++ b/kwordquiz/src/dlgsort.h @@ -26,7 +26,7 @@ */ class DlgSort : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kwordquiz/src/dlgspecchar.cpp b/kwordquiz/src/dlgspecchar.cpp index da993afc..697e6a16 100644 --- a/kwordquiz/src/dlgspecchar.cpp +++ b/kwordquiz/src/dlgspecchar.cpp @@ -41,7 +41,7 @@ void DlgSpecChar::initDialog(const TQChar &_chr, const TQString &_font, bool /*_ int t = (_chr.unicode()/256); charSelect = new KCharSelect( page, "", _font, _chr, t); - connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); + connect(charSelect, TQ_SIGNAL(doubleClicked()),this, TQ_SLOT(slotDoubleClicked())); charSelect->resize( charSelect->sizeHint() ); charSelect->enableFontCombo( false ); grid->addWidget( charSelect, 0, 0 ); diff --git a/kwordquiz/src/dlgspecchar.h b/kwordquiz/src/dlgspecchar.h index 45d38744..8cc79145 100644 --- a/kwordquiz/src/dlgspecchar.h +++ b/kwordquiz/src/dlgspecchar.h @@ -30,7 +30,7 @@ class KButtonBox; */ class DlgSpecChar : public KDialogBase { -Q_OBJECT +TQ_OBJECT public: //constructor when you want to insert multi char diff --git a/kwordquiz/src/flashview.cpp b/kwordquiz/src/flashview.cpp index 3e150a34..b22b9275 100644 --- a/kwordquiz/src/flashview.cpp +++ b/kwordquiz/src/flashview.cpp @@ -30,7 +30,7 @@ FlashView::FlashView(TQWidget *parent, const char *name, WFlags f) { m_score = new WTQScore(); m_timer = new TQTimer(this); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimer())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimer())); } diff --git a/kwordquiz/src/flashview.h b/kwordquiz/src/flashview.h index 8de031c1..02abcf41 100644 --- a/kwordquiz/src/flashview.h +++ b/kwordquiz/src/flashview.h @@ -30,7 +30,7 @@ class WQQuiz; */ class FlashView : public FlashViewBase { -Q_OBJECT +TQ_OBJECT public: FlashView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); diff --git a/kwordquiz/src/kvtmlwriter.cpp b/kwordquiz/src/kvtmlwriter.cpp index 4855dbf2..787cabab 100644 --- a/kwordquiz/src/kvtmlwriter.cpp +++ b/kwordquiz/src/kvtmlwriter.cpp @@ -21,7 +21,7 @@ KVTMLWriter::KVTMLWriter(TQFile *file) outputFile = file; if(outputFile->open(IO_WriteOnly)) { - outputStream.setDevice(TQT_TQIODEVICE(outputFile)); + outputStream.setDevice(outputFile); outputStream.setEncoding(TQTextStream::UnicodeUTF8); outputStream << "<?xml version=\"1.0\"?>" << endl; diff --git a/kwordquiz/src/kwordquiz.cpp b/kwordquiz/src/kwordquiz.cpp index 6e64b6b6..e0d3124f 100644 --- a/kwordquiz/src/kwordquiz.cpp +++ b/kwordquiz/src/kwordquiz.cpp @@ -26,7 +26,7 @@ #include <kstatusbar.h> #include <tdelocale.h> #include <kedittoolbar.h> -#include <kstandarddirs.h> //locate +#include <tdestandarddirs.h> //locate #include <tdefontdialog.h> #include <tdepopupmenu.h> #include <knotifydialog.h> @@ -105,117 +105,117 @@ void KWordQuizApp::initActions() TDEAction* configNotifications; TDEAction* configApp; - fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); + fileNew = KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); fileNew->setWhatsThis(i18n("Creates a new blank vocabulary document")); fileNew->setToolTip(fileNew->whatsThis()); - fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); fileOpen->setWhatsThis(i18n("Opens an existing vocabulary document")); fileOpen->setToolTip(fileOpen->whatsThis()); - fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", TQT_TQOBJECT(this), TQT_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); + fileGHNS = new TDEAction(i18n("&Get New Vocabularies..."), "knewstuff", "CTRL+G", this, TQ_SLOT(slotFileGHNS()), actionCollection(), "file_ghns"); fileGHNS->setWhatsThis(i18n("Downloads new vocabularies")); fileGHNS->setToolTip(fileGHNS->whatsThis()); - fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); fileSave->setWhatsThis(i18n("Saves the active vocabulary document")); fileSave->setToolTip(fileSave->whatsThis()); - fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); + fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); fileSaveAs->setWhatsThis(i18n("Saves the active vocabulary document with a different name")); fileSaveAs->setToolTip(fileSaveAs->whatsThis()); - fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); + fileClose = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); fileClose->setWhatsThis(i18n("Closes the active vocabulary document")); fileClose->setToolTip(fileClose->whatsThis()); - filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); filePrint->setWhatsThis(i18n("Prints the active vocabulary document")); filePrint->setToolTip(filePrint->whatsThis()); - fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); fileQuit->setWhatsThis(i18n("Quits KWordQuiz")); fileQuit->setToolTip(fileQuit->whatsThis()); - editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()), actionCollection()); + editUndo = KStdAction::undo(this, TQ_SLOT(slotEditUndo()), actionCollection()); editUndo->setWhatsThis(i18n("Undoes the last command")); editUndo->setToolTip(editUndo->whatsThis()); - editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); + editCut = KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); editCut->setWhatsThis(i18n("Cuts the text from the selected cells and places it on the clipboard")); editCut->setToolTip(editCut->whatsThis()); - editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); editCopy->setWhatsThis(i18n("Copies the text from the selected cells and places it on the clipboard")); editCopy->setToolTip(editCopy->whatsThis()); - editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); editPaste->setWhatsThis(i18n("Pastes previously cut or copied text from the clipboard into the selected cells")); editPaste->setToolTip(editPaste->whatsThis()); - editClear = KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(slotEditClear()), actionCollection()); + editClear = KStdAction::clear(this, TQ_SLOT(slotEditClear()), actionCollection()); editClear->setWhatsThis(i18n("Clears the content of the selected cells")); editClear->setToolTip(editClear->whatsThis()); - editInsert = new TDEAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", TQT_TQOBJECT(this), TQT_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); + editInsert = new TDEAction(i18n("&Insert Row"), "insert_table_row", "CTRL+I", this, TQ_SLOT(slotEditInsert()), actionCollection(),"edit_insert"); editInsert->setWhatsThis(i18n("Inserts a new row above the current row")); editInsert->setToolTip(editInsert->whatsThis()); - editDelete = new TDEAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", TQT_TQOBJECT(this), TQT_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); + editDelete = new TDEAction(i18n("&Delete Row"), "delete_table_row", "CTRL+K", this, TQ_SLOT(slotEditDelete()), actionCollection(),"edit_delete"); editDelete->setWhatsThis(i18n("Deletes the selected row(s)")); editDelete->setToolTip(editDelete->whatsThis()); - editMarkBlank = new TDEAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", TQT_TQOBJECT(this), TQT_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank"); + editMarkBlank = new TDEAction(i18n("&Mark as Blank"), "markasblank", "CTRL+M", this, TQ_SLOT(slotEditMarkBlank()), actionCollection(),"edit_mark_blank"); editMarkBlank->setWhatsThis(i18n("Marks the current or selected word as a blank for Fill-in-the-blank")); editMarkBlank->setToolTip(editMarkBlank->whatsThis()); - editUnmarkBlank = new TDEAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); + editUnmarkBlank = new TDEAction(i18n("&Unmark Blanks"), "unmarkasblank", 0, this, TQ_SLOT(slotEditUnmarkBlank()), actionCollection(),"edit_unmark_blank"); editUnmarkBlank->setWhatsThis(i18n("Removes blanks from the current or selected word")); editUnmarkBlank->setToolTip(editUnmarkBlank->whatsThis()); - //@todo implement editFind = KStdAction::find(this, TQT_SLOT(slotEditFind()), actionCollection()); + //@todo implement editFind = KStdAction::find(this, TQ_SLOT(slotEditFind()), actionCollection()); - vocabLanguages = new TDEAction(i18n("&Column Titles..."), "languages", "CTRL+L", TQT_TQOBJECT(this), TQT_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); + vocabLanguages = new TDEAction(i18n("&Column Titles..."), "languages", "CTRL+L", this, TQ_SLOT(slotVocabLanguages()), actionCollection(),"vocab_languages"); vocabLanguages->setWhatsThis(i18n("Defines the column titles for the active vocabulary")); vocabLanguages->setToolTip(vocabLanguages->whatsThis()); - vocabFont = new TDEAction(i18n("&Font..."), "fonts", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); + vocabFont = new TDEAction(i18n("&Font..."), "fonts", 0, this, TQ_SLOT(slotVocabFont()), actionCollection(),"vocab_font"); vocabFont->setWhatsThis(i18n("Defines the font used by the editor")); vocabFont->setToolTip(vocabFont->whatsThis()); - //@todo implement vocabKeyboard = new TDEAction(i18n("&Keyboard..."), "kxkb", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); + //@todo implement vocabKeyboard = new TDEAction(i18n("&Keyboard..."), "kxkb", 0, this, TQ_SLOT(slotVocabKeyboard()), actionCollection(),"vocab_keyboard"); - vocabRC = new TDEAction(i18n("&Rows/Columns..."), "rowcol", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); + vocabRC = new TDEAction(i18n("&Rows/Columns..."), "rowcol", 0, this, TQ_SLOT(slotVocabRC()), actionCollection(),"vocab_rc"); vocabRC->setWhatsThis(i18n("Defines the number of rows, row heights, and column widths for the active vocabulary")); vocabRC->setToolTip(vocabRC->whatsThis()); - vocabSort = new TDEAction(i18n("&Sort..."), "sort_incr", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); + vocabSort = new TDEAction(i18n("&Sort..."), "sort_incr", 0, this, TQ_SLOT(slotVocabSort()), actionCollection(),"vocab_sort"); vocabSort->setWhatsThis(i18n("Sorts the vocabulary in ascending or descending order based on the left or right column")); vocabSort->setToolTip(vocabSort->whatsThis()); - vocabShuffle = new TDEAction(i18n("Sh&uffle"), "shuffle", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); + vocabShuffle = new TDEAction(i18n("Sh&uffle"), "shuffle", 0, this, TQ_SLOT(slotVocabShuffle()), actionCollection(),"vocab_shuffle"); vocabShuffle->setWhatsThis(i18n("Shuffles the entries of the active vocabulary")); vocabShuffle->setToolTip(vocabShuffle->whatsThis()); - mode = new TDEToolBarPopupAction(i18n("Change Mode"), "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode0()), actionCollection(),"mode_0"); + mode = new TDEToolBarPopupAction(i18n("Change Mode"), "mode1", 0, this, TQ_SLOT(slotMode0()), actionCollection(),"mode_0"); mode->setWhatsThis(i18n("Changes the mode used in quiz sessions")); mode->setToolTip(mode->whatsThis()); TDEPopupMenu *popup = mode->popupMenu(); popup->clear(); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), 0, 0); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), 0, 1); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), 0, 2); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), 0, 3); - popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", TDEIcon::Toolbar), "", TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), 0, 4); - - mode1 = new TDEToggleAction("", "mode1", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode1()), actionCollection(),"mode_1"); - mode2 = new TDEToggleAction("", "mode2", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode2()), actionCollection(),"mode_2"); - mode3 = new TDEToggleAction("", "mode3", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode3()), actionCollection(),"mode_3"); - mode4 = new TDEToggleAction("", "mode4", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode4()), actionCollection(),"mode_4"); - mode5 = new TDEToggleAction("", "mode5", 0, TQT_TQOBJECT(this), TQT_SLOT(slotMode5()), actionCollection(),"mode_5"); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode1", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode1()), 0, 0); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode2", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode2()), 0, 1); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode3", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode3()), 0, 2); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode4", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode4()), 0, 3); + popup->insertItem(TDEGlobal::iconLoader()->loadIconSet("mode5", TDEIcon::Toolbar), "", this, TQ_SLOT(slotMode5()), 0, 4); + + mode1 = new TDEToggleAction("", "mode1", 0, this, TQ_SLOT(slotMode1()), actionCollection(),"mode_1"); + mode2 = new TDEToggleAction("", "mode2", 0, this, TQ_SLOT(slotMode2()), actionCollection(),"mode_2"); + mode3 = new TDEToggleAction("", "mode3", 0, this, TQ_SLOT(slotMode3()), actionCollection(),"mode_3"); + mode4 = new TDEToggleAction("", "mode4", 0, this, TQ_SLOT(slotMode4()), actionCollection(),"mode_4"); + mode5 = new TDEToggleAction("", "mode5", 0, this, TQ_SLOT(slotMode5()), actionCollection(),"mode_5"); mode1->setWhatsThis(i18n("Selects this mode")); mode2->setWhatsThis(i18n("Selects this mode")); mode3->setWhatsThis(i18n("Selects this mode")); @@ -227,66 +227,66 @@ void KWordQuizApp::initActions() mode4->setToolTip(mode4->whatsThis()); mode5->setToolTip(mode5->whatsThis()); - quizEditor = new TDEAction(i18n("&Editor"), "editor", "F6", TQT_TQOBJECT(this), TQT_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); + quizEditor = new TDEAction(i18n("&Editor"), "editor", "F6", this, TQ_SLOT(slotQuizEditor()), actionCollection(),"quiz_editor"); quizEditor->setWhatsThis(i18n("Activates the vocabulary editor")); quizEditor->setToolTip(quizEditor->whatsThis()); - quizFlash = new TDEAction(i18n("&Flashcard"), "flash", "F7", TQT_TQOBJECT(this), TQT_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); + quizFlash = new TDEAction(i18n("&Flashcard"), "flash", "F7", this, TQ_SLOT(slotQuizFlash()), actionCollection(),"quiz_flash"); quizFlash->setWhatsThis(i18n("Starts a flashcard session using the active vocabulary")); quizFlash->setToolTip(quizFlash->whatsThis()); - quizMultiple = new TDEAction(i18n("&Multiple Choice"), "multiple", "F8", TQT_TQOBJECT(this), TQT_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); + quizMultiple = new TDEAction(i18n("&Multiple Choice"), "multiple", "F8", this, TQ_SLOT(slotQuizMultiple()), actionCollection(),"quiz_multiple"); quizMultiple->setWhatsThis(i18n("Starts a multiple choice session using the active vocabulary")); quizMultiple->setToolTip(quizMultiple->whatsThis()); - quizQA = new TDEAction(i18n("&Question && Answer"), "qa", "F9", TQT_TQOBJECT(this), TQT_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); + quizQA = new TDEAction(i18n("&Question && Answer"), "qa", "F9", this, TQ_SLOT(slotQuizQA()), actionCollection(),"quiz_qa"); quizQA->setWhatsThis(i18n("Starts a question and answer session using the active vocabulary")); quizQA->setToolTip(quizQA->whatsThis()); - quizCheck = new TDEAction(i18n("&Check"), "check", "Return", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_check"); + quizCheck = new TDEAction(i18n("&Check"), "check", "Return", this, 0, actionCollection(),"quiz_check"); quizCheck->setWhatsThis(i18n("Checks your answer to this question")); quizCheck->setToolTip(quizCheck->whatsThis()); - flashKnow = new TDEAction(i18n("I &Know"), "know", "K", TQT_TQOBJECT(this), 0, actionCollection(),"flash_know"); + flashKnow = new TDEAction(i18n("I &Know"), "know", "K", this, 0, actionCollection(),"flash_know"); flashKnow->setWhatsThis(i18n("Counts this card as correct and shows the next card")); flashKnow->setToolTip(flashKnow->whatsThis()); - flashDontKnow = new TDEAction(i18n("I &Do Not Know"), "dontknow", "D", TQT_TQOBJECT(this), 0, actionCollection(),"flash_dont_know"); + flashDontKnow = new TDEAction(i18n("I &Do Not Know"), "dontknow", "D", this, 0, actionCollection(),"flash_dont_know"); flashDontKnow->setWhatsThis(i18n("Counts this card as incorrect and shows the next card")); flashDontKnow->setToolTip(flashDontKnow->whatsThis()); - qaHint = new TDEAction(i18n("&Hint"), "hint", "CTRL+H", TQT_TQOBJECT(this), 0, actionCollection(),"qa_hint"); + qaHint = new TDEAction(i18n("&Hint"), "hint", "CTRL+H", this, 0, actionCollection(),"qa_hint"); qaHint->setWhatsThis(i18n("Gets the next correct letter of the answer")); qaHint->setToolTip(qaHint->whatsThis()); - quizRestart = new TDEAction(i18n("&Restart"), "restart.png", "CTRL+R", TQT_TQOBJECT(this), 0, actionCollection(), "quiz_restart"); + quizRestart = new TDEAction(i18n("&Restart"), "restart.png", "CTRL+R", this, 0, actionCollection(), "quiz_restart"); quizRestart->setWhatsThis(i18n("Restarts the quiz session from the beginning")); quizRestart->setToolTip(quizRestart->whatsThis()); - quizRepeatErrors = new TDEAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", TQT_TQOBJECT(this), 0, actionCollection(),"quiz_repeat_errors"); + quizRepeatErrors = new TDEAction(i18n("Repeat &Errors"), "repeat", "CTRL+E", this, 0, actionCollection(),"quiz_repeat_errors"); quizRepeatErrors->setWhatsThis(i18n("Repeats all incorrectly answered questions")); quizRepeatErrors->setToolTip(quizRepeatErrors->whatsThis()); - configNotifications = KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureNotifications()), actionCollection()); + configNotifications = KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), actionCollection()); configNotifications->setWhatsThis(i18n("Configures sound and other notifications for certain events")); configNotifications->setToolTip(configNotifications->whatsThis()); - configApp = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotConfigure()), actionCollection()); + configApp = KStdAction::preferences(this, TQ_SLOT( slotConfigure()), actionCollection()); configApp->setWhatsThis(i18n("Specifies preferences for the vocabulary editor and quiz sessions")); configApp->setToolTip(configApp->whatsThis()); - charMapper = new TQSignalMapper(TQT_TQOBJECT(this)); - connect(charMapper, TQT_SIGNAL(mapped(int)), TQT_TQOBJECT(this), TQT_SLOT(slotInsertChar(int))); + charMapper = new TQSignalMapper(this); + connect(charMapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(slotInsertChar(int))); - specialChar1 = new TDEAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQT_SLOT(map()), actionCollection(), "char_1") ; - specialChar2 = new TDEAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQT_SLOT(map()), actionCollection(), "char_2") ; - specialChar3 = new TDEAction(i18n("Special Character 3"), 0, "CTRL+3", charMapper, TQT_SLOT(map()), actionCollection(), "char_3") ; - specialChar4 = new TDEAction(i18n("Special Character 4"), 0, "CTRL+4", charMapper, TQT_SLOT(map()), actionCollection(), "char_4") ; - specialChar5 = new TDEAction(i18n("Special Character 5"), 0, "CTRL+5", charMapper, TQT_SLOT(map()), actionCollection(), "char_5") ; - specialChar6 = new TDEAction(i18n("Special Character 6"), 0, "CTRL+6", charMapper, TQT_SLOT(map()), actionCollection(), "char_6") ; - specialChar7 = new TDEAction(i18n("Special Character 7"), 0, "CTRL+7", charMapper, TQT_SLOT(map()), actionCollection(), "char_7") ; - specialChar8 = new TDEAction(i18n("Special Character 8"), 0, "CTRL+8", charMapper, TQT_SLOT(map()), actionCollection(), "char_8") ; - specialChar9 = new TDEAction(i18n("Special Character 9"), 0, "CTRL+9", charMapper, TQT_SLOT(map()), actionCollection(), "char_9") ; + specialChar1 = new TDEAction(i18n("Special Character 1"), "", "CTRL+1", charMapper, TQ_SLOT(map()), actionCollection(), "char_1") ; + specialChar2 = new TDEAction(i18n("Special Character 2"), 0, "CTRL+2", charMapper, TQ_SLOT(map()), actionCollection(), "char_2") ; + specialChar3 = new TDEAction(i18n("Special Character 3"), 0, "CTRL+3", charMapper, TQ_SLOT(map()), actionCollection(), "char_3") ; + specialChar4 = new TDEAction(i18n("Special Character 4"), 0, "CTRL+4", charMapper, TQ_SLOT(map()), actionCollection(), "char_4") ; + specialChar5 = new TDEAction(i18n("Special Character 5"), 0, "CTRL+5", charMapper, TQ_SLOT(map()), actionCollection(), "char_5") ; + specialChar6 = new TDEAction(i18n("Special Character 6"), 0, "CTRL+6", charMapper, TQ_SLOT(map()), actionCollection(), "char_6") ; + specialChar7 = new TDEAction(i18n("Special Character 7"), 0, "CTRL+7", charMapper, TQ_SLOT(map()), actionCollection(), "char_7") ; + specialChar8 = new TDEAction(i18n("Special Character 8"), 0, "CTRL+8", charMapper, TQ_SLOT(map()), actionCollection(), "char_8") ; + specialChar9 = new TDEAction(i18n("Special Character 9"), 0, "CTRL+9", charMapper, TQ_SLOT(map()), actionCollection(), "char_9") ; charMapper->setMapping(specialChar1, 1); charMapper->setMapping(specialChar2, 2); @@ -299,8 +299,8 @@ void KWordQuizApp::initActions() charMapper->setMapping(specialChar9, 9); actionCollection()->setHighlightingEnabled(true); - connect(actionCollection(), TQT_SIGNAL(actionStatusText(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); - connect(actionCollection(), TQT_SIGNAL(actionHighlighted(TDEAction *, bool)), TQT_TQOBJECT(this), TQT_SLOT(slotActionHighlighted(TDEAction *, bool))); + connect(actionCollection(), TQ_SIGNAL(actionStatusText(const TQString &)), this, TQ_SLOT(slotStatusMsg(const TQString &))); + connect(actionCollection(), TQ_SIGNAL(actionHighlighted(TDEAction *, bool)), this, TQ_SLOT(slotActionHighlighted(TDEAction *, bool))); updateSpecialCharIcons(); if (!initialGeometrySet()) @@ -333,8 +333,8 @@ void KWordQuizApp::initView() setCentralWidget(m_editView); setCaption(doc->URL().fileName(),false); m_editView->setFont(Prefs::editorFont()); - connect(m_editView, TQT_SIGNAL(undoChange(const TQString&, bool )), TQT_TQOBJECT(this), TQT_SLOT(slotUndoChange(const TQString&, bool))); - connect(m_editView, TQT_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), TQT_TQOBJECT(this), TQT_SLOT(slotContextMenuRequested(int, int, const TQPoint& ))); + connect(m_editView, TQ_SIGNAL(undoChange(const TQString&, bool )), this, TQ_SLOT(slotUndoChange(const TQString&, bool))); + connect(m_editView, TQ_SIGNAL(contextMenuRequested(int, int, const TQPoint &)), this, TQ_SLOT(slotContextMenuRequested(int, int, const TQPoint& ))); } void KWordQuizApp::openURL(const KURL& url) @@ -396,7 +396,7 @@ KWordQuizDoc *KWordQuizApp::getDocument() const void KWordQuizApp::saveOptions() { - fileOpenRecent->saveEntries(kapp->config(), "Recent Files"); + fileOpenRecent->saveEntries(tdeApp->config(), "Recent Files"); Prefs::writeConfig(); } @@ -404,7 +404,7 @@ void KWordQuizApp::saveOptions() void KWordQuizApp::readOptions() { //Prefs::readConfig(); - fileOpenRecent->loadEntries(kapp->config(), "Recent Files"); + fileOpenRecent->loadEntries(tdeApp->config(), "Recent Files"); } void KWordQuizApp::saveProperties(TDEConfig *_cfg) @@ -419,7 +419,7 @@ void KWordQuizApp::saveProperties(TDEConfig *_cfg) KURL url=doc->URL(); _cfg->writeEntry("filename", url.url()); _cfg->writeEntry("modified", doc->isModified()); - TQString tempname = kapp->tempSaveName(url.url()); + TQString tempname = tdeApp->tempSaveName(url.url()); TQString tempurl= KURL::encode_string(tempname); KURL _url(tempurl); doc->saveDocument(_url); @@ -435,7 +435,7 @@ void KWordQuizApp::readProperties(TDEConfig* _cfg) if(modified) { bool canRecover; - TQString tempname = kapp->checkRecoverFile(filename, canRecover); + TQString tempname = tdeApp->checkRecoverFile(filename, canRecover); KURL _url(tempname); if(canRecover) @@ -472,7 +472,7 @@ bool KWordQuizApp::queryExit() } ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void KWordQuizApp::slotFileNew() @@ -956,7 +956,7 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) break; case WQQuiz::qtFlash: m_quiz = new WQQuiz(m_editView); - connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); + connect(m_quiz, TQ_SIGNAL(checkingAnswer(int )), m_editView, TQ_SLOT(slotCheckedAnswer(int ))); m_quiz ->setQuizType(WQQuiz::qtFlash); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) @@ -964,12 +964,12 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_editView->saveCurrentSelection(true); m_editView->hide(); m_flashView = new FlashView(this); - connect(quizCheck, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotFlip())); - connect(flashKnow, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotKnow())); - connect(flashDontKnow, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotDontKnow())); - connect(quizRestart, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotRestart())); - connect(quizRepeatErrors, TQT_SIGNAL(activated()), m_flashView, TQT_SLOT(slotRepeat())); - connect(this, TQT_SIGNAL(settingsChanged()), m_flashView, TQT_SLOT(slotApplySettings())); + connect(quizCheck, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotFlip())); + connect(flashKnow, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotKnow())); + connect(flashDontKnow, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotDontKnow())); + connect(quizRestart, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotRestart())); + connect(quizRepeatErrors, TQ_SIGNAL(activated()), m_flashView, TQ_SLOT(slotRepeat())); + connect(this, TQ_SIGNAL(settingsChanged()), m_flashView, TQ_SLOT(slotApplySettings())); setCentralWidget(m_flashView); m_flashView -> setQuiz(m_quiz); @@ -984,7 +984,7 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) break; case WQQuiz::qtMultiple: m_quiz = new WQQuiz(m_editView); - connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); + connect(m_quiz, TQ_SIGNAL(checkingAnswer(int )), m_editView, TQ_SLOT(slotCheckedAnswer(int ))); m_quiz ->setQuizType(WQQuiz::qtMultiple); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) @@ -992,10 +992,10 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_editView->saveCurrentSelection(true); m_editView->hide(); m_multipleView = new MultipleView(this); - connect(quizCheck, TQT_SIGNAL(activated()), m_multipleView, TQT_SLOT(slotCheck())); - connect(quizRestart, TQT_SIGNAL(activated()), m_multipleView, TQT_SLOT(slotRestart())); - connect(quizRepeatErrors, TQT_SIGNAL(activated()), m_multipleView, TQT_SLOT(slotRepeat())); - connect(this, TQT_SIGNAL(settingsChanged()), m_multipleView, TQT_SLOT(slotApplySettings())); + connect(quizCheck, TQ_SIGNAL(activated()), m_multipleView, TQ_SLOT(slotCheck())); + connect(quizRestart, TQ_SIGNAL(activated()), m_multipleView, TQ_SLOT(slotRestart())); + connect(quizRepeatErrors, TQ_SIGNAL(activated()), m_multipleView, TQ_SLOT(slotRepeat())); + connect(this, TQ_SIGNAL(settingsChanged()), m_multipleView, TQ_SLOT(slotApplySettings())); setCentralWidget(m_multipleView); @@ -1011,7 +1011,7 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) break; case WQQuiz::qtQA: m_quiz = new WQQuiz(m_editView); - connect(m_quiz, TQT_SIGNAL(checkingAnswer(int )), m_editView, TQT_SLOT(slotCheckedAnswer(int ))); + connect(m_quiz, TQ_SIGNAL(checkingAnswer(int )), m_editView, TQ_SLOT(slotCheckedAnswer(int ))); m_quiz ->setQuizType(WQQuiz::qtQA); m_quiz->setQuizMode(Prefs::mode()); if (m_quiz -> init()) @@ -1019,11 +1019,11 @@ void KWordQuizApp::updateSession(WQQuiz::QuizType qt) m_editView->saveCurrentSelection(true); m_editView->hide(); m_qaView = new QAView(this); - connect(quizCheck, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotCheck())); - connect(qaHint, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotHint())); - connect(quizRestart, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotRestart())); - connect(quizRepeatErrors, TQT_SIGNAL(activated()), m_qaView, TQT_SLOT(slotRepeat())); - connect(this, TQT_SIGNAL(settingsChanged()), m_qaView, TQT_SLOT(slotApplySettings())); + connect(quizCheck, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotCheck())); + connect(qaHint, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotHint())); + connect(quizRestart, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotRestart())); + connect(quizRepeatErrors, TQ_SIGNAL(activated()), m_qaView, TQ_SLOT(slotRepeat())); + connect(this, TQ_SIGNAL(settingsChanged()), m_qaView, TQ_SLOT(slotApplySettings())); setCentralWidget(m_qaView); @@ -1055,7 +1055,7 @@ void KWordQuizApp::slotConfigure() //TDEConfigDialog didn't find an instance of this dialog, so lets create it : KWordQuizPrefs* dialog = new KWordQuizPrefs( this, "settings", Prefs::self() ); - connect(dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotApplyPreferences())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotApplyPreferences())); dialog->show(); } diff --git a/kwordquiz/src/kwordquiz.h b/kwordquiz/src/kwordquiz.h index fe8d4bc3..347a0529 100644 --- a/kwordquiz/src/kwordquiz.h +++ b/kwordquiz/src/kwordquiz.h @@ -59,7 +59,7 @@ class KWQNewStuff; */ class KWordQuizApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT friend class KWordQuizView; diff --git a/kwordquiz/src/kwordquiz.kcfg b/kwordquiz/src/kwordquiz.kcfg index 3eacdf76..5a300c63 100644 --- a/kwordquiz/src/kwordquiz.kcfg +++ b/kwordquiz/src/kwordquiz.kcfg @@ -74,15 +74,15 @@ </entry> <entry name="FrontTextColor" type="Color"> <label>Color used for text on front of flashcard</label> - <default code="true">Qt::black</default> + <default code="true">TQt::black</default> </entry> <entry name="FrontCardColor" type="Color"> <label>Color used for front of flashcard</label> - <default code="true">Qt::white</default> + <default code="true">TQt::white</default> </entry> <entry name="FrontFrameColor" type="Color"> <label>Color used for frame on front of flashcard</label> - <default code="true">Qt::red</default> + <default code="true">TQt::red</default> </entry> <entry name="BackFont" type="Font"> <label>Font used for back of flashcard</label> @@ -90,15 +90,15 @@ </entry> <entry name="BackTextColor" type="Color"> <label>Color used for text on back of flashcard</label> - <default code="true">Qt::black</default> + <default code="true">TQt::black</default> </entry> <entry name="BackCardColor" type="Color"> <label>Color used for back of flashcard</label> - <default code="true">Qt::white</default> + <default code="true">TQt::white</default> </entry> <entry name="BackFrameColor" type="Color"> <label>Color used for frame on back of flashcard</label> - <default code="true">Qt::blue</default> + <default code="true">TQt::blue</default> </entry> </group> <group name="TDENewStuff"> diff --git a/kwordquiz/src/kwordquizdoc.cpp b/kwordquiz/src/kwordquizdoc.cpp index c132a7f2..70fb3663 100644 --- a/kwordquiz/src/kwordquizdoc.cpp +++ b/kwordquiz/src/kwordquizdoc.cpp @@ -33,15 +33,15 @@ #include "wqlwriter.h" #include "prefs.h" -//TQList<KWordQuizView> *KWordQuizDoc::pViewList = 0L; +//TQPtrList<KWordQuizView> *KWordQuizDoc::pViewList = 0L; //KWordQuizView *KWordQuizDoc::m_view; KWordQuizDoc::KWordQuizDoc(TQWidget *parent, const char *name) : TQObject(parent, name) { - connect(KDirWatch::self(), TQT_SIGNAL(dirty(const TQString& )), this, TQT_SLOT(slotModifiedOnDisk(const TQString& ))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty(const TQString& )), this, TQ_SLOT(slotModifiedOnDisk(const TQString& ))); /* if(!pViewList) { - pViewList = new TQList<KWordQuizView>(); + pViewList = new TQPtrList<KWordQuizView>(); } pViewList->setAutoDelete(true);*/ diff --git a/kwordquiz/src/kwordquizdoc.h b/kwordquiz/src/kwordquizdoc.h index b1f30a0e..8ab3b387 100644 --- a/kwordquiz/src/kwordquizdoc.h +++ b/kwordquiz/src/kwordquizdoc.h @@ -42,7 +42,7 @@ class KWordQuizView; */ class KWordQuizDoc : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** Constructor for the fileclass of the application */ @@ -84,7 +84,7 @@ class KWordQuizDoc : public TQObject public: /** the list of the views currently connected to the document */ - //static TQList<KWordQuizView> *pViewList; + //static TQPtrList<KWordQuizView> *pViewList; //static KWordQuizView *m_view; private: /** the modified flag of the current document */ diff --git a/kwordquiz/src/kwordquizprefs.cpp b/kwordquiz/src/kwordquizprefs.cpp index 0f8a13c7..7ab9a442 100644 --- a/kwordquiz/src/kwordquizprefs.cpp +++ b/kwordquiz/src/kwordquizprefs.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <krestrictedline.h> #include <tdemessagebox.h> @@ -60,8 +60,8 @@ KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name, TDEConfigSke m_dlgSpecChar = 0L; - connect(m_prefCharacter->lstCharacters, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotCharListSelectionChanged())); - connect(m_prefCharacter->btnCharacter, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectSpecChar())); + connect(m_prefCharacter->lstCharacters, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotCharListSelectionChanged())); + connect(m_prefCharacter->btnCharacter, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectSpecChar())); KWordQuizApp *win=(KWordQuizApp *) parent; int i=0; @@ -78,7 +78,7 @@ KWordQuizPrefs::KWordQuizPrefs(TQWidget *parent, const char *name, TDEConfigSke m_prefCharacter->lstCharacters->setSelected(m_prefCharacter->lstCharacters->firstChild(), true); m_prefCharacter->lstCharacters->setItemMargin(2); - kapp->processEvents(); + tdeApp->processEvents(); } void KWordQuizPrefs::slotCharListSelectionChanged() @@ -96,8 +96,8 @@ void KWordQuizPrefs::slotSelectSpecChar( ) if (m_dlgSpecChar == 0) { m_dlgSpecChar = new DlgSpecChar( this, "insert special char", f, c, true ); - connect(m_dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - connect(m_dlgSpecChar, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDlgSpecCharClosed())); + connect(m_dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + connect(m_dlgSpecChar, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDlgSpecCharClosed())); } m_dlgSpecChar->show(); } @@ -106,8 +106,8 @@ void KWordQuizPrefs::slotDlgSpecCharClosed() { if ( m_dlgSpecChar ) { - disconnect(m_dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - disconnect(m_dlgSpecChar, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDlgSpecCharClosed())); + disconnect(m_dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + disconnect(m_dlgSpecChar, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDlgSpecCharClosed())); m_dlgSpecChar->deleteLater(); m_dlgSpecChar = 0L; } diff --git a/kwordquiz/src/kwordquizprefs.h b/kwordquiz/src/kwordquizprefs.h index 1a99bffe..6db9adac 100644 --- a/kwordquiz/src/kwordquizprefs.h +++ b/kwordquiz/src/kwordquizprefs.h @@ -32,7 +32,7 @@ class DlgSpecChar; class KWordQuizPrefs : public TDEConfigDialog { - Q_OBJECT + TQ_OBJECT public: KWordQuizPrefs(TQWidget *parent=0, const char *name=0, TDEConfigSkeleton *config=0, DialogType dialogType=IconList, diff --git a/kwordquiz/src/kwordquizview.cpp b/kwordquiz/src/kwordquizview.cpp index 5fbf5be6..3fac1d06 100644 --- a/kwordquiz/src/kwordquizview.cpp +++ b/kwordquiz/src/kwordquizview.cpp @@ -435,7 +435,7 @@ void KWordQuizView::doEditCopy( ) s = s + text(r, c) + "\t"; s = s + "\n"; } - kapp->clipboard()->setText(s); + tdeApp->clipboard()->setText(s); } getDocument()->setModified(mod); } @@ -457,7 +457,7 @@ void KWordQuizView::doEditPaste( ) if (lc == rc && tr == br) //one cell selected { - TQString s = kapp->clipboard()->text(); + TQString s = tdeApp->clipboard()->text(); TQStringList sl; sl = TQStringList::split("\n", s); @@ -498,7 +498,7 @@ void KWordQuizView::doEditPaste( ) } else { - TQString s = kapp->clipboard()->text(); + TQString s = tdeApp->clipboard()->text(); TQStringList sl; sl = TQStringList::split("\n", s); uint i = 0; @@ -842,8 +842,8 @@ void KWordQuizView::doVocabSpecChar( ) if (dlgSpecChar==0) { dlgSpecChar = new DlgSpecChar( this, "insert special char", f, c, false ); - connect( dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - connect( dlgSpecChar, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDlgSpecCharClosed() ) ); + connect( dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + connect( dlgSpecChar, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDlgSpecCharClosed() ) ); } dlgSpecChar->show(); } @@ -852,8 +852,8 @@ void KWordQuizView::slotDlgSpecCharClosed( ) { if ( dlgSpecChar ) { - disconnect( dlgSpecChar, TQT_SIGNAL(insertChar(TQChar)), this, TQT_SLOT(slotSpecChar(TQChar))); - disconnect( dlgSpecChar, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDlgSpecCharClosed() ) ); + disconnect( dlgSpecChar, TQ_SIGNAL(insertChar(TQChar)), this, TQ_SLOT(slotSpecChar(TQChar))); + disconnect( dlgSpecChar, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDlgSpecCharClosed() ) ); dlgSpecChar->deleteLater(); dlgSpecChar = 0L; } @@ -1051,7 +1051,7 @@ void KWordQuizView::slotCheckedAnswer( int i ) bool KWordQuizView::eventFilter( TQObject * o, TQEvent * e ) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(cellEditor)) + if (o == cellEditor) { if ( e->type() == TQEvent::KeyPress ) { diff --git a/kwordquiz/src/kwordquizview.h b/kwordquiz/src/kwordquizview.h index 6dfec55a..c2056759 100644 --- a/kwordquiz/src/kwordquizview.h +++ b/kwordquiz/src/kwordquizview.h @@ -50,7 +50,7 @@ public: class KWordQuizView : public TQTable { - Q_OBJECT + TQ_OBJECT public: /** Constructor for the main view */ diff --git a/kwordquiz/src/kwqnewstuff.cpp b/kwordquiz/src/kwqnewstuff.cpp index 2b547053..1f254d6c 100644 --- a/kwordquiz/src/kwqnewstuff.cpp +++ b/kwordquiz/src/kwqnewstuff.cpp @@ -17,9 +17,9 @@ #include <tqdir.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tdenewstuff/entry.h> diff --git a/kwordquiz/src/kwqnewstuff.h b/kwordquiz/src/kwqnewstuff.h index a740459f..28178cf6 100644 --- a/kwordquiz/src/kwqnewstuff.h +++ b/kwordquiz/src/kwqnewstuff.h @@ -27,7 +27,7 @@ class KWordQuizApp; */ class KWQNewStuff : public TQObject, public TDENewStuff { -Q_OBJECT +TQ_OBJECT public: KWQNewStuff(TQWidget *parent = 0, const char *name = 0); diff --git a/kwordquiz/src/multipleview.h b/kwordquiz/src/multipleview.h index ac70aa55..b8bc454e 100644 --- a/kwordquiz/src/multipleview.h +++ b/kwordquiz/src/multipleview.h @@ -28,7 +28,7 @@ */ class MultipleView : public MultipleViewBase { -Q_OBJECT +TQ_OBJECT public: MultipleView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); diff --git a/kwordquiz/src/multipleviewbase.ui b/kwordquiz/src/multipleviewbase.ui index 3d848b83..4ad7b4ac 100644 --- a/kwordquiz/src/multipleviewbase.ui +++ b/kwordquiz/src/multipleviewbase.ui @@ -967,10 +967,10 @@ <slot>slotOpt3Clicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotOpt1Clicked()</slot> <slot>slotOpt2Clicked()</slot> <slot>slotOpt3Clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kwordquiz/src/prefcardappearance.h b/kwordquiz/src/prefcardappearance.h index c2091eb6..a7263dfe 100644 --- a/kwordquiz/src/prefcardappearance.h +++ b/kwordquiz/src/prefcardappearance.h @@ -19,7 +19,7 @@ */ class PrefCardAppearance : public PrefCardAppearanceBase { -Q_OBJECT +TQ_OBJECT public: PrefCardAppearance(TQWidget *parent = 0, const char *name = 0); diff --git a/kwordquiz/src/prefcardappearancebase.ui b/kwordquiz/src/prefcardappearancebase.ui index 9a1af12b..125defe6 100644 --- a/kwordquiz/src/prefcardappearancebase.ui +++ b/kwordquiz/src/prefcardappearancebase.ui @@ -534,14 +534,14 @@ <tabstop>kcfg_FrontCardColor</tabstop> <tabstop>kcfg_FrontFrameColor</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>slotFlipButtonClicked()</slot> <slot>slotFontChanged(const TQFont &)</slot> <slot>slotTextColorChanged(const TQColor &)</slot> <slot>slotAboutToShowWidget(TQWidget *)</slot> <slot>slotFrameColorChanged(const TQColor &)</slot> <slot>slotCardColorChanged(const TQColor &)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kpushbutton.h</include> diff --git a/kwordquiz/src/prefcharacter.h b/kwordquiz/src/prefcharacter.h index c9b5d168..162ee6a5 100644 --- a/kwordquiz/src/prefcharacter.h +++ b/kwordquiz/src/prefcharacter.h @@ -26,7 +26,7 @@ */ class PrefCharacter : public PrefCharacterBase { -Q_OBJECT +TQ_OBJECT public: PrefCharacter(TQWidget *parent = 0, const char *name = 0); diff --git a/kwordquiz/src/prefeditor.h b/kwordquiz/src/prefeditor.h index 922831a6..00e3a4ce 100644 --- a/kwordquiz/src/prefeditor.h +++ b/kwordquiz/src/prefeditor.h @@ -26,7 +26,7 @@ */ class PrefEditor : public PrefEditorBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kwordquiz/src/prefquiz.h b/kwordquiz/src/prefquiz.h index 0ae8227b..aa013380 100644 --- a/kwordquiz/src/prefquiz.h +++ b/kwordquiz/src/prefquiz.h @@ -26,7 +26,7 @@ */ class PrefQuiz : public PrefQuizBase { -Q_OBJECT +TQ_OBJECT public: diff --git a/kwordquiz/src/prefquizbase.ui b/kwordquiz/src/prefquizbase.ui index 89e0dffa..fe12e9cf 100644 --- a/kwordquiz/src/prefquizbase.ui +++ b/kwordquiz/src/prefquizbase.ui @@ -284,9 +284,9 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotAutoFlipClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">knuminput.h</include> diff --git a/kwordquiz/src/qaview.h b/kwordquiz/src/qaview.h index 1deb4049..9cf195a3 100644 --- a/kwordquiz/src/qaview.h +++ b/kwordquiz/src/qaview.h @@ -31,7 +31,7 @@ */ class QAView : public QAViewBase { -Q_OBJECT +TQ_OBJECT public: QAView(TQWidget *parent = 0, const char *name = 0, WFlags f = 0); diff --git a/kwordquiz/src/qaviewbase.ui b/kwordquiz/src/qaviewbase.ui index 9c5b3353..c82f4026 100644 --- a/kwordquiz/src/qaviewbase.ui +++ b/kwordquiz/src/qaviewbase.ui @@ -862,9 +862,9 @@ <slot>slotCheck()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="private">slotCheck()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/kwordquiz/src/wqlwriter.cpp b/kwordquiz/src/wqlwriter.cpp index 2052c079..e5314201 100644 --- a/kwordquiz/src/wqlwriter.cpp +++ b/kwordquiz/src/wqlwriter.cpp @@ -22,7 +22,7 @@ WqlWriter::WqlWriter(TQFile *file) outputFile = file; if(outputFile->open(IO_WriteOnly)) { - outputStream.setDevice(TQT_TQIODEVICE(outputFile)); + outputStream.setDevice(outputFile); outputStream.setEncoding(TQTextStream::Latin1); outputStream << "WordQuiz" << winendl; diff --git a/kwordquiz/src/wqprintdialogpage.cpp b/kwordquiz/src/wqprintdialogpage.cpp index 148d298b..9ff03284 100644 --- a/kwordquiz/src/wqprintdialogpage.cpp +++ b/kwordquiz/src/wqprintdialogpage.cpp @@ -33,7 +33,7 @@ WQPrintDialogPage::WQPrintDialogPage(TQWidget *parent, const char *name ) TQGridLayout * l = new TQGridLayout( this, 1, 1, 11, 6); g = new TQButtonGroup(i18n("Select Type of Printout"), this ); - g->setColumnLayout(0, Qt::Vertical ); + g->setColumnLayout(0, TQt::Vertical ); g->layout()->setSpacing( 6 ); g->layout()->setMargin( 11 ); TQGridLayout * v = new TQGridLayout( g->layout() ); diff --git a/kwordquiz/src/wqprintdialogpage.h b/kwordquiz/src/wqprintdialogpage.h index b5d749f8..0ee89549 100644 --- a/kwordquiz/src/wqprintdialogpage.h +++ b/kwordquiz/src/wqprintdialogpage.h @@ -29,7 +29,7 @@ Print dialog page to provide specific print options for KWordQuiz */ class WQPrintDialogPage : public KPrintDialogPage { -Q_OBJECT +TQ_OBJECT public: WQPrintDialogPage( TQWidget *parent = 0, const char *name = 0 ); diff --git a/kwordquiz/src/wqquiz.h b/kwordquiz/src/wqquiz.h index a9bdc190..6f3337d4 100644 --- a/kwordquiz/src/wqquiz.h +++ b/kwordquiz/src/wqquiz.h @@ -32,7 +32,7 @@ typedef TQValueList<WTQListItem> QuizList; class WQQuiz : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum QuizType {qtEditor, qtFlash, qtMultiple, qtQA}; diff --git a/libtdeedu/extdate/Makefile.am b/libtdeedu/extdate/Makefile.am index a06b2eca..3d2a60a4 100644 --- a/libtdeedu/extdate/Makefile.am +++ b/libtdeedu/extdate/Makefile.am @@ -7,15 +7,15 @@ lib_LTLIBRARIES = libextdate.la libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 -libextdate_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE) +libextdate_la_LIBADD = $(LIB_TDEUI) $(LIB_TQT) $(LIB_TDECORE) test_extdate_SOURCES = test_extdate.cpp test_extdate_LDADD = libextdate.la -test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor test_extdatepicker_SOURCES = testwidget.cpp main.cpp test_extdatepicker_LDADD = libextdate.la -test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor METASOURCES = AUTO diff --git a/libtdeedu/extdate/extdatepicker.cpp b/libtdeedu/extdate/extdatepicker.cpp index ad347c31..b8874d75 100644 --- a/libtdeedu/extdate/extdatepicker.cpp +++ b/libtdeedu/extdate/extdatepicker.cpp @@ -178,17 +178,17 @@ void ExtDatePicker::init( const ExtDate &dt ) monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); } - connect(table, TQT_SIGNAL(dateChanged(const ExtDate&)), TQT_SLOT(dateChangedSlot(const ExtDate&))); - connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); - connect(monthForward, TQT_SIGNAL(clicked()), TQT_SLOT(monthForwardClicked())); - connect(monthBackward, TQT_SIGNAL(clicked()), TQT_SLOT(monthBackwardClicked())); - connect(yearForward, TQT_SIGNAL(clicked()), TQT_SLOT(yearForwardClicked())); - connect(yearBackward, TQT_SIGNAL(clicked()), TQT_SLOT(yearBackwardClicked())); - connect(d->selectWeek, TQT_SIGNAL(activated(int)), TQT_SLOT(weekSelected(int))); - connect(d->todayButton, TQT_SIGNAL(clicked()), TQT_SLOT(todayButtonClicked())); - connect(selectMonth, TQT_SIGNAL(clicked()), TQT_SLOT(selectMonthClicked())); - connect(selectYear, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectYearClicked())); - connect(line, TQT_SIGNAL(returnPressed()), TQT_SLOT(lineEnterPressed())); + connect(table, TQ_SIGNAL(dateChanged(const ExtDate&)), TQ_SLOT(dateChangedSlot(const ExtDate&))); + connect(table, TQ_SIGNAL(tableClicked()), TQ_SLOT(tableClickedSlot())); + connect(monthForward, TQ_SIGNAL(clicked()), TQ_SLOT(monthForwardClicked())); + connect(monthBackward, TQ_SIGNAL(clicked()), TQ_SLOT(monthBackwardClicked())); + connect(yearForward, TQ_SIGNAL(clicked()), TQ_SLOT(yearForwardClicked())); + connect(yearBackward, TQ_SIGNAL(clicked()), TQ_SLOT(yearBackwardClicked())); + connect(d->selectWeek, TQ_SIGNAL(activated(int)), TQ_SLOT(weekSelected(int))); + connect(d->todayButton, TQ_SIGNAL(clicked()), TQ_SLOT(todayButtonClicked())); + connect(selectMonth, TQ_SIGNAL(clicked()), TQ_SLOT(selectMonthClicked())); + connect(selectYear, TQ_SIGNAL(toggled(bool)), TQ_SLOT(selectYearClicked())); + connect(line, TQ_SIGNAL(returnPressed()), TQ_SLOT(lineEnterPressed())); table->setFocus(); @@ -388,7 +388,7 @@ ExtDatePicker::selectYearClicked() // ----- picker->resize(picker->sizeHint()); popup->setMainWidget(picker); - connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); + connect(picker, TQ_SIGNAL(closeMe(int)), popup, TQ_SLOT(close(int))); picker->setFocus(); if(popup->exec(selectYear->mapToGlobal(TQPoint(0, selectMonth->height())))) { @@ -490,7 +490,7 @@ ExtDatePicker::setFontSize(int s) maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); } - TQSize metricBound = style().tqsizeFromContents(TQStyle::CT_ToolButton, + TQSize metricBound = style().sizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); selectMonth->setMinimumSize(metricBound); @@ -511,8 +511,8 @@ ExtDatePicker::setCloseButton( bool enable ) d->navigationLayout->addWidget(d->closeButton); TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); - connect( d->closeButton, TQT_SIGNAL( clicked() ), - topLevelWidget(), TQT_SLOT( close() ) ); + connect( d->closeButton, TQ_SIGNAL( clicked() ), + topLevelWidget(), TQ_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/libtdeedu/extdate/extdatepicker.h b/libtdeedu/extdate/extdatepicker.h index 0d0b63d1..29d35b5c 100644 --- a/libtdeedu/extdate/extdatepicker.h +++ b/libtdeedu/extdate/extdatepicker.h @@ -49,9 +49,9 @@ class ExtDateTable; * * @short A date selection widget. **/ -class KDE_EXPORT ExtDatePicker: public TQFrame +class TDE_EXPORT ExtDatePicker: public TQFrame { - Q_OBJECT + TQ_OBJECT // TQ_PROPERTY( ExtDate date READ date WRITE setDate) TQ_PROPERTY( bool closeButton READ hasCloseButton WRITE setCloseButton ) @@ -106,7 +106,7 @@ public: * Returns the selected date. * @deprecated **/ - const ExtDate& getDate() const KDE_DEPRECATED; + const ExtDate& getDate() const TDE_DEPRECATED; /** * @returns the selected date. diff --git a/libtdeedu/extdate/extdatetbl.cpp b/libtdeedu/extdate/extdatetbl.cpp index 7b60954b..662e8a7c 100644 --- a/libtdeedu/extdate/extdatetbl.cpp +++ b/libtdeedu/extdate/extdatetbl.cpp @@ -83,7 +83,7 @@ public: ExtDateValidator::ExtDateValidator(TQWidget* parent, const char* name) - : TQValidator(TQT_TQOBJECT(parent), name) + : TQValidator(parent, name) { } @@ -126,7 +126,7 @@ ExtDateTable::ExtDateTable(TQWidget *parent, ExtDate date_, const char* name, WF kdDebug() << "ExtDateTable ctor: WARNING: Given date is invalid, using current date." << endl; date_=ExtDate::currentDate(); } - setFocusPolicy( TQ_StrongFocus ); + setFocusPolicy( TQWidget::StrongFocus ); setNumRows(7); // 6 weeks max + headline setNumCols(7); // 7 days a week setHScrollBarMode(AlwaysOff); @@ -448,7 +448,7 @@ ExtDateTable::contentsMousePressEvent(TQMouseEvent *e) emit tableClicked(); - if ( e->button() == Qt::RightButton && d->popupMenuEnabled ) + if ( e->button() == TQt::RightButton && d->popupMenuEnabled ) { TDEPopupMenu *menu = new TDEPopupMenu(); @@ -567,7 +567,7 @@ void ExtDateTable::unsetCustomDatePainting( const ExtDate &date ) ExtDateInternalWeekSelector::ExtDateInternalWeekSelector (TQWidget* parent, const char* name) : KLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), + val(new TQIntValidator(this)), result(0) { TQFont font; @@ -576,7 +576,7 @@ ExtDateInternalWeekSelector::ExtDateInternalWeekSelector setFont(font); setFrameStyle(TQFrame::NoFrame); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(weekEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(weekEnteredSlot())); } void @@ -720,7 +720,7 @@ ExtDateInternalMonthPicker::paintCell(TQPainter* painter, int row, int col) void ExtDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) { - if(!isEnabled() || e->button() != Qt::LeftButton) + if(!isEnabled() || e->button() != TQt::LeftButton) { KNotifyClient::beep(); return; @@ -747,7 +747,7 @@ ExtDateInternalMonthPicker::contentsMousePressEvent(TQMouseEvent *e) void ExtDateInternalMonthPicker::contentsMouseMoveEvent(TQMouseEvent *e) { - if (e->state() & Qt::LeftButton) + if (e->state() & TQt::LeftButton) { int row, col; TQPoint mouseCoord; @@ -813,7 +813,7 @@ ExtDateInternalMonthPicker::contentsMouseReleaseEvent(TQMouseEvent *e) ExtDateInternalYearSelector::ExtDateInternalYearSelector (TQWidget* parent, const char* name) : TQLineEdit(parent, name), - val(new TQIntValidator(TQT_TQOBJECT(this))), + val(new TQIntValidator(this)), result(0), d(new ExtDateInternalYearPrivate()) { @@ -826,7 +826,7 @@ ExtDateInternalYearSelector::ExtDateInternalYearSelector //there si also a year limit in ExtCalendarSystemGregorian... val->setRange(-50000, 50000); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(yearEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(yearEnteredSlot())); } ExtDateInternalYearSelector::~ExtDateInternalYearSelector() { diff --git a/libtdeedu/extdate/extdatetbl.h b/libtdeedu/extdate/extdatetbl.h index 622b45e8..0c931824 100644 --- a/libtdeedu/extdate/extdatetbl.h +++ b/libtdeedu/extdate/extdatetbl.h @@ -40,7 +40,7 @@ class TDEPopupMenu; */ class ExtDateInternalWeekSelector : public KLineEdit { - Q_OBJECT + TQ_OBJECT protected: TQIntValidator *val; @@ -68,7 +68,7 @@ private: */ class ExtDateInternalMonthPicker : public TQGridView { - Q_OBJECT + TQ_OBJECT protected: /** @@ -142,7 +142,7 @@ private: */ class ExtDateInternalYearSelector : public TQLineEdit { - Q_OBJECT + TQ_OBJECT protected: TQIntValidator *val; @@ -179,7 +179,7 @@ private: */ class TDEPopupFrame : public TQFrame { - Q_OBJECT + TQ_OBJECT protected: /** @@ -268,7 +268,7 @@ public: */ class ExtDateTable : public TQGridView { - Q_OBJECT + TQ_OBJECT //TQ_PROPERTY( ExtDate date READ getDate WRITE setDate ) TQ_PROPERTY( bool popupMenu READ popupMenuEnabled WRITE setPopupMenuEnabled ) diff --git a/libtdeedu/extdate/extdatetime.cpp b/libtdeedu/extdate/extdatetime.cpp index e5cc7b6c..696e7d84 100644 --- a/libtdeedu/extdate/extdatetime.cpp +++ b/libtdeedu/extdate/extdatetime.cpp @@ -241,7 +241,7 @@ TQString ExtDate::longDayName( int weekday ) {return m_longDayNames[weekday-1];} #ifndef TQT_NO_TEXTSTRING #if !defined(TQT_NO_SPRINTF) -TQString ExtDate::toString( Qt::DateFormat f) const +TQString ExtDate::toString( TQt::DateFormat f) const { TQString a_format; @@ -249,15 +249,15 @@ TQString ExtDate::toString( Qt::DateFormat f) const switch (f) { - case Qt::TextDate : // Sat May 20 1995 + case TQt::TextDate : // Sat May 20 1995 a_format = "%a %b %e %Y"; break; - case Qt::ISODate : // YYYY-MM-DD + case TQt::ISODate : // YYYY-MM-DD a_format = "%Y-%m-%d"; break; - case Qt::LocalDate : // local settings + case TQt::LocalDate : // local settings a_format = TDEGlobal::locale()->dateFormat(); break; @@ -377,7 +377,7 @@ int ExtDate::daysTo( const ExtDate & a_date) const return a_date.jd() - jd(); } -ExtDate ExtDate::currentDate(Qt::TimeSpec ts) +ExtDate ExtDate::currentDate(TQt::TimeSpec ts) { time_t a_current_time; struct tm a_current_time_tm; @@ -404,19 +404,19 @@ ExtDate ExtDate::currentDate(Qt::TimeSpec ts) //Try both DateFormat values ExtDate ExtDate::fromString( const TQString& s ) { - ExtDate dResult = ExtDate::fromString( s, Qt::TextDate ); + ExtDate dResult = ExtDate::fromString( s, TQt::TextDate ); if ( dResult.isValid() ) return dResult; - dResult = ExtDate::fromString( s, Qt::ISODate ); + dResult = ExtDate::fromString( s, TQt::ISODate ); if ( dResult.isValid() ) return dResult; else return ExtDate(); //invalid } -ExtDate ExtDate::fromString( const TQString& s, Qt::DateFormat f ) +ExtDate ExtDate::fromString( const TQString& s, TQt::DateFormat f ) { ExtDate dt = ExtDate(); //initialize invalid date if ( s.isEmpty() ) { return dt; } - if ( f == Qt::LocalDate ) { //can't use LocalFormat + if ( f == TQt::LocalDate ) { //can't use LocalFormat #if defined(TQT_CHECK_RANGE) tqWarning( "TQDate::fromString: Parameter out of range" ); #endif @@ -424,7 +424,7 @@ ExtDate ExtDate::fromString( const TQString& s, Qt::DateFormat f ) } switch( f ) { - case Qt::ISODate : + case TQt::ISODate : { int year( s.mid( 0, 4 ).toInt() ); int month( s.mid( 5, 2 ).toInt() ); @@ -437,7 +437,7 @@ ExtDate ExtDate::fromString( const TQString& s, Qt::DateFormat f ) default : #ifndef TQT_NO_TEXTDATE - case Qt::TextDate : + case TQt::TextDate : { //Three possible date formats: //dd mth yyyy; mth dd yyyy; wkd mth dd yyyy @@ -623,8 +623,8 @@ ExtDateTime::ExtDateTime( const ExtDate &date, const TQTime &time ) /*! \fn bool ExtDateTime::isNull() const - Returns TRUE if both the date and the time are null; otherwise - returns FALSE. A null datetime is invalid. + Returns true if both the date and the time are null; otherwise + returns false. A null datetime is invalid. \sa ExtDate::isNull(), TQTime::isNull() */ @@ -632,8 +632,8 @@ ExtDateTime::ExtDateTime( const ExtDate &date, const TQTime &time ) /*! \fn bool ExtDateTime::isValid() const - Returns TRUE if both the date and the time are valid; otherwise - returns FALSE. + Returns true if both the date and the time are valid; otherwise + returns false. \sa ExtDate::isValid(), TQTime::isValid() */ @@ -706,7 +706,7 @@ uint ExtDateTime::toTime_t() const void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC ) { - setTime_t( secsSince1Jan1970UTC, Qt::LocalTime ); + setTime_t( secsSince1Jan1970UTC, TQt::LocalTime ); } /*! @@ -721,12 +721,12 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC ) \sa toTime_t() */ -void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts ) +void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, TQt::TimeSpec ts ) { time_t tmp = (time_t) secsSince1Jan1970UTC; tm *brokenDown = 0; -#if defined(Q_OS_UNIX) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) +#if defined(Q_OS_UNIX) && defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) // posix compliant system // use the reentrant versions of localtime() and gmtime() where available tm res; @@ -771,16 +771,16 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts ) Returns the datetime as a string. The \a f parameter determines the format of the string. - If \a f is \c Qt::TextDate, the string format is "Wed May 20 + If \a f is \c TQt::TextDate, the string format is "Wed May 20 03:40:13 1998" (using ExtDate::shortDayName(), ExtDate::shortMonthName(), and TQTime::toString() to generate the string, so the day and month names will have localized names). - If \a f is \c Qt::ISODate, the string format corresponds to the + If \a f is \c TQt::ISODate, the string format corresponds to the ISO 8601 extended specification for representations of dates and times, which is YYYY-MM-DDTHH:MM:SS. - If \a f is \c Qt::LocalDate, the string format depends on the + If \a f is \c TQt::LocalDate, the string format depends on the locale settings of the system. If the format \a f is invalid or the datetime is invalid, toString() @@ -789,20 +789,20 @@ void ExtDateTime::setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ts ) \sa ExtDate::toString() TQTime::toString() */ -TQString ExtDateTime::toString( Qt::DateFormat f ) const +TQString ExtDateTime::toString( TQt::DateFormat f ) const { if ( !isValid() ) return TQString(); - if ( f == Qt::ISODate ) { - return d.toString( Qt::ISODate ) + "T" + t.toString( Qt::ISODate ); + if ( f == TQt::ISODate ) { + return d.toString( TQt::ISODate ) + "T" + t.toString( TQt::ISODate ); } #ifndef TQT_NO_TEXTDATE - else if ( f == Qt::TextDate ) { + else if ( f == TQt::TextDate ) { return toString( "%a %b %e %Y %H:%M:%S" ); } #endif - else if ( f == Qt::LocalDate ) { + else if ( f == TQt::LocalDate ) { return toString( TDEGlobal::locale()->dateFormat() + " " + TDEGlobal::locale()->timeFormat() ); } @@ -948,7 +948,7 @@ int ExtDateTime::secsTo( const ExtDateTime &dt ) const /*! - Returns TRUE if this datetime is equal to \a dt; otherwise returns FALSE. + Returns true if this datetime is equal to \a dt; otherwise returns false. \sa operator!=() */ @@ -959,8 +959,8 @@ bool ExtDateTime::operator==( const ExtDateTime &dt ) const } /*! - Returns TRUE if this datetime is different from \a dt; otherwise - returns FALSE. + Returns true if this datetime is different from \a dt; otherwise + returns false. \sa operator==() */ @@ -971,8 +971,8 @@ bool ExtDateTime::operator!=( const ExtDateTime &dt ) const } /*! - Returns TRUE if this datetime is earlier than \a dt; otherwise - returns FALSE. + Returns true if this datetime is earlier than \a dt; otherwise + returns false. */ bool ExtDateTime::operator<( const ExtDateTime &dt ) const @@ -983,8 +983,8 @@ bool ExtDateTime::operator<( const ExtDateTime &dt ) const } /*! - Returns TRUE if this datetime is earlier than or equal to \a dt; - otherwise returns FALSE. + Returns true if this datetime is earlier than or equal to \a dt; + otherwise returns false. */ bool ExtDateTime::operator<=( const ExtDateTime &dt ) const @@ -995,8 +995,8 @@ bool ExtDateTime::operator<=( const ExtDateTime &dt ) const } /*! - Returns TRUE if this datetime is later than \a dt; otherwise - returns FALSE. + Returns true if this datetime is later than \a dt; otherwise + returns false. */ bool ExtDateTime::operator>( const ExtDateTime &dt ) const @@ -1007,8 +1007,8 @@ bool ExtDateTime::operator>( const ExtDateTime &dt ) const } /*! - Returns TRUE if this datetime is later than or equal to \a dt; - otherwise returns FALSE. + Returns true if this datetime is later than or equal to \a dt; + otherwise returns false. */ bool ExtDateTime::operator>=( const ExtDateTime &dt ) const @@ -1028,17 +1028,17 @@ bool ExtDateTime::operator>=( const ExtDateTime &dt ) const ExtDateTime ExtDateTime::currentDateTime() { - return currentDateTime( Qt::LocalTime ); + return currentDateTime( TQt::LocalTime ); } /*! Returns the current datetime, as reported by the system clock, for the TimeSpec \a ts. The default TimeSpec is LocalTime. - \sa ExtDate::currentDate(), TQTime::currentTime(), Qt::TimeSpec + \sa ExtDate::currentDate(), TQTime::currentTime(), TQt::TimeSpec */ -ExtDateTime ExtDateTime::currentDateTime( Qt::TimeSpec ts ) +ExtDateTime ExtDateTime::currentDateTime( TQt::TimeSpec ts ) { ExtDateTime dt; dt.setDate( ExtDate::currentDate(ts) ); @@ -1054,28 +1054,28 @@ ExtDateTime ExtDateTime::currentDateTime( Qt::TimeSpec ts ) Returns the ExtDateTime represented by the string \a s, using the format \a f, or an invalid datetime if this is not possible. - Note for \c Qt::TextDate: It is recommended that you use the + Note for \c TQt::TextDate: It is recommended that you use the English short month names (e.g. "Jan"). Although localized month names can also be used, they depend on the user's locale settings. - \warning Note that \c Qt::LocalDate cannot be used here. + \warning Note that \c TQt::LocalDate cannot be used here. */ ExtDateTime ExtDateTime::fromString( const TQString& s ) { - ExtDateTime dtResult = ExtDateTime::fromString( s, Qt::TextDate ); + ExtDateTime dtResult = ExtDateTime::fromString( s, TQt::TextDate ); if ( dtResult.isValid() ) return dtResult; - dtResult = ExtDateTime::fromString( s, Qt::ISODate ); + dtResult = ExtDateTime::fromString( s, TQt::ISODate ); if ( dtResult.isValid() ) return dtResult; else return ExtDateTime(); //invalid } -ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) +ExtDateTime ExtDateTime::fromString( const TQString& s, TQt::DateFormat f ) { ExtDateTime dt; - if ( ( s.isEmpty() ) || ( f == Qt::LocalDate ) ) { + if ( ( s.isEmpty() ) || ( f == TQt::LocalDate ) ) { #if defined(TQT_CHECK_RANGE) tqWarning( "ExtDateTime::fromString: Parameter out of range" ); #endif @@ -1083,17 +1083,17 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) return dt; } - if ( f == Qt::ISODate ) { + if ( f == TQt::ISODate ) { if ( s.length() <= 10 || ! s.contains( ':' ) ) { //no time specified TQTime t = TQTime(0,0,0); - return ExtDateTime( ExtDate::fromString( s.mid(0,10), Qt::ISODate ) ); + return ExtDateTime( ExtDate::fromString( s.mid(0,10), TQt::ISODate ) ); } else { - return ExtDateTime( ExtDate::fromString( s.mid(0,10), Qt::ISODate ), - TQTime::fromString( s.mid(11), Qt::ISODate ) ); + return ExtDateTime( ExtDate::fromString( s.mid(0,10), TQt::ISODate ), + TQTime::fromString( s.mid(11), TQt::ISODate ) ); } } #if !defined(TQT_NO_REGEXP) && !defined(TQT_NO_TEXTDATE) - else if ( f == Qt::TextDate ) { + else if ( f == TQt::TextDate ) { //parse the time, if it exists. TQTime time; @@ -1110,7 +1110,7 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) } //sd is now just the date string. - ExtDate date = ExtDate::fromString( s, Qt::TextDate ); + ExtDate date = ExtDate::fromString( s, TQt::TextDate ); return ExtDateTime( date, time ); } @@ -1121,12 +1121,12 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f ) #ifndef TQT_NO_DATASTREAM -KDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDate & date) +TDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDate & date) { return ostream << (TQ_UINT32)(date.jd()); } -KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDate & date) +TDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDate & date) { TQ_UINT32 julday; ostream >> julday; @@ -1134,14 +1134,14 @@ KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDate & date) return ostream; } -KDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDateTime & dt) +TDE_EXPORT TQDataStream &operator<<( TQDataStream & ostream, const ExtDateTime & dt) { ostream << dt.d; ostream << dt.t; return ostream; } -KDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDateTime & dt) +TDE_EXPORT TQDataStream &operator>>( TQDataStream & ostream, ExtDateTime & dt) { ostream >> dt.d >> dt.t; return ostream; diff --git a/libtdeedu/extdate/extdatetime.h b/libtdeedu/extdate/extdatetime.h index 479d1fae..d07eaa4a 100644 --- a/libtdeedu/extdate/extdatetime.h +++ b/libtdeedu/extdate/extdatetime.h @@ -20,7 +20,7 @@ #include "tqstring.h" #include "tqnamespace.h" #include "tqdatetime.h" -#include <kdemacros.h> +#include <tdemacros.h> #define INVALID_DAY LONG_MIN @@ -34,7 +34,7 @@ extern void test2_unit(int y, int m, int d); class ExtDateTime; -class KDE_EXPORT ExtDate +class TDE_EXPORT ExtDate { public: ExtDate() : m_jd(INVALID_DAY), m_year(0), m_month(0), m_day(0) {} @@ -58,10 +58,6 @@ public: long int jd() const { return m_jd; } #ifndef TQT_NO_TEXTDATE -#ifndef TQT_NO_COMPAT - static TQString monthName( int month ) { return shortMonthName( month ); } - static TQString dayName( int weekday ) { return shortDayName( weekday ); } -#endif static TQString shortMonthName( int month ); static TQString shortDayName( int weekday ); static TQString longMonthName( int month ); @@ -69,7 +65,7 @@ public: #endif //TQT_NO_TEXTDATE #ifndef TQT_NO_TEXTSTRING #if !defined(TQT_NO_SPRINTF) - TQString toString( Qt::DateFormat f = Qt::TextDate ) const; + TQString toString( TQt::DateFormat f = TQt::TextDate ) const; #endif TQString toString( const TQString& format ) const; #endif @@ -88,10 +84,10 @@ public: bool operator>( const ExtDate &d ) const { return m_jd > d.jd(); } bool operator>=( const ExtDate &d ) const { return m_jd >= d.jd(); } - static ExtDate currentDate( Qt::TimeSpec ts = Qt::LocalTime ); + static ExtDate currentDate( TQt::TimeSpec ts = TQt::LocalTime ); #ifndef TQT_NO_DATESTRING static ExtDate fromString( const TQString &s ); - static ExtDate fromString( const TQString &s, Qt::DateFormat f ); + static ExtDate fromString( const TQString &s, TQt::DateFormat f ); #endif static bool isValid( int y, int m, int d ); static bool leapYear( int year ); @@ -125,7 +121,7 @@ private: ExtDateTime class *****************************************************************************/ -class KDE_EXPORT ExtDateTime +class TDE_EXPORT ExtDateTime { public: ExtDateTime() {} // set null date and null time @@ -141,10 +137,10 @@ public: void setDate( const ExtDate &date ) { d = date; } void setTime( const TQTime &time ) { t = time; } void setTime_t( uint secsSince1Jan1970UTC ); - void setTime_t( uint secsSince1Jan1970UTC, Qt::TimeSpec ); + void setTime_t( uint secsSince1Jan1970UTC, TQt::TimeSpec ); #ifndef TQT_NO_DATESTRING #ifndef TQT_NO_SPRINTF - TQString toString( Qt::DateFormat f = Qt::TextDate ) const; + TQString toString( TQt::DateFormat f = TQt::TextDate ) const; #endif TQString toString( const TQString& format ) const; #endif @@ -163,10 +159,10 @@ public: bool operator>=( const ExtDateTime &dt ) const; static ExtDateTime currentDateTime(); - static ExtDateTime currentDateTime( Qt::TimeSpec ); + static ExtDateTime currentDateTime( TQt::TimeSpec ); #ifndef TQT_NO_DATESTRING static ExtDateTime fromString( const TQString &s ); - static ExtDateTime fromString( const TQString &s, Qt::DateFormat f ); + static ExtDateTime fromString( const TQString &s, TQt::DateFormat f ); #endif private: ExtDate d; diff --git a/libtdeedu/extdate/extdatetimeedit.cpp b/libtdeedu/extdate/extdatetimeedit.cpp index 21e74809..4a7527aa 100644 --- a/libtdeedu/extdate/extdatetimeedit.cpp +++ b/libtdeedu/extdate/extdatetimeedit.cpp @@ -27,10 +27,8 @@ #ifndef TQT_NO_DATETIMEEDIT -//#include "../kernel/tqinternal_p.h" -//#include "../kernel/tqrichtext_p.h" -#include <tqinternal_p.h> -#include <tqrichtext_p.h> +#include <private/tqinternal_p.h> +#include <private/tqrichtext_p.h> #include <tqrangecontrol.h> #include <tqapplication.h> #include <tqpixmap.h> @@ -44,7 +42,7 @@ static TQString *lDateSep = 0; static TQString *lTimeSep = 0; -static bool lAMPM = FALSE; +static bool lAMPM = false; static TQString *lAM = 0; static TQString *lPM = 0; static ExtDateEdit::Order lOrder = ExtDateEdit::YMD; @@ -112,7 +110,7 @@ static void readLocaleSettings() *lDateSep = "-"; *lTimeSep = ":"; #endif - TQString d = ExtDate( 1999, 11, 22 ).toString( Qt::LocalDate ); + TQString d = ExtDate( 1999, 11, 22 ).toString( TQt::LocalDate ); dpos = d.find( "22" ); mpos = d.find( "11" ); ypos = d.find( "99" ); @@ -142,7 +140,7 @@ static void readLocaleSettings() } #ifndef TQ_WS_WIN - TQString t = TQTime( 11, 22, 33 ).toString( Qt::LocalDate ); + TQString t = TQTime( 11, 22, 33 ).toString( TQt::LocalDate ); dpos = t.find( "11" ); mpos = t.find( "22" ); ypos = t.find( "33" ); @@ -181,11 +179,11 @@ class ExtDateTimeEditorPrivate { public: ExtDateTimeEditorPrivate() - : frm( TRUE ), - parag( new TQTextParagraph( 0, 0, 0, FALSE ) ), + : frm( true ), + parag( new TQTextParagraph( 0, 0, 0, false ) ), focusSec(0) { - parag->formatter()->setWrapEnabled( FALSE ); + parag->formatter()->setWrapEnabled( false ); cursor = new TQTextCursor( 0 ); cursor->setParagraph( parag ); offset = 0; @@ -242,13 +240,13 @@ public: bool setFocusSection( int idx ) { if ( idx > (int)sections.count()-1 || idx < 0 ) - return FALSE; + return false; if ( idx != focusSec ) { focusSec = idx; applyFocusSelection(); - return TRUE; + return true; } - return FALSE; + return false; } bool inSectionSelection( int idx ) @@ -256,9 +254,9 @@ public: for ( uint i = 0; i < sections.count(); ++i ) { if ( idx >= sections[i].selectionStart() && idx <= sections[i].selectionEnd() ) - return TRUE; + return true; } - return FALSE; + return false; } void paint( const TQString& txt, bool focus, TQPainter& p, @@ -304,7 +302,7 @@ public: yoff = 0; p.translate( xoff, yoff ); - parag->paint( p, cg, 0, TRUE ); + parag->paint( p, cg, 0, true ); if ( frm ) p.translate( -xoff, -yoff ); } @@ -372,7 +370,7 @@ void ExtDateTimeEditor::init() setBackgroundMode( PaletteBase ); setFocusSection( -1 ); installEventFilter( this ); - setFocusPolicy( TQ_WheelFocus ); + setFocusPolicy( TQWidget::WheelFocus ); } @@ -465,7 +463,7 @@ void ExtDateTimeEditor::mousePressEvent( TQMouseEvent *e ) int sec = sectionAt( p ); if ( sec != -1 ) { cw->setFocusSection( sec ); - repaint( rect(), FALSE ); + repaint( rect(), false ); } } @@ -474,71 +472,71 @@ void ExtDateTimeEditor::mousePressEvent( TQMouseEvent *e ) */ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) { - if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) { + if ( o == this ) { if ( e->type() == TQEvent::KeyPress ) { TQKeyEvent *ke = (TQKeyEvent*)e; switch ( ke->key() ) { case Key_Right: if ( d->focusSection() < (int)d->sectionCount()-1 ) { if ( cw->setFocusSection( focusSection()+1 ) ) - repaint( rect(), FALSE ); + repaint( rect(), false ); } - return TRUE; + return true; case Key_Left: if ( d->focusSection() > 0 ) { if ( cw->setFocusSection( focusSection()-1 ) ) - repaint( rect(), FALSE ); + repaint( rect(), false ); } - return TRUE; + return true; case Key_Up: cw->stepUp(); - return TRUE; + return true; case Key_Down: cw->stepDown(); - return TRUE; + return true; case Key_Backspace: - if ( ::tqqt_cast<ExtDateEdit*>(cw) ) + if ( ::tqt_cast<ExtDateEdit*>(cw) ) ((ExtDateEdit*)cw)->removeFirstNumber( d->focusSection() ); - else if ( ::tqqt_cast<TQTimeEdit*>(cw) ) + else if ( ::tqt_cast<TQTimeEdit*>(cw) ) ((TQTimeEdit*)cw)->removeFirstNumber( d->focusSection() ); - return TRUE; + return true; case Key_Delete: cw->removeLastNumber( d->focusSection() ); - return TRUE; + return true; case Key_Tab: case Key_BackTab: { if ( ke->state() == TQt::ControlButton ) - return FALSE; + return false; TQWidget *w = this; - bool hadDateEdit = FALSE; + bool hadDateEdit = false; while ( w ) { - if ( ::tqqt_cast<ExtDateTimeSpinWidget*>(w) && qstrcmp( w->name(), "qt_spin_widget" ) != 0 || - ::tqqt_cast<ExtDateTimeEdit*>(w) ) + if ( ::tqt_cast<ExtDateTimeSpinWidget*>(w) && qstrcmp( w->name(), "qt_spin_widget" ) != 0 || + ::tqt_cast<ExtDateTimeEdit*>(w) ) break; - hadDateEdit = hadDateEdit || ::tqqt_cast<ExtDateEdit*>(w); + hadDateEdit = hadDateEdit || ::tqt_cast<ExtDateEdit*>(w); w = w->parentWidget(); } if ( w ) { - if ( !::tqqt_cast<ExtDateTimeEdit*>(w) ) { + if ( !::tqt_cast<ExtDateTimeEdit*>(w) ) { w = w->parentWidget(); } else { ExtDateTimeEdit *ed = (ExtDateTimeEdit*)w; if ( hadDateEdit && ke->key() == Key_Tab ) { ed->timeEdit()->setFocus(); - return TRUE; + return true; } else if ( !hadDateEdit && ke->key() == Key_BackTab ) { ed->dateEdit()->setFocus(); - return TRUE; + return true; } else { - while ( w && !::tqqt_cast<ExtDateTimeEdit*>(w) ) + while ( w && !::tqt_cast<ExtDateTimeEdit*>(w) ) w = w->parentWidget(); } } tqApp->sendEvent( w, e ); - return TRUE; + return true; } } break; default: @@ -547,10 +545,10 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) // do the same thing as KEY_RIGHT when the user presses the separator key if ( d->focusSection() < 2 ) { if ( cw->setFocusSection( focusSection()+1 ) ) - repaint( rect(), FALSE ); + repaint( rect(), false ); } - return TRUE; - } else if ( !txt.isEmpty() && ::tqqt_cast<TQTimeEdit*>(cw) && focusSection() == (int) d->sectionCount()-1 ) { + return true; + } else if ( !txt.isEmpty() && ::tqt_cast<TQTimeEdit*>(cw) && focusSection() == (int) d->sectionCount()-1 ) { // the first character of the AM/PM indicator toggles if the section has focus TQTimeEdit *te = (TQTimeEdit*)cw; TQTime time = te->time(); @@ -568,12 +566,12 @@ bool ExtDateTimeEditor::eventFilter( TQObject *o, TQEvent *e ) int num = txt[0].digitValue(); if ( num != -1 ) { cw->addNumber( d->focusSection(), num ); - return TRUE; + return true; } } } } - return FALSE; + return false; } @@ -744,13 +742,13 @@ public: dateEdit->setRange( ExtDate::currentDate().addDays( -365 ), ExtDate::currentDate().addDays( 365 ) ); dateEdit->setOrder( ExtDateEdit::MDY ); - dateEdit->setAutoAdvance( TRUE ); + dateEdit->setAutoAdvance( true ); \endcode Here we've created a new ExtDateEdit object initialised with today's date and restricted the valid date range to today plus or minus 365 days. We've set the order to month, day, year. If the auto - advance property is TRUE (as we've set it here) when the user + advance property is true (as we've set it here) when the user completes a section of the date, e.g. enters two digits for the month, they are automatically taken to the next section. @@ -830,10 +828,10 @@ void ExtDateEdit::init() d->ed = new ExtDateTimeEditor( this, "date editor" ); d->controls->setEditWidget( d->ed ); setFocusProxy( d->ed ); - connect( d->controls, TQT_SIGNAL( stepUpPressed() ), TQT_SLOT( stepUp() ) ); - connect( d->controls, TQT_SIGNAL( stepDownPressed() ), TQT_SLOT( stepDown() ) ); - connect( this, TQT_SIGNAL( valueChanged(const ExtDate&) ), - TQT_SLOT( updateButtons() ) ); + connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); + connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); + connect( this, TQ_SIGNAL( valueChanged(const ExtDate&) ), + TQ_SLOT( updateButtons() ) ); d->ed->appendSection( TQNumberSection( 0,4 ) ); d->ed->appendSection( TQNumberSection( 5,7 ) ); d->ed->appendSection( TQNumberSection( 8,10 ) ); @@ -848,13 +846,13 @@ void ExtDateEdit::init() d->dayCache = 0; setOrder( localOrder() ); setFocusSection( 0 ); - d->overwrite = TRUE; - d->adv = FALSE; + d->overwrite = true; + d->adv = false; d->timerId = 0; - d->typing = FALSE; + d->typing = false; d->min = ExtDate( -50000, 1, 1 ); d->max = ExtDate( 50000, 12, 31 ); - d->changed = FALSE; + d->changed = false; setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); @@ -1133,7 +1131,7 @@ void ExtDateEdit::setOrder( ExtDateEdit::Order order ) } if ( isVisible() ) - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } @@ -1149,29 +1147,29 @@ ExtDateEdit::Order ExtDateEdit::order() const void ExtDateEdit::stepUp() { int sec = d->ed->focusSection(); - bool accepted = FALSE; + bool accepted = false; if ( sec == d->yearSection ) { if ( !outOfRange( d->y+1, d->m, d->d ) ) { - accepted = TRUE; + accepted = true; setYear( d->y+1 ); } } else if ( sec == d->monthSection ) { if ( !outOfRange( d->y, d->m+1, d->d ) ) { - accepted = TRUE; + accepted = true; setMonth( d->m+1 ); } } else if ( sec == d->daySection ) { if ( !outOfRange( d->y, d->m, d->d+1 ) ) { - accepted = TRUE; + accepted = true; setDay( d->d+1 ); } } if ( accepted ) { - d->changed = TRUE; + d->changed = true; emit valueChanged( date() ); } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } @@ -1183,29 +1181,29 @@ void ExtDateEdit::stepUp() void ExtDateEdit::stepDown() { int sec = d->ed->focusSection(); - bool accepted = FALSE; + bool accepted = false; if ( sec == d->yearSection ) { if ( !outOfRange( d->y-1, d->m, d->d ) ) { - accepted = TRUE; + accepted = true; setYear( d->y-1 ); } } else if ( sec == d->monthSection ) { if ( !outOfRange( d->y, d->m-1, d->d ) ) { - accepted = TRUE; + accepted = true; setMonth( d->m-1 ); } } else if ( sec == d->daySection ) { if ( !outOfRange( d->y, d->m, d->d-1 ) ) { - accepted = TRUE; + accepted = true; setDay( d->d-1 ); } } if ( accepted ) { - d->changed = TRUE; + d->changed = true; emit valueChanged( date() ); } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } /*! @@ -1291,8 +1289,8 @@ void ExtDateEdit::setDate( const ExtDate& date ) d->dayCache = d->d; emit valueChanged( date ); } - d->changed = FALSE; - d->ed->repaint( d->ed->rect(), FALSE ); + d->changed = false; + d->ed->repaint( d->ed->rect(), false ); } ExtDate ExtDateEdit::date() const @@ -1304,8 +1302,8 @@ ExtDate ExtDateEdit::date() const /*! \internal - Returns TRUE if \a y, \a m, \a d is out of range, otherwise returns - FALSE. + Returns true if \a y, \a m, \a d is out of range, otherwise returns + false. \sa setRange() @@ -1317,11 +1315,11 @@ bool ExtDateEdit::outOfRange( int y, int m, int d ) const ExtDate currentDate( y, m, d ); if ( currentDate > maxValue() || currentDate < minValue() ) { //## outOfRange should set overwrite? - return TRUE; + return true; } - return FALSE; + return false; } - return FALSE; /* assume ok */ + return false; /* assume ok */ } /*! \reimp @@ -1333,25 +1331,25 @@ void ExtDateEdit::addNumber( int sec, int num ) if ( sec == -1 ) return; killTimer( d->timerId ); - bool overwrite = FALSE; - bool accepted = FALSE; - d->typing = TRUE; + bool overwrite = false; + bool accepted = false; + d->typing = true; TQString txt; if ( sec == d->yearSection ) { if ( d->overwrite ) { d->y = num; - d->overwrite = FALSE; - accepted = TRUE; + d->overwrite = false; + accepted = true; } else { txt = TQString::number( 10*d->y + num ); if ( txt.length() > 5 ) txt = txt.mid(1); d->y = txt.toInt(); - accepted = TRUE; + accepted = true; } /* txt = TQString::number( d->y ); if ( d->overwrite || txt.length() == 4 ) { - accepted = TRUE; + accepted = true; d->y = num; } else { txt += TQString::number( num ); @@ -1364,23 +1362,23 @@ void ExtDateEdit::addNumber( int sec, int num ) else if ( outOfRange( val, d->m, d->d ) ) txt = TQString::number( d->y ); else { - accepted = TRUE; + accepted = true; d->y = val; } } else { - accepted = TRUE; + accepted = true; d->y = txt.toInt(); } if ( d->adv && txt.length() == 4 ) { d->ed->setFocusSection( d->ed->focusSection()+1 ); - overwrite = TRUE; + overwrite = true; } } */ } else if ( sec == d->monthSection ) { txt = TQString::number( d->m ); if ( d->overwrite || txt.length() == 2 ) { - accepted = TRUE; + accepted = true; d->m = num; } else { txt += TQString::number( num ); @@ -1390,18 +1388,18 @@ void ExtDateEdit::addNumber( int sec, int num ) if ( outOfRange( d->y, temp, d->d ) ) txt = TQString::number( d->m ); else { - accepted = TRUE; + accepted = true; d->m = temp; } if ( d->adv && txt.length() == 2 ) { d->ed->setFocusSection( d->ed->focusSection()+1 ); - overwrite = TRUE; + overwrite = true; } } } else if ( sec == d->daySection ) { txt = TQString::number( d->d ); if ( d->overwrite || txt.length() == 2 ) { - accepted = TRUE; + accepted = true; d->d = num; d->dayCache = d->d; } else { @@ -1412,23 +1410,23 @@ void ExtDateEdit::addNumber( int sec, int num ) if ( outOfRange( d->y, d->m, temp ) ) txt = TQString::number( d->d ); else { - accepted = TRUE; + accepted = true; d->d = temp; d->dayCache = d->d; } if ( d->adv && txt.length() == 2 ) { d->ed->setFocusSection( d->ed->focusSection()+1 ); - overwrite = TRUE; + overwrite = true; } } } if ( accepted ) { - d->changed = TRUE; + d->changed = true; emit valueChanged( date() ); } d->overwrite = overwrite; d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } @@ -1440,8 +1438,8 @@ bool ExtDateEdit::setFocusSection( int s ) { if ( s != d->ed->focusSection() ) { killTimer( d->timerId ); - d->overwrite = TRUE; - d->typing = FALSE; + d->overwrite = true; + d->typing = false; fix(); // will emit valueChanged if necessary } return d->ed->setFocusSection( s ); @@ -1466,13 +1464,13 @@ bool ExtDateEdit::setFocusSection( int s ) void ExtDateEdit::fix() { - bool changed = FALSE; + bool changed = false; ExtDate test = ExtDate( d->y, d->m, 1 ); if ( d->d > test.daysInMonth() ) { d->d = test.daysInMonth(); - changed = TRUE; + changed = true; } int currentYear = ExtDate::currentDate().year(); @@ -1488,11 +1486,11 @@ void ExtDateEdit::fix() if ( year >= currentYear + 30 ) year -= 100; } - changed = TRUE; + changed = true; } else if ( year < 1000 ) { int currentMillennium = currentYear / 10; year += currentMillennium * 10; - changed = TRUE; + changed = true; } */ if ( changed && outOfRange( year, d->m, d->d ) ) { @@ -1513,7 +1511,7 @@ void ExtDateEdit::fix() if ( changed ) { // emit valueChanged( date() ); -// d->changed = FALSE; +// d->changed = false; } } @@ -1525,8 +1523,8 @@ void ExtDateEdit::fix() bool ExtDateEdit::event( TQEvent *e ) { if( e->type() == TQEvent::FocusOut ) { - d->typing = FALSE; - d->overwrite = TRUE; + d->typing = false; + d->overwrite = true; // the following can't be done in fix() because fix() called // from all over the place and it will break the old behaviour if ( !ExtDate::isValid( d->y, d->m, d->d ) ) { @@ -1537,12 +1535,12 @@ bool ExtDateEdit::event( TQEvent *e ) if ( ExtDate::isValid( d->y, d->m, d->d ) ) break; } - d->changed = TRUE; + d->changed = true; } if ( d->changed ) { fix(); emit valueChanged( date() ); - d->changed = FALSE; + d->changed = false; } } else if ( e->type() == TQEvent::LocaleChange ) { readLocaleSettings(); @@ -1581,7 +1579,7 @@ void ExtDateEdit::removeFirstNumber( int sec ) d->d = txt.toInt(); d->dayCache = d->d; } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } /*! \reimp @@ -1607,7 +1605,7 @@ void ExtDateEdit::removeLastNumber( int sec ) d->d = txt.toInt(); d->dayCache = d->d; } - d->ed->repaint( d->ed->rect(), FALSE ); + d->ed->repaint( d->ed->rect(), false ); } /*! @@ -1615,9 +1613,9 @@ void ExtDateEdit::removeLastNumber( int sec ) \brief whether the editor automatically advances to the next section - If autoAdvance is TRUE, the editor will automatically advance + If autoAdvance is true, the editor will automatically advance focus to the next date section if a user has completed a section. - The default is FALSE. + The default is false. */ void ExtDateEdit::setAutoAdvance( bool advance ) @@ -1636,7 +1634,7 @@ bool ExtDateEdit::autoAdvance() const void ExtDateEdit::timerEvent( TQTimerEvent * ) { - d->overwrite = TRUE; + d->overwrite = true; } /*! @@ -1740,12 +1738,12 @@ public: // d->controls = new ExtDateTimeSpinWidget( this, qstrcmp( name(), "qt_datetime_timeedit" ) == 0 ? "qt_spin_widget" : "time edit controls" ); // d->controls->setEditWidget( d->ed ); // setFocusProxy( d->ed ); -// connect( d->controls, TQT_SIGNAL( stepUpPressed() ), TQT_SLOT( stepUp() ) ); -// connect( d->controls, TQT_SIGNAL( stepDownPressed() ), TQT_SLOT( stepDown() ) ); +// connect( d->controls, TQ_SIGNAL( stepUpPressed() ), TQ_SLOT( stepUp() ) ); +// connect( d->controls, TQ_SIGNAL( stepDownPressed() ), TQ_SLOT( stepDown() ) ); // -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 2 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 0 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 1 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 2 ) ); // d->ed->setSeparator( localTimeSep() ); // // d->h = 0; @@ -1754,15 +1752,15 @@ public: // d->display = Hours | Minutes | Seconds; // if ( lAMPM ) { // d->display |= AMPM; -// d->ed->appendSection( TQNumberSection( 0,0, FALSE, 3 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, false, 3 ) ); // } -// d->adv = FALSE; -// d->overwrite = TRUE; +// d->adv = false; +// d->overwrite = true; // d->timerId = 0; -// d->typing = FALSE; +// d->typing = false; // d->min = TQTime( 0, 0, 0 ); // d->max = TQTime( 23, 59, 59 ); -// d->changed = FALSE; +// d->changed = false; // // setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); // @@ -1842,13 +1840,13 @@ public: // d->ed->clearSections(); // d->display = display; // if ( d->display & Hours ) -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 0 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 0 ) ); // if ( d->display & Minutes ) -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 1 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 1 ) ); // if ( d->display & Seconds ) -// d->ed->appendSection( TQNumberSection( 0,0, TRUE, 2 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, true, 2 ) ); // if ( d->display & AMPM ) -// d->ed->appendSection( TQNumberSection( 0,0, FALSE, 3 ) ); +// d->ed->appendSection( TQNumberSection( 0,0, false, 3 ) ); // // d->ed->setFocusSection( 0 ); // d->ed->update(); @@ -1881,8 +1879,8 @@ public: // d->s = time.second(); // emit valueChanged( time ); // } -// d->changed = FALSE; -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->changed = false; +// d->ed->repaint( d->ed->rect(), false ); // } // // TQTime TQTimeEdit::time() const @@ -1897,9 +1895,9 @@ public: // \brief whether the editor automatically advances to the next // section // -// If autoAdvance is TRUE, the editor will automatically advance +// If autoAdvance is true, the editor will automatically advance // focus to the next time section if a user has completed a section. -// The default is FALSE. +// The default is false. // */ // // void TQTimeEdit::setAutoAdvance( bool advance ) @@ -1946,10 +1944,10 @@ public: // bool TQTimeEdit::event( TQEvent *e ) // { // if ( e->type() == TQEvent::FocusOut ) { -// d->typing = FALSE; +// d->typing = false; // if ( d->changed ) { // emit valueChanged( time() ); -// d->changed = FALSE; +// d->changed = false; // } // } else if ( e->type() == TQEvent::LocaleChange ) { // readLocaleSettings(); @@ -1964,7 +1962,7 @@ public: // // void TQTimeEdit::timerEvent( TQTimerEvent * ) // { -// d->overwrite = TRUE; +// d->overwrite = true; // } // // @@ -1975,7 +1973,7 @@ public: // void TQTimeEdit::stepUp() // { // int sec = d->ed->mapSection( d->ed->focusSection() ); -// bool accepted = TRUE; +// bool accepted = true; // switch( sec ) { // case 0: // if ( !outOfRange( d->h+1, d->m, d->s ) ) @@ -2002,17 +2000,17 @@ public: // setHour( d->h-12 ); // break; // default: -// accepted = FALSE; +// accepted = false; // #ifdef TQT_CHECK_RANGE // tqWarning( "TQTimeEdit::stepUp: Focus section out of range!" ); // #endif // break; // } // if ( accepted ) { -// d->changed = TRUE; +// d->changed = true; // emit valueChanged( time() ); // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), false ); // } // // @@ -2024,7 +2022,7 @@ public: // { // int sec = d->ed->mapSection( d->ed->focusSection() ); // -// bool accepted = TRUE; +// bool accepted = true; // switch( sec ) { // case 0: // if ( !outOfRange( d->h-1, d->m, d->s ) ) @@ -2051,17 +2049,17 @@ public: // setHour( d->h+12 ); // break; // default: -// accepted = FALSE; +// accepted = false; // #ifdef TQT_CHECK_RANGE // tqWarning( "TQTimeEdit::stepDown: Focus section out of range!" ); // #endif // break; // } // if ( accepted ) { -// d->changed = TRUE; +// d->changed = true; // emit valueChanged( time() ); // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), false ); // } // // @@ -2094,15 +2092,15 @@ public: // { // if ( sec != d->ed->focusSection() ) { // killTimer( d->timerId ); -// d->overwrite = TRUE; -// d->typing = FALSE; +// d->overwrite = true; +// d->typing = false; // TQString txt = sectionText( sec ); // txt = txt.rightJustify( 2, EXTDATETIMEEDIT_HIDDEN_CHAR ); // int offset = sec*2+sec*separator().length() + txt.length(); // d->ed->setSectionSelection( sec, offset - txt.length(), offset ); // if ( d->changed ) { // emit valueChanged( time() ); -// d->changed = FALSE; +// d->changed = false; // } // } // return d->ed->setFocusSection( sec ); @@ -2203,7 +2201,7 @@ public: // // // /*! \internal -// Returns TRUE if \a h, \a m, and \a s are out of range. +// Returns true if \a h, \a m, and \a s are out of range. // */ // // bool TQTimeEdit::outOfRange( int h, int m, int s ) const @@ -2212,11 +2210,11 @@ public: // TQTime currentTime( h, m, s ); // if ( currentTime > maxValue() || // currentTime < minValue() ) -// return TRUE; +// return true; // else -// return FALSE; +// return false; // } -// return TRUE; +// return true; // } // // /*! \reimp @@ -2229,9 +2227,9 @@ public: // return; // sec = d->ed->mapSection( sec ); // killTimer( d->timerId ); -// bool overwrite = FALSE; -// bool accepted = FALSE; -// d->typing = TRUE; +// bool overwrite = false; +// bool accepted = false; +// d->typing = true; // TQString txt; // // switch( sec ) { @@ -2245,7 +2243,7 @@ public: // if ( d->display & AMPM && d->h > 11 ) // num += 12; // if ( !outOfRange( num, d->m, d->s ) ) { -// accepted = TRUE; +// accepted = true; // d->h = num; // } // } else { @@ -2257,19 +2255,19 @@ public: // if ( d->h < 12 ) { // temp = 0; // } -// accepted = TRUE; +// accepted = true; // } else if ( outOfRange( temp + 12, d->m, d->s ) ) { // txt = TQString::number( d->h ); // } else { // if ( d->h > 11 ) { // temp += 12; // } -// accepted = TRUE; +// accepted = true; // } // } else if ( !(d->display & AMPM) && outOfRange( temp, d->m, d->s ) ) { // txt = TQString::number( d->h ); // } else { -// accepted = TRUE; +// accepted = true; // } // // if ( accepted ) @@ -2277,7 +2275,7 @@ public: // // if ( d->adv && txt.length() == 2 ) { // setFocusSection( d->ed->focusSection()+1 ); -// overwrite = TRUE; +// overwrite = true; // } // } // break; @@ -2286,7 +2284,7 @@ public: // txt = TQString::number( d->m ); // if ( d->overwrite || txt.length() == 2 ) { // if ( !outOfRange( d->h, num, d->s ) ) { -// accepted = TRUE; +// accepted = true; // d->m = num; // } // } else { @@ -2297,12 +2295,12 @@ public: // if ( outOfRange( d->h, temp, d->s ) ) // txt = TQString::number( d->m ); // else { -// accepted = TRUE; +// accepted = true; // d->m = temp; // } // if ( d->adv && txt.length() == 2 ) { // setFocusSection( d->ed->focusSection()+1 ); -// overwrite = TRUE; +// overwrite = true; // } // } // break; @@ -2311,7 +2309,7 @@ public: // txt = TQString::number( d->s ); // if ( d->overwrite || txt.length() == 2 ) { // if ( !outOfRange( d->h, d->m, num ) ) { -// accepted = TRUE; +// accepted = true; // d->s = num; // } // } else { @@ -2322,12 +2320,12 @@ public: // if ( outOfRange( d->h, d->m, temp ) ) // txt = TQString::number( d->s ); // else { -// accepted = TRUE; +// accepted = true; // d->s = temp; // } // if ( d->adv && txt.length() == 2 ) { // setFocusSection( d->ed->focusSection()+1 ); -// overwrite = TRUE; +// overwrite = true; // } // } // break; @@ -2343,7 +2341,7 @@ public: // emit valueChanged( time() ); // d->overwrite = overwrite; // d->timerId = startTimer( tqApp->doubleClickInterval()*4 ); -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), false ); // } // // @@ -2383,7 +2381,7 @@ public: // d->s = txt.toInt(); // break; // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), false ); // } // // /*! \reimp @@ -2418,7 +2416,7 @@ public: // d->s = txt.toInt(); // break; // } -// d->ed->repaint( d->ed->rect(), FALSE ); +// d->ed->repaint( d->ed->rect(), false ); // } // // /*! \reimp @@ -2609,11 +2607,11 @@ void ExtDateTimeEdit::init() d = new ExtDateTimeEditPrivate(); de = new ExtDateEdit( this, "qt_datetime_dateedit" ); te = new TQTimeEdit( this, "qt_datetime_timeedit" ); - d->adv = FALSE; - connect( de, TQT_SIGNAL( valueChanged( const ExtDate& ) ), - this, TQT_SLOT( newValue( const ExtDate& ) ) ); - connect( te, TQT_SIGNAL( valueChanged( const TQTime& ) ), - this, TQT_SLOT( newValue( const TQTime& ) ) ); + d->adv = false; + connect( de, TQ_SIGNAL( valueChanged( const ExtDate& ) ), + this, TQ_SLOT( newValue( const ExtDate& ) ) ); + connect( te, TQ_SIGNAL( valueChanged( const TQTime& ) ), + this, TQ_SLOT( newValue( const TQTime& ) ) ); setFocusProxy( de ); setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } @@ -2684,7 +2682,7 @@ void ExtDateTimeEdit::newValue( const TQTime& ) /*! Sets the auto advance property of the editor to \a advance. If set - to TRUE, the editor will automatically advance focus to the next + to true, the editor will automatically advance focus to the next date or time section if the user has completed a section. */ @@ -2695,7 +2693,7 @@ void ExtDateTimeEdit::setAutoAdvance( bool advance ) } /*! - Returns TRUE if auto-advance is enabled, otherwise returns FALSE. + Returns true if auto-advance is enabled, otherwise returns false. \sa setAutoAdvance() */ diff --git a/libtdeedu/extdate/extdatetimeedit.h b/libtdeedu/extdate/extdatetimeedit.h index 449839c8..c4feaed7 100644 --- a/libtdeedu/extdate/extdatetimeedit.h +++ b/libtdeedu/extdate/extdatetimeedit.h @@ -37,7 +37,7 @@ class TQTimeEdit; class ExtDateTimeEditBase : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ExtDateTimeEditBase( TQWidget* parent=0, const char* name=0 ) @@ -61,9 +61,9 @@ private: class ExtDateEditPrivate; -class KDE_EXPORT ExtDateEdit : public ExtDateTimeEditBase +class TDE_EXPORT ExtDateEdit : public ExtDateTimeEditBase { - Q_OBJECT + TQ_OBJECT TQ_ENUMS( Order ) TQ_PROPERTY( Order order READ order WRITE setOrder ) @@ -147,7 +147,7 @@ private: // // class TQ_EXPORT TQTimeEdit : public ExtDateTimeEditBase // { -// Q_OBJECT +// TQ_OBJECT // // TQ_SETS( Display ) // TQ_PROPERTY( TQTime time READ time WRITE setTime ) @@ -230,9 +230,9 @@ private: class ExtDateTimeEditPrivate; -class KDE_EXPORT ExtDateTimeEdit : public TQWidget +class TDE_EXPORT ExtDateTimeEdit : public TQWidget { - Q_OBJECT + TQ_OBJECT // TQ_PROPERTY( ExtDateTime dateTime READ dateTime WRITE setDateTime ) @@ -285,7 +285,7 @@ private: class TQNumberSection { public: - TQNumberSection( int selStart = 0, int selEnd = 0, bool separat = TRUE, int actual = -1 ) + TQNumberSection( int selStart = 0, int selEnd = 0, bool separat = true, int actual = -1 ) : selstart( selStart ), selend( selEnd ), act( actual ), sep( separat ) {} int selectionStart() const { return selstart; } @@ -307,7 +307,7 @@ class ExtDateTimeEditorPrivate; class ExtDateTimeEditor : public TQWidget { - Q_OBJECT + TQ_OBJECT public: ExtDateTimeEditor( ExtDateTimeEditBase * parent=0, @@ -343,7 +343,7 @@ private: class ExtDateTimeSpinWidget : public TQSpinWidget { - Q_OBJECT + TQ_OBJECT public: ExtDateTimeSpinWidget( TQWidget *parent, const char *name ) diff --git a/libtdeedu/extdate/extdatewidget.cpp b/libtdeedu/extdate/extdatewidget.cpp index 5d790bf4..87252215 100644 --- a/libtdeedu/extdate/extdatewidget.cpp +++ b/libtdeedu/extdate/extdatewidget.cpp @@ -89,9 +89,9 @@ ExtDateWidget::ExtDateWidget( const ExtDate &date, TQWidget *parent, // d->m_year = new ExtDateWidgetSpinBox(d->calendar->minValidYear(), // d->calendar->maxValidYear(), this); // -// connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); -// connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); -// connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); +// connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); +// connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged())); +// connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); // } void ExtDateWidget::init(const ExtDate& date) @@ -113,9 +113,9 @@ void ExtDateWidget::init(const ExtDate& date) d->m_year = new ExtDateWidgetSpinBox(d->calendar->minValidYear(), d->calendar->maxValidYear(), this); - connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); + connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); } ExtDateWidget::~ExtDateWidget() diff --git a/libtdeedu/extdate/extdatewidget.h b/libtdeedu/extdate/extdatewidget.h index 99c0c5fd..acc02713 100644 --- a/libtdeedu/extdate/extdatewidget.h +++ b/libtdeedu/extdate/extdatewidget.h @@ -32,9 +32,9 @@ * @short A pushbutton to display or allow user selection of a date. * @version $Id$ */ -class KDE_EXPORT ExtDateWidget : public TQWidget +class TDE_EXPORT ExtDateWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT // TQ_PROPERTY( ExtDate date READ date WRITE setDate ) diff --git a/libtdeedu/extdate/main.cpp b/libtdeedu/extdate/main.cpp index 53e8d92f..c444d655 100644 --- a/libtdeedu/extdate/main.cpp +++ b/libtdeedu/extdate/main.cpp @@ -25,6 +25,6 @@ int main( int argc, char *argv[] ) TDEApplication a; TestWidget *t = new TestWidget(0,0); t->show(); - TQObject::connect(kapp, TQT_SIGNAL(lastWindowClosed()), kapp, TQT_SLOT(quit())); + TQObject::connect(tdeApp, TQ_SIGNAL(lastWindowClosed()), tdeApp, TQ_SLOT(quit())); return a.exec(); } diff --git a/libtdeedu/extdate/test_extdate.cpp b/libtdeedu/extdate/test_extdate.cpp index d70d3e94..e787f6e4 100644 --- a/libtdeedu/extdate/test_extdate.cpp +++ b/libtdeedu/extdate/test_extdate.cpp @@ -237,8 +237,8 @@ void test5() void test6_unit(int y, int m, int d) { std::cout << d << "/" << m << "/" << y << " :: " - << ( ExtDate::isValid(y, m, d) ? "TRUE" : "FALSE" ) << " : " - << ( TQDate::isValid(y, m, d) ? "TRUE" : "FALSE" ) << std::endl; + << ( ExtDate::isValid(y, m, d) ? "true" : "false" ) << " : " + << ( TQDate::isValid(y, m, d) ? "true" : "false" ) << std::endl; } void test6() diff --git a/libtdeedu/extdate/testwidget.cpp b/libtdeedu/extdate/testwidget.cpp index a6912ef4..e78546e4 100644 --- a/libtdeedu/extdate/testwidget.cpp +++ b/libtdeedu/extdate/testwidget.cpp @@ -35,9 +35,9 @@ TestWidget::TestWidget( TQWidget *p, const char *name ) : TDEMainWindow( p, name kdp = new KDatePicker(w); edp = new ExtDatePicker(w); kdpEdit = new KLineEdit(w); - kdpEdit->setReadOnly( TRUE ); + kdpEdit->setReadOnly( true ); edpEdit = new KLineEdit(w); - edpEdit->setReadOnly( TRUE ); + edpEdit->setReadOnly( true ); kdw = new KDateWidget( TQDate::currentDate(), w ); edw = new ExtDateWidget( ExtDate::currentDate(), w ); @@ -53,8 +53,8 @@ TestWidget::TestWidget( TQWidget *p, const char *name ) : TDEMainWindow( p, name setCentralWidget(w); - connect( kdp, TQT_SIGNAL( dateChanged(TQDate) ), this, TQT_SLOT( slotKDateChanged(TQDate) ) ); - connect( edp, TQT_SIGNAL( dateChanged(const ExtDate&) ), this, TQT_SLOT( slotExtDateChanged(const ExtDate&) ) ); + connect( kdp, TQ_SIGNAL( dateChanged(TQDate) ), this, TQ_SLOT( slotKDateChanged(TQDate) ) ); + connect( edp, TQ_SIGNAL( dateChanged(const ExtDate&) ), this, TQ_SLOT( slotExtDateChanged(const ExtDate&) ) ); } void TestWidget::slotKDateChanged(TQDate d) { diff --git a/libtdeedu/extdate/testwidget.h b/libtdeedu/extdate/testwidget.h index 6b6db294..04d045f3 100644 --- a/libtdeedu/extdate/testwidget.h +++ b/libtdeedu/extdate/testwidget.h @@ -30,7 +30,7 @@ class TQDate; class ExtDate; class TestWidget : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: TestWidget(TQWidget *parent = NULL, const char *name = NULL); diff --git a/libtdeedu/tdeeducore/Makefile.am b/libtdeedu/tdeeducore/Makefile.am index 856037fd..61c56091 100644 --- a/libtdeedu/tdeeducore/Makefile.am +++ b/libtdeedu/tdeeducore/Makefile.am @@ -11,7 +11,7 @@ libtdeeducore_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 libtdeeducode_includedir = $(includedir)/libtdeedu libtdeeducode_include_HEADERS = keduvocdata.h -libtdeeducore_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) +libtdeeducore_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT) METASOURCES = AUTO diff --git a/libtdeedu/tdeeducore/keduvocdata.h b/libtdeedu/tdeeducore/keduvocdata.h index b8ac6676..5006488a 100644 --- a/libtdeedu/tdeeducore/keduvocdata.h +++ b/libtdeedu/tdeeducore/keduvocdata.h @@ -21,9 +21,9 @@ #include <tqdom.h> #include <tqvaluelist.h> -#include <kdemacros.h> +#include <tdemacros.h> -class KDE_EXPORT KEduVocDataItem +class TDE_EXPORT KEduVocDataItem { public: KEduVocDataItem(); @@ -42,7 +42,7 @@ private: typedef TQValueList<KEduVocDataItem> KEduVocDataItemList; -class KDE_EXPORT KEduVocData +class TDE_EXPORT KEduVocData { public: static KEduVocDataItemList parse(const TQString &fileName); diff --git a/libtdeedu/tdeeducore/tdeeducore.kdevprj b/libtdeedu/tdeeducore/tdeeducore.kdevprj deleted file mode 100644 index 5cd1dc62..00000000 --- a/libtdeedu/tdeeducore/tdeeducore.kdevprj +++ /dev/null @@ -1,84 +0,0 @@ -[./Makefile.am] -files=./tdeeducore.kdevprj, -sub_dirs= -type=normal - -[./tdeeducore.kdevprj] -dist=true -install=false -install_location= -type=DATA - -[Config for BinMakefileAm] -addcxxflags= -bin_program=tdeeducore -cflags= -cppflags= -cxxflags=\s-O0 -ldadd= -ldflags=\s -libtool_dir= -path_to_bin_program=. - -[General] -author=earnold -configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux\s -dir_where_make_will_be_called= -email=earnold@venus -kdevprj_version=1.3 -lfv_open_groups= -make_options=\s-j1 all\s -makefiles=./Makefile.am,Makefile.am,tests/Makefile.am -modifyMakefiles=false -project_name=tdeeducore -project_type=normal_empty -short_info= -sub_dir= -version=1.0 -version_control=CVS -workspace=1 - -[LFV Groups] -GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS, -Headers=*.h,*.hxx,*.hpp,*.H, -Others=*, -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l, -Translations=*.ts,*.po, -User Interface=*.ui,*.kdevdlg,*.rc, -groups=Headers,Sources,GNU,Translations,User Interface,Others - -[Makefile.am] -dist=true -files=Makefile.am,kedudata.cpp,kedudata.h -install=false -install_location= -sub_dirs=tests -type=static_library - -[kedudata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kedudata.h] -dist=true -install=false -install_location= -type=HEADER - -[tests/Makefile.am] -dist=true -files=tests/loader.cpp,tests/Makefile.am -install=false -install_location= -sharedlib_LDFLAGS=-version-info 0:0:0 -sharedlib_rootname=tests -sub_dirs= -type=DATA - -[tests/loader.cpp] -dist=true -install=false -install_location= -type=SOURCE diff --git a/libtdeedu/tdeeduplot/Makefile.am b/libtdeedu/tdeeduplot/Makefile.am index 21b84f2a..00d8f278 100644 --- a/libtdeedu/tdeeduplot/Makefile.am +++ b/libtdeedu/tdeeduplot/Makefile.am @@ -9,7 +9,7 @@ libtdeeduplotinclude_HEADERS = kplotobject.h kplotaxis.h kplotwidget.h libtdeeduplot_la_SOURCES = kplotobject.cpp kplotaxis.cpp kplotwidget.cpp libtdeeduplot_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2 -libtdeeduplot_la_LIBADD = $(LIB_TDECORE) $(LIB_QT) +libtdeeduplot_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT) METASOURCES = AUTO diff --git a/libtdeedu/tdeeduplot/README b/libtdeedu/tdeeduplot/README index ab695f9a..e9a52c23 100644 --- a/libtdeedu/tdeeduplot/README +++ b/libtdeedu/tdeeduplot/README @@ -1,6 +1,6 @@ This library provides KPlotWidget and KPlotObject classes. -KPlotWidget is a QWidget-derived class that provides a virtual baseclass +KPlotWidget is a TQWidget-derived class that provides a virtual baseclass for easy data-plotting. The idea behind KPlotWidget is that you only have to specify information in "data units"; i.e., the natural units of the data being plotted. KPlotWidget automatically converts everything diff --git a/libtdeedu/tdeeduplot/kplotaxis.h b/libtdeedu/tdeeduplot/kplotaxis.h index 3209b18c..901bc4a3 100644 --- a/libtdeedu/tdeeduplot/kplotaxis.h +++ b/libtdeedu/tdeeduplot/kplotaxis.h @@ -20,14 +20,14 @@ #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> /**class KPlotAxis *@short Contains all data for drawing an axis including format specification axis labels. *@author Andreas Nicolai *@version 1.0 */ -class KDE_EXPORT KPlotAxis { +class TDE_EXPORT KPlotAxis { public: /**@short Default constructor, creates a default axis. */ diff --git a/libtdeedu/tdeeduplot/kplotobject.h b/libtdeedu/tdeeduplot/kplotobject.h index f1074cb6..70fe608f 100644 --- a/libtdeedu/tdeeduplot/kplotobject.h +++ b/libtdeedu/tdeeduplot/kplotobject.h @@ -22,14 +22,14 @@ class TQString; class TQPainter; -#include <kdemacros.h> +#include <tdemacros.h> /**class DRect *@short equivalent of TQRect with double x,y coordinates *@author Jason Harris *@version 1.0 */ -class KDE_EXPORT DRect { +class TDE_EXPORT DRect { public: DRect() { DRect( 0.0, 0.0, 1.0, 1.0 ); } DRect( double x, double y, double w, double h ) { X = x; Y = y; W = w; H = h; } @@ -56,7 +56,7 @@ private: *@author Jason Harris *@version 1.0 */ -class KDE_EXPORT DPoint { +class TDE_EXPORT DPoint { public: DPoint() { DPoint( 0.0, 0.0 ); } DPoint( double x, double y ) { setX( x ); setY( y ); } @@ -87,7 +87,7 @@ private: *about the object's appearance, depending on its type. There is a draw function *for plotting the object on a KPlotWidget's TQPainter. */ -class KDE_EXPORT KPlotObject{ +class TDE_EXPORT KPlotObject{ public: /**@enum PTYPE *The Type classification of the KPlotObject diff --git a/libtdeedu/tdeeduplot/kplotwidget.h b/libtdeedu/tdeeduplot/kplotwidget.h index fd3504df..98566edd 100644 --- a/libtdeedu/tdeeduplot/kplotwidget.h +++ b/libtdeedu/tdeeduplot/kplotwidget.h @@ -38,8 +38,8 @@ class TQPixmap; *tickmarks and labels and a list of KPlotObjects to be drawn. */ -class KDE_EXPORT KPlotWidget : public TQWidget { - Q_OBJECT +class TDE_EXPORT KPlotWidget : public TQWidget { + TQ_OBJECT public: /**@short Constructor. Sets the primary x and y limits in data units. diff --git a/libtdeedu/tdeeduui/Makefile.am b/libtdeedu/tdeeduui/Makefile.am index 0cc29e05..3b19aeea 100644 --- a/libtdeedu/tdeeduui/Makefile.am +++ b/libtdeedu/tdeeduui/Makefile.am @@ -10,7 +10,7 @@ libtdeeduuiincludedir = $(includedir)/libtdeedu libtdeeduuiinclude_HEADERS = tdeeduglossary.h libtdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0 -libtdeeduui_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_QT) +libtdeeduui_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TQT) METASOURCES = AUTO diff --git a/libtdeedu/tdeeduui/kedusimpleentrydlg.h b/libtdeedu/tdeeduui/kedusimpleentrydlg.h index ae560f76..72d0f512 100644 --- a/libtdeedu/tdeeduui/kedusimpleentrydlg.h +++ b/libtdeedu/tdeeduui/kedusimpleentrydlg.h @@ -6,7 +6,7 @@ class KEduSimpleEntryDlg : public KEduSimpleEntryDlgForm { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdeedu/tdeeduui/tdeeduglossary.cpp b/libtdeedu/tdeeduui/tdeeduglossary.cpp index 50443f2f..9ae67588 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.cpp +++ b/libtdeedu/tdeeduui/tdeeduglossary.cpp @@ -17,7 +17,7 @@ #include <tdeglobal.h> #include <tdelistview.h> #include <tdelistviewsearchline.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeactioncollection.h> #include <tqfile.h> @@ -203,9 +203,9 @@ GlossaryDialog::GlossaryDialog( bool folded, TQWidget *parent, const char *name) m_htmlpart = new TDEHTMLPart( vs, "html-part" ); - connect( m_htmlpart->browserExtension(), TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), this, TQT_SLOT( displayItem( const KURL &, const KParts::URLArgs & ) ) ); - connect( m_glosstree, TQT_SIGNAL(clicked( TQListViewItem * )), this, TQT_SLOT(slotClicked( TQListViewItem * ))); - connect( clear, TQT_SIGNAL(clicked()), m_search, TQT_SLOT(clear())); + connect( m_htmlpart->browserExtension(), TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), this, TQ_SLOT( displayItem( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_glosstree, TQ_SIGNAL(clicked( TQListViewItem * )), this, TQ_SLOT(slotClicked( TQListViewItem * ))); + connect( clear, TQ_SIGNAL(clicked()), m_search, TQ_SLOT(clear())); resize( 600, 400 ); } diff --git a/libtdeedu/tdeeduui/tdeeduglossary.h b/libtdeedu/tdeeduui/tdeeduglossary.h index dcb510d4..cef411b5 100644 --- a/libtdeedu/tdeeduui/tdeeduglossary.h +++ b/libtdeedu/tdeeduui/tdeeduglossary.h @@ -34,7 +34,7 @@ class GlossaryItem; * This class stores all items to be displayed. It also * has access-methods to the items */ -class KDE_EXPORT Glossary +class TDE_EXPORT Glossary { public: Glossary(); @@ -176,7 +176,7 @@ class KDE_EXPORT Glossary * a number of pictures or references associated to it. * These are stored as TQStringLists. */ -class KDE_EXPORT GlossaryItem +class TDE_EXPORT GlossaryItem { public: GlossaryItem(){} @@ -237,9 +237,9 @@ class KDE_EXPORT GlossaryItem * @author Pino Toscano * @author Carsten Niehaus */ -class KDE_EXPORT GlossaryDialog : public KDialogBase +class TDE_EXPORT GlossaryDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/libtdeedu/tdeeduui/tdeeduui.kdevprj b/libtdeedu/tdeeduui/tdeeduui.kdevprj deleted file mode 100644 index 1fa59784..00000000 --- a/libtdeedu/tdeeduui/tdeeduui.kdevprj +++ /dev/null @@ -1,92 +0,0 @@ -[./Makefile.am] -files=./tdeeduui.kdevprj, -sub_dirs= -type=normal - -[./tdeeduui.kdevprj] -dist=true -install=false -install_location= -type=DATA - -[Config for BinMakefileAm] -addcxxflags= -bin_program=tdeeduui -cflags= -cppflags= -cxxflags=\s-O0 -ldadd= -ldflags=\s \s -libtool_dir= -path_to_bin_program=. - -[General] -author=earnold -configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux\s -dir_where_make_will_be_called=\s -email=earnold@venus -kdevprj_version=1.3 -lfv_open_groups=Others -make_options=\s-j1 all\s -makefiles=./Makefile.am,Makefile.am,tests/Makefile.am -modifyMakefiles=false -project_name=tdeeduui -project_type=normal_empty -short_info= -sub_dir= -version=1.0 -version_control=CVS -workspace=1 - -[LFV Groups] -GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS, -Headers=*.h,*.hxx,*.hpp,*.H, -Others=*, -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l, -Translations=*.ts,*.po, -User Interface=*.ui,*.kdevdlg,*.rc, -groups=Headers,Sources,GNU,Translations,User Interface,Others - -[Makefile.am] -dist=true -files=Makefile.am,kedusimpleentrydlg.h,kedusimpleentrydlgForm.ui,kedusimpleentrydlg.cpp -install=false -install_location= -sharedlib_LDFLAGS=-version-info 0:0:0 -sharedlib_rootname=. -sub_dirs=tests -type=static_library - -[kedusimpleentrydlg.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[kedusimpleentrydlg.h] -dist=true -install=false -install_location= -type=HEADER - -[kedusimpleentrydlgForm.ui] -dist=true -install=false -install_location= -type=SOURCE - -[tests/Makefile.am] -dist=true -files=tests/entrydialogs.cpp,tests/Makefile.am -install=false -install_location= -sharedlib_LDFLAGS=-version-info 0:0:0 -sharedlib_rootname=tests -sub_dirs= -type=DATA - -[tests/entrydialogs.cpp] -dist=true -install=false -install_location= -type=SOURCE diff --git a/release_app.rb b/release_app.rb deleted file mode 100755 index 6d9315c3..00000000 --- a/release_app.rb +++ /dev/null @@ -1,238 +0,0 @@ -#!/usr/bin/env ruby -# -# Ruby script for generating tarball releases from SVN -# -# (c) 2005 Mark Kretschmann <markey@web.de> -# modified by Carsten Niehaus -# Some parts of this code taken from cvs2dist -# License: GPL V2 - -require 'getoptlong' - -opts = GetoptLong.new( - [ "--noi18n", "-i", GetoptLong::NO_ARGUMENT ], - [ "--nogpg", "-g", GetoptLong::NO_ARGUMENT ], - [ "--libtdeedu", "-l", GetoptLong::NO_ARGUMENT ], - [ "--widgets", "-w", GetoptLong::NO_ARGUMENT ], - [ "--appname", "-a", GetoptLong::REQUIRED_ARGUMENT ], - [ "--help", "-h", GetoptLong::NO_ARGUMENT ] -) - -doi18n = "yes" -dogpg = "yes" -packlibtdeedu = "no" -packwidgets = "no" -name = "" - -#check if there are arguments -opts.each do |opt, arg| - if opt == "--noi18n" - doi18n = "no" - elsif opt == "--nogpg" - dogpg = "no" - elsif opt == "--libtdeedu" - packlibtdeedu = "yes" - elsif opt == "--widgets" - packwidgets = "yes" - elsif opt == "--appname" - name = arg - elsif opt == "--help" - puts "Usage:\n - Optional:\n - --noi18n to disable the packaging of translations and documentation\n - --nogpg to disable signing with GnuPG\n - --libtdeedu to enable packing libtdeedu\n - --widgets to enable packing the KDEEDU-Widgets" - exit() - end -end - -if name.empty? - name = `kdialog --combobox "Select an application:" Kalzium KBruch KHangMan Kig Kiten KPercentage KMessedWords KmPlot KStars KTouch KTurtle KVerbos KVoctrain KWordQuiz`.chomp!.downcase -end - -if name.empty? - exit() -end - -version = `kdialog --title "Version number" --inputbox "Enter the version number"`.chomp! -if version.empty? - version = "preview" -end - -puts "Start packing #{name}".center(40, " - ") - -folder = "#{name}-#{version}" - -# Some helper methods -def svn( command, dir ) - `svn #{command} svn://anonsvn.kde.org/home/kde/#{dir}` -end - -# Prevent using unsermake -oldmake = ENV["UNSERMAKE"] -ENV["UNSERMAKE"] = "no" - -# Remove old folder, if exists -`rm -rf #{folder} 2> /dev/null` -`rm -rf folder.tar.bz2 2> /dev/null` - -Dir.mkdir( folder ) -Dir.chdir( folder ) - -if packlibtdeedu == "yes" - svn( "co -N", "/trunk/KDE/tdeedu/" ) - Dir.chdir( "tdeedu") - puts "Checking out libtdeedu".center(40, " - ") - `svn up libtdeedu` -end -if packwidgets == "yes" - svn( "co -N", "/trunk/playground/edu/" ) - Dir.chdir( "playground/edu") - puts "Checking out the tdeedu-widgets".center(40, " - ") - svn( "co", "/trunk/playground/edu/widgets/") -end - -puts "Checking out #{name}".center(40," - ") -`svn up #{name}` - -puts "Checking out kde-commons/admin".center(40, " - ") -svn( "co", "/trunk/KDE/kde-common/admin") - -# we check out kde-l10n... -if doi18n == "yes" - puts "\n" - puts "l10n".center(40, " - ") - puts "\n" - - Dir.mkdir( "doc" ) - - i18nlangs = `svn cat https://svn.kde.org/home/kde/trunk/l10n/subdirs` - Dir.mkdir( "l10n" ) - Dir.chdir( "l10n" ) - - # docs - for lang in i18nlangs - lang.chomp! - `rm -rf ../doc/#{lang}` - `rm -rf #{name}` - docdirname = "l10n/#{lang}/docs/tdeedu/#{name}" - `svn co -q https://svn.kde.org/home/kde/trunk/#{docdirname} > /dev/null 2>&1` - next unless FileTest.exists?( "#{name}" ) - `cp -R #{name}/ ../doc/#{lang}` - - # we don't want KDE_DOCS = AUTO, cause that makes the - # build system assume that the name of the app is the - # same as the name of the dir the Makefile.am is in. - # Instead, we explicitly pass the name.. - makefile = File.new( "../doc/#{lang}/Makefile.am", File::CREAT | File::RDWR | File::TRUNC ) - makefile << "KDE_LANG = #{lang}\n" - makefile << "KDE_DOCS = #{name}\n" - makefile.close() - - puts( "#{lang} done.\n" ) - end - - #now create the Makefile.am so that the docs will be build - makefile = File.new( "../doc/Makefile.am", File::CREAT | File::RDWR | File::TRUNC ) - makefile << "KDE_LANG = en\n" - makefile << "KDE_DOCS = AUTO\n" - makefile << "SUBDIRS = $(AUTODIRS)\n" - makefile.close() - - Dir.chdir( ".." ) # multimedia - puts "\n" - - $subdirs = false - Dir.mkdir( "po" ) - - for lang in i18nlangs - lang.chomp! - pofilename = "l10n/#{lang}/messages/tdeedu/#{name}.po" - `svn cat https://svn.kde.org/home/kde/trunk/#{pofilename} 2> /dev/null | tee l10n/#{name}.po` - next if FileTest.size( "l10n/#{name}.po" ) == 0 - - dest = "po/#{lang}" - Dir.mkdir( dest ) - print "Copying #{lang}'s #{name}.po over .. " - `mv l10n/#{name}.po #{dest}` - puts( "done.\n" ) - - makefile = File.new( "#{dest}/Makefile.am", File::CREAT | File::RDWR | File::TRUNC ) - makefile << "KDE_LANG = #{lang}\n" - makefile << "SUBDIRS = $(AUTODIRS)\n" - makefile << "POFILES = AUTO\n" - makefile.close() - - $subdirs = true - end - - if $subdirs - makefile = File.new( "po/Makefile.am", File::CREAT | File::RDWR | File::TRUNC ) - makefile << "SUBDIRS = $(AUTODIRS)\n" - makefile.close() - else - puts "Removing po-subdirectory" - `rm -Rf po` - end - - `rm -rf l10n` -end - -puts "\n" - -puts "Removing svn-history files" -`find -name ".svn" | xargs rm -rf` - -Dir.chdir( "#{name}" ) - -`rm -rf debian` - -Dir.chdir( ".." ) # tdeedu -puts( "\n" ) - -`find | xargs touch` - - -puts "Generating Makefiles".center(40, " - ") -`make -f Makefile.cvs` -puts "done.\n" - -`rm -rf autom4te.cache` -`rm stamp-h.in` - - -puts "Compressing".center(40, " - ") -`mv * ..` -Dir.chdir( ".." ) -`rm -rf kde-common` -`rm -rf tdeedu` # after the moving of the directory this is empty -Dir.chdir( ".." ) # root folder -`tar -cf #{folder}.tar #{folder}` -`bzip2 #{folder}.tar` -`rm -rf #{folder}` -puts "done.\n" - - -ENV["UNSERMAKE"] = oldmake - -if dogpg == "yes" - puts "Signing with your GnuPG-key".center(40, " - ") - `gpg --detach-sign #{folder}.tar.bz2` -end - - -puts "\n" -puts "=====================================================" -puts "Congratulations :) #{name} #{version} tarball generated.\n" -puts "\n" -puts "MD5 checksum: " + `md5sum #{folder}.tar.bz2` -if dogpg == "yes" - puts "The user can verify this package with " - puts "\n" - puts "gpg --verify #{folder}.tar.bz2.sig #{folder}.tar.bz2" -end -puts "\n" -puts "\n" - - diff --git a/translations/desktop_files/applnk-directories/es_AR.po b/translations/desktop_files/applnk-directories/es_AR.po new file mode 100644 index 00000000..3fa36c4f --- /dev/null +++ b/translations/desktop_files/applnk-directories/es_AR.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 02:58+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: languages.desktop:3 +msgid "Languages" +msgstr "" + +#. Name +#: mathematics.desktop:3 +msgid "Mathematics" +msgstr "" + +#. Name +#: miscellaneous.desktop:3 +msgid "Miscellaneous" +msgstr "" + +#. Name +#: science.desktop:3 +msgid "Science" +msgstr "" + +#. Name +#: tools.desktop:3 +msgid "Teaching Tools" +msgstr "" diff --git a/translations/desktop_files/blinken.desktop/es_AR.po b/translations/desktop_files/blinken.desktop/es_AR.po new file mode 100644 index 00000000..0baebffb --- /dev/null +++ b/translations/desktop_files/blinken.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 03:08+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: blinken.desktop:2 +msgid "Blinken" +msgstr "" + +#. GenericName +#: blinken.desktop:4 +msgid "Simon Says Game" +msgstr "" + +#. Comment +#: blinken.desktop:8 +msgid "A retro memory enhancement game" +msgstr "" diff --git a/translations/desktop_files/blinken.desktop/ka.po b/translations/desktop_files/blinken.desktop/ka.po index e24b815e..87896011 100644 --- a/translations/desktop_files/blinken.desktop/ka.po +++ b/translations/desktop_files/blinken.desktop/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 03:08+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/blinken-blinkendesktop/ka/>\n" "Language: ka\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.17\n" #. Name #: blinken.desktop:2 msgid "Blinken" -msgstr "" +msgstr "Blinken" #. GenericName #: blinken.desktop:4 diff --git a/translations/desktop_files/blinken.desktop/ru.po b/translations/desktop_files/blinken.desktop/ru.po index 9e0b0a63..72d0ee19 100644 --- a/translations/desktop_files/blinken.desktop/ru.po +++ b/translations/desktop_files/blinken.desktop/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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 03:08+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/blinken-blinkendesktop/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 #: blinken.desktop:2 msgid "Blinken" -msgstr "" +msgstr "Blinken" #. GenericName #: blinken.desktop:4 diff --git a/translations/desktop_files/blinken.desktop/zh_CN.po b/translations/desktop_files/blinken.desktop/zh_CN.po index ed3b0b62..e8c30e2d 100644 --- a/translations/desktop_files/blinken.desktop/zh_CN.po +++ b/translations/desktop_files/blinken.desktop/zh_CN.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Toad114514 <xiaolan2332021@163.com>, 2025. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 03:08+0200\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: 2025-09-13 13:15+0000\n" +"Last-Translator: Toad114514 <xiaolan2332021@163.com>\n" +"Language-Team: Chinese (Simplified Han script) <https://mirror.git." +"trinitydesktop.org/weblate/projects/tdeedu/blinken-blinkendesktop/zh_Hans/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Weblate 4.18.2\n" #. Name #: blinken.desktop:2 msgid "Blinken" -msgstr "" +msgstr "BlinKen" #. GenericName #: blinken.desktop:4 @@ -29,4 +30,4 @@ msgstr "我说你做游戏" #. Comment #: blinken.desktop:8 msgid "A retro memory enhancement game" -msgstr "一个记忆强化游戏" +msgstr "锻炼记忆力这一块" diff --git a/translations/desktop_files/kalzium.desktop/es_AR.po b/translations/desktop_files/kalzium.desktop/es_AR.po new file mode 100644 index 00000000..a38f88eb --- /dev/null +++ b/translations/desktop_files/kalzium.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 03:12+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: kalzium.desktop:6 +msgid "TDE Periodic Table of Elements" +msgstr "" + +#. Name +#: kalzium.desktop:8 +msgid "Kalzium" +msgstr "" + +#. GenericName +#: kalzium.desktop:9 +msgid "Periodic Table of Elements" +msgstr "" diff --git a/translations/desktop_files/kalzium.desktop/ka.po b/translations/desktop_files/kalzium.desktop/ka.po index 923f9ad9..bab3b525 100644 --- a/translations/desktop_files/kalzium.desktop/ka.po +++ b/translations/desktop_files/kalzium.desktop/ka.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 03:12+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kalzium-kalziumdesktop/ka/>\n" "Language: ka\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.17\n" #. Comment #: kalzium.desktop:6 @@ -24,7 +25,7 @@ msgstr "ელემენტების პერიოდული ცხრ #. Name #: kalzium.desktop:8 msgid "Kalzium" -msgstr "" +msgstr "Kalzium" #. GenericName #: kalzium.desktop:9 diff --git a/translations/desktop_files/kalzium.desktop/ru.po b/translations/desktop_files/kalzium.desktop/ru.po index 71310d29..3690975f 100644 --- a/translations/desktop_files/kalzium.desktop/ru.po +++ b/translations/desktop_files/kalzium.desktop/ru.po @@ -1,20 +1,22 @@ # 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: 2020-05-26 03:12+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kalzium-kalziumdesktop/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" #. Comment #: kalzium.desktop:6 @@ -24,7 +26,7 @@ msgstr "Периодическая система Менделеева" #. Name #: kalzium.desktop:8 msgid "Kalzium" -msgstr "" +msgstr "Kalzium" #. GenericName #: kalzium.desktop:9 diff --git a/translations/desktop_files/kanagram.desktop/es_AR.po b/translations/desktop_files/kanagram.desktop/es_AR.po new file mode 100644 index 00000000..5e8dbdb5 --- /dev/null +++ b/translations/desktop_files/kanagram.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 03:18+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kanagram.desktop:2 +msgid "Kanagram" +msgstr "" + +#. Comment +#: kanagram.desktop:7 +msgid "TDE Letter Order Game" +msgstr "" + +#. GenericName +#: kanagram.desktop:8 +msgid "Letter Order Game" +msgstr "" diff --git a/translations/desktop_files/kanagram.desktop/ka.po b/translations/desktop_files/kanagram.desktop/ka.po index a7564baf..cb31a72d 100644 --- a/translations/desktop_files/kanagram.desktop/ka.po +++ b/translations/desktop_files/kanagram.desktop/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 03:18+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kanagram-kanagramdesktop/ka/>\n" "Language: ka\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.17\n" #. Name #: kanagram.desktop:2 msgid "Kanagram" -msgstr "" +msgstr "Kanagram" #. Comment #: kanagram.desktop:7 diff --git a/translations/desktop_files/kanagram.desktop/ru.po b/translations/desktop_files/kanagram.desktop/ru.po index b81ddb1f..5e81f9ea 100644 --- a/translations/desktop_files/kanagram.desktop/ru.po +++ b/translations/desktop_files/kanagram.desktop/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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 03:18+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kanagram-kanagramdesktop/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 #: kanagram.desktop:2 msgid "Kanagram" -msgstr "" +msgstr "Kanagram" #. Comment #: kanagram.desktop:7 diff --git a/translations/desktop_files/kbruch.desktop/es_AR.po b/translations/desktop_files/kbruch.desktop/es_AR.po new file mode 100644 index 00000000..94c53f9f --- /dev/null +++ b/translations/desktop_files/kbruch.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 03:20+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kbruch.desktop:6 +msgid "KBruch" +msgstr "" + +#. GenericName +#: kbruch.desktop:7 +msgid "Exercise Fractions" +msgstr "" + +#. Comment +#: kbruch.desktop:8 +msgid "Practice exercises with fractions" +msgstr "" diff --git a/translations/desktop_files/kbruch.desktop/ka.po b/translations/desktop_files/kbruch.desktop/ka.po index dfd994ba..89743cce 100644 --- a/translations/desktop_files/kbruch.desktop/ka.po +++ b/translations/desktop_files/kbruch.desktop/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 03:20+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kbruch-kbruchdesktop/ka/>\n" "Language: ka\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.17\n" #. Name #: kbruch.desktop:6 msgid "KBruch" -msgstr "" +msgstr "KBruch" #. GenericName #: kbruch.desktop:7 diff --git a/translations/desktop_files/kbruch.desktop/ru.po b/translations/desktop_files/kbruch.desktop/ru.po index 1497a009..6ffd3e12 100644 --- a/translations/desktop_files/kbruch.desktop/ru.po +++ b/translations/desktop_files/kbruch.desktop/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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 03:20+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kbruch-kbruchdesktop/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 #: kbruch.desktop:6 msgid "KBruch" -msgstr "" +msgstr "KBruch" #. GenericName #: kbruch.desktop:7 diff --git a/translations/desktop_files/keduca-desktops/es_AR.po b/translations/desktop_files/keduca-desktops/es_AR.po new file mode 100644 index 00000000..977d0797 --- /dev/null +++ b/translations/desktop_files/keduca-desktops/es_AR.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 17:43+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: keduca/keduca_part.desktop:3 resources/keduca.desktop:2 +msgid "KEduca" +msgstr "" + +#. GenericName +#: resources/keduca.desktop:3 +msgid "Tests & Exams" +msgstr "" + +#. Comment +#: resources/keduca.desktop:4 +msgid "TDE Tests & Exams Program" +msgstr "" + +#. Name +#: resources/keducabuilder.desktop:2 +msgid "KEduca-Editor" +msgstr "" + +#. GenericName +#: resources/keducabuilder.desktop:3 +msgid "Tests & Exams Editor" +msgstr "" diff --git a/translations/desktop_files/keduca-desktops/ka.po b/translations/desktop_files/keduca-desktops/ka.po index e0315d25..ad04d7df 100644 --- a/translations/desktop_files/keduca-desktops/ka.po +++ b/translations/desktop_files/keduca-desktops/ka.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 17:43+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/keduca-desktop-files/ka/>\n" "Language: ka\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.17\n" #. Name #: keduca/keduca_part.desktop:3 resources/keduca.desktop:2 -#, fuzzy msgid "KEduca" -msgstr "KEduca რედაქტორი" +msgstr "KEduca" #. GenericName #: resources/keduca.desktop:3 diff --git a/translations/desktop_files/keduca-desktops/ru.po b/translations/desktop_files/keduca-desktops/ru.po index e8f63e80..b3ceedd5 100644 --- a/translations/desktop_files/keduca-desktops/ru.po +++ b/translations/desktop_files/keduca-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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 17:43+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/keduca-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 #: keduca/keduca_part.desktop:3 resources/keduca.desktop:2 msgid "KEduca" -msgstr "" +msgstr "KEduca" #. GenericName #: resources/keduca.desktop:3 @@ -34,7 +36,7 @@ msgstr "Простая программа для проведения тесто #. Name #: resources/keducabuilder.desktop:2 msgid "KEduca-Editor" -msgstr "" +msgstr "Редактор KEduca" #. GenericName #: resources/keducabuilder.desktop:3 diff --git a/translations/desktop_files/keduca-mimetypes/es_AR.po b/translations/desktop_files/keduca-mimetypes/es_AR.po new file mode 100644 index 00000000..3a2b88d3 --- /dev/null +++ b/translations/desktop_files/keduca-mimetypes/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 17:43+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: resources/x-edu.desktop:2 +msgid "Edu Document" +msgstr "" + +#. Comment +#: resources/x-edugallery.desktop:2 +msgid "Edu Gallery Document" +msgstr "" diff --git a/translations/desktop_files/kgeography.desktop/es_AR.po b/translations/desktop_files/kgeography.desktop/es_AR.po new file mode 100644 index 00000000..969f4bfe --- /dev/null +++ b/translations/desktop_files/kgeography.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 17:55+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kgeography.desktop:2 +msgid "KGeography" +msgstr "" + +#. GenericName +#: kgeography.desktop:3 +msgid "Geography Trainer" +msgstr "" + +#. Comment +#: kgeography.desktop:4 +msgid "A Geography Learning Program" +msgstr "" diff --git a/translations/desktop_files/kgeography.desktop/ka.po b/translations/desktop_files/kgeography.desktop/ka.po index 7be1d982..d03a0fe0 100644 --- a/translations/desktop_files/kgeography.desktop/ka.po +++ b/translations/desktop_files/kgeography.desktop/ka.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 17:55+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kgeography-kgeographydesktop/ka/>\n" "Language: ka\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.17\n" #. Name #: kgeography.desktop:2 -#, fuzzy msgid "KGeography" -msgstr "გეოგრაფიის სავარჯიშოები" +msgstr "KGeography" #. GenericName #: kgeography.desktop:3 diff --git a/translations/desktop_files/kgeography.desktop/ru.po b/translations/desktop_files/kgeography.desktop/ru.po index 25a938e9..786cf8b2 100644 --- a/translations/desktop_files/kgeography.desktop/ru.po +++ b/translations/desktop_files/kgeography.desktop/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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 17:55+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kgeography-kgeographydesktop/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 #: kgeography.desktop:2 -#, fuzzy msgid "KGeography" -msgstr "Тренировка знаний по географии" +msgstr "KGeography" #. GenericName #: kgeography.desktop:3 diff --git a/translations/desktop_files/khangman.desktop/es_AR.po b/translations/desktop_files/khangman.desktop/es_AR.po new file mode 100644 index 00000000..219fce4e --- /dev/null +++ b/translations/desktop_files/khangman.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 18:02+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: khangman.desktop:6 +msgid "KHangMan" +msgstr "" + +#. GenericName +#: khangman.desktop:7 +msgid "Hangman Game" +msgstr "" + +#. Comment +#: khangman.desktop:8 +msgid "TDE Hangman Game" +msgstr "" diff --git a/translations/desktop_files/khangman.desktop/ka.po b/translations/desktop_files/khangman.desktop/ka.po index fd0268fc..ee8025c7 100644 --- a/translations/desktop_files/khangman.desktop/ka.po +++ b/translations/desktop_files/khangman.desktop/ka.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 18:02+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/khangman-khangmandesktop/ka/>\n" "Language: ka\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.17\n" #. Name #: khangman.desktop:6 -#, fuzzy msgid "KHangMan" -msgstr "თამაში \"ჩამოხრჩობანა\"" +msgstr "KHangMan" #. GenericName #: khangman.desktop:7 diff --git a/translations/desktop_files/khangman.desktop/ru.po b/translations/desktop_files/khangman.desktop/ru.po index 5d9b7bf6..7b0607de 100644 --- a/translations/desktop_files/khangman.desktop/ru.po +++ b/translations/desktop_files/khangman.desktop/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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 18:02+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/khangman-khangmandesktop/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 #: khangman.desktop:6 -#, fuzzy msgid "KHangMan" -msgstr "Игра «Виселица»" +msgstr "KHangMan" #. GenericName #: khangman.desktop:7 diff --git a/translations/desktop_files/kig-desktops/es_AR.po b/translations/desktop_files/kig-desktops/es_AR.po new file mode 100644 index 00000000..fb11ccf9 --- /dev/null +++ b/translations/desktop_files/kig-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 18:07+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kig/kig.desktop:2 +msgid "Kig" +msgstr "" + +#. GenericName +#: kig/kig.desktop:3 +msgid "Interactive Geometry" +msgstr "" + +#. Comment +#: kig/kig.desktop:4 +msgid "Explore Geometric Constructions" +msgstr "" + +#. Name +#: kig/kig_part.desktop:2 +msgid "KigPart" +msgstr "" diff --git a/translations/desktop_files/kig-desktops/ka.po b/translations/desktop_files/kig-desktops/ka.po index d5149100..42b0c271 100644 --- a/translations/desktop_files/kig-desktops/ka.po +++ b/translations/desktop_files/kig-desktops/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 18:07+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kig-desktop-files/ka/>\n" "Language: ka\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.17\n" #. Name #: kig/kig.desktop:2 msgid "Kig" -msgstr "" +msgstr "Kig" #. GenericName #: kig/kig.desktop:3 @@ -34,4 +35,4 @@ msgstr "გეომეტრიულ ფიგურათა შესწა #. Name #: kig/kig_part.desktop:2 msgid "KigPart" -msgstr "" +msgstr "KigPart" diff --git a/translations/desktop_files/kig-desktops/ru.po b/translations/desktop_files/kig-desktops/ru.po index b7c31773..1ad067e3 100644 --- a/translations/desktop_files/kig-desktops/ru.po +++ b/translations/desktop_files/kig-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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 18:07+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kig-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 #: kig/kig.desktop:2 msgid "Kig" -msgstr "" +msgstr "Kig" #. GenericName #: kig/kig.desktop:3 @@ -34,4 +36,4 @@ msgstr "Работа с геометрическими построениями" #. Name #: kig/kig_part.desktop:2 msgid "KigPart" -msgstr "" +msgstr "KigPart" diff --git a/translations/desktop_files/kig-mimetypes/es_AR.po b/translations/desktop_files/kig-mimetypes/es_AR.po new file mode 100644 index 00000000..fddf190f --- /dev/null +++ b/translations/desktop_files/kig-mimetypes/es_AR.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 18:09+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: mimetypes/x-cabri.desktop:4 +msgid "Cabri Figure" +msgstr "" + +#. Comment +#: mimetypes/x-drgeo.desktop:4 +msgid "Dr. Geo Figure" +msgstr "" + +#. Comment +#: mimetypes/x-kgeo.desktop:4 +msgid "KGeo Figure" +msgstr "" + +#. Comment +#: mimetypes/x-kig.desktop:4 +msgid "Kig Figure" +msgstr "" + +#. Comment +#: mimetypes/x-kseg.desktop:4 +msgid "KSeg Document" +msgstr "" diff --git a/translations/desktop_files/kig-tdefile/es_AR.po b/translations/desktop_files/kig-tdefile/es_AR.po new file mode 100644 index 00000000..24750baf --- /dev/null +++ b/translations/desktop_files/kig-tdefile/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 18:12+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: tdefile/tdefile_drgeo.desktop:3 +msgid "Dr. Geo Info" +msgstr "" + +#. Name +#: tdefile/tdefile_kig.desktop:3 +msgid "Kig Info" +msgstr "" diff --git a/translations/desktop_files/kiten.desktop/es_AR.po b/translations/desktop_files/kiten.desktop/es_AR.po new file mode 100644 index 00000000..2f1542fe --- /dev/null +++ b/translations/desktop_files/kiten.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 18:16+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kiten.desktop:2 +msgid "Kiten" +msgstr "" + +#. GenericName +#: kiten.desktop:3 +msgid "Japanese Reference/Study Tool" +msgstr "" + +#. Comment +#: kiten.desktop:4 +msgid "Japanese Reference and Study Tool" +msgstr "" diff --git a/translations/desktop_files/kiten.desktop/ka.po b/translations/desktop_files/kiten.desktop/ka.po index 9be2f84a..5c455638 100644 --- a/translations/desktop_files/kiten.desktop/ka.po +++ b/translations/desktop_files/kiten.desktop/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 18:16+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kiten-kitendesktop/ka/>\n" "Language: ka\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.17\n" #. Name #: kiten.desktop:2 msgid "Kiten" -msgstr "" +msgstr "Kiten" #. GenericName #: kiten.desktop:3 @@ -28,6 +29,5 @@ msgstr "იაპონურის ლექსიკონი/შესწა #. Comment #: kiten.desktop:4 -#, fuzzy msgid "Japanese Reference and Study Tool" msgstr "იაპონურის ლექსიკონი/შესწავლა" diff --git a/translations/desktop_files/kiten.desktop/ru.po b/translations/desktop_files/kiten.desktop/ru.po index 79a3f068..9c01f947 100644 --- a/translations/desktop_files/kiten.desktop/ru.po +++ b/translations/desktop_files/kiten.desktop/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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 18:16+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kiten-kitendesktop/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 #: kiten.desktop:2 msgid "Kiten" -msgstr "" +msgstr "Kiten" #. GenericName #: kiten.desktop:3 diff --git a/translations/desktop_files/klatin.desktop/es_AR.po b/translations/desktop_files/klatin.desktop/es_AR.po new file mode 100644 index 00000000..8f58b9b2 --- /dev/null +++ b/translations/desktop_files/klatin.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 18:19+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: klatin.desktop:6 +msgid "A program to help revise Latin" +msgstr "" + +#. Name +#: klatin.desktop:8 +msgid "KLatin" +msgstr "" + +#. GenericName +#: klatin.desktop:9 +msgid "Latin Reviser" +msgstr "" diff --git a/translations/desktop_files/klatin.desktop/ka.po b/translations/desktop_files/klatin.desktop/ka.po index 77379701..9ced4829 100644 --- a/translations/desktop_files/klatin.desktop/ka.po +++ b/translations/desktop_files/klatin.desktop/ka.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 18:19+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/klatin-klatindesktop/ka/>\n" "Language: ka\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.17\n" #. Comment #: klatin.desktop:6 @@ -24,7 +25,7 @@ msgstr "ლათინურის შესასწავლი პროგ #. Name #: klatin.desktop:8 msgid "KLatin" -msgstr "" +msgstr "KLatin" #. GenericName #: klatin.desktop:9 diff --git a/translations/desktop_files/klatin.desktop/ru.po b/translations/desktop_files/klatin.desktop/ru.po index 5dce7edd..06690dc1 100644 --- a/translations/desktop_files/klatin.desktop/ru.po +++ b/translations/desktop_files/klatin.desktop/ru.po @@ -1,20 +1,22 @@ # 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: 2020-05-26 18:19+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/klatin-klatindesktop/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" #. Comment #: klatin.desktop:6 @@ -24,7 +26,7 @@ msgstr "Программа обучения латыни" #. Name #: klatin.desktop:8 msgid "KLatin" -msgstr "" +msgstr "KLatin" #. GenericName #: klatin.desktop:9 diff --git a/translations/desktop_files/klettres.desktop/es_AR.po b/translations/desktop_files/klettres.desktop/es_AR.po new file mode 100644 index 00000000..0f006223 --- /dev/null +++ b/translations/desktop_files/klettres.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 18:21+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: klettres.desktop:6 +msgid "a TDE program to learn the alphabet" +msgstr "" + +#. Name +#: klettres.desktop:8 +msgid "KLettres" +msgstr "" + +#. GenericName +#: klettres.desktop:9 +msgid "Learn Alphabet" +msgstr "" diff --git a/translations/desktop_files/klettres.desktop/ka.po b/translations/desktop_files/klettres.desktop/ka.po index 477de22d..893c5ca8 100644 --- a/translations/desktop_files/klettres.desktop/ka.po +++ b/translations/desktop_files/klettres.desktop/ka.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 18:21+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/klettres-klettresdesktop/ka/>\n" "Language: ka\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.17\n" #. Comment #: klettres.desktop:6 @@ -24,7 +25,7 @@ msgstr "TDE ანბანის შესასწავლი პროგრ #. Name #: klettres.desktop:8 msgid "KLettres" -msgstr "" +msgstr "KLettres" #. GenericName #: klettres.desktop:9 diff --git a/translations/desktop_files/klettres.desktop/ru.po b/translations/desktop_files/klettres.desktop/ru.po index 1d0b8a5a..e8160c4d 100644 --- a/translations/desktop_files/klettres.desktop/ru.po +++ b/translations/desktop_files/klettres.desktop/ru.po @@ -1,20 +1,22 @@ # 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: 2020-05-26 18:21+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/klettres-klettresdesktop/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" #. Comment #: klettres.desktop:6 @@ -24,7 +26,7 @@ msgstr "Программа для изучения алфавита" #. Name #: klettres.desktop:8 msgid "KLettres" -msgstr "" +msgstr "KLettres" #. GenericName #: klettres.desktop:9 diff --git a/translations/desktop_files/kmplot-desktops/es_AR.po b/translations/desktop_files/kmplot-desktops/es_AR.po new file mode 100644 index 00000000..6bf4c5d9 --- /dev/null +++ b/translations/desktop_files/kmplot-desktops/es_AR.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 19:25+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kmplot.desktop:7 +msgid "KmPlot" +msgstr "" + +#. GenericName +#: kmplot.desktop:8 +msgid "Mathematical Function Plotter" +msgstr "" + +#. Comment +#: kmplot.desktop:9 +msgid "Function Plotter" +msgstr "" + +#. Name +#: kmplot_part.desktop:3 +msgid "KmPlotPart" +msgstr "" + +#. Comment +#: x-kmplot.desktop:2 +msgid "KmPlot File" +msgstr "" diff --git a/translations/desktop_files/kmplot-desktops/ka.po b/translations/desktop_files/kmplot-desktops/ka.po index 848b224c..8a859adb 100644 --- a/translations/desktop_files/kmplot-desktops/ka.po +++ b/translations/desktop_files/kmplot-desktops/ka.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:25+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kmplot-desktop-files/ka/>\n" "Language: ka\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.17\n" #. Name #: kmplot.desktop:7 -#, fuzzy msgid "KmPlot" -msgstr "KmPlot ფაილი" +msgstr "KmPlot" #. GenericName #: kmplot.desktop:8 @@ -35,7 +35,7 @@ msgstr "ფუნქციების გრაფიკები" #. Name #: kmplot_part.desktop:3 msgid "KmPlotPart" -msgstr "" +msgstr "KmPlotPart" #. Comment #: x-kmplot.desktop:2 diff --git a/translations/desktop_files/kmplot-desktops/ru.po b/translations/desktop_files/kmplot-desktops/ru.po index 4730ab23..674eb5d6 100644 --- a/translations/desktop_files/kmplot-desktops/ru.po +++ b/translations/desktop_files/kmplot-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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:25+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kmplot-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 #: kmplot.desktop:7 -#, fuzzy msgid "KmPlot" -msgstr "Файл KmPlot" +msgstr "KmPlot" #. GenericName #: kmplot.desktop:8 @@ -35,7 +36,7 @@ msgstr "Построение графиков функций" #. Name #: kmplot_part.desktop:3 msgid "KmPlotPart" -msgstr "" +msgstr "KmPlotPart" #. Comment #: x-kmplot.desktop:2 diff --git a/translations/desktop_files/kpercentage.desktop/es_AR.po b/translations/desktop_files/kpercentage.desktop/es_AR.po new file mode 100644 index 00000000..24f8b279 --- /dev/null +++ b/translations/desktop_files/kpercentage.desktop/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 19:29+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kpercentage.desktop:2 +msgid "KPercentage" +msgstr "" + +#. GenericName +#: kpercentage.desktop:3 +msgid "Exercise Percentages" +msgstr "" diff --git a/translations/desktop_files/kpercentage.desktop/ka.po b/translations/desktop_files/kpercentage.desktop/ka.po index 7c720c4c..8f925f7c 100644 --- a/translations/desktop_files/kpercentage.desktop/ka.po +++ b/translations/desktop_files/kpercentage.desktop/ka.po @@ -1,26 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:29+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kpercentage-kpercentagedesktop/ka/>\n" "Language: ka\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.17\n" #. Name #: kpercentage.desktop:2 -#, fuzzy msgid "KPercentage" -msgstr "სავარჯიშოები პროცენტებთან" +msgstr "KPercentage" #. GenericName #: kpercentage.desktop:3 diff --git a/translations/desktop_files/kpercentage.desktop/ru.po b/translations/desktop_files/kpercentage.desktop/ru.po index 0b13397a..b94029e1 100644 --- a/translations/desktop_files/kpercentage.desktop/ru.po +++ b/translations/desktop_files/kpercentage.desktop/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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:29+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kpercentage-kpercentagedesktop/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 #: kpercentage.desktop:2 -#, fuzzy msgid "KPercentage" -msgstr "Упражнения с процентами" +msgstr "KPercentage" #. GenericName #: kpercentage.desktop:3 diff --git a/translations/desktop_files/kstars.desktop/es_AR.po b/translations/desktop_files/kstars.desktop/es_AR.po new file mode 100644 index 00000000..5acbf6f6 --- /dev/null +++ b/translations/desktop_files/kstars.desktop/es_AR.po @@ -0,0 +1,26 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 19:33+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#. GenericName +#: kstars.desktop:6 kstars.desktop:9 +msgid "Desktop Planetarium" +msgstr "" + +#. Name +#: kstars.desktop:8 +msgid "KStars" +msgstr "" diff --git a/translations/desktop_files/kstars.desktop/ka.po b/translations/desktop_files/kstars.desktop/ka.po index 6952f85c..2cfbd7a8 100644 --- a/translations/desktop_files/kstars.desktop/ka.po +++ b/translations/desktop_files/kstars.desktop/ka.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:33+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kstars-kstarsdesktop/ka/>\n" "Language: ka\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.17\n" #. Comment #. GenericName @@ -25,4 +26,4 @@ msgstr "სამაგიდო პლანეტარიუმი" #. Name #: kstars.desktop:8 msgid "KStars" -msgstr "" +msgstr "KStars" diff --git a/translations/desktop_files/kstars.desktop/ru.po b/translations/desktop_files/kstars.desktop/ru.po index f68aaeb2..7194e869 100644 --- a/translations/desktop_files/kstars.desktop/ru.po +++ b/translations/desktop_files/kstars.desktop/ru.po @@ -1,20 +1,22 @@ # 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: 2020-05-26 19:33+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kstars-kstarsdesktop/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" #. Comment #. GenericName @@ -25,4 +27,4 @@ msgstr "Настольный планетарий" #. Name #: kstars.desktop:8 msgid "KStars" -msgstr "" +msgstr "KStars" diff --git a/translations/desktop_files/ktouch.desktop/es_AR.po b/translations/desktop_files/ktouch.desktop/es_AR.po new file mode 100644 index 00000000..480cb952 --- /dev/null +++ b/translations/desktop_files/ktouch.desktop/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 19:35+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: ktouch.desktop:6 +msgid "KTouch" +msgstr "" + +#. GenericName +#: ktouch.desktop:7 +msgid "Touch Typing Tutor" +msgstr "" diff --git a/translations/desktop_files/ktouch.desktop/ka.po b/translations/desktop_files/ktouch.desktop/ka.po index 978f61bb..1143edd9 100644 --- a/translations/desktop_files/ktouch.desktop/ka.po +++ b/translations/desktop_files/ktouch.desktop/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:35+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/ktouch-ktouchdesktop/ka/>\n" "Language: ka\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.17\n" #. Name #: ktouch.desktop:6 msgid "KTouch" -msgstr "" +msgstr "KTouch" #. GenericName #: ktouch.desktop:7 diff --git a/translations/desktop_files/ktouch.desktop/ru.po b/translations/desktop_files/ktouch.desktop/ru.po index d350fb55..a60c81c0 100644 --- a/translations/desktop_files/ktouch.desktop/ru.po +++ b/translations/desktop_files/ktouch.desktop/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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:35+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/ktouch-ktouchdesktop/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 #: ktouch.desktop:6 msgid "KTouch" -msgstr "" +msgstr "KTouch" #. GenericName #: ktouch.desktop:7 diff --git a/translations/desktop_files/kturtle.desktop/es_AR.po b/translations/desktop_files/kturtle.desktop/es_AR.po new file mode 100644 index 00000000..d38f33d8 --- /dev/null +++ b/translations/desktop_files/kturtle.desktop/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 19:38+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kturtle.desktop:3 +msgid "KTurtle" +msgstr "" + +#. GenericName +#: kturtle.desktop:4 +msgid "Logo Programming Environment" +msgstr "" + +#. Comment +#: kturtle.desktop:8 +msgid "A TDE Logo programming environment" +msgstr "" diff --git a/translations/desktop_files/kturtle.desktop/ka.po b/translations/desktop_files/kturtle.desktop/ka.po index e3b7f28b..087686fc 100644 --- a/translations/desktop_files/kturtle.desktop/ka.po +++ b/translations/desktop_files/kturtle.desktop/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:38+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kturtle-kturtledesktop/ka/>\n" "Language: ka\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.17\n" #. Name #: kturtle.desktop:3 msgid "KTurtle" -msgstr "" +msgstr "KTurtle" #. GenericName #: kturtle.desktop:4 diff --git a/translations/desktop_files/kturtle.desktop/ru.po b/translations/desktop_files/kturtle.desktop/ru.po index 490f5dc0..d3ebbdb3 100644 --- a/translations/desktop_files/kturtle.desktop/ru.po +++ b/translations/desktop_files/kturtle.desktop/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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:38+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kturtle-kturtledesktop/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 #: kturtle.desktop:3 msgid "KTurtle" -msgstr "" +msgstr "KTurtle" #. GenericName #: kturtle.desktop:4 diff --git a/translations/desktop_files/kverbos.desktop/es_AR.po b/translations/desktop_files/kverbos.desktop/es_AR.po new file mode 100644 index 00000000..233ec5ac --- /dev/null +++ b/translations/desktop_files/kverbos.desktop/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 19:41+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kverbos.desktop:7 +msgid "Kverbos" +msgstr "" + +#. GenericName +#: kverbos.desktop:8 +msgid "Study Spanish Verbforms" +msgstr "" diff --git a/translations/desktop_files/kverbos.desktop/ka.po b/translations/desktop_files/kverbos.desktop/ka.po index d3cdde08..63b5a633 100644 --- a/translations/desktop_files/kverbos.desktop/ka.po +++ b/translations/desktop_files/kverbos.desktop/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:41+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kverbos-kverbosdesktop/ka/>\n" "Language: ka\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.17\n" #. Name #: kverbos.desktop:7 msgid "Kverbos" -msgstr "" +msgstr "Kverbos" #. GenericName #: kverbos.desktop:8 diff --git a/translations/desktop_files/kverbos.desktop/ru.po b/translations/desktop_files/kverbos.desktop/ru.po index 3668121b..a2ffb8c6 100644 --- a/translations/desktop_files/kverbos.desktop/ru.po +++ b/translations/desktop_files/kverbos.desktop/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>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:41+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kverbos-kverbosdesktop/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 #: kverbos.desktop:7 msgid "Kverbos" -msgstr "" +msgstr "Kverbos" #. GenericName #: kverbos.desktop:8 diff --git a/translations/desktop_files/kvoctrain-desktops/es_AR.po b/translations/desktop_files/kvoctrain-desktops/es_AR.po new file mode 100644 index 00000000..ecbe8d4e --- /dev/null +++ b/translations/desktop_files/kvoctrain-desktops/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 19:46+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. GenericName +#: kvoctrain.desktop:2 +msgid "Vocabulary Trainer" +msgstr "" + +#. Name +#: kvoctrain.desktop:3 +msgid "KVocTrain" +msgstr "" + +#. Comment +#: x-kvtml.desktop:2 +msgid "Vocabulary Trainer Document" +msgstr "" diff --git a/translations/desktop_files/kvoctrain-desktops/ka.po b/translations/desktop_files/kvoctrain-desktops/ka.po index 800c578d..6f993b33 100644 --- a/translations/desktop_files/kvoctrain-desktops/ka.po +++ b/translations/desktop_files/kvoctrain-desktops/ka.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:46+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kvoctrain-desktop-files/ka/>\n" "Language: ka\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.17\n" #. GenericName #: kvoctrain.desktop:2 @@ -24,7 +25,7 @@ msgstr "სიტყვათა მარაგის შემოწმებ #. Name #: kvoctrain.desktop:3 msgid "KVocTrain" -msgstr "" +msgstr "KVocTrain" #. Comment #: x-kvtml.desktop:2 diff --git a/translations/desktop_files/kvoctrain-desktops/ru.po b/translations/desktop_files/kvoctrain-desktops/ru.po index c3b33c78..bc2211bc 100644 --- a/translations/desktop_files/kvoctrain-desktops/ru.po +++ b/translations/desktop_files/kvoctrain-desktops/ru.po @@ -1,20 +1,22 @@ # 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: 2020-05-26 19:46+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kvoctrain-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" #. GenericName #: kvoctrain.desktop:2 @@ -24,7 +26,7 @@ msgstr "Тренировка словарного запаса" #. Name #: kvoctrain.desktop:3 msgid "KVocTrain" -msgstr "" +msgstr "KVocTrain" #. Comment #: x-kvtml.desktop:2 diff --git a/translations/desktop_files/kwordquiz-desktops/es_AR.po b/translations/desktop_files/kwordquiz-desktops/es_AR.po new file mode 100644 index 00000000..7b71f902 --- /dev/null +++ b/translations/desktop_files/kwordquiz-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 19:49+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: kwordquiz.desktop:6 +msgid "A flashcard and vocabulary learning program" +msgstr "" + +#. Name +#: kwordquiz.desktop:8 +msgid "KWordQuiz" +msgstr "" + +#. GenericName +#: kwordquiz.desktop:9 +msgid "Vocabulary Trainer" +msgstr "" + +#. Comment +#: x-kwordquiz.desktop:2 +msgid "KWordQuiz Vocabulary" +msgstr "" diff --git a/translations/desktop_files/kwordquiz-desktops/ka.po b/translations/desktop_files/kwordquiz-desktops/ka.po index 52f9db50..30ee9399 100644 --- a/translations/desktop_files/kwordquiz-desktops/ka.po +++ b/translations/desktop_files/kwordquiz-desktops/ka.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:49+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kwordquiz-desktop-files/ka/>\n" "Language: ka\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.17\n" #. Comment #: kwordquiz.desktop:6 @@ -23,9 +24,8 @@ msgstr "სიტყვათა მარაგის შემოწმებ #. Name #: kwordquiz.desktop:8 -#, fuzzy msgid "KWordQuiz" -msgstr "KWordQuiz სიტყვარი" +msgstr "KWordQuiz" #. GenericName #: kwordquiz.desktop:9 diff --git a/translations/desktop_files/kwordquiz-desktops/ru.po b/translations/desktop_files/kwordquiz-desktops/ru.po index 098cc3ed..8bb4cea3 100644 --- a/translations/desktop_files/kwordquiz-desktops/ru.po +++ b/translations/desktop_files/kwordquiz-desktops/ru.po @@ -1,20 +1,22 @@ # 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: 2020-05-26 19:49+0200\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-09 05:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kwordquiz-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" #. Comment #: kwordquiz.desktop:6 @@ -23,9 +25,8 @@ msgstr "Программа для заучивания слов" #. Name #: kwordquiz.desktop:8 -#, fuzzy msgid "KWordQuiz" -msgstr "Словарь KWordQuiz" +msgstr "KWordQuiz" #. GenericName #: kwordquiz.desktop:9 diff --git a/translations/desktop_files/kwordquiz-events/es_AR.po b/translations/desktop_files/kwordquiz-events/es_AR.po new file mode 100644 index 00000000..3cad4d65 --- /dev/null +++ b/translations/desktop_files/kwordquiz-events/es_AR.po @@ -0,0 +1,50 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-05-26 19:49+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: eventsrc:3 +msgid "KWordQuiz" +msgstr "" + +#. Name +#: eventsrc:6 +msgid "QuizCorrect" +msgstr "" + +#. Comment +#: eventsrc:7 +msgid "Correct answer" +msgstr "" + +#. Name +#: eventsrc:12 +msgid "QuizError" +msgstr "" + +#. Comment +#: eventsrc:13 +msgid "Wrong answer" +msgstr "" + +#. Name +#: eventsrc:18 +msgid "syntaxerror" +msgstr "" + +#. Comment +#: eventsrc:19 +msgid "Error in syntax" +msgstr "" diff --git a/translations/desktop_files/kwordquiz-events/ka.po b/translations/desktop_files/kwordquiz-events/ka.po index dc337aaa..bd4955f7 100644 --- a/translations/desktop_files/kwordquiz-events/ka.po +++ b/translations/desktop_files/kwordquiz-events/ka.po @@ -1,30 +1,31 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-05-26 19:49+0200\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-12-21 20:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kwordquiz-events/ka/>\n" "Language: ka\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.17\n" #. Comment #: eventsrc:3 msgid "KWordQuiz" -msgstr "" +msgstr "KWordQuiz" #. Name #: eventsrc:6 msgid "QuizCorrect" -msgstr "" +msgstr "QuizCorrect" #. Comment #: eventsrc:7 @@ -34,7 +35,7 @@ msgstr "სწორი პასუხი" #. Name #: eventsrc:12 msgid "QuizError" -msgstr "" +msgstr "QuizError" #. Comment #: eventsrc:13 @@ -44,7 +45,7 @@ msgstr "მცდარი პასუხი" #. Name #: eventsrc:18 msgid "syntaxerror" -msgstr "" +msgstr "syntaxerror" #. Comment #: eventsrc:19 diff --git a/translations/desktop_files/kwordquiz-events/ru.po b/translations/desktop_files/kwordquiz-events/ru.po index d9121c8f..09cfee01 100644 --- a/translations/desktop_files/kwordquiz-events/ru.po +++ b/translations/desktop_files/kwordquiz-events/ru.po @@ -1,30 +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: 2020-05-26 19:49+0200\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-11-05 18:02+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdeedu/kwordquiz-events/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" #. Comment #: eventsrc:3 msgid "KWordQuiz" -msgstr "" +msgstr "KWordQuiz" #. Name #: eventsrc:6 msgid "QuizCorrect" -msgstr "" +msgstr "QuizCorrect" #. Comment #: eventsrc:7 @@ -34,7 +36,7 @@ msgstr "Правильный ответ" #. Name #: eventsrc:12 msgid "QuizError" -msgstr "" +msgstr "QuizError" #. Comment #: eventsrc:13 @@ -44,7 +46,7 @@ msgstr "Неправильный ответ" #. Name #: eventsrc:18 msgid "syntaxerror" -msgstr "" +msgstr "syntaxerror" #. Comment #: eventsrc:19 |
