-rw-r--r-- | examples/todayplugin/config.in | 2 | ||||
-rw-r--r-- | examples/todayplugin/example.pro | 2 | ||||
-rw-r--r-- | examples/todayplugin/exampleplugin.h | 4 | ||||
-rw-r--r-- | examples/todayplugin/examplepluginimpl.h | 2 | ||||
-rw-r--r-- | examples/todayplugin/examplepluginwidget.cpp | 3 | ||||
-rw-r--r-- | examples/todayplugin/examplepluginwidget.h | 4 |
6 files changed, 9 insertions, 8 deletions
diff --git a/examples/todayplugin/config.in b/examples/todayplugin/config.in index 53004cb..0a6a573 100644 --- a/examples/todayplugin/config.in +++ b/examples/todayplugin/config.in | |||
@@ -1,5 +1,5 @@ | |||
1 | config TODAY_EXAMPLE | 1 | config TODAY_EXAMPLE |
2 | boolean "Opie-Today Plugin Example" | 2 | boolean "Opie-Today Plugin Example" |
3 | default "n" | 3 | default "n" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) && EXAMPLES && LIBOPIEUI2 |
5 | 5 | ||
diff --git a/examples/todayplugin/example.pro b/examples/todayplugin/example.pro index 4c8c942..f4bca36 100644 --- a/examples/todayplugin/example.pro +++ b/examples/todayplugin/example.pro | |||
@@ -1,17 +1,17 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG -= moc | 2 | CONFIG -= moc |
3 | CONFIG += qt release | 3 | CONFIG += qt release |
4 | 4 | ||
5 | # Input | 5 | # Input |
6 | HEADERS = exampleplugin.h examplepluginimpl.h examplepluginwidget.h | 6 | HEADERS = exampleplugin.h examplepluginimpl.h examplepluginwidget.h |
7 | SOURCES = exampleplugin.cpp examplepluginimpl.cpp examplepluginwidget.cpp | 7 | SOURCES = exampleplugin.cpp examplepluginimpl.cpp examplepluginwidget.cpp |
8 | 8 | ||
9 | INCLUDEPATH += $(OPIEDIR)/include | 9 | INCLUDEPATH += $(OPIEDIR)/include |
10 | DEPENDPATH += $(OPIEDIR)/include | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | 11 | ||
12 | LIBS+= -lqpe -lopie | 12 | LIBS+= -lqpe -lopieui2 |
13 | 13 | ||
14 | DESTDIR = $(OPIEDIR)/plugins/today | 14 | DESTDIR = $(OPIEDIR)/plugins/today |
15 | TARGET = todayexampleplugin | 15 | TARGET = todayexampleplugin |
16 | 16 | ||
17 | include ( $(OPIEDIR)/include.pro ) | 17 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/examples/todayplugin/exampleplugin.h b/examples/todayplugin/exampleplugin.h index a1df923..94f5b37 100644 --- a/examples/todayplugin/exampleplugin.h +++ b/examples/todayplugin/exampleplugin.h | |||
@@ -3,26 +3,26 @@ | |||
3 | * | 3 | * |
4 | * email : harlekin@handhelds.org | 4 | * email : harlekin@handhelds.org |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | 7 | ||
8 | 8 | ||
9 | #ifndef EXAMPLE_PLUGIN_H | 9 | #ifndef EXAMPLE_PLUGIN_H |
10 | #define EXAMPLE_PLUGIN_H | 10 | #define EXAMPLE_PLUGIN_H |
11 | 11 | ||
12 | #include <qwidget.h> | 12 | #include <qwidget.h> |
13 | #include <qguardedptr.h> | 13 | #include <qguardedptr.h> |
14 | 14 | ||
15 | #include <opie/todayplugininterface.h> | 15 | #include <opie2/todayplugininterface.h> |
16 | #include <opie/todayconfigwidget.h> | 16 | #include <opie2/todayconfigwidget.h> |
17 | 17 | ||
18 | #include "examplepluginwidget.h" | 18 | #include "examplepluginwidget.h" |
19 | 19 | ||
20 | // implementation of the today plugin interface | 20 | // implementation of the today plugin interface |
21 | class ExamplePlugin : public TodayPluginObject { | 21 | class ExamplePlugin : public TodayPluginObject { |
22 | 22 | ||
23 | public: | 23 | public: |
24 | ExamplePlugin(); | 24 | ExamplePlugin(); |
25 | ~ExamplePlugin(); | 25 | ~ExamplePlugin(); |
26 | 26 | ||
27 | QString pluginName() const; | 27 | QString pluginName() const; |
28 | double versionNumber() const; | 28 | double versionNumber() const; |
diff --git a/examples/todayplugin/examplepluginimpl.h b/examples/todayplugin/examplepluginimpl.h index 77ec4f6..31f8907 100644 --- a/examples/todayplugin/examplepluginimpl.h +++ b/examples/todayplugin/examplepluginimpl.h | |||
@@ -1,23 +1,23 @@ | |||
1 | /* | 1 | /* |
2 | * examplepluginimpl.h | 2 | * examplepluginimpl.h |
3 | * | 3 | * |
4 | * email : harlekin@handhelds.org | 4 | * email : harlekin@handhelds.org |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #ifndef EXAMPLE_PLUGIN_IMPL_H | 8 | #ifndef EXAMPLE_PLUGIN_IMPL_H |
9 | #define EXAMPLE_PLUGIN_IMPL_H | 9 | #define EXAMPLE_PLUGIN_IMPL_H |
10 | 10 | ||
11 | #include <opie/todayplugininterface.h> | 11 | #include <opie2/todayplugininterface.h> |
12 | 12 | ||
13 | class ExamplePlugin; | 13 | class ExamplePlugin; |
14 | 14 | ||
15 | class ExamplePluginImpl : public TodayPluginInterface{ | 15 | class ExamplePluginImpl : public TodayPluginInterface{ |
16 | 16 | ||
17 | public: | 17 | public: |
18 | ExamplePluginImpl(); | 18 | ExamplePluginImpl(); |
19 | virtual ~ExamplePluginImpl(); | 19 | virtual ~ExamplePluginImpl(); |
20 | 20 | ||
21 | QRESULT queryInterface( const QUuid &, QUnknownInterface** ); | 21 | QRESULT queryInterface( const QUuid &, QUnknownInterface** ); |
22 | Q_REFCOUNT | 22 | Q_REFCOUNT |
23 | 23 | ||
diff --git a/examples/todayplugin/examplepluginwidget.cpp b/examples/todayplugin/examplepluginwidget.cpp index d66a11a..10fd39a 100644 --- a/examples/todayplugin/examplepluginwidget.cpp +++ b/examples/todayplugin/examplepluginwidget.cpp | |||
@@ -1,38 +1,39 @@ | |||
1 | /* | 1 | /* |
2 | * examplepluginwidget.cpp | 2 | * examplepluginwidget.cpp |
3 | * | 3 | * |
4 | * email : harlekin@handhelds.org | 4 | * email : harlekin@handhelds.org |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #include <qpe/config.h> | 8 | #include <qpe/config.h> |
9 | #include <qpe/qcopenvelope_qws.h> | 9 | #include <qpe/qcopenvelope_qws.h> |
10 | 10 | ||
11 | #include "examplepluginwidget.h" | 11 | #include "examplepluginwidget.h" |
12 | 12 | ||
13 | |||
13 | ExamplePluginWidget::ExamplePluginWidget( QWidget *parent, const char* name) | 14 | ExamplePluginWidget::ExamplePluginWidget( QWidget *parent, const char* name) |
14 | : QWidget(parent, name ) { | 15 | : QWidget(parent, name ) { |
15 | 16 | ||
16 | m_exampleLabel = 0l; | 17 | m_exampleLabel = 0l; |
17 | m_layout = 0l; | 18 | m_layout = 0l; |
18 | 19 | ||
19 | if ( m_exampleLabel ) { | 20 | if ( m_exampleLabel ) { |
20 | delete m_exampleLabel; | 21 | delete m_exampleLabel; |
21 | } | 22 | } |
22 | 23 | ||
23 | // since here a OClickableLabel is used, the plugin part will be clickable, and the actions | 24 | // since here a OClickableLabel is used, the plugin part will be clickable, and the actions |
24 | // that should be triggered when clicked are defined in slotClicked() | 25 | // that should be triggered when clicked are defined in slotClicked() |
25 | // of course also normal widgets can be used. | 26 | // of course also normal widgets can be used. |
26 | m_exampleLabel = new OClickableLabel( this ); | 27 | m_exampleLabel = new Opie::Ui::OClickableLabel( this ); |
27 | connect( m_exampleLabel, SIGNAL( clicked() ), this, SLOT( slotClicked() ) ); | 28 | connect( m_exampleLabel, SIGNAL( clicked() ), this, SLOT( slotClicked() ) ); |
28 | 29 | ||
29 | if ( m_layout ) { | 30 | if ( m_layout ) { |
30 | delete m_layout; | 31 | delete m_layout; |
31 | } | 32 | } |
32 | m_layout = new QHBoxLayout( this ); | 33 | m_layout = new QHBoxLayout( this ); |
33 | m_layout->setAutoAdd( true ); | 34 | m_layout->setAutoAdd( true ); |
34 | 35 | ||
35 | readConfig(); | 36 | readConfig(); |
36 | getInfo(); | 37 | getInfo(); |
37 | } | 38 | } |
38 | 39 | ||
diff --git a/examples/todayplugin/examplepluginwidget.h b/examples/todayplugin/examplepluginwidget.h index eb3c660..70e717e 100644 --- a/examples/todayplugin/examplepluginwidget.h +++ b/examples/todayplugin/examplepluginwidget.h | |||
@@ -1,35 +1,35 @@ | |||
1 | /* | 1 | /* |
2 | * examplepluginwidget.h | 2 | * examplepluginwidget.h |
3 | * | 3 | * |
4 | * email : harlekin@handhelds.org | 4 | * email : harlekin@handhelds.org |
5 | * | 5 | * |
6 | */ | 6 | */ |
7 | 7 | ||
8 | #ifndef EXAMPLE_PLUGIN_WIDGET_H | 8 | #ifndef EXAMPLE_PLUGIN_WIDGET_H |
9 | #define EXAMPLE_PLUGIN_WIDGET_H | 9 | #define EXAMPLE_PLUGIN_WIDGET_H |
10 | 10 | ||
11 | #include <qlayout.h> | 11 | #include <qlayout.h> |
12 | 12 | ||
13 | #include <opie/oclickablelabel.h> | 13 | #include <opie2/oclickablelabel.h> |
14 | 14 | ||
15 | class ExamplePluginWidget : public QWidget { | 15 | class ExamplePluginWidget : public QWidget { |
16 | 16 | ||
17 | Q_OBJECT | 17 | Q_OBJECT |
18 | 18 | ||
19 | public: | 19 | public: |
20 | ExamplePluginWidget( QWidget *parent, const char *name ); | 20 | ExamplePluginWidget( QWidget *parent, const char *name ); |
21 | ~ExamplePluginWidget(); | 21 | ~ExamplePluginWidget(); |
22 | 22 | ||
23 | void refresh(); | 23 | void refresh(); |
24 | 24 | ||
25 | private slots: | 25 | private slots: |
26 | void slotClicked(); | 26 | void slotClicked(); |
27 | 27 | ||
28 | private: | 28 | private: |
29 | OClickableLabel* m_exampleLabel; | 29 | Opie::Ui::OClickableLabel* m_exampleLabel; |
30 | QHBoxLayout* m_layout; | 30 | QHBoxLayout* m_layout; |
31 | void readConfig(); | 31 | void readConfig(); |
32 | void getInfo(); | 32 | void getInfo(); |
33 | }; | 33 | }; |
34 | 34 | ||
35 | #endif | 35 | #endif |