Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 12 deletions

diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 2d4e962d5..8cbc7ceb7 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -61,7 +61,7 @@ using namespace KCal;
 
 TQString AlarmCalendar::icalProductId()
 {
-	return TQString::tqfromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").arg(KAlarm::currentCalendarVersionString());
+	return TQString::tqfromLatin1("-//K Desktop Environment//NONSGML " KALARM_NAME " %1//EN").tqarg(KAlarm::currentCalendarVersionString());
 }
 
 static const KAEvent::tqStatus 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").arg(errorKey1).arg(file));
+		KAlarmApp::displayFatalError(i18n("%1: file name not permitted: %2").tqarg(errorKey1).tqarg(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").arg(errorKey1).arg(errorKey2));
+		KAlarmApp::displayFatalError(i18n("%1, %2: file names must be different").tqarg(errorKey1).tqarg(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").arg(path));
+		KAlarmApp::displayFatalError(i18n("Invalid calendar file name: %1").tqarg(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").arg(mUrl.prettyURL()));
+		KMessageBox::error(0, i18n("Cannot open calendar:\n%1").tqarg(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.").arg(mUrl.prettyURL()));
+		KMessageBox::error(0, i18n("Error loading calendar:\n%1\n\nPlease fix or delete the file.").tqarg(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'").arg(mICalUrl.prettyURL()));
+		KMessageBox::error(0, i18n("Failed to save calendar to\n'%1'").tqarg(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'").arg(mICalUrl.prettyURL()));
+			KMessageBox::error(0, i18n("Cannot upload calendar to\n'%1'").tqarg(mICalUrl.prettyURL()));
 			return false;
 		}
 	}
@@ -446,7 +446,7 @@ void AlarmCalendar::close()
 bool AlarmCalendar::importAlarms(TQWidget* tqparent)
 {
 	KURL url = KFileDialog::getOpenURL(TQString::tqfromLatin1(":importalarms"),
-	                                   TQString::tqfromLatin1("*.vcs *.ics|%1").arg(i18n("Calendar Files")), tqparent);
+	                                   TQString::tqfromLatin1("*.vcs *.ics|%1").tqarg(i18n("Calendar Files")), tqparent);
 	if (url.isEmpty())
 	{
 		kdError(5950) << "AlarmCalendar::importAlarms(): Empty URL" << endl;
@@ -468,7 +468,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
 		if (!KStandardDirs::exists(filename))
 		{
 			kdDebug(5950) << "AlarmCalendar::importAlarms(): File '" << url.prettyURL() << "' not found" << endl;
-			KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").arg(url.prettyURL()));
+			KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
 			return false;
 		}
 	}
@@ -477,7 +477,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
 		if (!KIO::NetAccess::download(url, filename, MainWindow::mainMainWindow()))
 		{
 			kdError(5950) << "AlarmCalendar::importAlarms(): Download failure" << endl;
-			KMessageBox::error(tqparent, i18n("Cannot download calendar:\n%1").arg(url.prettyURL()));
+			KMessageBox::error(tqparent, i18n("Cannot download calendar:\n%1").tqarg(url.prettyURL()));
 			return false;
 		}
 		kdDebug(5950) << "--- Downloaded to " << filename << endl;
@@ -490,7 +490,7 @@ bool AlarmCalendar::importAlarms(TQWidget* tqparent)
 	if (!success)
 	{
 		kdDebug(5950) << "AlarmCalendar::importAlarms(): error loading calendar '" << filename << "'" << endl;
-		KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").arg(url.prettyURL()));
+		KMessageBox::error(tqparent, i18n("Could not load calendar '%1'.").tqarg(url.prettyURL()));
 	}
 	else
 	{