summaryrefslogtreecommitdiffstats
path: root/kalarm/functions.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kalarm/functions.cpp')
-rw-r--r--kalarm/functions.cpp190
1 files changed, 95 insertions, 95 deletions
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index dd83fea43..45537e3d9 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -34,9 +34,9 @@
#include "templatelistview.h"
#include "templatemenuaction.h"
-#include <qdeepcopy.h>
-#include <qdir.h>
-#include <qregexp.h>
+#include <tqdeepcopy.h>
+#include <tqdir.h>
+#include <tqregexp.h>
#include <kconfig.h>
#include <kaction.h>
@@ -61,14 +61,14 @@
namespace
{
bool resetDaemonQueued = false;
-QCString korganizerName = "korganizer";
-QString korgStartError;
+TQCString korganizerName = "korganizer";
+TQString korgStartError;
#define KORG_DCOP_OBJECT "KOrganizerIface"
const char* KORG_DCOP_WINDOW = "KOrganizer MainWindow";
const char* KMAIL_DCOP_WINDOW = "kmail-mainwindow#1";
bool sendToKOrganizer(const KAEvent&);
-bool deleteFromKOrganizer(const QString& eventID);
+bool deleteFromKOrganizer(const TQString& eventID);
bool runKOrganizer();
}
#ifdef HAVE_XTEST
@@ -82,7 +82,7 @@ namespace KAlarm
/******************************************************************************
* Display a main window with the specified event selected.
*/
-MainWindow* displayMainWindowSelected(const QString& eventID)
+MainWindow* displayMainWindowSelected(const TQString& eventID)
{
MainWindow* win = MainWindow::firstWindow();
if (!win)
@@ -112,7 +112,7 @@ MainWindow* displayMainWindowSelected(const QString& eventID)
/******************************************************************************
* Create a New Alarm KAction.
*/
-KAction* createNewAlarmAction(const QString& label, QObject* receiver, const char* slot, KActionCollection* actions, const char* name)
+KAction* createNewAlarmAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection* actions, const char* name)
{
return new KAction(label, "filenew", KStdAccel::openNew(), receiver, slot, actions, name);
}
@@ -120,7 +120,7 @@ KAction* createNewAlarmAction(const QString& label, QObject* receiver, const cha
/******************************************************************************
* Create a New From Template KAction.
*/
-TemplateMenuAction* createNewFromTemplateAction(const QString& label, QObject* receiver, const char* slot, KActionCollection* actions, const char* name)
+TemplateMenuAction* createNewFromTemplateAction(const TQString& label, TQObject* receiver, const char* slot, KActionCollection* actions, const char* name)
{
return new TemplateMenuAction(label, "new_from_template", receiver, slot, actions, name);
}
@@ -132,7 +132,7 @@ TemplateMenuAction* createNewFromTemplateAction(const QString& label, QObject* r
* event in that listView instance.
* 'event' is updated with the actual event ID.
*/
-UpdateStatus addEvent(KAEvent& event, AlarmListView* selectionView, QWidget* errmsgParent, bool useEventID, bool allowKOrgUpdate)
+UpdateStatus addEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool useEventID, bool allowKOrgUpdate)
{
kdDebug(5950) << "KAlarm::addEvent(): " << event.id() << endl;
UpdateStatus status = UPDATE_OK;
@@ -177,7 +177,7 @@ bool addExpiredEvent(KAEvent& event)
return false;
bool archiving = (KAEvent::uidStatus(event.id()) == KAEvent::ACTIVE);
if (archiving)
- event.setSaveDateTime(QDateTime::currentDateTime()); // time stamp to control purging
+ event.setSaveDateTime(TQDateTime::currentDateTime()); // time stamp to control purging
KCal::Event* kcalEvent = cal->addEvent(event);
cal->save();
@@ -196,7 +196,7 @@ bool addExpiredEvent(KAEvent& event)
* event in that listView instance.
* 'event' is updated with the actual event ID.
*/
-UpdateStatus addTemplate(KAEvent& event, TemplateListView* selectionView, QWidget* errmsgParent)
+UpdateStatus addTemplate(KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent)
{
kdDebug(5950) << "KAlarm::addTemplate(): " << event.id() << endl;
UpdateStatus status = UPDATE_OK;
@@ -228,7 +228,7 @@ UpdateStatus addTemplate(KAEvent& event, TemplateListView* selectionView, QWidge
* If 'selectionView' is non-null, the selection highlight is moved to the
* modified event in that listView instance.
*/
-UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, QWidget* errmsgParent)
+UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListView* selectionView, TQWidget* errmsgParent)
{
kdDebug(5950) << "KAlarm::modifyEvent(): '" << oldEvent.id() << endl;
@@ -283,7 +283,7 @@ UpdateStatus modifyEvent(KAEvent& oldEvent, const KAEvent& newEvent, AlarmListVi
* The event is not updated in KOrganizer, since this function is called when an
* existing alarm is rescheduled (due to recurrence or deferral).
*/
-UpdateStatus updateEvent(KAEvent& event, AlarmListView* selectionView, QWidget* errmsgParent, bool archiveOnDelete, bool incRevision)
+UpdateStatus updateEvent(KAEvent& event, AlarmListView* selectionView, TQWidget* errmsgParent, bool archiveOnDelete, bool incRevision)
{
kdDebug(5950) << "KAlarm::updateEvent(): " << event.id() << endl;
@@ -314,7 +314,7 @@ UpdateStatus updateEvent(KAEvent& event, AlarmListView* selectionView, QWidget*
* If 'selectionView' is non-null, the selection highlight is moved to the
* updated event in that listView instance.
*/
-UpdateStatus updateTemplate(const KAEvent& event, TemplateListView* selectionView, QWidget* errmsgParent)
+UpdateStatus updateTemplate(const KAEvent& event, TemplateListView* selectionView, TQWidget* errmsgParent)
{
UpdateStatus status = UPDATE_OK;
AlarmCalendar* cal = AlarmCalendar::templateCalendarOpen();
@@ -341,9 +341,9 @@ UpdateStatus updateTemplate(const KAEvent& event, TemplateListView* selectionVie
* Delete an alarm from the calendar file and from every main window instance.
* If the event is archived, the event's ID is changed to an expired ID if necessary.
*/
-UpdateStatus deleteEvent(KAEvent& event, bool archive, QWidget* errmsgParent)
+UpdateStatus deleteEvent(KAEvent& event, bool archive, TQWidget* errmsgParent)
{
- QString id = event.id();
+ TQString id = event.id();
kdDebug(5950) << "KAlarm::deleteEvent(): " << id << endl;
// Update the window lists
@@ -388,7 +388,7 @@ UpdateStatus deleteEvent(KAEvent& event, bool archive, QWidget* errmsgParent)
*/
UpdateStatus deleteTemplate(const KAEvent& event)
{
- QString id = event.id();
+ TQString id = event.id();
// Delete the template from the calendar file
AlarmCalendar* cal = AlarmCalendar::templateCalendarOpen();
@@ -406,7 +406,7 @@ UpdateStatus deleteTemplate(const KAEvent& event)
/******************************************************************************
* Delete an alarm from the display calendar.
*/
-void deleteDisplayEvent(const QString& eventID)
+void deleteDisplayEvent(const TQString& eventID)
{
kdDebug(5950) << "KAlarm::deleteDisplayEvent(" << eventID << ")\n";
@@ -426,13 +426,13 @@ void deleteDisplayEvent(const QString& eventID)
*/
UpdateStatus reactivateEvent(KAEvent& event, AlarmListView* selectionView, bool useEventID)
{
- QString id = event.id();
+ TQString id = event.id();
kdDebug(5950) << "KAlarm::reactivateEvent(): " << id << endl;
// Delete the event from the expired calendar file
if (KAEvent::uidStatus(id) == KAEvent::EXPIRED)
{
- QDateTime now = QDateTime::currentDateTime();
+ TQDateTime now = TQDateTime::currentDateTime();
if (event.occursAfter(now, true))
{
if (event.recurs() || event.repeatCount())
@@ -501,9 +501,9 @@ UpdateStatus enableEvent(KAEvent& event, AlarmListView* selectionView, bool enab
/******************************************************************************
* Display an error message about an error saving an event.
*/
-void displayUpdateError(QWidget* parent, UpdateStatus, UpdateError code, int nAlarms)
+void displayUpdateError(TQWidget* parent, UpdateStatus, UpdateError code, int nAlarms)
{
- QString errmsg;
+ TQString errmsg;
switch (code)
{
case ERR_ADD:
@@ -528,9 +528,9 @@ void displayUpdateError(QWidget* parent, UpdateStatus, UpdateError code, int nAl
/******************************************************************************
* Display an error message corresponding to a specified alarm update error code.
*/
-void displayKOrgUpdateError(QWidget* parent, KOrgUpdateError code, int nAlarms)
+void displayKOrgUpdateError(TQWidget* parent, KOrgUpdateError code, int nAlarms)
{
- QString errmsg;
+ TQString errmsg;
switch (code)
{
case KORG_ERR_ADD:
@@ -551,7 +551,7 @@ void displayKOrgUpdateError(QWidget* parent, KOrgUpdateError code, int nAlarms)
/******************************************************************************
* Display the alarm edit dialogue to edit a specified alarm.
*/
-bool edit(const QString& eventID)
+bool edit(const TQString& eventID)
{
AlarmCalendar* cal;
switch (KAEvent::uidStatus(eventID))
@@ -581,7 +581,7 @@ bool edit(const QString& eventID)
* Display the alarm edit dialogue to edit a new alarm, optionally preset with
* a template.
*/
-bool editNew(const QString& templateName)
+bool editNew(const TQString& templateName)
{
bool result = true;
if (!templateName.isEmpty())
@@ -607,9 +607,9 @@ bool editNew(const QString& templateName)
* Returns a list of all alarm templates.
* If shell commands are disabled, command alarm templates are omitted.
*/
-QValueList<KAEvent> templateList()
+TQValueList<KAEvent> templateList()
{
- QValueList<KAEvent> templates;
+ TQValueList<KAEvent> templates;
AlarmCalendar* cal = AlarmCalendar::templateCalendarOpen();
if (cal)
{
@@ -631,7 +631,7 @@ QValueList<KAEvent> templateList()
* Prompt the user to re-enable alarms if they are currently disabled, and if
* it's an email alarm, warn if no 'From' email address is configured.
*/
-void outputAlarmWarnings(QWidget* parent, const KAEvent* event)
+void outputAlarmWarnings(TQWidget* parent, const KAEvent* event)
{
if (event && event->action() == KAEvent::EMAIL
&& Preferences::emailAddress().isEmpty())
@@ -641,8 +641,8 @@ void outputAlarmWarnings(QWidget* parent, const KAEvent* event)
if (!Daemon::monitoringAlarms())
{
if (KMessageBox::warningYesNo(parent, i18n("Alarms are currently disabled.\nDo you want to enable alarms now?"),
- QString::null, i18n("Enable"), i18n("Keep Disabled"),
- QString::fromLatin1("EditEnableAlarms"))
+ TQString::null, i18n("Enable"), i18n("Keep Disabled"),
+ TQString::fromLatin1("EditEnableAlarms"))
== KMessageBox::Yes)
Daemon::setAlarmsEnabled();
}
@@ -703,13 +703,13 @@ void resetDaemonIfQueued()
* Reply = reason for failure to run KMail (which may be the empty string)
* = null string if success.
*/
-QString runKMail(bool minimise)
+TQString runKMail(bool minimise)
{
- QCString dcopName;
- QString errmsg;
+ TQCString dcopName;
+ TQString errmsg;
if (!runProgram("kmail", (minimise ? KMAIL_DCOP_WINDOW : ""), dcopName, errmsg))
return i18n("Unable to start KMail\n(%1)").arg(errmsg);
- return QString::null;
+ return TQString::null;
}
/******************************************************************************
@@ -719,12 +719,12 @@ QString runKMail(bool minimise)
* 'errorMessage' contains an error message if failure.
* Reply = true if the program is now running.
*/
-bool runProgram(const QCString& program, const QCString& windowName, QCString& dcopName, QString& errorMessage)
+bool runProgram(const TQCString& program, const TQCString& windowName, TQCString& dcopName, TQString& errorMessage)
{
if (!kapp->dcopClient()->isApplicationRegistered(program))
{
// KOrganizer is not already running, so start it
- if (KApplication::startServiceByDesktopName(QString::fromLatin1(program), QString::null, &errorMessage, &dcopName))
+ if (KApplication::startServiceByDesktopName(TQString::fromLatin1(program), TQString::null, &errorMessage, &dcopName))
{
kdError(5950) << "runProgram(): couldn't start " << program << " (" << errorMessage << ")\n";
return false;
@@ -732,11 +732,11 @@ bool runProgram(const QCString& program, const QCString& windowName, QCString& d
// Minimise its window - don't use hide() since this would remove all
// trace of it from the panel if it is not configured to be docked in
// the system tray.
- kapp->dcopClient()->send(dcopName, windowName, "minimize()", QString::null);
+ kapp->dcopClient()->send(dcopName, windowName, "minimize()", TQString::null);
}
else if (dcopName.isEmpty())
dcopName = program;
- errorMessage = QString::null;
+ errorMessage = TQString::null;
return true;
}
@@ -746,13 +746,13 @@ bool runProgram(const QCString& program, const QCString& windowName, QCString& d
* Reply = true if size set in the config file, in which case 'result' is set
* = false if no size is set, in which case 'result' is unchanged.
*/
-bool readConfigWindowSize(const char* window, QSize& result)
+bool readConfigWindowSize(const char* window, TQSize& result)
{
KConfig* config = KGlobal::config();
- config->setGroup(QString::fromLatin1(window));
- QWidget* desktop = KApplication::desktop();
- QSize s = QSize(config->readNumEntry(QString::fromLatin1("Width %1").arg(desktop->width()), 0),
- config->readNumEntry(QString::fromLatin1("Height %1").arg(desktop->height()), 0));
+ config->setGroup(TQString::fromLatin1(window));
+ TQWidget* desktop = KApplication::desktop();
+ TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), 0),
+ config->readNumEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), 0));
if (s.isEmpty())
return false;
result = s;
@@ -763,13 +763,13 @@ bool readConfigWindowSize(const char* window, QSize& result)
* Write the size for the specified window to the config file, for the
* current screen resolution.
*/
-void writeConfigWindowSize(const char* window, const QSize& size)
+void writeConfigWindowSize(const char* window, const TQSize& size)
{
KConfig* config = KGlobal::config();
- config->setGroup(QString::fromLatin1(window));
- QWidget* desktop = KApplication::desktop();
- config->writeEntry(QString::fromLatin1("Width %1").arg(desktop->width()), size.width());
- config->writeEntry(QString::fromLatin1("Height %1").arg(desktop->height()), size.height());
+ config->setGroup(TQString::fromLatin1(window));
+ TQWidget* desktop = KApplication::desktop();
+ config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width());
+ config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height());
config->sync();
}
@@ -790,12 +790,12 @@ int Version()
* e.g. 010203 for 1.2.3
* = 0 if invalid version string.
*/
-int getVersionNumber(const QString& version, QString* subVersion)
+int getVersionNumber(const TQString& version, TQString* subVersion)
{
// N.B. Remember to change Version(int major, int minor, int rev)
// if the representation returned by this method changes.
if (subVersion)
- *subVersion = QString::null;
+ *subVersion = TQString::null;
int count = version.contains('.') + 1;
if (count < 2)
return 0;
@@ -810,7 +810,7 @@ int getVersionNumber(const QString& version, QString* subVersion)
if (count >= 3)
{
// Issue number: allow other characters to follow the last digit
- QString issue = version.section('.', 2);
+ TQString issue = version.section('.', 2);
if (!issue.at(0).isDigit())
return 0;
int n = issue.length();
@@ -829,7 +829,7 @@ int getVersionNumber(const QString& version, QString* subVersion)
* If a text file, its type is distinguished.
* Reply = file type.
*/
-FileType fileType(const QString& mimetype)
+FileType fileType(const TQString& mimetype)
{
static const char* applicationTypes[] = {
"x-shellscript", "x-nawk", "x-awk", "x-perl", "x-python",
@@ -837,20 +837,20 @@ FileType fileType(const QString& mimetype)
static const char* formattedTextTypes[] = {
"html", "xml", 0 };
- if (mimetype.startsWith(QString::fromLatin1("image/")))
+ if (mimetype.startsWith(TQString::fromLatin1("image/")))
return Image;
int slash = mimetype.find('/');
if (slash < 0)
return Unknown;
- QString type = mimetype.mid(slash + 1);
+ TQString type = mimetype.mid(slash + 1);
const char* typel = type.latin1();
- if (mimetype.startsWith(QString::fromLatin1("application")))
+ if (mimetype.startsWith(TQString::fromLatin1("application")))
{
for (int i = 0; applicationTypes[i]; ++i)
if (!strcmp(typel, applicationTypes[i]))
return TextApplication;
}
- else if (mimetype.startsWith(QString::fromLatin1("text")))
+ else if (mimetype.startsWith(TQString::fromLatin1("text")))
{
for (int i = 0; formattedTextTypes[i]; ++i)
if (!strcmp(typel, formattedTextTypes[i]))
@@ -870,20 +870,20 @@ FileType fileType(const QString& mimetype)
* @param mode OR of KFile::Mode values, e.g. ExistingOnly, LocalOnly.
* Reply = URL selected. If none is selected, URL.isEmpty() is true.
*/
-QString browseFile(const QString& caption, QString& defaultDir, const QString& initialFile,
- const QString& filter, int mode, QWidget* parent, const char* name)
+TQString browseFile(const TQString& caption, TQString& defaultDir, const TQString& initialFile,
+ const TQString& filter, int mode, TQWidget* parent, const char* name)
{
- QString initialDir = !initialFile.isEmpty() ? QString(initialFile).remove(QRegExp("/[^/]*$"))
+ TQString initialDir = !initialFile.isEmpty() ? TQString(initialFile).remove(TQRegExp("/[^/]*$"))
: !defaultDir.isEmpty() ? defaultDir
- : QDir::homeDirPath();
+ : TQDir::homeDirPath();
KFileDialog fileDlg(initialDir, filter, parent, name, true);
fileDlg.setOperationMode(mode & KFile::ExistingOnly ? KFileDialog::Opening : KFileDialog::Saving);
fileDlg.setMode(KFile::File | mode);
fileDlg.setCaption(caption);
if (!initialFile.isEmpty())
fileDlg.setSelection(initialFile);
- if (fileDlg.exec() != QDialog::Accepted)
- return QString::null;
+ if (fileDlg.exec() != TQDialog::Accepted)
+ return TQString::null;
KURL url = fileDlg.selectedURL();
defaultDir = url.path();
return (mode & KFile::LocalOnly) ? url.path() : url.prettyURL();
@@ -904,13 +904,13 @@ int localeFirstDayOfWeek()
/******************************************************************************
* Return the supplied string with any accelerator code stripped out.
*/
-QString stripAccel(const QString& text)
+TQString stripAccel(const TQString& text)
{
unsigned len = text.length();
- QString out = QDeepCopy<QString>(text);
- QChar *corig = (QChar*)out.unicode();
- QChar *cout = corig;
- QChar *cin = cout;
+ TQString out = TQDeepCopy<TQString>(text);
+ TQChar *corig = (TQChar*)out.unicode();
+ TQChar *cout = corig;
+ TQChar *cin = cout;
while (len)
{
if ( *cin == '&' )
@@ -955,10 +955,10 @@ namespace {
bool sendToKOrganizer(const KAEvent& event)
{
KCal::Event* kcalEvent = event.event();
- QString uid = KAEvent::uid(event.id(), KAEvent::KORGANIZER);
+ TQString uid = KAEvent::uid(event.id(), KAEvent::KORGANIZER);
kcalEvent->setUid(uid);
kcalEvent->clearAlarms();
- QString userEmail;
+ TQString userEmail;
switch (event.action())
{
case KAEvent::MESSAGE:
@@ -969,37 +969,37 @@ bool sendToKOrganizer(const KAEvent& event)
break;
case KAEvent::EMAIL:
{
- QString from = event.emailFromId()
+ TQString from = event.emailFromId()
? KAMail::identityManager()->identityForUoid(event.emailFromId()).fullEmailAddr()
: Preferences::emailAddress();
AlarmText atext;
- atext.setEmail(event.emailAddresses(", "), from, QString::null, QString::null, event.emailSubject(), QString::null);
+ atext.setEmail(event.emailAddresses(", "), from, TQString::null, TQString::null, event.emailSubject(), TQString::null);
kcalEvent->setSummary(atext.displayText());
userEmail = from;
break;
}
}
- kcalEvent->setOrganizer(KCal::Person(QString::null, userEmail));
+ kcalEvent->setOrganizer(KCal::Person(TQString::null, userEmail));
// Translate the event into string format
KCal::ICalFormat format;
- format.setTimeZone(QString::null, false);
- QString iCal = format.toICalString(kcalEvent);
+ format.setTimeZone(TQString::null, false);
+ TQString iCal = format.toICalString(kcalEvent);
kdDebug(5950)<<"Korg->"<<iCal<<endl;
delete kcalEvent;
// Send the event to KOrganizer
if (!runKOrganizer()) // start KOrganizer if it isn't already running
return false;
- QByteArray data, replyData;
- QCString replyType;
- QDataStream arg(data, IO_WriteOnly);
+ TQByteArray data, replyData;
+ TQCString replyType;
+ TQDataStream arg(data, IO_WriteOnly);
arg << iCal;
- if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "addIncidence(QString)", data, replyType, replyData)
+ if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "addIncidence(TQString)", data, replyType, replyData)
&& replyType == "bool")
{
bool result;
- QDataStream reply(replyData, IO_ReadOnly);
+ TQDataStream reply(replyData, IO_ReadOnly);
reply >> result;
if (result)
{
@@ -1014,20 +1014,20 @@ kdDebug(5950)<<"Korg->"<<iCal<<endl;
/******************************************************************************
* Tell KOrganizer to delete an event from its calendar.
*/
-bool deleteFromKOrganizer(const QString& eventID)
+bool deleteFromKOrganizer(const TQString& eventID)
{
if (!runKOrganizer()) // start KOrganizer if it isn't already running
return false;
- QString newID = KAEvent::uid(eventID, KAEvent::KORGANIZER);
- QByteArray data, replyData;
- QCString replyType;
- QDataStream arg(data, IO_WriteOnly);
+ TQString newID = KAEvent::uid(eventID, KAEvent::KORGANIZER);
+ TQByteArray data, replyData;
+ TQCString replyType;
+ TQDataStream arg(data, IO_WriteOnly);
arg << newID << true;
- if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "deleteIncidence(QString,bool)", data, replyType, replyData)
+ if (kapp->dcopClient()->call(korganizerName, KORG_DCOP_OBJECT, "deleteIncidence(TQString,bool)", data, replyType, replyData)
&& replyType == "bool")
{
bool result;
- QDataStream reply(replyData, IO_ReadOnly);
+ TQDataStream reply(replyData, IO_ReadOnly);
reply >> result;
if (result)
{
@@ -1044,9 +1044,9 @@ bool deleteFromKOrganizer(const QString& eventID)
*/
bool runKOrganizer()
{
- QString error;
- QCString dcopService;
- int result = KDCOPServiceStarter::self()->findServiceFor("DCOP/Organizer", QString::null, QString::null, &error, &dcopService);
+ TQString error;
+ TQCString dcopService;
+ int result = KDCOPServiceStarter::self()->findServiceFor("DCOP/Organizer", TQString::null, TQString::null, &error, &dcopService);
if (result)
{
kdDebug(5950) << "Unable to start DCOP/Organizer: " << dcopService << " " << error << endl;
@@ -1055,8 +1055,8 @@ bool runKOrganizer()
// If Kontact is running, there is be a load() method which needs to be called
// to load KOrganizer into Kontact. But if KOrganizer is running independently,
// the load() method doesn't exist.
- QCString dummy;
- if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", QByteArray(), dummy, dummy))
+ TQCString dummy;
+ if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
{
DCOPRef ref(dcopService, dcopService); // talk to the KUniqueApplication or its Kontact wrapper
DCOPReply reply = ref.call("load()");
@@ -1065,7 +1065,7 @@ bool runKOrganizer()
kdWarning(5950) << "Error loading " << dcopService << endl;
return false;
}
- if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", QByteArray(), dummy, dummy))
+ if (!kapp->dcopClient()->findObject(dcopService, KORG_DCOP_OBJECT, "", TQByteArray(), dummy, dummy))
{
kdWarning(5950) << "Unable to access KOrganizer's "KORG_DCOP_OBJECT" DCOP object" << endl;
return false;
@@ -1079,7 +1079,7 @@ bool runKOrganizer()
#ifdef HAVE_XTEST
#include <X11/keysym.h>
#include <X11/extensions/XTest.h>
-#include <qwindowdefs.h>
+#include <tqwindowdefs.h>
/******************************************************************************
* Cancel the screen saver, in case it is active.