File ksimus-gcc4.diff of Package ksimus

Overview Repositories Revisions Requests Users Attributes Meta

File ksimus-gcc4.diff of Package ksimus

--- ksimus/lib/componentinfo.cpp.orig	2005-04-07 20:13:27.000000000 +0200
+++ ksimus/lib/componentinfo.cpp	2005-04-07 20:46:49.976812683 +0200
@@ -31,7 +31,7 @@
 //##########################################################
 //##########################################################
 
-
+template <>
 EnumDict<ViewAttribute>::tData EnumDict<ViewAttribute>::data[]
 			= { {"VA_SHEETVIEW", 			VA_SHEETVIEW},
           {"VA_USERVIEW",  			VA_USERVIEW},
--- ksimus/tools/ksimtimebase.cpp.orig	2005-04-07 19:45:56.000000000 +0200
+++ ksimus/tools/ksimtimebase.cpp	2005-04-07 20:50:14.576456632 +0200
@@ -31,6 +31,7 @@
 #include "ksimtimeserver.h"
 #include "enumdict.h"
 
+template <>
 EnumDict<eTimeUnit>::tData EnumDict<eTimeUnit>::data[]
       = { {"Ticks",    unit_ticks},
           {"1/10ns",   unit_tenth_nsec},
--- ksimus/tools/ksimbooltristate.cpp.orig	2005-04-07 19:39:58.000000000 +0200
+++ ksimus/tools/ksimbooltristate.cpp	2005-04-07 20:47:33.886225583 +0200
@@ -32,6 +32,7 @@
 
 //#########################################################################################
 
+template <>
 EnumDict<eKSimBoolTristate>::tData EnumDict<eKSimBoolTristate>::data[]
       = { {"False",        KSIMBOOLTRISTATE_FALSE},
           {"True",         KSIMBOOLTRISTATE_TRUE},
--- ksimus/tools/ksimfilename.cpp.orig	2005-04-07 19:42:02.000000000 +0200
+++ ksimus/tools/ksimfilename.cpp	2005-04-07 20:50:46.638915291 +0200
@@ -46,6 +46,7 @@
 
 static EnumDict<KSimFilename::ePathType> pathTypeDict;
 
+template <>
 EnumDict<KSimFilename::ePathType>::tData EnumDict<KSimFilename::ePathType>::data[]
 			= { {"Absolute",          KSimFilename::PATH_ABSOLUTE},
 					{"Relative Document", KSimFilename::PATH_RELATIVE_DOCUMENT},
@@ -53,7 +54,6 @@ EnumDict<KSimFilename::ePathType>::tData
 					{"Relative Home",     KSimFilename::PATH_RELATIVE_HOME},
           {0,(KSimFilename::ePathType)0}};
 
-
 const char * KSimFilename::convertPathType(KSimFilename::ePathType pathType)
 {
 	return pathTypeDict.find(pathType);
--- ksimus/tools/ksimtype.h.orig	2005-04-07 19:01:55.000000000 +0200
+++ ksimus/tools/ksimtype.h	2005-04-07 19:39:10.000000000 +0200
@@ -45,6 +45,8 @@ class KSimData;
 class KSimTypeBase
 {
 public:
+	virtual ~KSimTypeBase() {}
+
 	/** Returns the current value as string. The function must be implemented in a sub class. */
 	virtual QString text() const = 0;
 	/** Sets a new value. The function must be implemented in a sub class. */
--- ksimus/tools/enumdict.h.orig	2005-04-07 20:35:57.000000000 +0200
+++ ksimus/tools/enumdict.h	2005-04-07 20:39:46.745992989 +0200
@@ -120,13 +120,14 @@ public: 
 		*/
 	const T * load(const KSimData & conf, const char * key) const;
 	
-private:
+public:
 		/** Stores the relation between one string and one enum. */
 		typedef struct {
 			const char * name;
 			T value;
 		} tData;
 
+protected:
 		/** Implement this data array as shown above. */
 		static tData data[];
 };
--- ksimus/ksimdata.cpp.orig	2005-04-07 20:20:59.000000000 +0200
+++ ksimus/ksimdata.cpp	2005-04-07 20:48:39.534881435 +0200
@@ -70,6 +70,7 @@ static const char * sKSimusKey =      "D
 
 //#########################################################################################
 
+template <>
 EnumDict<KSimData::eVersionType>::tData EnumDict<KSimData::eVersionType>::data[]
       = { {"error",        KSimData::versionError},
           {"as is",        KSimData::versionAsIs},
--- ksimus/ksimus.cpp.orig	2005-04-07 20:33:37.000000000 +0200
+++ ksimus/ksimus.cpp	2005-04-07 20:49:45.987397500 +0200
@@ -74,7 +74,7 @@
 //################################################################################
 //################################################################################
 
-
+template <>
 EnumDict<eAppViewType>::tData EnumDict<eAppViewType>::data[]
       = { {"Sheet View",   APP_SHEET_VIEW},
           {"User View",    APP_USER_VIEW},
@@ -1281,7 +1281,7 @@ void KSimusApp::slotEditorModeChanged(in
 		case EM_INSERT:
 			{
 				QString msg;
-				msg.sprintf(i18n("Insert Component '%1' ...").arg(i18n(m_p->lastSelectedCI->getName().latin1())));
+				msg = i18n("Insert Component '%1' ...").arg(i18n(m_p->lastSelectedCI->getName()));
 				slotStatusMsg(msg);
 			}
 			break;
--- ksimus/module/moduledata.cpp.orig	2005-04-07 19:47:25.000000000 +0200
+++ ksimus/module/moduledata.cpp	2005-04-07 20:48:11.376747295 +0200
@@ -68,6 +68,7 @@ static const char * sShortDescr 		= "Sho
 static const char * sPixmapStore	= "Pixmap Store";
 static const char * sPixmapData = "Pixmap Data";
 
+template <>
 EnumDict<ModuleViewType>::tData EnumDict<ModuleViewType>::data[]
       = { {"Generic",    MV_GENERIC},
           {"User View",  MV_USERVIEW},
@@ -81,7 +82,7 @@ static const EnumDict<ModuleViewType> & 
 	return moduleViewDict;
 }
 
-
+template <>
 EnumDict<ModulePixmapStoreType>::tData EnumDict<ModulePixmapStoreType>::data[]
       = { {"Absolute",         MPS_ABSOLTUE},
           {"Relative Module",  MPS_RELATIVE_MODULE},

Places

File ksimus-gcc4.diff of Package ksimus

Places