SVN commit 522687 by djarvie:

Rename displayUpdateError() -> displayKOrgUpdateError() for clarity


 M  +2 -2      functions.cpp   [UTF-8 ENCODING PROBLEMS]
 M  +3 -3      functions.h   [UTF-8 ENCODING PROBLEMS]
 M  +1 -1      kalarm.h  
 M  +5 -5      mainwindow.cpp  
 M  +2 -2      messagewin.cpp   [UTF-8 ENCODING PROBLEMS]
 M  +2 -2      undo.cpp   [UTF-8 ENCODING PROBLEMS]


--- trunk/KDE/kdepim/kalarm/functions.cpp #522686:522687
@@ -1,7 +1,7 @@
 /*
  *  functions.cpp  -  miscellaneous functions
  *  Program:  kalarm
- *  Copyright (c) 2001-2006 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2001-2006 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -438,7 +438,7 @@
 /******************************************************************************
 * Display an error message corresponding to a specified alarm update error code.
 */
-void displayUpdateError(QWidget* parent, UpdateError code, bool multipleAlarms)
+void displayKOrgUpdateError(QWidget* parent, UpdateError code, bool multipleAlarms)
 {
 	QString errmsg;
 	switch (code)
--- trunk/KDE/kdepim/kalarm/functions.h #522686:522687
@@ -1,7 +1,7 @@
 /*
  *  functions.h  -  miscellaneous functions
  *  Program:  kalarm
- *  Copyright (c) 2004, 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2004-2005 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@
 	UPDATE_ERROR,       // update failed completely
 	UPDATE_KORG_ERR     // update succeeded, but KOrganizer update failed
 };
-/** Error codes supplied as parameter to displayUpdateError() */
+/** Error codes supplied as parameter to displayKOrgUpdateError() */
 enum UpdateError { KORG_ERR_ADD, KORG_ERR_MODIFY, KORG_ERR_DELETE };
 
 
@@ -94,7 +94,7 @@
 void                deleteDisplayEvent(const QString& eventID);
 UpdateStatus        reactivateEvent(KAEvent&, AlarmListView* selectionView, bool useEventID = false);
 void                enableEvent(KAEvent&, AlarmListView* selectionView, bool enable);
-void                displayUpdateError(QWidget* parent, UpdateError, bool multipleAlarms = false);
+void                displayKOrgUpdateError(QWidget* parent, UpdateError, bool multipleAlarms = false);
 
 QString             stripAccel(const QString&);
 
--- trunk/KDE/kdepim/kalarm/kalarm.h #522686:522687
@@ -21,7 +21,7 @@
 #ifndef KALARM_H
 #define KALARM_H
 
-//#undef QT3_SUPPORT
+#undef QT3_SUPPORT
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
--- trunk/KDE/kdepim/kalarm/mainwindow.cpp #522686:522687
@@ -563,7 +563,7 @@
 
 		// Add the alarm to the displayed lists and to the calendar file
 		if (KAlarm::addEvent(event, (win ? win->mListView : 0)) == KAlarm::UPDATE_KORG_ERR)
-			KAlarm::displayUpdateError(win, KAlarm::KORG_ERR_ADD);
+			KAlarm::displayKOrgUpdateError(win, KAlarm::KORG_ERR_ADD);
 		Undo::saveAdd(event);
 
 		KAlarm::outputAlarmWarnings(&editDlg, &event);
@@ -629,7 +629,7 @@
 			else
 			{
 				if (KAlarm::modifyEvent(event, newEvent, mListView) == KAlarm::UPDATE_KORG_ERR)
-					KAlarm::displayUpdateError(this, KAlarm::KORG_ERR_MODIFY);
+					KAlarm::displayKOrgUpdateError(this, KAlarm::KORG_ERR_MODIFY);
 			}
 			Undo::saveEdit(event, newEvent);
 
@@ -693,7 +693,7 @@
 	Undo::saveDeletes(events);
 
 	if (warnKOrg)
-		KAlarm::displayUpdateError(this, KAlarm::KORG_ERR_DELETE, (warnKOrg > 1));
+		KAlarm::displayKOrgUpdateError(this, KAlarm::KORG_ERR_DELETE, (warnKOrg > 1));
 }
 
 /******************************************************************************
@@ -722,7 +722,7 @@
 	Undo::saveReactivates(events);
 
 	if (warnKOrg)
-		KAlarm::displayUpdateError(this, KAlarm::KORG_ERR_ADD, (warnKOrg > 1));
+		KAlarm::displayKOrgUpdateError(this, KAlarm::KORG_ERR_ADD, (warnKOrg > 1));
 }
 
 /******************************************************************************
@@ -805,7 +805,7 @@
 					++warnKOrg;
 			}
 			if (warnKOrg)
-				KAlarm::displayUpdateError(this, KAlarm::KORG_ERR_ADD, (warnKOrg > 1));
+				KAlarm::displayKOrgUpdateError(this, KAlarm::KORG_ERR_ADD, (warnKOrg > 1));
 			KAlarm::outputAlarmWarnings(&dlg);
 		}
 	}
--- trunk/KDE/kdepim/kalarm/messagewin.cpp #522686:522687
@@ -1,7 +1,7 @@
 /*
  *  messagewin.cpp  -  displays an alarm message
  *  Program:  kalarm
- *  Copyright (c) 2001-2006 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2001-2006 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -1464,7 +1464,7 @@
 		}
 
 		if (status == KAlarm::UPDATE_KORG_ERR)
-			KAlarm::displayUpdateError(this, KAlarm::KORG_ERR_MODIFY);
+			KAlarm::displayKOrgUpdateError(this, KAlarm::KORG_ERR_MODIFY);
 		KAlarm::outputAlarmWarnings(&editDlg, &event);
 
 		// Close the alarm window
--- trunk/KDE/kdepim/kalarm/undo.cpp #522686:522687
@@ -1,7 +1,7 @@
 /*
  *  undo.cpp  -  undo/redo facility
  *  Program:  kalarm
- *  Copyright (c) 2005 by David Jarvie <software@astrojar.org.uk>
+ *  Copyright © 2005-2006 by David Jarvie <software@astrojar.org.uk>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -346,7 +346,7 @@
 				default:
 					return true;
 			}
-			KAlarm::displayUpdateError(parent, errcode, (UndoItem::mRestoreWarning & UndoItem::WARN_MULTI));
+			KAlarm::displayKOrgUpdateError(parent, errcode, (UndoItem::mRestoreWarning & UndoItem::WARN_MULTI));
 			return true;
 		}
 		case UndoItem::ERR_NOT_FOUND:  err = i18n("Alarm not found");  break;