From 1a3e938ea6a568249910a55192b131fb182d60f1 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 25 Sep 2023 12:24:30 +0900 Subject: [PATCH] Replace QObject, QWidget, QImage, QPair, QRgb, QColor, QChar, QString, QIODevice with TQ* version Signed-off-by: Michele Calgaro (cherry picked from commit 33ba77ee894fb6368e3804458ddd52ea1a1f0909) --- akregator/HACKING | 12 +-- doc/kalarm/index.docbook | 130 +++++++++++++-------------- doc/karm/index.docbook | 12 +-- karm/doc/Mainpage.dox | 8 +- kmail/Mainpage.dox | 16 ++-- kmailcvt/README | 12 +-- knotes/knotesnetsend.cpp | 8 +- kontact/DESIGN.dcopinteraction | 2 +- kontact/Thoughts | 2 +- kontact/interfaces/core.cpp | 2 +- libkpimexchange/core/README.download | 4 +- 11 files changed, 104 insertions(+), 104 deletions(-) diff --git a/akregator/HACKING b/akregator/HACKING index 996560bc..cf8b640b 100644 --- a/akregator/HACKING +++ b/akregator/HACKING @@ -145,7 +145,7 @@ class QSomething; namespace Akregator { -class Test : public QObject +class Test : public TQObject { TQ_OBJECT @@ -153,7 +153,7 @@ class Test : public QObject typedef QValueList list; Test(); - Test(QString someString); + Test(TQString someString); explicit Test(int i = 0); virtual ~Test(); @@ -212,7 +212,7 @@ test.cpp: namespace Akregator { Test::Test() - : QObject() + : TQObject() , m_protectedVar(0) , m_privateVar(0) , m_tastyThing(0) @@ -220,8 +220,8 @@ Test::Test() { } -Test::Test(QString someString) - : QObject() +Test::Test(TQString someString) + : TQObject() , m_protectedVar(0) , m_privateVar(0) , m_tastyThing(someString) @@ -230,7 +230,7 @@ Test::Test(QString someString) } Test::Test(int i); - : QObject() + : TQObject() , m_protectedVar(0) , m_privateVar(0) , m_tastyThing(i) diff --git a/doc/kalarm/index.docbook b/doc/kalarm/index.docbook index 3362f18c..48b283f9 100644 --- a/doc/kalarm/index.docbook +++ b/doc/kalarm/index.docbook @@ -2700,8 +2700,8 @@ at some future date. -void cancelEvent(const QString& calendarFile, - const QString& eventID) +void cancelEvent(const TQString& calendarFile, + const TQString& eventID) @@ -2751,8 +2751,8 @@ ignored. -void triggerEvent(const QString& calendarFile, - const QString& eventID) +void triggerEvent(const TQString& calendarFile, + const TQString& eventID) @@ -2809,8 +2809,8 @@ ignored. -void handleEvent(const QString& calendarFile, - const QString& eventID) +void handleEvent(const TQString& calendarFile, + const TQString& eventID) @@ -2876,26 +2876,26 @@ ignored. -bool scheduleMessage(const QString& message, - const QString& dateTime, +bool scheduleMessage(const TQString& message, + const TQString& dateTime, int lateCancel, int flags, - const QString& bgColor, - const QString& fgColor, - const QString& font, + const TQString& bgColor, + const TQString& fgColor, + const TQString& font, const KURL& audioURL, int reminder, - const QString& recurrence, + const TQString& recurrence, int subRepeatInterval, int subRepeatCount) -bool scheduleMessage(const QString& message, - const QString& dateTime, +bool scheduleMessage(const TQString& message, + const TQString& dateTime, int lateCancel, int flags, - const QString& bgColor, - const QString& fgColor, - const QString& font, + const TQString& bgColor, + const TQString& fgColor, + const TQString& font, const KURL& audioURL, int reminder, int recurType, @@ -2903,18 +2903,18 @@ bool scheduleMessage(const QString& message, int recurCount) -bool scheduleMessage(const QString& message, - const QString& dateTime, +bool scheduleMessage(const TQString& message, + const TQString& dateTime, int lateCancel, int flags, - const QString& bgColor, - const QString& fgColor, - const QString& font, + const TQString& bgColor, + const TQString& fgColor, + const TQString& font, const KURL& audioURL, int reminder, int recurType, int recurInterval, - const QString& endDateTime) + const TQString& endDateTime) @@ -2969,10 +2969,10 @@ applicable to message alarms. Specifies the background color for displaying the message. The string may be in the format #RRGGBB (as returned by -QColor::name()) where RR, GG and BB are +TQColor::name()) where RR, GG and BB are two-digit hexadecimal values for red, green and blue. Alternatively the string may be in any of the other formats accepted by -QColor::setNamedColor(), such as a name from +TQColor::setNamedColor(), such as a name from the X color database (⪚ red or steelblue). Set the string to null to specify the current default background color. @@ -3124,22 +3124,22 @@ text or image file. bool scheduleFile(const KURL& URL, - const QString& dateTime, + const TQString& dateTime, int lateCancel, int flags, - const QString& bgColor, + const TQString& bgColor, const KURL& audioURL, int reminder, - const QString& recurrence, + const TQString& recurrence, int subRepeatInterval, int subRepeatCount) bool scheduleFile(const KURL& URL, - const QString& dateTime, + const TQString& dateTime, int lateCancel, int flags, - const QString& bgColor, + const TQString& bgColor, const KURL& audioURL, int reminder, int recurType, @@ -3148,15 +3148,15 @@ bool scheduleFile(const KURL& URL, bool scheduleFile(const KURL& URL, - const QString& dateTime, + const TQString& dateTime, int lateCancel, int flags, - const QString& bgColor, + const TQString& bgColor, const KURL& audioURL, int reminder, int recurType, int recurInterval, - const QString& endDateTime) + const TQString& endDateTime) @@ -3212,10 +3212,10 @@ applicable to file alarms. Specifies the background color for displaying the file. The string may be in the format #RRGGBB (as returned by -QColor::name()) where RR, GG and BB are +TQColor::name()) where RR, GG and BB are two-digit hexadecimal values for red, green and blue. Alternatively the string may be in any of the other formats accepted by -QColor::setNamedColor(), such as a name from +TQColor::setNamedColor(), such as a name from the X color database (⪚ red or steelblue). Set the string to null to specify the current default background color. @@ -3338,17 +3338,17 @@ command. -bool scheduleCommand(const QString& commandLine, - const QString& dateTime, +bool scheduleCommand(const TQString& commandLine, + const TQString& dateTime, int lateCancel, int flags, - const QString& recurrence, + const TQString& recurrence, int subRepeatInterval, int subRepeatCount) -bool scheduleCommand(const QString& commandLine, - const QString& dateTime, +bool scheduleCommand(const TQString& commandLine, + const TQString& dateTime, int lateCancel, int flags, int recurType, @@ -3356,13 +3356,13 @@ bool scheduleCommand(const QString& commandLine, int recurCount) -bool scheduleCommand(const QString& commandLine, - const QString& dateTime, +bool scheduleCommand(const TQString& commandLine, + const TQString& dateTime, int lateCancel, int flags, int recurType, int recurInterval, - const QString& endDateTime) + const TQString& endDateTime) @@ -3512,25 +3512,25 @@ parameters, its usage is identical to -bool scheduleEmail(const QString& fromID, - const QString& addresses, - const QString& subject, - const QString& message, - const QString& attachments, - const QString& dateTime, +bool scheduleEmail(const TQString& fromID, + const TQString& addresses, + const TQString& subject, + const TQString& message, + const TQString& attachments, + const TQString& dateTime, int lateCancel, int flags, - const QString& recurrence, + const TQString& recurrence, int subRepeatInterval, int subRepeatCount) -bool scheduleEmail(const QString& fromID, - const QString& addresses, - const QString& subject, - const QString& message, - const QString& attachments, - const QString& dateTime, +bool scheduleEmail(const TQString& fromID, + const TQString& addresses, + const TQString& subject, + const TQString& message, + const TQString& attachments, + const TQString& dateTime, int lateCancel, int flags, int recurType, @@ -3538,17 +3538,17 @@ bool scheduleEmail(const QString& fromID, int recurCount) -bool scheduleEmail(const QString& fromID, - const QString& addresses, - const QString& subject, - const QString& message, - const QString& attachments, - const QString& dateTime, +bool scheduleEmail(const TQString& fromID, + const TQString& addresses, + const TQString& subject, + const TQString& message, + const TQString& attachments, + const TQString& dateTime, int lateCancel, nt flags, int recurType, int recurInterval, - const QString& endTime) + const TQString& endTime) @@ -3728,7 +3728,7 @@ dialog to edit an alarm. -bool edit(const QString& eventID) +bool edit(const TQString& eventID) @@ -3772,7 +3772,7 @@ dialog to edit a new alarm. -bool editNew(const QString& templateName) +bool editNew(const TQString& templateName) diff --git a/doc/karm/index.docbook b/doc/karm/index.docbook index 08de3cc4..e8d6495e 100644 --- a/doc/karm/index.docbook +++ b/doc/karm/index.docbook @@ -1117,7 +1117,7 @@ times were reset. -QString version() +TQString version() @@ -1138,7 +1138,7 @@ in the typical GNU format of major.minor.bugfix. -QString quit() +TQString quit() @@ -1159,7 +1159,7 @@ external program can gracefully shutdown &karm;. -QString hastodo(QString taskname) +TQString hastodo(TQString taskname) Parameters @@ -1175,7 +1175,7 @@ QString hastodo(QString taskname) Description -hastodo(QString taskname) is a &DCOP; call that +hastodo(TQString taskname) is a &DCOP; call that looks for a of the given name. If found, it returns the iCalendar UID that identifies that todo. If not found, it returns an empty string. @@ -1196,7 +1196,7 @@ than one todo has a matching name, the first one found is returned. -QString addtodo(QString todoname) +TQString addtodo(TQString todoname) Parameters @@ -1213,7 +1213,7 @@ QString addtodo(QString todoname) Description -addtodo(QString todoname) is a &DCOP; call that +addtodo(TQString todoname) is a &DCOP; call that adds a new top-level todo to the current storage. The UID of the new todo is returned. diff --git a/karm/doc/Mainpage.dox b/karm/doc/Mainpage.dox index 44aae4ee..b320effb 100644 --- a/karm/doc/Mainpage.dox +++ b/karm/doc/Mainpage.dox @@ -76,9 +76,9 @@ These are the Q_SIGNALS:
  • Preferences::autoSavePeriod(int)
  • Preferences::detectIdleness(bool)
  • Preferences::idlenessTimeout(int) -
  • Preferences::saveFile(QString) +
  • Preferences::saveFile(TQString)
  • Preferences::setupChanged() -
  • Preferences::timeLog(QString) +
  • Preferences::timeLog(TQString)
  • Preferences::timeLoging(bool)
  • Preferences::hideOnClose(bool) @@ -100,8 +100,8 @@ These are the Q_SIGNALS:
  • Karm::load()
  • Karm::newSubTask()
  • Karm::newTask() -
  • Karm::newTask(QString, QListViewItem*) -
  • Karm::parseLine(QString, long*, QString*, int*) +
  • Karm::newTask(TQString, QListViewItem*) +
  • Karm::parseLine(TQString, long*, TQString*, int*)
  • Karm::resetSessionTimeForAllTasks()
  • Karm::save()
  • Karm::startTimer() diff --git a/kmail/Mainpage.dox b/kmail/Mainpage.dox index 3121e2d9..cd21bf04 100644 --- a/kmail/Mainpage.dox +++ b/kmail/Mainpage.dox @@ -109,8 +109,8 @@ instance of the filter manager is held by the kernel The search pattern is a QPtrList of search rules (kmsearchpattern.h) and a boolean operator that defines their relation (and/or). -A search rule consists of a field-QString, a "function"-enum and a -"contents" or "value" QString. The first gives the header (or +A search rule consists of a field-TQString, a "function"-enum and a +"contents" or "value" TQString. The first gives the header (or pseudoheader) to match against, the second says how to match (equals, consists, is less than,...) and the third holds the pattern to match against. @@ -155,7 +155,7 @@ the corresponding config manager instead. But that won't change the basic principle. Thus, there is an abstract base class ConfigurePage (defined in -configuredialog_p.h), which derives from QWidget. It has four methods +configuredialog_p.h), which derives from TQWidget. It has four methods of which you have to reimplement at least the first two: - void setup() @@ -239,7 +239,7 @@ as follows : ---< actual folder types: KMFolderImap, KMFolderMbox... >-- At the base KMail's folder design starts with KMFolderNode which -inherits QObject. KMFolderNode is the base class encapsulating +inherits TQObject. KMFolderNode is the base class encapsulating common folder properties such as the name and a boolean signifying whether the folder is a folder holding mail directly or a KMFolderDir. KMFolderNode's often do not have an on-disk representation, they are @@ -410,7 +410,7 @@ uniq: 3 bits = max. 8 different types with same chunk size: 010 Offset32 011 SerNum/UOID 100 DateTime - 101 Color (QRgb: (a,r,g,b)) + 101 Color (TQRgb: (a,r,g,b)) 110 reserved 111 Extend @@ -821,7 +821,7 @@ During the design phase we identified a need for BodyPartFormatters to request their being called on some form of events, e.g. a dcop signal. Thus, the Memento interface also includes the IObserver and ISubject interfaces. If a BodyPartFormatter needs to react to a signal -(Qt or DCOP), it implements the Memento interface using a QObject, +(Qt or DCOP), it implements the Memento interface using a TQObject, connects the signal to a slot on the Memento and (as an ISubject) notifies it's IObservers when the slot is called. If a Memento is created, the reader window registers itself as an observer of the @@ -850,10 +850,10 @@ public: }; class DelayedHelloWorldBodyPartMemento - : public QObject, public KMail::BodyPartMemento { + : public TQObject, public KMail::BodyPartMemento { public: DelayedHelloWorldBodyPartMemento() - : QObject( 0, "DelayedHelloWorldBodyPartMemento" ), + : TQObject( 0, "DelayedHelloWorldBodyPartMemento" ), KMail::BodyPartMemento() { QTimer::singleShot( 10*1000, this, SLOT(slotTimeout()) ); diff --git a/kmailcvt/README b/kmailcvt/README index d1105fe4..1f778afe 100644 --- a/kmailcvt/README +++ b/kmailcvt/README @@ -16,14 +16,14 @@ your tdepim source directory. In the import method of your filter you are passed a FilterInfo object. This has the following methods that you may want to use: - void setFrom( const QString& from ); // Set to file importing from - void setTo( const QString& to ); // Set to folder importing into - void setCurrent( const QString& current ); // What we are doing + void setFrom( const TQString& from ); // Set to file importing from + void setTo( const TQString& to ); // Set to folder importing into + void setCurrent( const TQString& current ); // What we are doing void setCurrent( int percent = 0 ); // Set percentage of current file void setOverall( int percent = 0 ); // Set overall percentage - void addLog( const QString& log ); // Add a message for the user to see - void alert( const QString& message ); // Tell user something has gone wrong - QWidget *parent(); // The parent widget + void addLog( const TQString& log ); // Add a message for the user to see + void alert( const TQString& message ); // Tell user something has gone wrong + TQWidget *parent(); // The parent widget bool removeDupMsg; // true, if user selected 'remove duplicated messages' diff --git a/knotes/knotesnetsend.cpp b/knotes/knotesnetsend.cpp index 26d2b8f7..187d606b 100644 --- a/knotes/knotesnetsend.cpp +++ b/knotes/knotesnetsend.cpp @@ -48,11 +48,11 @@ KNotesNetworkSender::KNotesNetworkSender( const TQString& hostname, int port ) // TQObject:: prefix needed, otherwise the KStreamSocket::connect() // mehtod is called!!! - QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(connected( const KResolverEntry& )), + TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(connected( const KResolverEntry& )), TQT_SLOT(slotConnected( const KResolverEntry& )) ); - QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) ); - QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(closed()), TQT_SLOT(slotClosed()) ); - QObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(readyWrite()), TQT_SLOT(slotReadyWrite()) ); + TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(gotError( int )), TQT_SLOT(slotError( int )) ); + TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(closed()), TQT_SLOT(slotClosed()) ); + TQObject::connect( TQT_TQOBJECT(this), TQT_SIGNAL(readyWrite()), TQT_SLOT(slotReadyWrite()) ); } void KNotesNetworkSender::setSenderId( const TQString& sender ) diff --git a/kontact/DESIGN.dcopinteraction b/kontact/DESIGN.dcopinteraction index 950b9eea..d51fd886 100644 --- a/kontact/DESIGN.dcopinteraction +++ b/kontact/DESIGN.dcopinteraction @@ -57,7 +57,7 @@ In the kontact plugin * Don't use dcopClient() until the part is loaded * After loading the part, you might want to create a DCOP stub to use some of its methods (do both in a loadPart() method, e.g.). -* Implement createDCOPInterface( const QString& serviceType ), to +* Implement createDCOPInterface( const TQString& serviceType ), to load the part if the serviceType is one provided by it. See KAddressbookPlugin (plugins/kaddressbook/*) for a working example. diff --git a/kontact/Thoughts b/kontact/Thoughts index c4332425..a7601453 100644 --- a/kontact/Thoughts +++ b/kontact/Thoughts @@ -367,7 +367,7 @@ h: there is something else broken IMHO Summary View ------------ h: How would one best integrate a summary view into kontact? -h: a) add a virtual QWidget *summary(const QDateTime&, QWidget* parent ); +h: a) add a virtual TQWidget *summary(const QDateTime&, TQWidget* parent ); h: to get a summary widget for a day? h: b) use some sort of XML to UI to represent the summary informations h: c) have a stand a lone part which opens the PIM data seperately? ( How diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 3c270aa8..5cc30c2c 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -71,7 +71,7 @@ KParts::ReadOnlyPart *Core::createPart( const char *libname ) KParts::ReadOnlyPart *pimPart = dynamic_cast( part ); if ( pimPart ) { mParts.insert( libname, pimPart ); - QObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ), + TQObject::connect( pimPart, TQT_SIGNAL( destroyed( TQObject * ) ), TQT_SLOT( slotPartDestroyed( TQObject * ) ) ); } else { // TODO move to KParts::ComponentFactory diff --git a/libkpimexchange/core/README.download b/libkpimexchange/core/README.download index 07540db8..34f3c528 100644 --- a/libkpimexchange/core/README.download +++ b/libkpimexchange/core/README.download @@ -10,12 +10,12 @@ NOTES: It uses internal state member variables and such. DATA STRUCTURES: -QMap m_uids is in fact a set of known uids telling us +QMap m_uids is in fact a set of known uids telling us whether we're already busy or finished reading the Master event for this UID. The map contains the UID as key, with a value of 1, if UID is either being or finished downloading. -QMap m_transferJobs maps URLs being downloaded +QMap m_transferJobs maps URLs being downloaded to strings of data already received. A URL is removed from the map if all data has been received