author | zecke <zecke> | 2004-07-13 14:01:44 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-07-13 14:01:44 (UTC) |
commit | 03930fa4871365efb6438b74b3a68f8f06aa7e4f (patch) (unidiff) | |
tree | 86c83a95b37fbde6e467b852393b66527383492e /libopie2 | |
parent | 74f19a502a513258f88a75e057a5998393e3c7f6 (diff) | |
download | opie-03930fa4871365efb6438b74b3a68f8f06aa7e4f.zip opie-03930fa4871365efb6438b74b3a68f8f06aa7e4f.tar.gz opie-03930fa4871365efb6438b74b3a68f8f06aa7e4f.tar.bz2 |
Fix compiler warnings coming from static methods which are unused most of the
time in headers.
Move isQWS and makeChannel to Opie::Core. Maybe we will move them
to internal later
-rw-r--r-- | libopie2/opiecore/device/odevice.cpp | 34 | ||||
-rw-r--r-- | libopie2/opiecore/device/odevice.h | 21 |
2 files changed, 35 insertions, 20 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index 5b73e59..0068d88 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -60,5 +60,31 @@ | |||
60 | 60 | ||
61 | const char* PATH_PROC_CPUINFO = "/proc/cpuinfo"; | 61 | namespace Opie { |
62 | namespace Core { | ||
62 | 63 | ||
63 | using namespace Opie::Core; | 64 | static const char* PATH_PROC_CPUINFO = "/proc/cpuinfo"; |
65 | |||
66 | |||
67 | /* STATIC and common implementation */ | ||
68 | /* EXPORT */ ODistribution distributions[] = { | ||
69 | { System_Familiar, "FamiliarLinux", "/etc/familiar-version" }, | ||
70 | { System_OpenZaurus, "OpenZaurus", "/etc/oz_version" }, | ||
71 | { System_OpenEmbedded, "OpenEmbedded", "/etc/oe-version" }, | ||
72 | { System_Unknown, "Linux", "/etc/issue" }, | ||
73 | }; | ||
74 | |||
75 | |||
76 | /* EXPORT */ bool isQWS(){ | ||
77 | return qApp ? ( qApp->type() == QApplication::GuiServer ) : false; | ||
78 | } | ||
79 | |||
80 | /* EXPORT */ QCString makeChannel ( const char *str ){ | ||
81 | if ( str && !::strchr ( str, '/' )) | ||
82 | return QCString ( "QPE/Application/" ) + str; | ||
83 | else | ||
84 | return str; | ||
85 | } | ||
86 | |||
87 | |||
88 | |||
89 | /* Now the default implementation of ODevice */ | ||
64 | 90 | ||
@@ -687 +713,5 @@ void ODevice::sendSuspendmsg() | |||
687 | } | 713 | } |
714 | |||
715 | |||
716 | } | ||
717 | } | ||
diff --git a/libopie2/opiecore/device/odevice.h b/libopie2/opiecore/device/odevice.h index 474d792..0465d7e 100644 --- a/libopie2/opiecore/device/odevice.h +++ b/libopie2/opiecore/device/odevice.h | |||
@@ -136,10 +136,4 @@ typedef struct { | |||
136 | 136 | ||
137 | static ODistribution distributions[] = | 137 | extern ODistribution distributions[]; |
138 | { | ||
139 | { System_Familiar, "FamiliarLinux", "/etc/familiar-version" }, | ||
140 | { System_OpenZaurus, "OpenZaurus", "/etc/oz_version" }, | ||
141 | { System_OpenEmbedded, "OpenEmbedded", "/etc/oe-version" }, | ||
142 | { System_Unknown, "Linux", "/etc/issue" }, | ||
143 | 138 | ||
144 | }; | ||
145 | 139 | ||
@@ -354,2 +348,4 @@ class ODeviceData { | |||
354 | 348 | ||
349 | extern bool isQWS(); | ||
350 | extern QCString makeChannel ( const char *str ); | ||
355 | } | 351 | } |
@@ -357,14 +353,3 @@ class ODeviceData { | |||
357 | 353 | ||
358 | static inline bool isQWS() | ||
359 | { | ||
360 | return qApp ? ( qApp->type() == QApplication::GuiServer ) : false; | ||
361 | } | ||
362 | 354 | ||
363 | static QCString makeChannel ( const char *str ) | ||
364 | { | ||
365 | if ( str && !::strchr ( str, '/' )) | ||
366 | return QCString ( "QPE/Application/" ) + str; | ||
367 | else | ||
368 | return str; | ||
369 | } | ||
370 | 355 | ||