summaryrefslogtreecommitdiff
authorzecke <zecke>2004-07-13 14:01:44 (UTC)
committer zecke <zecke>2004-07-13 14:01:44 (UTC)
commit03930fa4871365efb6438b74b3a68f8f06aa7e4f (patch) (side-by-side diff)
tree86c83a95b37fbde6e467b852393b66527383492e
parent74f19a502a513258f88a75e057a5998393e3c7f6 (diff)
downloadopie-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
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice.cpp34
-rw-r--r--libopie2/opiecore/device/odevice.h21
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
@@ -55,15 +55,41 @@
#include <sys/time.h>
#include <unistd.h>
#ifndef QT_NO_SOUND
#include <linux/soundcard.h>
#endif
-const char* PATH_PROC_CPUINFO = "/proc/cpuinfo";
+namespace Opie {
+namespace Core {
-using namespace Opie::Core;
+static const char* PATH_PROC_CPUINFO = "/proc/cpuinfo";
+
+
+/* STATIC and common implementation */
+/* EXPORT */ ODistribution distributions[] = {
+ { System_Familiar, "FamiliarLinux", "/etc/familiar-version" },
+ { System_OpenZaurus, "OpenZaurus", "/etc/oz_version" },
+ { System_OpenEmbedded, "OpenEmbedded", "/etc/oe-version" },
+ { System_Unknown, "Linux", "/etc/issue" },
+};
+
+
+/* EXPORT */ bool isQWS(){
+ return qApp ? ( qApp->type() == QApplication::GuiServer ) : false;
+}
+
+/* EXPORT */ QCString makeChannel ( const char *str ){
+ if ( str && !::strchr ( str, '/' ))
+ return QCString ( "QPE/Application/" ) + str;
+ else
+ return str;
+}
+
+
+
+/* Now the default implementation of ODevice */
struct default_button default_buttons [] = {
{ Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"),
"devicebuttons/z_calendar",
"datebook", "nextView()",
"today", "raise()" },
@@ -682,6 +708,10 @@ void ODevice::sendSuspendmsg()
{
if ( isQWS() )
return;
QCopEnvelope ( "QPE/System", "aboutToSuspend()" );
}
+
+
+}
+}
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
@@ -131,20 +131,14 @@ enum OSystem {
typedef struct {
OSystem system;
char* sysstr;
char* sysvfile;
} ODistribution;
-static ODistribution distributions[] =
-{
- { System_Familiar, "FamiliarLinux", "/etc/familiar-version" },
- { System_OpenZaurus, "OpenZaurus", "/etc/oz_version" },
- { System_OpenEmbedded, "OpenEmbedded", "/etc/oe-version" },
- { System_Unknown, "Linux", "/etc/issue" },
+extern ODistribution distributions[];
-};
enum OLedState {
Led_Off,
Led_On,
Led_BlinkSlow,
Led_BlinkFast
@@ -349,25 +343,16 @@ class ODeviceData {
QValueList <ODeviceButton> *m_buttons;
uint m_holdtime;
QStrList *m_cpu_frequencies;
};
+extern bool isQWS();
+extern QCString makeChannel ( const char *str );
}
}
-static inline bool isQWS()
-{
- return qApp ? ( qApp->type() == QApplication::GuiServer ) : false;
-}
-static QCString makeChannel ( const char *str )
-{
- if ( str && !::strchr ( str, '/' ))
- return QCString ( "QPE/Application/" ) + str;
- else
- return str;
-}
#endif