-rw-r--r-- | libopie2/opiecore/oglobal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libopie2/opiecore/oglobal.h b/libopie2/opiecore/oglobal.h index e6a6c46..d79a218 100644 --- a/libopie2/opiecore/oglobal.h +++ b/libopie2/opiecore/oglobal.h | |||
@@ -66,55 +66,55 @@ namespace Core { | |||
66 | * out of this config like Weekstart or Owner name. | 66 | * out of this config like Weekstart or Owner name. |
67 | * | 67 | * |
68 | * @todo ODP implement the things from Global which are good | 68 | * @todo ODP implement the things from Global which are good |
69 | * @author mickey,alwin,zecke | 69 | * @author mickey,alwin,zecke |
70 | * @version 0.1 | 70 | * @version 0.1 |
71 | */ | 71 | */ |
72 | class OGlobal : public Global | 72 | class OGlobal : public Global |
73 | { | 73 | { |
74 | public: | 74 | public: |
75 | 75 | ||
76 | // how do they relate to our Document Idea | 76 | // how do they relate to our Document Idea |
77 | /** @name Document System related functions | 77 | /** @name Document System related functions |
78 | * | 78 | * |
79 | */ | 79 | */ |
80 | //@{ | 80 | //@{ |
81 | static bool isAppLnkFileName( const QString& str ); | 81 | static bool isAppLnkFileName( const QString& str ); |
82 | static bool isDocumentFileName( const QString& file ); | 82 | static bool isDocumentFileName( const QString& file ); |
83 | //@} | 83 | //@} |
84 | 84 | ||
85 | /** @name File Operations | 85 | /** @name File Operations |
86 | * File operations provided by OGlobal | 86 | * File operations provided by OGlobal |
87 | */ | 87 | */ |
88 | //@{ | 88 | //@{ |
89 | /** the content of TEMP | 89 | /** the content of TEMP |
90 | * reads the environment variable TEMP and returns the content. | 90 | * reads the environment variable TEMP and returns the content. |
91 | * if not set returns "/tmp" | 91 | * if not set returns "/tmp" |
92 | * @return a string containing a dir without trailing slash! | 92 | * @return a string containing a dir without trailing slash! |
93 | */ | 93 | */ |
94 | static QString tempDirPath(); | 94 | static QString tempDirPath(); |
95 | /** the content of HOME | 95 | /** the content of HOME |
96 | * reads the environment variable HOME and returns the content. | 96 | * reads the environment variable HOME and returns the content. |
97 | * if not set returns "/" | 97 | * if not set returns "/" |
98 | * @return a string containing a dir without trailing slash! | 98 | * @return a string containing a dir without trailing slash! |
99 | */ | 99 | */ |
100 | static QString homeDirPath(); | 100 | static QString homeDirPath(); |
101 | static QString tempFileName( const QString& ); | 101 | static QString tempFileName( const QString& ); |
102 | static bool renameFile( const QString& from, const QString& to ); | 102 | static bool renameFile( const QString& from, const QString& to ); |
103 | static bool truncateFile( QFile &f, off_t size ); | 103 | static bool truncateFile( QFile &f, off_t size ); |
104 | //@} | 104 | //@} |
105 | 105 | ||
106 | 106 | ||
107 | static QString generateUuid(); | 107 | static QString generateUuid(); |
108 | 108 | ||
109 | /** @name Convert Content | 109 | /** @name Convert Content |
110 | * Convert Content of a QByteArray | 110 | * Convert Content of a QByteArray |
111 | */ | 111 | */ |
112 | //@{ | 112 | //@{ |
113 | static QByteArray encodeBase64(const QByteArray&, bool insertLF = false ); | 113 | static QByteArray encodeBase64(const QByteArray&, bool insertLF = false ); |
114 | static QByteArray decodeBase64(const QByteArray& ); | 114 | static QByteArray decodeBase64(const QByteArray& ); |
115 | //@} | 115 | //@} |
116 | 116 | ||
117 | //FIXME Do we want to put that into OApplication as in KApplication? -zecke | 117 | //FIXME Do we want to put that into OApplication as in KApplication? -zecke |
118 | // We already have a per-application config in OApplication | 118 | // We already have a per-application config in OApplication |
119 | // ( accessed through oApp->config() ), but this one is the global one! -mickeyl | 119 | // ( accessed through oApp->config() ), but this one is the global one! -mickeyl |
120 | /** @name Config and Owner related Information | 120 | /** @name Config and Owner related Information |
@@ -128,32 +128,33 @@ public: | |||
128 | static bool useAMPM(); | 128 | static bool useAMPM(); |
129 | #ifdef ODP | 129 | #ifdef ODP |
130 | #error "Fix dateFormat" | 130 | #error "Fix dateFormat" |
131 | /** | 131 | /** |
132 | * For Qt3/Qt4 we can use QDate::toString(OGlobal::dateFormat) | 132 | * For Qt3/Qt4 we can use QDate::toString(OGlobal::dateFormat) |
133 | * See if we need to use the function with String in it | 133 | * See if we need to use the function with String in it |
134 | * Anyway this is the future | 134 | * Anyway this is the future |
135 | * for now still use TimeString! | 135 | * for now still use TimeString! |
136 | */ | 136 | */ |
137 | #endif | 137 | #endif |
138 | static DateFormat dateFormat(); | 138 | static DateFormat dateFormat(); |
139 | static void setDateFormat( const DateFormat& ); | 139 | static void setDateFormat( const DateFormat& ); |
140 | 140 | ||
141 | 141 | ||
142 | static void setWeekStartsOnMonday( bool ); | 142 | static void setWeekStartsOnMonday( bool ); |
143 | static void setUseAMPM( bool ); | 143 | static void setUseAMPM( bool ); |
144 | //@} | 144 | //@} |
145 | 145 | ||
146 | //@{ | 146 | //@{ |
147 | static Global::Command* builtinCommands(); | 147 | static Global::Command* builtinCommands(); |
148 | static QGuardedPtr<QWidget>* builtinRunning(); | 148 | static QGuardedPtr<QWidget>* builtinRunning(); |
149 | //@} | 149 | //@} |
150 | 150 | ||
151 | private: | 151 | private: |
152 | static void clean_up(); | ||
152 | static OConfig* _config; | 153 | static OConfig* _config; |
153 | static OConfig* _qpe_config; | 154 | static OConfig* _qpe_config; |
154 | class Private; | 155 | class Private; |
155 | Private *d; | 156 | Private *d; |
156 | }; | 157 | }; |
157 | } | 158 | } |
158 | } | 159 | } |
159 | #endif // OGLOBAL_H | 160 | #endif // OGLOBAL_H |