23 files changed, 42 insertions, 33 deletions
diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp index 1ad0327..ee66d95 100644 --- a/libopie2/opiecore/device/odevice.cpp +++ b/libopie2/opiecore/device/odevice.cpp | |||
@@ -81,11 +81,11 @@ ODevice *ODevice::inst() | |||
81 | if ( line.startsWith( "Hardware" ) ) | 81 | if ( line.startsWith( "Hardware" ) ) |
82 | { | 82 | { |
83 | qDebug( "ODevice() - found '%s'", (const char*) line ); | 83 | qDebug( "ODevice() - found '%s'", (const char*) line ); |
84 | if ( line.contains( "sharp", false ) ) dev = new Private::Zaurus(); | 84 | if ( line.contains( "sharp", false ) ) dev = new Internal::Zaurus(); |
85 | else if ( line.contains( "ipaq", false ) ) dev = new Private::iPAQ(); | 85 | else if ( line.contains( "ipaq", false ) ) dev = new Internal::iPAQ(); |
86 | else if ( line.contains( "simpad", false ) ) dev = new Private::SIMpad(); | 86 | else if ( line.contains( "simpad", false ) ) dev = new Internal::SIMpad(); |
87 | else if ( line.contains( "jornada", false ) ) dev = new Private::Jornada(); | 87 | else if ( line.contains( "jornada", false ) ) dev = new Internal::Jornada(); |
88 | else if ( line.contains( "ramses", false ) ) dev = new Private::Ramses(); | 88 | else if ( line.contains( "ramses", false ) ) dev = new Internal::Ramses(); |
89 | else qWarning( "ODevice() - unknown hardware - using default." ); | 89 | else qWarning( "ODevice() - unknown hardware - using default." ); |
90 | break; | 90 | break; |
91 | } | 91 | } |
diff --git a/libopie2/opiecore/device/odevice_ipaq.cpp b/libopie2/opiecore/device/odevice_ipaq.cpp index 177fd4c..2efcd3a 100644 --- a/libopie2/opiecore/device/odevice_ipaq.cpp +++ b/libopie2/opiecore/device/odevice_ipaq.cpp | |||
@@ -55,7 +55,7 @@ | |||
55 | 55 | ||
56 | 56 | ||
57 | using namespace Opie::Core; | 57 | using namespace Opie::Core; |
58 | using namespace Opie::Core::Private; | 58 | using namespace Opie::Core::Internal; |
59 | 59 | ||
60 | /* KERNEL */ | 60 | /* KERNEL */ |
61 | #define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) | 61 | #define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) |
diff --git a/libopie2/opiecore/device/odevice_ipaq.h b/libopie2/opiecore/device/odevice_ipaq.h index 4f4af46..968f715 100644 --- a/libopie2/opiecore/device/odevice_ipaq.h +++ b/libopie2/opiecore/device/odevice_ipaq.h | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | namespace Opie { | 38 | namespace Opie { |
39 | namespace Core { | 39 | namespace Core { |
40 | namespace Private { | 40 | namespace Internal { |
41 | 41 | ||
42 | class iPAQ : public ODevice, public QWSServer::KeyboardFilter | 42 | class iPAQ : public ODevice, public QWSServer::KeyboardFilter |
43 | { | 43 | { |
diff --git a/libopie2/opiecore/device/odevice_jornada.cpp b/libopie2/opiecore/device/odevice_jornada.cpp index b79b0b5..eaa93ca 100644 --- a/libopie2/opiecore/device/odevice_jornada.cpp +++ b/libopie2/opiecore/device/odevice_jornada.cpp | |||
@@ -77,7 +77,7 @@ typedef struct { | |||
77 | #define LED_ON OD_IOW( 'f', 5, LED_IN ) | 77 | #define LED_ON OD_IOW( 'f', 5, LED_IN ) |
78 | #define FLITE_ON OD_IOW( 'f', 7, FLITE_IN ) | 78 | #define FLITE_ON OD_IOW( 'f', 7, FLITE_IN ) |
79 | 79 | ||
80 | using namespace Opie::Core::Private; | 80 | using namespace Opie::Core::Internal; |
81 | 81 | ||
82 | void Jornada::init() | 82 | void Jornada::init() |
83 | { | 83 | { |
diff --git a/libopie2/opiecore/device/odevice_jornada.h b/libopie2/opiecore/device/odevice_jornada.h index c37d75e..e2e67af 100644 --- a/libopie2/opiecore/device/odevice_jornada.h +++ b/libopie2/opiecore/device/odevice_jornada.h | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | namespace Opie { | 35 | namespace Opie { |
36 | namespace Core { | 36 | namespace Core { |
37 | namespace Private { | 37 | namespace Internal { |
38 | class Jornada : public ODevice | 38 | class Jornada : public ODevice |
39 | { | 39 | { |
40 | 40 | ||
diff --git a/libopie2/opiecore/device/odevice_ramses.cpp b/libopie2/opiecore/device/odevice_ramses.cpp index 77de8c5..10b7b61 100644 --- a/libopie2/opiecore/device/odevice_ramses.cpp +++ b/libopie2/opiecore/device/odevice_ramses.cpp | |||
@@ -54,7 +54,7 @@ | |||
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | using namespace Opie::Core; | 56 | using namespace Opie::Core; |
57 | using namespace Opie::Core::Private; | 57 | using namespace Opie::Core::Internal; |
58 | 58 | ||
59 | struct r_button ramses_buttons [] = { | 59 | struct r_button ramses_buttons [] = { |
60 | { Model_Ramses_MNCI, | 60 | { Model_Ramses_MNCI, |
diff --git a/libopie2/opiecore/device/odevice_ramses.h b/libopie2/opiecore/device/odevice_ramses.h index e673b1a..aea9e2a 100644 --- a/libopie2/opiecore/device/odevice_ramses.h +++ b/libopie2/opiecore/device/odevice_ramses.h | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | namespace Opie { | 37 | namespace Opie { |
38 | namespace Core { | 38 | namespace Core { |
39 | namespace Private { | 39 | namespace Internal { |
40 | 40 | ||
41 | class Ramses : public ODevice, public QWSServer::KeyboardFilter | 41 | class Ramses : public ODevice, public QWSServer::KeyboardFilter |
42 | { | 42 | { |
diff --git a/libopie2/opiecore/device/odevice_simpad.cpp b/libopie2/opiecore/device/odevice_simpad.cpp index 80d40a3..7d79ef5 100644 --- a/libopie2/opiecore/device/odevice_simpad.cpp +++ b/libopie2/opiecore/device/odevice_simpad.cpp | |||
@@ -54,7 +54,7 @@ _;:, .> :=|. This program is free software; you can | |||
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | using namespace Opie::Core; | 56 | using namespace Opie::Core; |
57 | using namespace Opie::Core::Private; | 57 | using namespace Opie::Core::Internal; |
58 | 58 | ||
59 | struct s_button simpad_buttons [] = { | 59 | struct s_button simpad_buttons [] = { |
60 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, | 60 | { Model_SIMpad_CL4 | Model_SIMpad_SL4 | Model_SIMpad_SLC | Model_SIMpad_TSinus, |
diff --git a/libopie2/opiecore/device/odevice_simpad.h b/libopie2/opiecore/device/odevice_simpad.h index 1848151..3d5acb5 100644 --- a/libopie2/opiecore/device/odevice_simpad.h +++ b/libopie2/opiecore/device/odevice_simpad.h | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | namespace Opie { | 38 | namespace Opie { |
39 | namespace Core { | 39 | namespace Core { |
40 | namespace Private { | 40 | namespace Internal { |
41 | 41 | ||
42 | class SIMpad : public ODevice, public QWSServer::KeyboardFilter | 42 | class SIMpad : public ODevice, public QWSServer::KeyboardFilter |
43 | { | 43 | { |
diff --git a/libopie2/opiecore/device/odevice_yopy.cpp b/libopie2/opiecore/device/odevice_yopy.cpp index f7a4025..4e9f227 100644 --- a/libopie2/opiecore/device/odevice_yopy.cpp +++ b/libopie2/opiecore/device/odevice_yopy.cpp | |||
@@ -54,7 +54,7 @@ _;:, .> :=|. This program is free software; you can | |||
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | using namespace Opie::Core; | 56 | using namespace Opie::Core; |
57 | using namespace Opie::Core::Private; | 57 | using namespace Opie::Core::Internal; |
58 | 58 | ||
59 | struct yopy_button yopy_buttons [] = { | 59 | struct yopy_button yopy_buttons [] = { |
60 | { Qt::Key_F10, QT_TRANSLATE_NOOP( "Button", "Action Button" ), | 60 | { Qt::Key_F10, QT_TRANSLATE_NOOP( "Button", "Action Button" ), |
diff --git a/libopie2/opiecore/device/odevice_yopy.h b/libopie2/opiecore/device/odevice_yopy.h index 7d85479..6e1db88 100644 --- a/libopie2/opiecore/device/odevice_yopy.h +++ b/libopie2/opiecore/device/odevice_yopy.h | |||
@@ -34,7 +34,7 @@ _;:, .> :=|. This program is free software; you can | |||
34 | 34 | ||
35 | namespace Opie { | 35 | namespace Opie { |
36 | namespace Core { | 36 | namespace Core { |
37 | namespace Private { | 37 | namespace Internal { |
38 | class Yopy : public ODevice | 38 | class Yopy : public ODevice |
39 | { | 39 | { |
40 | protected: | 40 | protected: |
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp index 0d21f26..000d29c 100644 --- a/libopie2/opiecore/device/odevice_zaurus.cpp +++ b/libopie2/opiecore/device/odevice_zaurus.cpp | |||
@@ -54,7 +54,7 @@ _;:, .> :=|. This program is free software; you can | |||
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | using namespace Opie::Core; | 56 | using namespace Opie::Core; |
57 | using namespace Opie::Core::Private; | 57 | using namespace Opie::Core::Internal; |
58 | 58 | ||
59 | struct z_button z_buttons [] = { | 59 | struct z_button z_buttons [] = { |
60 | { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), | 60 | { Qt::Key_F9, QT_TRANSLATE_NOOP("Button", "Calendar Button"), |
diff --git a/libopie2/opiecore/device/odevice_zaurus.h b/libopie2/opiecore/device/odevice_zaurus.h index ffb648f..a0b1787 100644 --- a/libopie2/opiecore/device/odevice_zaurus.h +++ b/libopie2/opiecore/device/odevice_zaurus.h | |||
@@ -48,7 +48,7 @@ | |||
48 | 48 | ||
49 | namespace Opie { | 49 | namespace Opie { |
50 | namespace Core { | 50 | namespace Core { |
51 | namespace Private { | 51 | namespace Internal { |
52 | class Zaurus : public ODevice | 52 | class Zaurus : public ODevice |
53 | { | 53 | { |
54 | 54 | ||
diff --git a/libopie2/opiecore/device/odevicebutton.cpp b/libopie2/opiecore/device/odevicebutton.cpp index a081b7f..6974b30 100644 --- a/libopie2/opiecore/device/odevicebutton.cpp +++ b/libopie2/opiecore/device/odevicebutton.cpp | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | namespace Opie { | 37 | namespace Opie { |
38 | namespace Core { | 38 | namespace Core { |
39 | namespace Private { | 39 | namespace Internal { |
40 | 40 | ||
41 | class OQCopMessageData | 41 | class OQCopMessageData |
42 | { | 42 | { |
@@ -48,7 +48,7 @@ class OQCopMessageData | |||
48 | } | 48 | } |
49 | 49 | ||
50 | using namespace Opie::Core; | 50 | using namespace Opie::Core; |
51 | using namespace Opie::Core::Private; | 51 | using Opie::Core::Internal::OQCopMessageData; |
52 | 52 | ||
53 | OQCopMessage::OQCopMessage() | 53 | OQCopMessage::OQCopMessage() |
54 | : d ( 0 ) | 54 | : d ( 0 ) |
diff --git a/libopie2/opiecore/device/odevicebutton.h b/libopie2/opiecore/device/odevicebutton.h index 4000144..e3f9ba9 100644 --- a/libopie2/opiecore/device/odevicebutton.h +++ b/libopie2/opiecore/device/odevicebutton.h | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | namespace Opie{ | 27 | namespace Opie{ |
28 | namespace Core{ | 28 | namespace Core{ |
29 | namespace Private { | 29 | namespace Internal { |
30 | class OQCopMessageData; | 30 | class OQCopMessageData; |
31 | } | 31 | } |
32 | 32 | ||
@@ -54,7 +54,7 @@ public: | |||
54 | private: | 54 | private: |
55 | void init ( const QCString &m_channel, const QCString &message, const QByteArray &args ); | 55 | void init ( const QCString &m_channel, const QCString &message, const QByteArray &args ); |
56 | 56 | ||
57 | Private::OQCopMessageData *d; | 57 | Internal::OQCopMessageData *d; |
58 | class Private; | 58 | class Private; |
59 | Private* m_data; | 59 | Private* m_data; |
60 | }; | 60 | }; |
diff --git a/libopie2/opiecore/oapplication.cpp b/libopie2/opiecore/oapplication.cpp index e2f6e82..ac7cd5a 100644 --- a/libopie2/opiecore/oapplication.cpp +++ b/libopie2/opiecore/oapplication.cpp | |||
@@ -45,7 +45,7 @@ OApplication* OApplication::_instance = 0; | |||
45 | 45 | ||
46 | namespace Opie { | 46 | namespace Opie { |
47 | namespace Core { | 47 | namespace Core { |
48 | namespace Private { | 48 | namespace Internal { |
49 | class OApplicationPrivate | 49 | class OApplicationPrivate |
50 | { | 50 | { |
51 | public: | 51 | public: |
@@ -91,7 +91,7 @@ OConfig* OApplication::config() | |||
91 | 91 | ||
92 | void OApplication::init() | 92 | void OApplication::init() |
93 | { | 93 | { |
94 | d = new Private::OApplicationPrivate(); | 94 | d = new Internal::OApplicationPrivate(); |
95 | if ( !OApplication::_instance ) | 95 | if ( !OApplication::_instance ) |
96 | { | 96 | { |
97 | OApplication::_instance = this; | 97 | OApplication::_instance = this; |
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index c1e32a6..337fe5e 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h | |||
@@ -37,7 +37,7 @@ | |||
37 | 37 | ||
38 | namespace Opie { | 38 | namespace Opie { |
39 | namespace Core { | 39 | namespace Core { |
40 | namespace Private { | 40 | namespace Internal { |
41 | class OApplicationPrivate; | 41 | class OApplicationPrivate; |
42 | } // private class | 42 | } // private class |
43 | 43 | ||
@@ -102,7 +102,7 @@ class OApplication : public QPEApplication | |||
102 | const QCString _appname; | 102 | const QCString _appname; |
103 | static OApplication* _instance; | 103 | static OApplication* _instance; |
104 | OConfig* _config; | 104 | OConfig* _config; |
105 | Private::OApplicationPrivate* d; | 105 | Internal::OApplicationPrivate* d; |
106 | }; | 106 | }; |
107 | 107 | ||
108 | } // Core | 108 | } // Core |
diff --git a/libopie2/opiecore/oconfig.h b/libopie2/opiecore/oconfig.h index 29c1f86..8c3060c 100644 --- a/libopie2/opiecore/oconfig.h +++ b/libopie2/opiecore/oconfig.h | |||
@@ -67,7 +67,7 @@ class OConfig : public Config | |||
67 | * The current group is used for searching keys and accessing entries. | 67 | * The current group is used for searching keys and accessing entries. |
68 | * @todo make const | 68 | * @todo make const |
69 | */ | 69 | */ |
70 | const QString& group() { return git.key(); }; | 70 | const QString& group()const { return git.key(); }; |
71 | /** | 71 | /** |
72 | * @returns a @ref QColor entry or a @a default value if the key is not found. | 72 | * @returns a @ref QColor entry or a @a default value if the key is not found. |
73 | */ | 73 | */ |
diff --git a/libopie2/opiecore/odebug.cpp b/libopie2/opiecore/odebug.cpp index cac985b..f258faa 100644 --- a/libopie2/opiecore/odebug.cpp +++ b/libopie2/opiecore/odebug.cpp | |||
@@ -67,6 +67,15 @@ | |||
67 | 67 | ||
68 | namespace Opie { | 68 | namespace Opie { |
69 | namespace Core { | 69 | namespace Core { |
70 | namespace Internal { | ||
71 | class DebugBackend { | ||
72 | }; | ||
73 | |||
74 | static DebugBackend *backEnd = 0; | ||
75 | } | ||
76 | static void clean_up_routine() { | ||
77 | delete Internal::backEnd; | ||
78 | } | ||
70 | /*====================================================================================== | 79 | /*====================================================================================== |
71 | * debug levels | 80 | * debug levels |
72 | *======================================================================================*/ | 81 | *======================================================================================*/ |
diff --git a/libopie2/opiecore/oprocctrl.cpp b/libopie2/opiecore/oprocctrl.cpp index 46708ba..404e0b3 100644 --- a/libopie2/opiecore/oprocctrl.cpp +++ b/libopie2/opiecore/oprocctrl.cpp | |||
@@ -41,7 +41,7 @@ | |||
41 | #include <qsocketnotifier.h> | 41 | #include <qsocketnotifier.h> |
42 | #include "oprocctrl.h" | 42 | #include "oprocctrl.h" |
43 | 43 | ||
44 | using namespace Opie::Core::Private; | 44 | using namespace Opie::Core::Internal; |
45 | 45 | ||
46 | OProcessController *OProcessController::theOProcessController = 0; | 46 | OProcessController *OProcessController::theOProcessController = 0; |
47 | 47 | ||
diff --git a/libopie2/opiecore/oprocctrl.h b/libopie2/opiecore/oprocctrl.h index 4922ba2..ea00859 100644 --- a/libopie2/opiecore/oprocctrl.h +++ b/libopie2/opiecore/oprocctrl.h | |||
@@ -39,7 +39,7 @@ class QSocketNotifier; | |||
39 | 39 | ||
40 | namespace Opie { | 40 | namespace Opie { |
41 | namespace Core { | 41 | namespace Core { |
42 | namespace Private { | 42 | namespace Internal { |
43 | class OProcessControllerPrivate; | 43 | class OProcessControllerPrivate; |
44 | 44 | ||
45 | /** | 45 | /** |
diff --git a/libopie2/opiecore/oprocess.cpp b/libopie2/opiecore/oprocess.cpp index dfde74a..b3f9724 100644 --- a/libopie2/opiecore/oprocess.cpp +++ b/libopie2/opiecore/oprocess.cpp | |||
@@ -61,11 +61,11 @@ _;:, .> :=|. This program is free software; you can | |||
61 | #include <grp.h> | 61 | #include <grp.h> |
62 | #endif | 62 | #endif |
63 | 63 | ||
64 | using namespace Opie::Core::Private; | 64 | using namespace Opie::Core::Internal; |
65 | 65 | ||
66 | namespace Opie { | 66 | namespace Opie { |
67 | namespace Core { | 67 | namespace Core { |
68 | namespace Private { | 68 | namespace Internal { |
69 | class OProcessPrivate | 69 | class OProcessPrivate |
70 | { | 70 | { |
71 | public: | 71 | public: |
diff --git a/libopie2/opiecore/oprocess.h b/libopie2/opiecore/oprocess.h index e23f98c..be1436c 100644 --- a/libopie2/opiecore/oprocess.h +++ b/libopie2/opiecore/oprocess.h | |||
@@ -46,7 +46,7 @@ class QSocketNotifier; | |||
46 | 46 | ||
47 | namespace Opie { | 47 | namespace Opie { |
48 | namespace Core { | 48 | namespace Core { |
49 | namespace Private { | 49 | namespace Internal { |
50 | class OProcessController; | 50 | class OProcessController; |
51 | class OProcessPrivate; | 51 | class OProcessPrivate; |
52 | } | 52 | } |
@@ -723,7 +723,7 @@ protected: | |||
723 | * @ref OProcessController is a friend of OProcess because it has to have | 723 | * @ref OProcessController is a friend of OProcess because it has to have |
724 | * access to various data members. | 724 | * access to various data members. |
725 | */ | 725 | */ |
726 | friend class Private::OProcessController; | 726 | friend class Internal::OProcessController; |
727 | 727 | ||
728 | private: | 728 | private: |
729 | /** | 729 | /** |
@@ -752,7 +752,7 @@ private: | |||
752 | 752 | ||
753 | private: | 753 | private: |
754 | void init ( ); | 754 | void init ( ); |
755 | Private::OProcessPrivate *d; | 755 | Internal::OProcessPrivate *d; |
756 | }; | 756 | }; |
757 | } | 757 | } |
758 | } | 758 | } |