author | ulf69 <ulf69> | 2004-08-11 01:55:03 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-08-11 01:55:03 (UTC) |
commit | 1f7c51ec14521aedd2e8838f1760cdd5eb3ed08a (patch) (unidiff) | |
tree | 1391f8e0d48b925116051c2efbdea4fdf50556f2 | |
parent | 02d51ae409a353d3a79e976c26ccc1f652e55de8 (diff) | |
download | kdepimpi-1f7c51ec14521aedd2e8838f1760cdd5eb3ed08a.zip kdepimpi-1f7c51ec14521aedd2e8838f1760cdd5eb3ed08a.tar.gz kdepimpi-1f7c51ec14521aedd2e8838f1760cdd5eb3ed08a.tar.bz2 |
assign values to the size enums
to allow comparisons
-rw-r--r-- | microkde/kglobal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/microkde/kglobal.h b/microkde/kglobal.h index 1e03bea..a6c2527 100644 --- a/microkde/kglobal.h +++ b/microkde/kglobal.h | |||
@@ -1,65 +1,65 @@ | |||
1 | #ifndef MINIKDE_KGLOBAL_H | 1 | #ifndef MINIKDE_KGLOBAL_H |
2 | #define MINIKDE_KGLOBAL_H | 2 | #define MINIKDE_KGLOBAL_H |
3 | 3 | ||
4 | #include "klocale.h" | 4 | #include "klocale.h" |
5 | #include "kconfig.h" | 5 | #include "kconfig.h" |
6 | #include "kiconloader.h" | 6 | #include "kiconloader.h" |
7 | #include <kstandarddirs.h> | 7 | #include <kstandarddirs.h> |
8 | #include <qevent.h> | 8 | #include <qevent.h> |
9 | class KStandardDirs; | 9 | class KStandardDirs; |
10 | class KGlobal { | 10 | class KGlobal { |
11 | public: | 11 | public: |
12 | static KLocale *locale(); | 12 | static KLocale *locale(); |
13 | static KConfig *config(); | 13 | static KConfig *config(); |
14 | static KIconLoader *iconLoader(); | 14 | static KIconLoader *iconLoader(); |
15 | static KStandardDirs *dirs(); | 15 | static KStandardDirs *dirs(); |
16 | static int knumkeykonv( int ); | 16 | static int knumkeykonv( int ); |
17 | 17 | ||
18 | static void setAppName( const QString & ); | 18 | static void setAppName( const QString & ); |
19 | static QString formatMessage( QString mess, int maxlen ) ; | 19 | static QString formatMessage( QString mess, int maxlen ) ; |
20 | 20 | ||
21 | //US begin: added the following methods for convenience | 21 | //US begin: added the following methods for convenience |
22 | static QString getAppName(); | 22 | static QString getAppName(); |
23 | static void setLocale(KLocale *); | 23 | static void setLocale(KLocale *); |
24 | 24 | ||
25 | enum Orientation { Portrait, Landscape }; | 25 | enum Orientation { Portrait, Landscape }; |
26 | enum Size { Small, Medium, Desktop }; | 26 | enum Size { Small = 0, Medium = 1, Desktop = 2}; |
27 | 27 | ||
28 | static int getDesktopWidth(); | 28 | static int getDesktopWidth(); |
29 | static int getDesktopHeight(); | 29 | static int getDesktopHeight(); |
30 | static KGlobal::Size getDesktopSize(); | 30 | static KGlobal::Size getDesktopSize(); |
31 | static KGlobal::Orientation getOrientation(); | 31 | static KGlobal::Orientation getOrientation(); |
32 | 32 | ||
33 | 33 | ||
34 | private: | 34 | private: |
35 | static KLocale *mLocale; | 35 | static KLocale *mLocale; |
36 | static KConfig *mConfig; | 36 | static KConfig *mConfig; |
37 | static KIconLoader *mIconLoader; | 37 | static KIconLoader *mIconLoader; |
38 | static KStandardDirs *mDirs; | 38 | static KStandardDirs *mDirs; |
39 | 39 | ||
40 | static QString mAppName; | 40 | static QString mAppName; |
41 | }; | 41 | }; |
42 | 42 | ||
43 | 43 | ||
44 | /** @ref KGlobal | 44 | /** @ref KGlobal |
45 | * A typesafe function to find the minimum of the two arguments. | 45 | * A typesafe function to find the minimum of the two arguments. |
46 | */ | 46 | */ |
47 | #define KMIN(a,b)kMin(a,b) | 47 | #define KMIN(a,b)kMin(a,b) |
48 | /** @ref KGlobal | 48 | /** @ref KGlobal |
49 | * A typesafe function to find the maximum of the two arguments. | 49 | * A typesafe function to find the maximum of the two arguments. |
50 | */ | 50 | */ |
51 | #define KMAX(a,b)kMax(a,b) | 51 | #define KMAX(a,b)kMax(a,b) |
52 | /** @ref KGlobal | 52 | /** @ref KGlobal |
53 | * A typesafe function to determine the absolute value of the argument. | 53 | * A typesafe function to determine the absolute value of the argument. |
54 | */ | 54 | */ |
55 | #define KABS(a)kAbs(a) | 55 | #define KABS(a)kAbs(a) |
56 | 56 | ||
57 | 57 | ||
58 | template<class T> | 58 | template<class T> |
59 | inline const T& kMin (const T& a, const T& b) { return a < b ? a : b; } | 59 | inline const T& kMin (const T& a, const T& b) { return a < b ? a : b; } |
60 | 60 | ||
61 | template<class T> | 61 | template<class T> |
62 | inline const T& kMax (const T& a, const T& b) { return b < a ? a : b; } | 62 | inline const T& kMax (const T& a, const T& b) { return b < a ? a : b; } |
63 | 63 | ||
64 | template<class T> | 64 | template<class T> |
65 | inline T kAbs (const T& a) { return a < 0 ? -a : a; } | 65 | inline T kAbs (const T& a) { return a < 0 ? -a : a; } |