summaryrefslogtreecommitdiffstats
path: root/kalarm
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:59:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:59:01 -0600
commit716a5de8870d7c02bb4d0aed72f30291b17b763a (patch)
tree29e58b213ead28151ccf7eb33d12c968ea844120 /kalarm
parent0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 (diff)
downloadtdepim-716a5de8870d7c02bb4d0aed72f30291b17b763a.tar.gz
tdepim-716a5de8870d7c02bb4d0aed72f30291b17b763a.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kalarm')
-rw-r--r--kalarm/alarmcalendar.cpp24
-rw-r--r--kalarm/alarmevent.cpp34
-rw-r--r--kalarm/alarmlistview.cpp10
-rw-r--r--kalarm/alarmtimewidget.cpp10
-rw-r--r--kalarm/daemon.cpp10
-rw-r--r--kalarm/deferdlg.cpp2
-rw-r--r--kalarm/editdlg.cpp44
-rw-r--r--kalarm/functions.cpp12
-rw-r--r--kalarm/kalarmapp.cpp88
-rw-r--r--kalarm/kamail.cpp38
-rw-r--r--kalarm/lib/dateedit.cpp2
-rw-r--r--kalarm/lib/shellprocess.cpp4
-rw-r--r--kalarm/lib/spinbox2.h10
-rw-r--r--kalarm/mainwindow.cpp10
-rw-r--r--kalarm/messagewin.cpp16
-rw-r--r--kalarm/prefdlg.cpp66
-rw-r--r--kalarm/recurrenceedit.cpp2
-rw-r--r--kalarm/sounddlg.cpp10
-rw-r--r--kalarm/soundpicker.cpp10
-rw-r--r--kalarm/traywindow.cpp16
-rw-r--r--kalarm/undo.cpp2
21 files changed, 210 insertions, 210 deletions
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 1de9e8323..f17cd7495 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -61,7 +61,7 @@ using namespace KCal;
TQString AlarmCalendar::icalProductId()
{
- return TQString::fromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").tqarg(KAlarm::currentCalendarVersionString());
+ return TQString::fromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").arg(KAlarm::currentCalendarVersionString());
}
static const KAEvent::Status eventTypes[AlarmCalendar::NCALS] = {
@@ -112,7 +112,7 @@ bool AlarmCalendar::initialiseCalendars()
{
kdError(5950) << "AlarmCalendar::initialiseCalendars(): '" << errorKey1 << "' calendar name = display calendar name\n";
TQString file = config->readPathEntry(errorKey1);
- KAlarmApp::displayFatalError(i18n("%1: file name not permitted: %2").tqarg(errorKey1).tqarg(file));
+ KAlarmApp::displayFatalError(i18n("%1: file name not permitted: %2").arg(errorKey1).arg(file));
return false;
}
if (activeCal == expiredCal)
@@ -133,14 +133,14 @@ bool AlarmCalendar::initialiseCalendars()
if (!errorKey1.isNull())
{
kdError(5950) << "AlarmCalendar::initialiseCalendars(): calendar names clash: " << errorKey1 << ", " << errorKey2 << endl;
- KAlarmApp::displayFatalError(i18n("%1, %2: file names must be different").tqarg(errorKey1).tqarg(errorKey2));
+ KAlarmApp::displayFatalError(i18n("%1, %2: file names must be different").arg(errorKey1).arg(errorKey2));
return false;
}
if (!mCalendars[ACTIVE]->valid())
{
TQString path = mCalendars[ACTIVE]->path();
kdError(5950) << "AlarmCalendar::initialiseCalendars(): invalid name: " << path << endl;
- KAlarmApp::displayFatalError(i18n("Invalid calendar file name: %1").tqarg(path));
+ KAlarmApp::displayFatalError(i18n("Invalid calendar file name: %1").arg(path));
return false;
}
return true;
@@ -321,7 +321,7 @@ int AlarmCalendar::load()
if (!KIO::NetAccess::download(mUrl, tmpFile, MainWindow::mainMainWindow()))
{
kdError(5950) << "AlarmCalendar::load(): Load failure" << endl;
- KMessageBox::error(0, i18n("Cannot open calendar:\n%1").tqarg(mUrl.prettyURL()));
+ KMessageBox::error(0, i18n("Cannot open calendar:\n%1").arg(mUrl.prettyURL()));
return -1;
}
kdDebug(5950) << "AlarmCalendar::load(): --- Downloaded to " << tmpFile << endl;
@@ -338,7 +338,7 @@ int AlarmCalendar::load()
if (!fi.size())
return 0; // file is zero length
kdError(5950) << "AlarmCalendar::load(): Error loading calendar file '" << tmpFile << "'" << endl;
- KMessageBox::error(0, i18n("Error loading calendar:\n%1\n\nPlease fix or delete the file.").tqarg(mUrl.prettyURL()));
+ KMessageBox::error(0, i18n("Error loading calendar:\n%1\n\nPlease fix or delete the file.").arg(mUrl.prettyURL()));
// load() could have partially populated the calendar, so clear it out
mCalendar->close();
delete mCalendar;
@@ -383,7 +383,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
if (!mCalendar->save(saveFilename, new ICalFormat))
{
kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): failed.\n";
- KMessageBox::error(0, i18n("Failed to save calendar to\n'%1'").tqarg(mICalUrl.prettyURL()));
+ KMessageBox::error(0, i18n("Failed to save calendar to\n'%1'").arg(mICalUrl.prettyURL()));
return false;
}
@@ -392,7 +392,7 @@ bool AlarmCalendar::saveCal(const TQString& newFile)
if (!KIO::NetAccess::upload(saveFilename, mICalUrl, MainWindow::mainMainWindow()))
{
kdError(5950) << "AlarmCalendar::saveCal(" << saveFilename << "): upload failed.\n";
- KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").tqarg(mICalUrl.prettyURL()));
+ KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").arg(mICalUrl.prettyURL()));
return false;
}
}
@@ -446,7 +446,7 @@ void AlarmCalendar::close()
bool AlarmCalendar::importAlarms(TQWidget* parent)
{
KURL url = KFileDialog::getOpenURL(TQString::fromLatin1(":importalarms"),
- TQString::fromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), parent);
+ TQString::fromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), parent);
if (url.isEmpty())
{
kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl;
@@ -468,7 +468,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
if (!KStandardDirs::exists(filename))
{
kdDebug(5950) << "AlarmCalendar::importAlarms(): File '" << url.prettyURL() << "' not found" << endl;
- KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
+ KMessageBox::error(parent, i18n("Could not load calendar '%1'.").arg(url.prettyURL()));
return false;
}
}
@@ -477,7 +477,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow()))
{
kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl;
- KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").tqarg(url.prettyURL()));
+ KMessageBox::error(parent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL()));
return false;
}
kdDebug(5950) << "--- Downloaded to " << filename << endl;
@@ -490,7 +490,7 @@ bool AlarmCalendar::importAlarms(TQWidget* parent)
if (!success)
{
kdDebug(5950) << "AlarmCalendar::importAlarms(): error loading calendar '" << filename << "'" << endl;
- KMessageBox::error(parent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
+ KMessageBox::error(parent, i18n("Could not load calendar '%1'.").arg(url.prettyURL()));
}
else
{
diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp
index 9acb722d1..d39567938 100644
--- a/kalarm/alarmevent.cpp
+++ b/kalarm/alarmevent.cpp
@@ -1000,7 +1000,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
if (mEmailBcc)
cats.append(EMAIL_BCC_CATEGORY);
if (mKMailSerialNumber)
- cats.append(TQString("%1%2").tqarg(KMAIL_SERNUM_CATEGORY).tqarg(mKMailSerialNumber));
+ cats.append(TQString("%1%2").arg(KMAIL_SERNUM_CATEGORY).arg(mKMailSerialNumber));
if (mCopyToKOrganizer)
cats.append(KORGANIZER_CATEGORY);
if (mCommandXterm)
@@ -1008,11 +1008,11 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
else if (!mLogFile.isEmpty())
cats.append(LOG_CATEGORY + mLogFile);
if (mLateCancel)
- cats.append(TQString("%1%2").tqarg(mAutoClose ? AUTO_CLOSE_CATEGORY : LATE_CANCEL_CATEGORY).tqarg(mLateCancel));
+ cats.append(TQString("%1%2").arg(mAutoClose ? AUTO_CLOSE_CATEGORY : LATE_CANCEL_CATEGORY).arg(mLateCancel));
if (mDeferDefaultMinutes)
- cats.append(TQString("%1%2").tqarg(DEFER_CATEGORY).tqarg(mDeferDefaultMinutes));
+ cats.append(TQString("%1%2").arg(DEFER_CATEGORY).arg(mDeferDefaultMinutes));
if (!mTemplateName.isEmpty() && mTemplateAfterTime >= 0)
- cats.append(TQString("%1%2").tqarg(TEMPL_AFTER_TIME_CATEGORY).tqarg(mTemplateAfterTime));
+ cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(mTemplateAfterTime));
if (mArchive && !original)
{
TQStringList params;
@@ -1032,7 +1032,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
unit = 'H';
count /= 60;
}
- params += TQString("%1%2").tqarg(count).tqarg(unit);
+ params += TQString("%1%2").arg(count).arg(unit);
}
if (mArchiveRepeatAtLogin)
params += AT_LOGIN_TYPE;
@@ -1084,7 +1084,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
{
// Alarm repetition is normally held in the main alarm, but since
// the main alarm has expired, store in a custom property.
- TQString param = TQString("%1:%2").tqarg(mRepeatInterval).tqarg(mRepeatCount);
+ TQString param = TQString("%1:%2").arg(mRepeatInterval).arg(mRepeatCount);
ev.setCustomProperty(APPNAME, REPEAT_PROPERTY, param);
}
@@ -1251,9 +1251,9 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
}
if (!mAudioFile.isEmpty() && mSoundVolume >= 0)
alarm->setCustomProperty(APPNAME, VOLUME_PROPERTY,
- TQString::fromLatin1("%1;%2;%3").tqarg(TQString::number(mSoundVolume, 'f', 2))
- .tqarg(TQString::number(mFadeVolume, 'f', 2))
- .tqarg(mFadeSeconds));
+ TQString::fromLatin1("%1;%2;%3").arg(TQString::number(mSoundVolume, 'f', 2))
+ .arg(TQString::number(mFadeVolume, 'f', 2))
+ .arg(mFadeSeconds));
break;
case KAAlarm::PRE_ACTION_ALARM:
setProcedureAlarm(alarm, mPreAction);
@@ -1277,9 +1277,9 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
case T_MESSAGE:
alarm->setDisplayAlarm(AlarmText::toCalendarText(mText));
alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY,
- TQString::fromLatin1("%1;%2;%3").tqarg(mBgColour.name())
- .tqarg(mFgColour.name())
- .tqarg(mDefaultFont ? TQString() : mFont.toString()));
+ TQString::fromLatin1("%1;%2;%3").arg(mBgColour.name())
+ .arg(mFgColour.name())
+ .arg(mDefaultFont ? TQString() : mFont.toString()));
break;
case T_COMMAND:
if (mCommandScript)
@@ -2093,7 +2093,7 @@ TQString KAEvent::recurrenceText(bool brief) const
else
{
TQString mins;
- return i18n("Hours and Minutes", "%1H %2M").tqarg(TQString::number(frequency/60)).tqarg(mins.sprintf("%02d", frequency%60));
+ return i18n("Hours and Minutes", "%1H %2M").arg(TQString::number(frequency/60)).arg(mins.sprintf("%02d", frequency%60));
}
case RecurrenceRule::rDaily:
return i18n("1 Day", "%n Days", frequency);
@@ -2125,7 +2125,7 @@ TQString KAEvent::repetitionText(bool brief) const
if (mRepeatInterval % 60 == 0)
return i18n("1 Hour", "%n Hours", mRepeatInterval/60);
TQString mins;
- return i18n("Hours and Minutes", "%1H %2M").tqarg(TQString::number(mRepeatInterval/60)).tqarg(mins.sprintf("%02d", mRepeatInterval%60));
+ return i18n("Hours and Minutes", "%1H %2M").arg(TQString::number(mRepeatInterval/60)).arg(mins.sprintf("%02d", mRepeatInterval%60));
}
if (mRepeatInterval % (7*1440))
return i18n("1 Day", "%n Days", mRepeatInterval/1440);
@@ -2844,7 +2844,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
Alarm* alarm = *alit;
if (alarm->type() == Alarm::Display)
alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY,
- TQString::fromLatin1("%1;;").tqarg(cats[0]));
+ TQString::fromLatin1("%1;;").arg(cats[0]));
}
cats.remove(cats.begin());
}
@@ -2918,7 +2918,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
while ((it = cats.find(TEMPL_DEF_TIME_CAT)) != cats.end())
{
cats.remove(it);
- cats.append(TQString("%1%2").tqarg(TEMPL_AFTER_TIME_CATEGORY).tqarg(0));
+ cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(0));
}
}
@@ -2937,7 +2937,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
}
if (addLateCancel)
- cats.append(TQString("%1%2").tqarg(LATE_CANCEL_CATEGORY).tqarg(1));
+ cats.append(TQString("%1%2").arg(LATE_CANCEL_CATEGORY).arg(1));
event->setCategories(cats);
diff --git a/kalarm/alarmlistview.cpp b/kalarm/alarmlistview.cpp
index 419f642a4..3e3db18d4 100644
--- a/kalarm/alarmlistview.cpp
+++ b/kalarm/alarmlistview.cpp
@@ -503,7 +503,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const
{
// Initialise the position of the hour within the time string, if leading
// zeroes are omitted, so that displayed times can be aligned with each other.
- mTimeHourPos = -1; // default = tqalignment isn't possible/sensible
+ mTimeHourPos = -1; // default = alignment isn't possible/sensible
if (!TQApplication::reverseLayout()) // don't try to align right-to-left languages
{
TQString fmt = locale->timeFormat();
@@ -514,7 +514,7 @@ TQString AlarmListViewItem::alarmTimeText(const DateTime& dateTime) const
}
if (mTimeHourPos >= 0 && (int)time.length() > mTimeHourPos + 1
&& time[mTimeHourPos].isDigit() && !time[mTimeHourPos + 1].isDigit())
- dateTimeText += '~'; // improve tqalignment of times with no leading zeroes
+ dateTimeText += '~'; // improve alignment of times with no leading zeroes
dateTimeText += time;
}
return dateTimeText + ' ';
@@ -531,7 +531,7 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const
if (dateTime.isDateOnly())
{
int days = now.date().daysTo(dateTime.date());
- return i18n("n days", " %1d ").tqarg(days);
+ return i18n("n days", " %1d ").arg(days);
}
int mins = (now.secsTo(dateTime.dateTime()) + 59) / 60;
if (mins < 0)
@@ -540,10 +540,10 @@ TQString AlarmListViewItem::timeToAlarmText(const TQDateTime& now) const
minutes[0] = (mins%60) / 10 + '0';
minutes[1] = (mins%60) % 10 + '0';
if (mins < 24*60)
- return i18n("hours:minutes", " %1:%2 ").tqarg(mins/60).tqarg(minutes);
+ return i18n("hours:minutes", " %1:%2 ").arg(mins/60).arg(minutes);
int days = mins / (24*60);
mins = mins % (24*60);
- return i18n("days hours:minutes", " %1d %2:%3 ").tqarg(days).tqarg(mins/60).tqarg(minutes);
+ return i18n("days hours:minutes", " %1d %2:%3 ").arg(days).arg(mins/60).arg(minutes);
}
/******************************************************************************
diff --git a/kalarm/alarmtimewidget.cpp b/kalarm/alarmtimewidget.cpp
index 2b65c7001..ffda682c2 100644
--- a/kalarm/alarmtimewidget.cpp
+++ b/kalarm/alarmtimewidget.cpp
@@ -104,7 +104,7 @@ void AlarmTimeWidget::init(int mode)
connect(mDateEdit, TQT_SIGNAL(dateEntered(const TQDate&)), TQT_SLOT(dateTimeChanged()));
static const TQString enterDateText = i18n("Enter the date to schedule the alarm.");
TQWhatsThis::add(mDateEdit, ((mode & DEFER_TIME) ? enterDateText
- : TQString("%1\n%2").tqarg(enterDateText).tqarg(recurText)));
+ : TQString("%1\n%2").arg(enterDateText).arg(recurText)));
mAtTimeRadio->setFocusWidget(mDateEdit);
// Time edit box and Any time checkbox
@@ -115,8 +115,8 @@ void AlarmTimeWidget::init(int mode)
connect(mTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(dateTimeChanged()));
static const TQString enterTimeText = i18n("Enter the time to schedule the alarm.");
TQWhatsThis::add(mTimeEdit,
- ((mode & DEFER_TIME) ? TQString("%1\n\n%2").tqarg(enterTimeText).tqarg(TimeSpinBox::shiftWhatsThis())
- : TQString("%1\n%2\n\n%3").tqarg(enterTimeText).tqarg(recurText).tqarg(TimeSpinBox::shiftWhatsThis())));
+ ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(enterTimeText).arg(TimeSpinBox::shiftWhatsThis())
+ : TQString("%1\n%2\n\n%3").arg(enterTimeText).arg(recurText).arg(TimeSpinBox::shiftWhatsThis())));
mAnyTime = -1; // current status is uninitialised
if (mode & DEFER_TIME)
@@ -147,8 +147,8 @@ void AlarmTimeWidget::init(int mode)
mDelayTimeEdit->setFixedSize(mDelayTimeEdit->sizeHint());
connect(mDelayTimeEdit, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(delayTimeChanged(int)));
TQWhatsThis::add(mDelayTimeEdit,
- ((mode & DEFER_TIME) ? TQString("%1\n\n%2").tqarg(i18n_TimeAfterPeriod()).tqarg(TimeSpinBox::shiftWhatsThis())
- : TQString("%1\n%2\n\n%3").tqarg(i18n_TimeAfterPeriod()).tqarg(recurText).tqarg(TimeSpinBox::shiftWhatsThis())));
+ ((mode & DEFER_TIME) ? TQString("%1\n\n%2").arg(i18n_TimeAfterPeriod()).arg(TimeSpinBox::shiftWhatsThis())
+ : TQString("%1\n%2\n\n%3").arg(i18n_TimeAfterPeriod()).arg(recurText).arg(TimeSpinBox::shiftWhatsThis())));
mAfterTimeRadio->setFocusWidget(mDelayTimeEdit);
// Set up the tqlayout, either narrow or wide
diff --git a/kalarm/daemon.cpp b/kalarm/daemon.cpp
index a970b94e1..4ad785552 100644
--- a/kalarm/daemon.cpp
+++ b/kalarm/daemon.cpp
@@ -221,7 +221,7 @@ void Daemon::registrationResult(bool reregister, int result, int version)
failed = true;
kdError(5950) << "Daemon::registrationResult(" << reregister << "): kalarmd reports incompatible version " << version << endl;
errmsg = i18n("Cannot enable alarms.\nInstallation or configuration error: Alarm Daemon (%1) version is incompatible.")
- .tqarg(TQString::fromLatin1(DAEMON_APP_NAME));
+ .arg(TQString::fromLatin1(DAEMON_APP_NAME));
}
else
{
@@ -236,8 +236,8 @@ void Daemon::registrationResult(bool reregister, int result, int version)
kdError(5950) << "Daemon::registrationResult(" << reregister << "): registerApp dcop call: " << kapp->aboutData()->appName() << " not found\n";
KMessageBox::error(0, i18n("Alarms will be disabled if you stop KAlarm.\n"
"(Installation or configuration error: %1 cannot locate %2 executable.)")
- .tqarg(TQString::fromLatin1(DAEMON_APP_NAME))
- .tqarg(kapp->aboutData()->appName()));
+ .arg(TQString::fromLatin1(DAEMON_APP_NAME))
+ .arg(kapp->aboutData()->appName()));
break;
case KAlarmd::FAILURE:
default:
@@ -248,7 +248,7 @@ void Daemon::registrationResult(bool reregister, int result, int version)
if (!reregister)
{
errmsg = i18n("Cannot enable alarms:\nFailed to register with Alarm Daemon (%1)")
- .tqarg(TQString::fromLatin1(DAEMON_APP_NAME));
+ .arg(TQString::fromLatin1(DAEMON_APP_NAME));
}
break;
}
@@ -304,7 +304,7 @@ void Daemon::checkIfStarted()
if (err)
{
kdError(5950) << "Daemon::checkIfStarted(): failed to start daemon" << endl;
- KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").tqarg(TQString::fromLatin1(DAEMON_APP_NAME)));
+ KMessageBox::error(0, i18n("Cannot enable alarms:\nFailed to start Alarm Daemon (%1)").arg(TQString::fromLatin1(DAEMON_APP_NAME)));
}
}
diff --git a/kalarm/deferdlg.cpp b/kalarm/deferdlg.cpp
index 8c7edd3ce..b2120f9de 100644
--- a/kalarm/deferdlg.cpp
+++ b/kalarm/deferdlg.cpp
@@ -107,7 +107,7 @@ void DeferAlarmDlg::slotOk()
case KAEvent::LIMIT_NONE:
break; // can't happen with a valid endTime
}
- KMessageBox::sorry(this, text.tqarg(endTime.formatLocale()));
+ KMessageBox::sorry(this, text.arg(endTime.formatLocale()));
}
else
accept();
diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp
index acb7df637..7df529564 100644
--- a/kalarm/editdlg.cpp
+++ b/kalarm/editdlg.cpp
@@ -129,10 +129,10 @@ inline TQString recurText(const KAEvent& event)
{
TQString r;
if (event.repeatCount())
- r = TQString::fromLatin1("%1 / %2").tqarg(event.recurrenceText()).tqarg(event.repetitionText());
+ r = TQString::fromLatin1("%1 / %2").arg(event.recurrenceText()).arg(event.repetitionText());
else
r = event.recurrenceText();
- return i18n("&Recurrence - [%1]").tqarg(r);
+ return i18n("&Recurrence - [%1]").arg(r);
}
// Collect these widget labels together to ensure consistent wording and
@@ -295,8 +295,8 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
tqlayout->addWidget(mTemplateTimeGroup);
grid = new TQGridLayout(mTemplateTimeGroup, 2, 2, marginHint(), spacingHint());
grid->addRowSpacing(0, fontMetrics().lineSpacing()/2);
- // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
- int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
+ // Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
+ int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
mTemplateDefaultTime = new RadioButton(i18n("&Default time"), mTemplateTimeGroup, "templateDefTimeButton");
mTemplateDefaultTime->setFixedSize(mTemplateDefaultTime->sizeHint());
@@ -304,7 +304,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
TQWhatsThis::add(mTemplateDefaultTime,
i18n("Do not specify a start time for alarms based on this template. "
"The normal default start time will be used."));
- grid->addWidget(mTemplateDefaultTime, 0, 0, tqalignment);
+ grid->addWidget(mTemplateDefaultTime, 0, 0, alignment);
TQHBox* box = new TQHBox(mTemplateTimeGroup);
box->setSpacing(spacingHint());
@@ -318,18 +318,18 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
mTemplateTime->setFixedSize(mTemplateTime->sizeHint());
mTemplateTime->setReadOnly(mReadOnly);
TQWhatsThis::add(mTemplateTime,
- TQString("%1\n\n%2").tqarg(i18n("Enter the start time for alarms based on this template."))
- .tqarg(TimeSpinBox::shiftWhatsThis()));
+ TQString("%1\n\n%2").arg(i18n("Enter the start time for alarms based on this template."))
+ .arg(TimeSpinBox::shiftWhatsThis()));
box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls
box->setFixedHeight(box->sizeHint().height());
- grid->addWidget(box, 0, 1, tqalignment);
+ grid->addWidget(box, 0, 1, alignment);
mTemplateAnyTime = new RadioButton(i18n("An&y time"), mTemplateTimeGroup, "templateAnyTimeButton");
mTemplateAnyTime->setFixedSize(mTemplateAnyTime->sizeHint());
mTemplateAnyTime->setReadOnly(mReadOnly);
TQWhatsThis::add(mTemplateAnyTime,
- i18n("Set the '%1' option for alarms based on this template.").tqarg(i18n("Any time")));
- grid->addWidget(mTemplateAnyTime, 1, 0, tqalignment);
+ i18n("Set the '%1' option for alarms based on this template.").arg(i18n("Any time")));
+ grid->addWidget(mTemplateAnyTime, 1, 0, alignment);
box = new TQHBox(mTemplateTimeGroup);
box->setSpacing(spacingHint());
@@ -345,10 +345,10 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
mTemplateTimeAfter->setFixedSize(mTemplateTimeAfter->sizeHint());
mTemplateTimeAfter->setReadOnly(mReadOnly);
TQWhatsThis::add(mTemplateTimeAfter,
- TQString("%1\n\n%2").tqarg(AlarmTimeWidget::i18n_TimeAfterPeriod())
- .tqarg(TimeSpinBox::shiftWhatsThis()));
+ TQString("%1\n\n%2").arg(AlarmTimeWidget::i18n_TimeAfterPeriod())
+ .arg(TimeSpinBox::shiftWhatsThis()));
box->setFixedHeight(box->sizeHint().height());
- grid->addWidget(box, 1, 1, tqalignment);
+ grid->addWidget(box, 1, 1, alignment);
tqlayout->addStretch();
}
@@ -363,7 +363,7 @@ EditAlarmDlg::EditAlarmDlg(bool Template, const TQString& caption, TQWidget* par
static const TQString reminderText = i18n("Enter how long in advance of the main alarm to display a reminder alarm.");
mReminder = new Reminder(i18n("Rem&inder:"),
i18n("Check to additionally display a reminder in advance of the main alarm time(s)."),
- TQString("%1\n\n%2").tqarg(reminderText).tqarg(TimeSpinBox::shiftWhatsThis()),
+ TQString("%1\n\n%2").arg(reminderText).arg(TimeSpinBox::shiftWhatsThis()),
true, true, mainPage);
mReminder->setFixedSize(mReminder->sizeHint());
topLayout->addWidget(mReminder, 0, TQt::AlignAuto);
@@ -626,7 +626,7 @@ void EditAlarmDlg::initEmail(TQWidget* parent)
mEmailAttachList->setMinimumSize(mEmailAttachList->sizeHint());
mEmailAttachList->lineEdit()->setReadOnly(true);
TQListBox* list = mEmailAttachList->listBox();
-TQRect rect = list->tqgeometry();
+TQRect rect = list->geometry();
list->setGeometry(rect.left() - 50, rect.top(), rect.width(), rect.height());
label->setBuddy(mEmailAttachList);
TQWhatsThis::add(mEmailAttachList,
@@ -1424,7 +1424,7 @@ void EditAlarmDlg::slotOk()
mTabs->setCurrentPage(mMainPageIndex);
mReminder->setFocusOnCount();
KMessageBox::sorry(this, i18n("Reminder period must be less than the recurrence interval, unless '%1' is checked."
- ).tqarg(Reminder::i18n_first_recurrence_only()));
+ ).arg(Reminder::i18n_first_recurrence_only()));
return;
}
}
@@ -1479,15 +1479,15 @@ void EditAlarmDlg::slotTry()
if (mCommandRadio->isOn() && mCmdOutputGroup->selectedId() != EXEC_IN_TERMINAL)
{
theApp()->commandMessage((ShellProcess*)proc, this);
- KMessageBox::information(this, i18n("Command executed:\n%1").tqarg(text));
+ KMessageBox::information(this, i18n("Command executed:\n%1").arg(text));
theApp()->commandMessage((ShellProcess*)proc, 0);
}
else if (mEmailRadio->isOn())
{
TQString bcc;
if (mEmailBcc->isChecked())
- bcc = i18n("\nBcc: %1").tqarg(Preferences::emailBccAddress());
- KMessageBox::information(this, i18n("Email sent to:\n%1%2").tqarg(mEmailAddresses.join("\n")).tqarg(bcc));
+ bcc = i18n("\nBcc: %1").arg(Preferences::emailBccAddress());
+ KMessageBox::information(this, i18n("Email sent to:\n%1%2").arg(mEmailAddresses.join("\n")).arg(bcc));
}
}
}
@@ -1728,7 +1728,7 @@ bool EditAlarmDlg::checkEmailData()
if (!bad.isEmpty())
{
mEmailToEdit->setFocus();
- KMessageBox::error(this, i18n("Invalid email address:\n%1").tqarg(bad));
+ KMessageBox::error(this, i18n("Invalid email address:\n%1").arg(bad));
return false;
}
}
@@ -1752,7 +1752,7 @@ bool EditAlarmDlg::checkEmailData()
break; // empty
case -1:
mEmailAttachList->setFocus();
- KMessageBox::error(this, i18n("Invalid email attachment:\n%1").tqarg(att));
+ KMessageBox::error(this, i18n("Invalid email attachment:\n%1").arg(att));
return false;
}
}
@@ -2012,7 +2012,7 @@ bool EditAlarmDlg::checkText(TQString& result, bool showErrorMessage) const
default:
break;
}
- if (KMessageBox::warningContinueCancel(const_cast<EditAlarmDlg*>(this), errmsg.tqarg(alarmtext))
+ if (KMessageBox::warningContinueCancel(const_cast<EditAlarmDlg*>(this), errmsg.arg(alarmtext))
== KMessageBox::Cancel)
return false;
}
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index a4cf2b04a..9fb76f21f 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -633,7 +633,7 @@ void outputAlarmWarnings(TQWidget* parent, const KAEvent* event)
if (event && event->action() == KAEvent::EMAIL
&& Preferences::emailAddress().isEmpty())
KMessageBox::information(parent, i18n("Please set the 'From' email address...",
- "%1\nPlease set it in the Preferences dialog.").tqarg(KAMail::i18n_NeedFromEmailAddress()));
+ "%1\nPlease set it in the Preferences dialog.").arg(KAMail::i18n_NeedFromEmailAddress()));
if (!Daemon::monitoringAlarms())
{
@@ -705,7 +705,7 @@ TQString runKMail(bool minimise)
TQCString dcopName;
TQString errmsg;
if (!runProgram("kmail", (minimise ? KMAIL_DCOP_WINDOW : ""), dcopName, errmsg))
- return i18n("Unable to start KMail\n(%1)").tqarg(errmsg);
+ return i18n("Unable to start KMail\n(%1)").arg(errmsg);
return TQString();
}
@@ -748,8 +748,8 @@ bool readConfigWindowSize(const char* window, TQSize& result)
KConfig* config = KGlobal::config();
config->setGroup(TQString::fromLatin1(window));
TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop());
- TQSize s = TQSize(config->readNumEntry(TQString::fromLatin1("Width %1").tqarg(desktop->width()), 0),
- config->readNumEntry(TQString::fromLatin1("Height %1").tqarg(desktop->height()), 0));
+ 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;
@@ -765,8 +765,8 @@ void writeConfigWindowSize(const char* window, const TQSize& size)
KConfig* config = KGlobal::config();
config->setGroup(TQString::fromLatin1(window));
TQWidget* desktop = TQT_TQWIDGET(KApplication::desktop());
- config->writeEntry(TQString::fromLatin1("Width %1").tqarg(desktop->width()), size.width());
- config->writeEntry(TQString::fromLatin1("Height %1").tqarg(desktop->height()), size.height());
+ config->writeEntry(TQString::fromLatin1("Width %1").arg(desktop->width()), size.width());
+ config->writeEntry(TQString::fromLatin1("Height %1").arg(desktop->height()), size.height());
config->sync();
}
diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
index 8ef9f6a54..25dd60f49 100644
--- a/kalarm/kalarmapp.cpp
+++ b/kalarm/kalarmapp.cpp
@@ -329,9 +329,9 @@ int KAlarmApp::newInstance()
if (args->isSet("triggerEvent")) { function = EVENT_TRIGGER; option = "triggerEvent"; ++count; }
if (args->isSet("cancelEvent")) { function = EVENT_CANCEL; option = "cancelEvent"; ++count; }
if (!count)
- USAGE(i18n("%1 requires %2, %3 or %4").tqarg(TQString::fromLatin1("--calendarURL")).tqarg(TQString::fromLatin1("--handleEvent")).tqarg(TQString::fromLatin1("--triggerEvent")).tqarg(TQString::fromLatin1("--cancelEvent")))
+ USAGE(i18n("%1 requires %2, %3 or %4").arg(TQString::fromLatin1("--calendarURL")).arg(TQString::fromLatin1("--handleEvent")).arg(TQString::fromLatin1("--triggerEvent")).arg(TQString::fromLatin1("--cancelEvent")))
if (count > 1)
- USAGE(i18n("%1, %2, %3 mutually exclusive").tqarg(TQString::fromLatin1("--handleEvent")).tqarg(TQString::fromLatin1("--triggerEvent")).tqarg(TQString::fromLatin1("--cancelEvent")));
+ USAGE(i18n("%1, %2, %3 mutually exclusive").arg(TQString::fromLatin1("--handleEvent")).arg(TQString::fromLatin1("--triggerEvent")).arg(TQString::fromLatin1("--cancelEvent")));
if (!initCheck(true)) // open the calendar, don't register with daemon yet
{
exitCode = 1;
@@ -341,7 +341,7 @@ int KAlarmApp::newInstance()
{
TQString calendarUrl = args->getOption("calendarURL");
if (KURL(calendarUrl).url() != AlarmCalendar::activeCalendar()->urlString())
- USAGE(i18n("%1: wrong calendar file").tqarg(TQString::fromLatin1("--calendarURL")))
+ USAGE(i18n("%1: wrong calendar file").arg(TQString::fromLatin1("--calendarURL")))
}
TQString eventID = args->getOption(option);
args->clear(); // free up memory
@@ -369,7 +369,7 @@ int KAlarmApp::newInstance()
}
if (!KAlarm::edit(eventID))
{
- USAGE(i18n("%1: Event %2 not found, or not editable").tqarg(TQString::fromLatin1("--edit")).tqarg(eventID))
+ USAGE(i18n("%1: Event %2 not found, or not editable").arg(TQString::fromLatin1("--edit")).arg(eventID))
exitCode = 1;
break;
}
@@ -401,11 +401,11 @@ int KAlarmApp::newInstance()
{
kdDebug(5950)<<"KAlarmApp::newInstance(): file\n";
if (args->isSet("exec"))
- USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--exec")).tqarg(TQString::fromLatin1("--file")))
+ USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--exec")).arg(TQString::fromLatin1("--file")))
if (args->isSet("mail"))
- USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--mail")).tqarg(TQString::fromLatin1("--file")))
+ USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--mail")).arg(TQString::fromLatin1("--file")))
if (args->count())
- USAGE(i18n("message incompatible with %1").tqarg(TQString::fromLatin1("--file")))
+ USAGE(i18n("message incompatible with %1").arg(TQString::fromLatin1("--file")))
alMessage = args->getOption("file");
action = KAEvent::FILE;
}
@@ -413,7 +413,7 @@ int KAlarmApp::newInstance()
{
kdDebug(5950)<<"KAlarmApp::newInstance(): exec\n";
if (args->isSet("mail"))
- USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--mail")).tqarg(TQString::fromLatin1("--exec")))
+ USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--mail")).arg(TQString::fromLatin1("--exec")))
alMessage = args->getOption("exec");
int n = args->count();
for (int i = 0; i < n; ++i)
@@ -435,7 +435,7 @@ int KAlarmApp::newInstance()
{
TQString addr = TQString::fromLocal8Bit(*i);
if (!KAMail::checkAddress(addr))
- USAGE(i18n("%1: invalid email address").tqarg(TQString::fromLatin1("--mail")))
+ USAGE(i18n("%1: invalid email address").arg(TQString::fromLatin1("--mail")))
alAddresses += KCal::Person(TQString(), addr);
}
params = args->getOptionList("attach");
@@ -453,13 +453,13 @@ int KAlarmApp::newInstance()
if (action != KAEvent::EMAIL)
{
if (args->isSet("subject"))
- USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--subject")).tqarg(TQString::fromLatin1("--mail")))
+ USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--subject")).arg(TQString::fromLatin1("--mail")))
if (args->isSet("from-id"))
- USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--from-id")).tqarg(TQString::fromLatin1("--mail")))
+ USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--from-id")).arg(TQString::fromLatin1("--mail")))
if (args->isSet("attach"))
- USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--attach")).tqarg(TQString::fromLatin1("--mail")))
+ USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--attach")).arg(TQString::fromLatin1("--mail")))
if (args->isSet("bcc"))
- USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--bcc")).tqarg(TQString::fromLatin1("--mail")))
+ USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--bcc")).arg(TQString::fromLatin1("--mail")))
}
bool alarmNoTime = false;
@@ -478,7 +478,7 @@ int KAlarmApp::newInstance()
colourText.replace(0, 2, "#");
bgColour.setNamedColor(colourText);
if (!bgColour.isValid())
- USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--color")))
+ USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--color")))
}
if (args->isSet("colorfg"))
{
@@ -489,14 +489,14 @@ int KAlarmApp::newInstance()
colourText.replace(0, 2, "#");
fgColour.setNamedColor(colourText);
if (!fgColour.isValid())
- USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--colorfg")))
+ USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--colorfg")))
}
if (args->isSet("time"))
{
TQCString dateTime = args->getOption("time");
if (!convWakeTime(dateTime, alarmTime, alarmNoTime))
- USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--time")))
+ USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--time")))
}
else
alarmTime = TQDateTime::currentDateTime();
@@ -505,9 +505,9 @@ int KAlarmApp::newInstance()
if (haveRecurrence)
{
if (args->isSet("login"))
- USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--login")).tqarg(TQString::fromLatin1("--recurrence")))
+ USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--login")).arg(TQString::fromLatin1("--recurrence")))
if (args->isSet("until"))
- USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--until")).tqarg(TQString::fromLatin1("--recurrence")))
+ USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--recurrence")))
TQCString rule = args->getOption("recurrence");
recurrence.set(TQString::fromLocal8Bit(static_cast<const char*>(rule)));
}
@@ -516,24 +516,24 @@ int KAlarmApp::newInstance()
// Repeat count is specified
int count;
if (args->isSet("login"))
- USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--login")).tqarg(TQString::fromLatin1("--interval")))
+ USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--login")).arg(TQString::fromLatin1("--interval")))
bool ok;
if (args->isSet("repeat"))
{
count = args->getOption("repeat").toInt(&ok);
if (!ok || !count || count < -1 || (count < 0 && haveRecurrence))
- USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--repeat")))
+ USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--repeat")))
}
else if (haveRecurrence)
- USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--interval")).tqarg(TQString::fromLatin1("--repeat")))
+ USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--interval")).arg(TQString::fromLatin1("--repeat")))
else if (args->isSet("until"))
{
count = 0;
TQCString dateTime = args->getOption("until");
if (!convWakeTime(dateTime, endTime, alarmNoTime))
- USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--until")))
+ USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--until")))
if (endTime < alarmTime)
- USAGE(i18n("%1 earlier than %2").tqarg(TQString::fromLatin1("--until")).tqarg(TQString::fromLatin1("--time")))
+ USAGE(i18n("%1 earlier than %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--time")))
}
else
count = -1;
@@ -543,16 +543,16 @@ int KAlarmApp::newInstance()
KARecurrence::Type recurType;
if (!convInterval(args->getOption("interval"), recurType, interval, !haveRecurrence)
|| interval < 0)
- USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--interval")))
+ USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--interval")))
if (alarmNoTime && recurType == KARecurrence::MINUTELY)
- USAGE(i18n("Invalid %1 parameter for date-only alarm").tqarg(TQString::fromLatin1("--interval")))
+ USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(TQString::fromLatin1("--interval")))
if (haveRecurrence)
{
// There is a also a recurrence specified, so set up a sub-repetition
int longestInterval = recurrence.longestInterval();
if (count * interval > longestInterval)
- USAGE(i18n("Invalid %1 and %2 parameters: repetition is longer than %3 interval").tqarg(TQString::fromLatin1("--interval")).tqarg(TQString::fromLatin1("--repeat")).tqarg(TQString::fromLatin1("--recurrence")));
+ USAGE(i18n("Invalid %1 and %2 parameters: repetition is longer than %3 interval").arg(TQString::fromLatin1("--interval")).arg(TQString::fromLatin1("--repeat")).arg(TQString::fromLatin1("--recurrence")));
repeatCount = count;
repeatInterval = interval;
}
@@ -566,9 +566,9 @@ int KAlarmApp::newInstance()
else
{
if (args->isSet("repeat"))
- USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--repeat")).tqarg(TQString::fromLatin1("--interval")))
+ USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--repeat")).arg(TQString::fromLatin1("--interval")))
if (args->isSet("until"))
- USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--until")).tqarg(TQString::fromLatin1("--interval")))
+ USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--until")).arg(TQString::fromLatin1("--interval")))
}
TQCString audioFile;
@@ -582,11 +582,11 @@ int KAlarmApp::newInstance()
{
// Play a sound with the alarm
if (audioRepeat && args->isSet("play"))
- USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--play")).tqarg(TQString::fromLatin1("--play-repeat")))
+ USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--play")).arg(TQString::fromLatin1("--play-repeat")))
if (args->isSet("beep"))
- USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--beep")).tqarg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play")))
+ USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--beep")).arg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play")))
if (args->isSet("speak"))
- USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--speak")).tqarg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play")))
+ USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--speak")).arg(TQString::fromLatin1(audioRepeat ? "--play-repeat" : "--play")))
audioFile = args->getOption(audioRepeat ? "play-repeat" : "play");
#ifndef WITHOUT_ARTS
if (args->isSet("volume"))
@@ -594,21 +594,21 @@ int KAlarmApp::newInstance()
bool ok;
int volumepc = args->getOption("volume").toInt(&ok);
if (!ok || volumepc < 0 || volumepc > 100)
- USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("--volume")))
+ USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("--volume")))
audioVolume = static_cast<float>(volumepc) / 100;
}
#endif
}
#ifndef WITHOUT_ARTS
else if (args->isSet("volume"))
- USAGE(i18n("%1 requires %2 or %3").tqarg(TQString::fromLatin1("--volume")).tqarg(TQString::fromLatin1("--play")).tqarg(TQString::fromLatin1("--play-repeat")))
+ USAGE(i18n("%1 requires %2 or %3").arg(TQString::fromLatin1("--volume")).arg(TQString::fromLatin1("--play")).arg(TQString::fromLatin1("--play-repeat")))
#endif
if (args->isSet("speak"))
{
if (args->isSet("beep"))
- USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--beep")).tqarg(TQString::fromLatin1("--speak")))
+ USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--beep")).arg(TQString::fromLatin1("--speak")))
if (!mSpeechEnabled)
- USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").tqarg(TQString::fromLatin1("--speak")))
+ USAGE(i18n("%1 requires speech synthesis to be configured using KTTSD").arg(TQString::fromLatin1("--speak")))
}
int reminderMinutes = 0;
bool onceOnly = args->isSet("reminder-once");
@@ -616,18 +616,18 @@ int KAlarmApp::newInstance()
{
// Issue a reminder alarm in advance of the main alarm
if (onceOnly && args->isSet("reminder"))
- USAGE(i18n("%1 incompatible with %2").tqarg(TQString::fromLatin1("--reminder")).tqarg(TQString::fromLatin1("--reminder-once")))
+ USAGE(i18n("%1 incompatible with %2").arg(TQString::fromLatin1("--reminder")).arg(TQString::fromLatin1("--reminder-once")))
TQString opt = onceOnly ? TQString::fromLatin1("--reminder-once") : TQString::fromLatin1("--reminder");
if (args->isSet("exec"))
- USAGE(i18n("%1 incompatible with %2").tqarg(opt).tqarg(TQString::fromLatin1("--exec")))
+ USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::fromLatin1("--exec")))
if (args->isSet("mail"))
- USAGE(i18n("%1 incompatible with %2").tqarg(opt).tqarg(TQString::fromLatin1("--mail")))
+ USAGE(i18n("%1 incompatible with %2").arg(opt).arg(TQString::fromLatin1("--mail")))
KARecurrence::Type recurType;
TQString optval = args->getOption(onceOnly ? "reminder-once" : "reminder");
if (!convInterval(args->getOption(onceOnly ? "reminder-once" : "reminder"), recurType, reminderMinutes))
- USAGE(i18n("Invalid %1 parameter").tqarg(opt))
+ USAGE(i18n("Invalid %1 parameter").arg(opt))
if (recurType == KARecurrence::MINUTELY && alarmNoTime)
- USAGE(i18n("Invalid %1 parameter for date-only alarm").tqarg(opt))
+ USAGE(i18n("Invalid %1 parameter for date-only alarm").arg(opt))
}
int lateCancel = 0;
@@ -636,10 +636,10 @@ int KAlarmApp::newInstance()
KARecurrence::Type recurType;
bool ok = convInterval(args->getOption("late-cancel"), recurType, lateCancel);
if (!ok || lateCancel <= 0)
- USAGE(i18n("Invalid %1 parameter").tqarg(TQString::fromLatin1("late-cancel")))
+ USAGE(i18n("Invalid %1 parameter").arg(TQString::fromLatin1("late-cancel")))
}
else if (args->isSet("auto-close"))
- USAGE(i18n("%1 requires %2").tqarg(TQString::fromLatin1("--auto-close")).tqarg(TQString::fromLatin1("--late-cancel")))
+ USAGE(i18n("%1 requires %2").arg(TQString::fromLatin1("--auto-close")).arg(TQString::fromLatin1("--late-cancel")))
int flags = KAEvent::DEFAULT_FONT;
if (args->isSet("ack-confirm"))
@@ -728,7 +728,7 @@ int KAlarmApp::newInstance()
#endif
if (!usage.isEmpty())
{
- usage += i18n(": option(s) only valid with a message/%1/%2").tqarg(TQString::fromLatin1("--file")).tqarg(TQString::fromLatin1("--exec"));
+ usage += i18n(": option(s) only valid with a message/%1/%2").arg(TQString::fromLatin1("--file")).arg(TQString::fromLatin1("--exec"));
break;
}
@@ -1759,7 +1759,7 @@ ShellProcess* KAlarmApp::doShellCommand(const TQString& command, const KAEvent&
// Set up a logging process to write the command's output to.
connect(proc, TQT_SIGNAL(receivedStdout(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int)));
connect(proc, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotCommandOutput(KProcess*,char*,int)));
- logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").tqarg(event.logFile()));
+ logproc = new ShellProcess(TQString::fromLatin1("cat >>%1").arg(event.logFile()));
connect(logproc, TQT_SIGNAL(shellExited(ShellProcess*)), TQT_SLOT(slotLogProcExited(ShellProcess*)));
logproc->start(KProcess::Stdin);
TQCString heading;
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index b50dcef0b..383d03caf 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -115,14 +115,14 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify)
if (identity.isNull())
{
kdError(5950) << "KAMail::send(): identity" << event.emailFromId() << "not found" << endl;
- errmsgs = errors(i18n("Invalid 'From' email address.\nKMail identity '%1' not found.").tqarg(event.emailFromId()));
+ errmsgs = errors(i18n("Invalid 'From' email address.\nKMail identity '%1' not found.").arg(event.emailFromId()));
return false;
}
from = identity.fullEmailAddr();
if (from.isEmpty())
{
kdError(5950) << "KAMail::send(): identity" << identity.identityName() << "uoid" << identity.uoid() << ": no email address" << endl;
- errmsgs = errors(i18n("Invalid 'From' email address.\nEmail identity '%1' has no email address").tqarg(identity.identityName()));
+ errmsgs = errors(i18n("Invalid 'From' email address.\nEmail identity '%1' has no email address").arg(identity.identityName()));
return false;
}
}
@@ -167,7 +167,7 @@ bool KAMail::send(const KAEvent& event, TQStringList& errmsgs, bool allowNotify)
command = KStandardDirs::findExe(TQString::fromLatin1("mail"));
if (command.isNull())
{
- errmsgs = errors(i18n("%1 not found").tqarg(TQString::fromLatin1("sendmail"))); // give up
+ errmsgs = errors(i18n("%1 not found").arg(TQString::fromLatin1("sendmail"))); // give up
return false;
}
@@ -387,14 +387,14 @@ TQString KAMail::initHeaders(const KAMailData& data, bool dateId)
TQString from = data.from;
from.replace(TQRegExp("^.*<"), TQString()).replace(TQRegExp(">.*$"), TQString());
message = TQString::fromLatin1(buff);
- message += TQString::fromLatin1("\nMessage-Id: <%1.%2.%3>\n").tqarg(timenow).tqarg(tod.tv_usec).tqarg(from);
+ message += TQString::fromLatin1("\nMessage-Id: <%1.%2.%3>\n").arg(timenow).arg(tod.tv_usec).arg(from);
}
message += TQString::fromLatin1("From: ") + data.from;
message += TQString::fromLatin1("\nTo: ") + data.event.emailAddresses(", ");
if (!data.bcc.isEmpty())
message += TQString::fromLatin1("\nBcc: ") + data.bcc;
message += TQString::fromLatin1("\nSubject: ") + data.event.emailSubject();
- message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).tqarg(kapp->aboutData()->programName());
+ message += TQString::fromLatin1("\nX-Mailer: %1/" KALARM_VERSION).arg(kapp->aboutData()->programName());
return message;
}
@@ -427,12 +427,12 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
TQCString boundary;
boundary.sprintf("------------_%lu_-%lx=", 2*timenow, timenow);
message += TQString::fromLatin1("\nMIME-Version: 1.0");
- message += TQString::fromLatin1("\nContent-Type: multipart/mixed;\n boundary=\"%1\"\n").tqarg(boundary.data());
+ message += TQString::fromLatin1("\nContent-Type: multipart/mixed;\n boundary=\"%1\"\n").arg(boundary.data());
if (!event.message().isEmpty())
{
// There is a message body
- message += TQString::fromLatin1("\n--%1\nContent-Type: text/plain\nContent-Transfer-Encoding: 8bit\n\n").tqarg(boundary.data());
+ message += TQString::fromLatin1("\n--%1\nContent-Type: text/plain\nContent-Transfer-Encoding: 8bit\n\n").arg(boundary.data());
message += event.message();
}
@@ -446,12 +446,12 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
KIO::UDSEntry uds;
if (!KIO::NetAccess::stat(url, uds, MainWindow::mainMainWindow())) {
kdError(5950) << "KAMail::appendBodyAttachments(): not found: " << attachment << endl;
- return i18n("Attachment not found:\n%1").tqarg(attachment);
+ return i18n("Attachment not found:\n%1").arg(attachment);
}
KFileItem fi(uds, url);
if (fi.isDir() || !fi.isReadable()) {
kdError(5950) << "KAMail::appendBodyAttachments(): not file/not readable: " << attachment << endl;
- return attachError.tqarg(attachment);
+ return attachError.arg(attachment);
}
// Check if the attachment is a text file
@@ -463,21 +463,21 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
text = (mimeType == textMimeTypes[i]);
}
- message += TQString::fromLatin1("\n--%1").tqarg(boundary.data());
- message += TQString::fromLatin1("\nContent-Type: %2; name=\"%3\"").tqarg(mimeType).tqarg(fi.text());
- message += TQString::fromLatin1("\nContent-Transfer-Encoding: %1").tqarg(TQString::fromLatin1(text ? "8bit" : "BASE64"));
- message += TQString::fromLatin1("\nContent-Disposition: attachment; filename=\"%4\"\n\n").tqarg(fi.text());
+ message += TQString::fromLatin1("\n--%1").arg(boundary.data());
+ message += TQString::fromLatin1("\nContent-Type: %2; name=\"%3\"").arg(mimeType).arg(fi.text());
+ message += TQString::fromLatin1("\nContent-Transfer-Encoding: %1").arg(TQString::fromLatin1(text ? "8bit" : "BASE64"));
+ message += TQString::fromLatin1("\nContent-Disposition: attachment; filename=\"%4\"\n\n").arg(fi.text());
// Read the file contents
TQString tmpFile;
if (!KIO::NetAccess::download(url, tmpFile, MainWindow::mainMainWindow())) {
kdError(5950) << "KAMail::appendBodyAttachments(): load failure: " << attachment << endl;
- return attachError.tqarg(attachment);
+ return attachError.arg(attachment);
}
TQFile file(tmpFile);
if (!file.open(IO_ReadOnly) ) {
kdDebug(5950) << "KAMail::appendBodyAttachments() tmp load error: " << attachment << endl;
- return attachError.tqarg(attachment);
+ return attachError.arg(attachment);
}
TQIODevice::Offset size = file.size();
char* contents = new char [size + 1];
@@ -509,9 +509,9 @@ TQString KAMail::appendBodyAttachments(TQString& message, const KAEvent& event)
}
delete[] contents;
if (atterror)
- return attachError.tqarg(attachment);
+ return attachError.arg(attachment);
}
- message += TQString::fromLatin1("\n--%1--\n.\n").tqarg(boundary.data());
+ message += TQString::fromLatin1("\n--%1--\n.\n").arg(boundary.data());
}
return TQString();
}
@@ -922,10 +922,10 @@ char* KAMail::base64Encode(const char* in, TQIODevice::Offset size, TQIODevice::
TQStringList KAMail::errors(const TQString& err, bool sendfail)
{
TQString error1 = sendfail ? i18n("Failed to send email")
- : i18n("Error copying sent email to KMail %1 folder").tqarg(i18n_sent_mail());
+ : i18n("Error copying sent email to KMail %1 folder").arg(i18n_sent_mail());
if (err.isEmpty())
return TQStringList(error1);
- TQStringList errs(TQString::fromLatin1("%1:").tqarg(error1));
+ TQStringList errs(TQString::fromLatin1("%1:").arg(error1));
errs += err;
return errs;
}
diff --git a/kalarm/lib/dateedit.cpp b/kalarm/lib/dateedit.cpp
index 6bc51aec5..2fef25de5 100644
--- a/kalarm/lib/dateedit.cpp
+++ b/kalarm/lib/dateedit.cpp
@@ -81,7 +81,7 @@ void DateEdit::pastLimitMessage(const TQDate& limit, const TQString& error, cons
errString = i18n("today");
else
errString = KGlobal::locale()->formatDate(limit, true);
- errString = defaultError.tqarg(errString);
+ errString = defaultError.arg(errString);
}
KMessageBox::sorry(this, errString);
}
diff --git a/kalarm/lib/shellprocess.cpp b/kalarm/lib/shellprocess.cpp
index a8c8228c3..b3df822e8 100644
--- a/kalarm/lib/shellprocess.cpp
+++ b/kalarm/lib/shellprocess.cpp
@@ -174,8 +174,8 @@ const TQCString& ShellProcess::shellPath()
struct stat fileinfo;
if (stat(envshell.data(), &fileinfo) != -1 // ensure file exists
&& !S_ISDIR(fileinfo.st_mode) // and it's not a directory
- && !S_ISCHR(fileinfo.st_mode) // and it's not a character tqdevice
- && !S_ISBLK(fileinfo.st_mode) // and it's not a block tqdevice
+ && !S_ISCHR(fileinfo.st_mode) // and it's not a character device
+ && !S_ISBLK(fileinfo.st_mode) // and it's not a block device
#ifdef S_ISSOCK
&& !S_ISSOCK(fileinfo.st_mode) // and it's not a socket
#endif
diff --git a/kalarm/lib/spinbox2.h b/kalarm/lib/spinbox2.h
index 292cd2a85..188cba526 100644
--- a/kalarm/lib/spinbox2.h
+++ b/kalarm/lib/spinbox2.h
@@ -115,7 +115,7 @@ class SpinBox2 : public TQFrame
*/
bool wrapping() const { return mSpinbox->wrapping(); }
- /** Set the text tqalignment of the widget */
+ /** Set the text alignment of the widget */
void setAlignment(int a) { mSpinbox->setAlignment(a); }
/** Sets the button symbols to use (arrows or plus/minus). */
virtual void setButtonSymbols(TQSpinBox::ButtonSymbols);
@@ -149,13 +149,13 @@ class SpinBox2 : public TQFrame
/** Returns the specified value clamped to the range of the spin box. */
int bound(int val) const;
- /** Returns the tqgeometry of the right-hand "up" button. */
+ /** Returns the geometry of the right-hand "up" button. */
TQRect upRect() const { return mSpinbox->upRect(); }
- /** Returns the tqgeometry of the right-hand "down" button. */
+ /** Returns the geometry of the right-hand "down" button. */
TQRect downRect() const { return mSpinbox->downRect(); }
- /** Returns the tqgeometry of the left-hand "up" button. */
+ /** Returns the geometry of the left-hand "up" button. */
TQRect up2Rect() const;
- /** Returns the tqgeometry of the left-hand "down" button. */
+ /** Returns the geometry of the left-hand "down" button. */
TQRect down2Rect() const;
/** Returns the unshifted step increment for the right-hand spin buttons,
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index d6597fe20..e9445d43a 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -294,7 +294,7 @@ void MainWindow::show()
// Show error message now that the main window has been displayed.
// Waiting until now lets the user easily associate the message with
// the main window which is faulty.
- KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").tqarg(TQString::fromLatin1(UI_FILE)));
+ KMessageBox::error(this, i18n("Failure to create menus\n(perhaps %1 missing or corrupted)").arg(TQString::fromLatin1(UI_FILE)));
mMenuError = false;
}
}
@@ -1023,8 +1023,8 @@ void MainWindow::initUndoMenu(KPopupMenu* menu, Undo::Type type)
TQString actText = Undo::actionText(type, id);
TQString descrip = Undo::description(type, id);
TQString text = descrip.isEmpty()
- ? i18n("Undo/Redo [action]", "%1 %2").tqarg(action).tqarg(actText)
- : i18n("Undo [action]: message", "%1 %2: %3").tqarg(action).tqarg(actText).tqarg(descrip);
+ ? i18n("Undo/Redo [action]", "%1 %2").arg(action).arg(actText)
+ : i18n("Undo [action]: message", "%1 %2: %3").arg(action).arg(actText).arg(descrip);
menu->insertItem(text, id);
}
}
@@ -1043,7 +1043,7 @@ void MainWindow::slotUndoStatus(const TQString& undo, const TQString& redo)
else
{
mActionUndo->setEnabled(true);
- mActionUndo->setText(TQString("%1 %2").tqarg(undoText).tqarg(undo));
+ mActionUndo->setText(TQString("%1 %2").arg(undoText).arg(undo));
}
if (redo.isNull())
{
@@ -1053,7 +1053,7 @@ void MainWindow::slotUndoStatus(const TQString& undo, const TQString& redo)
else
{
mActionRedo->setEnabled(true);
- mActionRedo->setText(TQString("%1 %2").tqarg(redoText).tqarg(redo));
+ mActionRedo->setText(TQString("%1 %2").arg(redoText).arg(redo));
}
}
diff --git a/kalarm/messagewin.cpp b/kalarm/messagewin.cpp
index 4849e5334..c1109b9d1 100644
--- a/kalarm/messagewin.cpp
+++ b/kalarm/messagewin.cpp
@@ -650,7 +650,7 @@ void MessageWin::setRemainingTextMinute()
else if (mins % 60 == 1)
text = i18n("in 1 hour 1 minute's time", "in %n hours 1 minute's time", mins/60);
else
- text = i18n("in 1 hour %1 minutes' time", "in %n hours %1 minutes' time", mins/60).tqarg(mins%60);
+ text = i18n("in 1 hour %1 minutes' time", "in %n hours %1 minutes' time", mins/60).arg(mins%60);
mRemainingText->setText(text);
}
@@ -859,7 +859,7 @@ void MessageWin::slotPlayAudio()
kdError(5950) << "MessageWin::playAudio(): Open failure: " << mAudioFile << endl;
if (!haveErrorMessage(ErrMsg_AudioFile))
{
- KMessageBox::error(this, i18n("Cannot open audio file:\n%1").tqarg(mAudioFile));
+ KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mAudioFile));
clearErrorMessage(ErrMsg_AudioFile);
}
return;
@@ -882,7 +882,7 @@ void MessageWin::slotPlayAudio()
kdWarning(5950) << "Unable to set master volume (KMix: " << mKMixError << ")\n";
if (!haveErrorMessage(ErrMsg_Volume))
{
- KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").tqarg(mKMixError),
+ KMessageBox::information(this, i18n("Unable to set master volume\n(Error accessing KMix:\n%1)").arg(mKMixError),
TQString(), TQString::fromLatin1("KMixError"));
clearErrorMessage(ErrMsg_Volume);
}
@@ -1207,7 +1207,7 @@ TQSize MessageWin::sizeHint() const
if (!mWinModule)
mWinModule = new KWinModule(0, KWinModule::INFO_DESKTOP);
TQSize frame = frameGeometry().size();
- TQSize contents = tqgeometry().size();
+ TQSize contents = geometry().size();
TQSize desktop = mWinModule->workArea().size();
TQSize maxSize(desktop.width() - (frame.width() - contents.width()),
desktop.height() - (frame.height() - contents.height()));
@@ -1246,10 +1246,10 @@ void MessageWin::showEvent(TQShowEvent* se)
* To achieve this, move the window so that the OK button is as far away
* from the cursor as possible. If the buttons are still too close to the
* cursor, disable the buttons for a short time.
- * N.B. This can't be done in show(), since the tqgeometry of the window
+ * N.B. This can't be done in show(), since the geometry of the window
* is not known until it is displayed. Unfortunately by moving the
* window in showEvent(), a flicker is unavoidable.
- * See the TQt documentation on window tqgeometry for more details.
+ * See the TQt documentation on window geometry for more details.
*/
// PROBLEM: The frame size is not known yet!
@@ -1267,7 +1267,7 @@ void MessageWin::showEvent(TQShowEvent* se)
desk &= dw->screenGeometry(dw->screenNumber(cursor));
TQRect frame = frameGeometry();
- TQRect rect = tqgeometry();
+ TQRect rect = geometry();
// Find the offsets from the outside of the frame to the edges of the OK button
TQRect button(mOkButton->mapToParent(TQPoint(0, 0)), mOkButton->mapToParent(mOkButton->rect().bottomRight()));
int buttonLeft = button.left() + rect.left() - frame.left();
@@ -1282,7 +1282,7 @@ void MessageWin::showEvent(TQShowEvent* se)
// Find the enclosing rectangle for the new button positions
// and check if the cursor is too near
- TQRect buttons = mOkButton->tqgeometry().unite(mKAlarmButton->tqgeometry());
+ TQRect buttons = mOkButton->geometry().unite(mKAlarmButton->geometry());
buttons.moveBy(rect.left() + x - frame.left(), rect.top() + y - frame.top());
int minDistance = proximityMultiple * mOkButton->height();
if ((abs(cursor.x() - buttons.left()) < minDistance
diff --git a/kalarm/prefdlg.cpp b/kalarm/prefdlg.cpp
index e259f3e56..3cde076b7 100644
--- a/kalarm/prefdlg.cpp
+++ b/kalarm/prefdlg.cpp
@@ -250,8 +250,8 @@ void PrefsTabBase::apply(bool syncToDisc)
MiscPrefTab::MiscPrefTab(TQVBox* frame)
: PrefsTabBase(frame)
{
- // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
- int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
+ // Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
+ int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
TQGroupBox* group = new TQButtonGroup(i18n("Run Mode"), mPage, "modeGroup");
TQGridLayout* grid = new TQGridLayout(group, 6, 2, KDialog::marginHint(), KDialog::spacingHint());
@@ -269,7 +269,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
"Notes:\n"
"1. Alarms are displayed even when KAlarm is not running, since alarm monitoring is done by the alarm daemon.\n"
"2. With this option selected, the system tray icon can be displayed or hidden independently of KAlarm."));
- grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, tqalignment);
+ grid->addMultiCellWidget(mRunOnDemand, 1, 1, 0, 2, alignment);
// Run-in-system-tray radio button
mRunInSystemTray = new TQRadioButton(i18n("Run continuously in system &tray"), group, "runTray");
@@ -281,7 +281,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
"1. With this option selected, closing the system tray icon will quit KAlarm.\n"
"2. You do not need to select this option in order for alarms to be displayed, since alarm monitoring is done by the alarm daemon."
" Running in the system tray simply provides easy access and a status indication."));
- grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, tqalignment);
+ grid->addMultiCellWidget(mRunInSystemTray, 2, 2, 0, 2, alignment);
// Run continuously options
mDisableAlarmsIfStopped = new TQCheckBox(i18n("Disa&ble alarms while not running"), group, "disableAl");
@@ -289,19 +289,19 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
connect(mDisableAlarmsIfStopped, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableIfStoppedToggled(bool)));
TQWhatsThis::add(mDisableAlarmsIfStopped,
i18n("Check to disable alarms whenever KAlarm is not running. Alarms will only appear while the system tray icon is visible."));
- grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, tqalignment);
+ grid->addMultiCellWidget(mDisableAlarmsIfStopped, 3, 3, 1, 2, alignment);
mQuitWarn = new TQCheckBox(i18n("Warn before &quitting"), group, "disableAl");
mQuitWarn->setFixedSize(mQuitWarn->sizeHint());
TQWhatsThis::add(mQuitWarn,
i18n("Check to display a warning prompt before quitting KAlarm."));
- grid->addWidget(mQuitWarn, 4, 2, tqalignment);
+ grid->addWidget(mQuitWarn, 4, 2, alignment);
mAutostartTrayIcon = new TQCheckBox(i18n("Autostart at &login"), group, "autoTray");
#ifdef AUTOSTART_BY_KALARMD
connect(mAutostartTrayIcon, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAutostartToggled(bool)));
#endif
- grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, tqalignment);
+ grid->addMultiCellWidget(mAutostartTrayIcon, 5, 5, 0, 2, alignment);
// Autostart alarm daemon
mAutostartDaemon = new TQCheckBox(i18n("Start alarm monitoring at lo&gin"), group, "startDaemon");
@@ -310,8 +310,8 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
TQWhatsThis::add(mAutostartDaemon,
i18n("Automatically start alarm monitoring whenever you start KDE, by running the alarm daemon (%1).\n\n"
"This option should always be checked unless you intend to discontinue use of KAlarm.")
- .tqarg(TQString::fromLatin1(DAEMON_APP_NAME)));
- grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, tqalignment);
+ .arg(TQString::fromLatin1(DAEMON_APP_NAME)));
+ grid->addMultiCellWidget(mAutostartDaemon, 6, 6, 0, 2, alignment);
group->setFixedHeight(group->sizeHint().height());
@@ -325,7 +325,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
label->setBuddy(mStartOfDay);
static const TQString startOfDayText = i18n("The earliest time of day at which a date-only alarm (i.e. "
"an alarm with \"any time\" specified) will be triggered.");
- TQWhatsThis::add(box, TQString("%1\n\n%2").tqarg(startOfDayText).tqarg(TimeSpinBox::shiftWhatsThis()));
+ TQWhatsThis::add(box, TQString("%1\n\n%2").arg(startOfDayText).arg(TimeSpinBox::shiftWhatsThis()));
itemBox->setStretchFactor(new TQWidget(itemBox), 1); // left adjust the controls
itemBox->setFixedHeight(box->sizeHint().height());
@@ -349,7 +349,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
connect(mKeepExpired, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotExpiredToggled(bool)));
TQWhatsThis::add(mKeepExpired,
i18n("Check to store alarms after expiry or deletion (except deleted alarms which were never triggered)."));
- grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, tqalignment);
+ grid->addMultiCellWidget(mKeepExpired, 1, 1, 0, 1, alignment);
box = new TQHBox(group);
box->setSpacing(KDialog::spacingHint());
@@ -365,14 +365,14 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
mPurgeAfterLabel->setBuddy(mPurgeAfter);
TQWhatsThis::add(box,
i18n("Uncheck to store expired alarms indefinitely. Check to enter how long expired alarms should be stored."));
- grid->addWidget(box, 2, 1, tqalignment);
+ grid->addWidget(box, 2, 1, alignment);
mClearExpired = new TQPushButton(i18n("Clear Expired Alar&ms"), group);
mClearExpired->setFixedSize(mClearExpired->sizeHint());
connect(mClearExpired, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearExpired()));
TQWhatsThis::add(mClearExpired,
i18n("Delete all existing expired alarms."));
- grid->addWidget(mClearExpired, 3, 1, tqalignment);
+ grid->addWidget(mClearExpired, 3, 1, alignment);
group->setFixedHeight(group->sizeHint().height());
// Terminal window to use for command alarms
@@ -404,7 +404,7 @@ MiscPrefTab::MiscPrefTab(TQVBox* frame)
cmd.replace("%w", "<command; sleep>");
cmd.replace("%C", "[command]");
cmd.replace("%W", "[command; sleep]");
- TQWhatsThis::add(radio, whatsThis.tqarg(cmd));
+ TQWhatsThis::add(radio, whatsThis.arg(cmd));
grid->addWidget(radio, (row = index/3 + 1), index % 3, TQt::AlignAuto);
++index;
}
@@ -470,7 +470,7 @@ void MiscPrefTab::apply(bool syncToDisc)
if (KStandardDirs::findExe(cmd).isEmpty())
{
mXtermCommand->setFocus();
- if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").tqarg(cmd))
+ if (KMessageBox::warningContinueCancel(this, i18n("Command to invoke terminal window not found:\n%1").arg(cmd))
!= KMessageBox::Continue)
return;
}
@@ -618,10 +618,10 @@ EmailPrefTab::EmailPrefTab(TQVBox* frame)
"your system is configured to use sendmail or a sendmail compatible mail transport agent."));
box = new TQHBox(mPage); // this is to allow left adjustment
- mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").tqarg(KAMail::i18n_sent_mail()), box);
+ mEmailCopyToKMail = new TQCheckBox(i18n("Co&py sent emails into KMail's %1 folder").arg(KAMail::i18n_sent_mail()), box);
mEmailCopyToKMail->setFixedSize(mEmailCopyToKMail->sizeHint());
TQWhatsThis::add(mEmailCopyToKMail,
- i18n("After sending an email, store a copy in KMail's %1 folder").tqarg(KAMail::i18n_sent_mail()));
+ i18n("After sending an email, store a copy in KMail's %1 folder").arg(KAMail::i18n_sent_mail()));
box->setStretchFactor(new TQWidget(box), 1); // left adjust the controls
box->setFixedHeight(box->sizeHint().height());
@@ -793,18 +793,18 @@ TQString EmailPrefTab::validate()
TQString EmailPrefTab::validateAddr(ButtonGroup* group, TQLineEdit* addr, const TQString& msg)
{
- TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").tqarg(msg);
+ TQString errmsg = i18n("%1\nAre you sure you want to save your changes?").arg(msg);
switch (group->selectedId())
{
case Preferences::MAIL_FROM_CONTROL_CENTRE:
if (!KAMail::controlCentreAddress().isEmpty())
return TQString();
- errmsg = i18n("No email address is currently set in the KDE Control Center. %1").tqarg(errmsg);
+ errmsg = i18n("No email address is currently set in the KDE Control Center. %1").arg(errmsg);
break;
case Preferences::MAIL_FROM_KMAIL:
if (KAMail::identitiesExist())
return TQString();
- errmsg = i18n("No KMail identities currently exist. %1").tqarg(errmsg);
+ errmsg = i18n("No KMail identities currently exist. %1").arg(errmsg);
break;
case Preferences::MAIL_FROM_ADDR:
if (!addr->text().stripWhiteSpace().isEmpty())
@@ -887,9 +887,9 @@ void FontColourPrefTab::setDefaults()
EditPrefTab::EditPrefTab(TQVBox* frame)
: PrefsTabBase(frame)
{
- // Get tqalignment to use in TQLabel::setAlignment(tqalignment | TQt::WordBreak)
+ // Get alignment to use in TQLabel::setAlignment(alignment | TQt::WordBreak)
// (AlignAuto doesn't work correctly there)
- int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
+ int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
int groupTopMargin = fontMetrics().lineSpacing()/2;
TQString defsetting = i18n("The default setting for \"%1\" in the alarm edit dialog.");
@@ -902,12 +902,12 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
mConfirmAck = new TQCheckBox(EditAlarmDlg::i18n_k_ConfirmAck(), group, "defConfAck");
mConfirmAck->setMinimumSize(mConfirmAck->sizeHint());
- TQWhatsThis::add(mConfirmAck, defsetting.tqarg(EditAlarmDlg::i18n_ConfirmAck()));
+ TQWhatsThis::add(mConfirmAck, defsetting.arg(EditAlarmDlg::i18n_ConfirmAck()));
tqlayout->addWidget(mConfirmAck, 0, TQt::AlignAuto);
mAutoClose = new TQCheckBox(LateCancelSelector::i18n_i_AutoCloseWinLC(), group, "defAutoClose");
mAutoClose->setMinimumSize(mAutoClose->sizeHint());
- TQWhatsThis::add(mAutoClose, defsetting.tqarg(LateCancelSelector::i18n_AutoCloseWin()));
+ TQWhatsThis::add(mAutoClose, defsetting.arg(LateCancelSelector::i18n_AutoCloseWin()));
tqlayout->addWidget(mAutoClose, 0, TQt::AlignAuto);
TQHBox* box = new TQHBox(group);
@@ -942,14 +942,14 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
if (theApp()->speechEnabled())
mSound->insertItem(SoundPicker::i18n_Speak()); // index 3
mSound->setMinimumSize(mSound->sizeHint());
- TQWhatsThis::add(mSound, defsetting.tqarg(SoundPicker::i18n_Sound()));
+ TQWhatsThis::add(mSound, defsetting.arg(SoundPicker::i18n_Sound()));
htqlayout->addWidget(mSound);
htqlayout->addStretch(1);
#ifndef WITHOUT_ARTS
mSoundRepeat = new TQCheckBox(i18n("Repea&t sound file"), bgroup, "defRepeatSound");
mSoundRepeat->setMinimumSize(mSoundRepeat->sizeHint());
- TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").tqarg(SoundDlg::i18n_Repeat()));
+ TQWhatsThis::add(mSoundRepeat, i18n("sound file \"Repeat\" checkbox", "The default setting for sound file \"%1\" in the alarm edit dialog.").arg(SoundDlg::i18n_Repeat()));
htqlayout->addWidget(mSoundRepeat);
#endif
@@ -978,13 +978,13 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
mCmdScript = new TQCheckBox(EditAlarmDlg::i18n_p_EnterScript(), group, "defCmdScript");
mCmdScript->setMinimumSize(mCmdScript->sizeHint());
- TQWhatsThis::add(mCmdScript, defsetting.tqarg(EditAlarmDlg::i18n_EnterScript()));
+ TQWhatsThis::add(mCmdScript, defsetting.arg(EditAlarmDlg::i18n_EnterScript()));
tqlayout->addWidget(mCmdScript);
tqlayout->addStretch();
mCmdXterm = new TQCheckBox(EditAlarmDlg::i18n_w_ExecInTermWindow(), group, "defCmdXterm");
mCmdXterm->setMinimumSize(mCmdXterm->sizeHint());
- TQWhatsThis::add(mCmdXterm, defsetting.tqarg(EditAlarmDlg::i18n_ExecInTermWindow()));
+ TQWhatsThis::add(mCmdXterm, defsetting.arg(EditAlarmDlg::i18n_ExecInTermWindow()));
tqlayout->addWidget(mCmdXterm);
// EMAIL ALARMS
@@ -995,21 +995,21 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
// BCC email to sender
mEmailBcc = new TQCheckBox(EditAlarmDlg::i18n_e_CopyEmailToSelf(), group, "defEmailBcc");
mEmailBcc->setMinimumSize(mEmailBcc->sizeHint());
- TQWhatsThis::add(mEmailBcc, defsetting.tqarg(EditAlarmDlg::i18n_CopyEmailToSelf()));
+ TQWhatsThis::add(mEmailBcc, defsetting.arg(EditAlarmDlg::i18n_CopyEmailToSelf()));
tqlayout->addWidget(mEmailBcc, 0, TQt::AlignAuto);
// MISCELLANEOUS
// Show in KOrganizer
mCopyToKOrganizer = new TQCheckBox(EditAlarmDlg::i18n_g_ShowInKOrganizer(), mPage, "defShowKorg");
mCopyToKOrganizer->setMinimumSize(mCopyToKOrganizer->sizeHint());
- TQWhatsThis::add(mCopyToKOrganizer, defsetting.tqarg(EditAlarmDlg::i18n_ShowInKOrganizer()));
+ TQWhatsThis::add(mCopyToKOrganizer, defsetting.arg(EditAlarmDlg::i18n_ShowInKOrganizer()));
// Late cancellation
box = new TQHBox(mPage);
box->setSpacing(KDialog::spacingHint());
mLateCancel = new TQCheckBox(LateCancelSelector::i18n_n_CancelIfLate(), box, "defCancelLate");
mLateCancel->setMinimumSize(mLateCancel->sizeHint());
- TQWhatsThis::add(mLateCancel, defsetting.tqarg(LateCancelSelector::i18n_CancelIfLate()));
+ TQWhatsThis::add(mLateCancel, defsetting.arg(LateCancelSelector::i18n_CancelIfLate()));
box->setStretchFactor(new TQWidget(box), 1); // left adjust the control
// Recurrence
@@ -1035,7 +1035,7 @@ EditPrefTab::EditPrefTab(TQVBox* frame)
TQVBox* vbox = new TQVBox(mPage); // this is to control the TQWhatsThis text display area
vbox->setSpacing(KDialog::spacingHint());
label = new TQLabel(i18n("In non-leap years, repeat yearly February 29th alarms on:"), vbox);
- label->setAlignment(tqalignment | TQt::WordBreak);
+ label->setAlignment(alignment | TQt::WordBreak);
itemBox = new TQHBox(vbox);
itemBox->setSpacing(2*KDialog::spacingHint());
mFeb29 = new TQButtonGroup(itemBox);
@@ -1179,7 +1179,7 @@ TQString EditPrefTab::validate()
if (mSound->currentItem() == SoundPicker::PLAY_FILE && mSoundFile->text().isEmpty())
{
mSoundFile->setFocus();
- return i18n("You must enter a sound file when %1 is selected as the default sound type").tqarg(SoundPicker::i18n_File());;
+ return i18n("You must enter a sound file when %1 is selected as the default sound type").arg(SoundPicker::i18n_File());;
}
return TQString();
}
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 87fd43c8c..0e8727047 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -268,7 +268,7 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, TQWidget* parent, const char* name
mEndTimeEdit->setFixedSize(mEndTimeEdit->sizeHint());
mEndTimeEdit->setReadOnly(mReadOnly);
static const TQString lastTimeText = i18n("Enter the last time to repeat the alarm.");
- TQWhatsThis::add(mEndTimeEdit, TQString("%1\n\n%2").tqarg(lastTimeText).tqarg(TimeSpinBox::shiftWhatsThis()));
+ TQWhatsThis::add(mEndTimeEdit, TQString("%1\n\n%2").arg(lastTimeText).arg(TimeSpinBox::shiftWhatsThis()));
mEndAnyTimeCheckBox = new CheckBox(i18n("Any time"), mRangeButtonGroup);
mEndAnyTimeCheckBox->setFixedSize(mEndAnyTimeCheckBox->sizeHint());
mEndAnyTimeCheckBox->setReadOnly(mReadOnly);
diff --git a/kalarm/sounddlg.cpp b/kalarm/sounddlg.cpp
index d1cd97887..77894b7a7 100644
--- a/kalarm/sounddlg.cpp
+++ b/kalarm/sounddlg.cpp
@@ -119,8 +119,8 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
int indentWidth = 3 * KDialog::spacingHint();
grid->addColSpacing(0, indentWidth);
grid->addColSpacing(1, indentWidth);
- // Get tqalignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
- int tqalignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
+ // Get alignment to use in TQGridLayout (AlignAuto doesn't work correctly there)
+ int alignment = TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft;
// 'Set volume' checkbox
box = new TQHBox(group);
@@ -146,12 +146,12 @@ SoundDlg::SoundDlg(const TQString& file, float volume, float fadeVolume, int fad
connect(mFadeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFadeToggled(bool)));
TQWhatsThis::add(mFadeCheckbox,
i18n("Select to fade the volume when the sound file first starts to play."));
- grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, tqalignment);
+ grid->addMultiCellWidget(mFadeCheckbox, 2, 2, 1, 2, alignment);
// Fade time
mFadeBox = new TQHBox(group);
mFadeBox->setSpacing(spacingHint());
- grid->addWidget(mFadeBox, 3, 2, tqalignment);
+ grid->addWidget(mFadeBox, 3, 2, alignment);
TQLabel* label = new TQLabel(i18n("Time period over which to fade the sound", "Fade time:"), mFadeBox);
label->setFixedSize(label->sizeHint());
mFadeTime = new SpinBox(1, 999, 1, mFadeBox);
@@ -299,7 +299,7 @@ void SoundDlg::playSound()
|| !KIO::NetAccess::download(url, mLocalAudioFile, mmw))
{
kdError(5950) << "SoundDlg::playAudio(): Open failure: " << mFileName << endl;
- KMessageBox::error(this, i18n("Cannot open audio file:\n%1").tqarg(mFileName));
+ KMessageBox::error(this, i18n("Cannot open audio file:\n%1").arg(mFileName));
return;
}
mPlayTimer = new TQTimer(this);
diff --git a/kalarm/soundpicker.cpp b/kalarm/soundpicker.cpp
index 485f0fdb1..3a3d17606 100644
--- a/kalarm/soundpicker.cpp
+++ b/kalarm/soundpicker.cpp
@@ -114,9 +114,9 @@ void SoundPicker::showSpeak(bool show)
if (show == mSpeakShowing)
return; // no change
TQString whatsThis = "<p>" + i18n("Choose a sound to play when the message is displayed.")
- + "<br>" + i18n("%1: the message is displayed silently.").tqarg("<b>" + i18n_None() + "</b>")
- + "<br>" + i18n("%1: a simple beep is sounded.").tqarg("<b>" + i18n_Beep() + "</b>")
- + "<br>" + i18n("%1: an audio file is played. You will be prompted to choose the file and set play options.").tqarg("<b>" + i18n_File() + "</b>");
+ + "<br>" + i18n("%1: the message is displayed silently.").arg("<b>" + i18n_None() + "</b>")
+ + "<br>" + i18n("%1: a simple beep is sounded.").arg("<b>" + i18n_Beep() + "</b>")
+ + "<br>" + i18n("%1: an audio file is played. You will be prompted to choose the file and set play options.").arg("<b>" + i18n_File() + "</b>");
if (!show && mTypeCombo->currentItem() == SPEAK)
mTypeCombo->setCurrentItem(NONE);
if (mTypeCombo->count() == SPEAK+1)
@@ -124,7 +124,7 @@ void SoundPicker::showSpeak(bool show)
if (show)
{
mTypeCombo->insertItem(i18n_Speak());
- whatsThis += "<br>" + i18n("%1: the message text is spoken.").tqarg("<b>" + i18n_Speak() + "</b>") + "</p>";
+ whatsThis += "<br>" + i18n("%1: the message text is spoken.").arg("<b>" + i18n_Speak() + "</b>") + "</p>";
}
TQWhatsThis::add(mTypeBox, whatsThis + "</p>");
mSpeakShowing = show;
@@ -283,7 +283,7 @@ TQString SoundPicker::browseFile(TQString& defaultDir, const TQString& initialFi
defaultDir = kdeSoundDir;
}
#ifdef WITHOUT_ARTS
- TQString filter = TQString::fromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").tqarg(i18n("Sound Files")).tqarg(i18n("All Files"));
+ TQString filter = TQString::fromLatin1("*.wav *.mp3 *.ogg|%1\n*|%2").arg(i18n("Sound Files")).arg(i18n("All Files"));
#else
TQStringList filters = KDE::PlayObjectFactory::mimeTypes();
TQString filter = filters.join(" ");
diff --git a/kalarm/traywindow.cpp b/kalarm/traywindow.cpp
index aac2806cd..81af39266 100644
--- a/kalarm/traywindow.cpp
+++ b/kalarm/traywindow.cpp
@@ -266,9 +266,9 @@ void TrayWindow::tooltipAlarmText(TQString& text) const
minutes[0] = (mins%60) / 10 + '0';
minutes[1] = (mins%60) % 10 + '0';
if (Preferences::showTooltipAlarmTime())
- item.text += i18n("prefix + hours:minutes", "(%1%2:%3)").tqarg(prefix).tqarg(mins/60).tqarg(minutes);
+ item.text += i18n("prefix + hours:minutes", "(%1%2:%3)").arg(prefix).arg(mins/60).arg(minutes);
else
- item.text += i18n("prefix + hours:minutes", "%1%2:%3").tqarg(prefix).tqarg(mins/60).tqarg(minutes);
+ item.text += i18n("prefix + hours:minutes", "%1%2:%3").arg(prefix).arg(mins/60).arg(minutes);
item.text += ' ';
space = true;
}
@@ -326,13 +326,13 @@ bool TrayWindow::inSystemTray() const
#ifdef HAVE_X11_HEADERS
Window xParent; // receives parent window
Window root;
- Window* tqchildren = 0;
- unsigned int ntqchildren;
+ Window* children = 0;
+ unsigned int nchildren;
// Find the X parent window of the widget. This is not the same as the TQt parent widget.
- if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &tqchildren, &ntqchildren))
+ if (!XQueryTree(qt_xdisplay(), winId(), &root, &xParent, &children, &nchildren))
return true; // error determining its parent X window
- if (tqchildren)
- XFree(tqchildren);
+ if (children)
+ XFree(children);
// If it is in the system tray, the system tray window will be its X parent.
// Otherwise, the root window will be its X parent.
@@ -353,7 +353,7 @@ void TrayTooltip::maybeTip(const TQPoint&)
if (Daemon::monitoringAlarms())
text = kapp->aboutData()->programName();
else
- text = i18n("%1 - disabled").tqarg(kapp->aboutData()->programName());
+ text = i18n("%1 - disabled").arg(kapp->aboutData()->programName());
kdDebug(5950) << "TrayTooltip::maybeTip(): " << text << endl;
if (Preferences::tooltipAlarmCount())
parent->tooltipAlarmText(text);
diff --git a/kalarm/undo.cpp b/kalarm/undo.cpp
index ead90e004..b2703d0f7 100644
--- a/kalarm/undo.cpp
+++ b/kalarm/undo.cpp
@@ -357,7 +357,7 @@ bool Undo::undo(Undo::Iterator it, Undo::Type type, TQWidget* parent, const TQSt
case UndoItem::ERR_PROG: err = i18n("Program error"); break;
default: err = i18n("Unknown error"); break;
}
- KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").tqarg(action).tqarg(err));
+ KMessageBox::sorry(parent, i18n("Undo-action: message", "%1: %2").arg(action).arg(err));
return false;
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-26 18:56:34 +0000