1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
Subject: Fix FTBFS with gcc 4.1
Author: Martin Michlmayr
--- a/libGIFTAcInvertedFile/include/CInvertedFileChunk.h
+++ b/libGIFTAcInvertedFile/include/CInvertedFileChunk.h
@@ -73,8 +73,7 @@
* add one document of to the list for one feature
*
*/
- void CInvertedFileChunk::addElement(TID inDocumentID,
- double inDocumentFrequency);
+ void addElement(TID inDocumentID, double inDocumentFrequency);
/**
*
--- a/libMRML/include/CAccessorAdmin.h
+++ b/libMRML/include/CAccessorAdmin.h
@@ -111,11 +111,11 @@
/** destructor */
~CAccessorAdmin();
/** */
- string CAccessorAdmin::getAlgorithmIDListID()const;
+ string getAlgorithmIDListID()const;
/** */
- string CAccessorAdmin::getName()const;
+ string getName()const;
/** */
- string CAccessorAdmin::getID()const;
+ string getID()const;
/** for sorting */
friend class CSortByName_pAP;
--- a/libMRML/include/CAttributeList.h
+++ b/libMRML/include/CAttributeList.h
@@ -79,7 +79,7 @@
virtual pair<bool,string> stringReadAttribute(const string& inAttribute)const;
/** Outputting a string to XML
*/
- void CAttributeList::toXML(string& outString)const;
+ void toXML(string& outString)const;
/** the destructor
in the case of char* as content it deletes the arrays of char.
*/
--- a/libMRML/include/CI18nTranslator.h
+++ b/libMRML/include/CI18nTranslator.h
@@ -98,11 +98,11 @@
void translateXMLTree(string inLanguageCode,
CXMLElement& inoutToBeTranslated)const;
/** for parsing the config file */
- static void CI18nTranslator::startXMLElement(void *inUserData,
+ static void startXMLElement(void *inUserData,
const char *inElementName,
const char **inAttributes);
/** for parsing the config file */
- static void CI18nTranslator::endXMLElement(void *inUserData,
+ static void endXMLElement(void *inUserData,
const char *inElementName);
};
#endif
--- a/libMRML/include/CSessionManager.h
+++ b/libMRML/include/CSessionManager.h
@@ -172,18 +172,18 @@
bool rename(const string& inName);
/** the list of preferred languages of this
is cleared */
- void CSession::clearLanguages();
+ void clearLanguages();
/** one language code is added at the back of the list
of preferred languages */
- void CSession::addLanguage(string inLanguageCode);
+ void addLanguage(string inLanguageCode);
/** commit the list of languages. That means, here the
actual language that will be used throughout the
translation is determined */
- void CSession::commitLanguages(const CI18nTranslator& inTranslator);
+ void commitLanguages(const CI18nTranslator& inTranslator);
/** get the preferred languages of this session */
- list<string> CSession::getLanguages()const;
+ list<string> getLanguages()const;
/** get the preferred languages of this session */
- string CSession::getPreferredLanguage()const;
+ string getPreferredLanguage()const;
//--------------------------------------------------
/** generating XML output for configuration/shandshake */
@@ -420,7 +420,7 @@
/** i18n: get the list of preferred languages of this session */
list<string> getSessionLanguages(const string& inSessionID)const;
/** i18n: get the list of preferred languages of this session */
- void CSessionManager::translate(string inSessionID,
+ void translate(string inSessionID,
CXMLElement& inoutToBeTranslated)const;
};
|
