-rw-r--r-- | core/settings/button/button.pro | 2 | ||||
-rw-r--r-- | core/settings/button/buttonsettings.cpp | 4 | ||||
-rw-r--r-- | core/settings/button/buttonsettings.h | 5 | ||||
-rw-r--r-- | core/settings/button/buttonutils.cpp | 1 | ||||
-rw-r--r-- | core/settings/button/buttonutils.h | 4 | ||||
-rw-r--r-- | core/settings/button/config.in | 2 | ||||
-rw-r--r-- | core/settings/button/main.cpp | 3 | ||||
-rw-r--r-- | core/settings/button/remapdlg.cpp | 4 | ||||
-rw-r--r-- | core/settings/button/remapdlg.h | 10 |
9 files changed, 18 insertions, 17 deletions
diff --git a/core/settings/button/button.pro b/core/settings/button/button.pro index 817eac4..aa47f54 100644 --- a/core/settings/button/button.pro +++ b/core/settings/button/button.pro @@ -10,10 +10,10 @@ SOURCES = main.cpp \ remapdlg.cpp INTERFACES = remapdlgbase.ui INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 TARGET = buttonsettings include ( $(OPIEDIR)/include.pro ) diff --git a/core/settings/button/buttonsettings.cpp b/core/settings/button/buttonsettings.cpp index d80e496..326554b 100644 --- a/core/settings/button/buttonsettings.cpp +++ b/core/settings/button/buttonsettings.cpp @@ -27,19 +27,19 @@ #include <qlayout.h> #include <qlabel.h> #include <qtimer.h> -#include <opie/odevice.h> +#include <opie2/odevice.h> #include "buttonsettings.h" #include "buttonutils.h" #include "remapdlg.h" -using namespace Opie; +using namespace Opie::Core; struct buttoninfo { const ODeviceButton *m_button; int m_index; OQCopMessage m_pmsg; diff --git a/core/settings/button/buttonsettings.h b/core/settings/button/buttonsettings.h index 67694d3..1127e7c 100644 --- a/core/settings/button/buttonsettings.h +++ b/core/settings/button/buttonsettings.h @@ -27,17 +27,16 @@ #ifndef __BUTTON_SETTINGS_H__ #define __BUTTON_SETTINGS_H__ #include <qdialog.h> #include <qlist.h> -#include <opie/odevice.h> +#include <opie2/odevice.h> class QTimer; -using namespace Opie; class buttoninfo; class ButtonSettings : public QDialog { Q_OBJECT @@ -58,13 +57,13 @@ protected: virtual void keyReleaseEvent ( QKeyEvent *e ); private: buttoninfo *buttonInfoForKeycode ( ushort key ); void edit ( buttoninfo *bi, bool hold ); - QString qcopToString ( const OQCopMessage &c ); + QString qcopToString ( const Opie::Core::OQCopMessage &c ); private: QTimer *m_timer; buttoninfo *m_last_button; QList <buttoninfo> m_infos; diff --git a/core/settings/button/buttonutils.cpp b/core/settings/button/buttonutils.cpp index 27a2f38..9bf4b53 100644 --- a/core/settings/button/buttonutils.cpp +++ b/core/settings/button/buttonutils.cpp @@ -7,12 +7,13 @@ #include <qpe/resource.h> #include "buttonutils.h" using namespace Opie; +using namespace Opie::Core; struct predef_qcop { const char *m_text; const char *m_pixmap; const char *m_channel; const char *m_function; }; diff --git a/core/settings/button/buttonutils.h b/core/settings/button/buttonutils.h index 5ea59bb..79eb8e3 100644 --- a/core/settings/button/buttonutils.h +++ b/core/settings/button/buttonutils.h @@ -25,13 +25,13 @@ */ #ifndef __BUTTON_UTILS_H__ #define __BUTTON_UTILS_H__ -#include <opie/odevicebutton.h> +#include <opie2/odevicebutton.h> class AppLnkSet; class QListViewItem; class qCopInfo { @@ -48,13 +48,13 @@ public: class ButtonUtils { public: ~ButtonUtils ( ); static ButtonUtils *inst ( ); - qCopInfo messageToInfo ( const Opie::OQCopMessage & ); + qCopInfo messageToInfo ( const Opie::Core::OQCopMessage & ); void insertActions ( QListViewItem *here ); void insertAppLnks ( QListViewItem *here ); private: ButtonUtils ( ); diff --git a/core/settings/button/config.in b/core/settings/button/config.in index 3eb9155..834c375 100644 --- a/core/settings/button/config.in +++ b/core/settings/button/config.in @@ -1,4 +1,4 @@ config BUTTON-SETTINGS boolean "opie-button-settings (application buttons settings)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && !TARGET_RAMSES + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 && !TARGET_RAMSES diff --git a/core/settings/button/main.cpp b/core/settings/button/main.cpp index e7c5bf9..6c2539f 100644 --- a/core/settings/button/main.cpp +++ b/core/settings/button/main.cpp @@ -24,9 +24,10 @@ Boston, MA 02111-1307, USA. */ #include "buttonsettings.h" -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> +using namespace Opie::Core; OPIE_EXPORT_APP( OApplicationFactory<ButtonSettings> ) diff --git a/core/settings/button/remapdlg.cpp b/core/settings/button/remapdlg.cpp index 121173a..4effebc 100644 --- a/core/settings/button/remapdlg.cpp +++ b/core/settings/button/remapdlg.cpp @@ -2,14 +2,14 @@ #include <qcombobox.h> #include <qtimer.h> #include "remapdlg.h" #include "buttonutils.h" -using namespace Opie; +using namespace Opie::Core; class NoSortItem : public QListViewItem { public: NoSortItem ( QListView *lv, uint pos, const QString &str, const QCString &s1 = 0, const QCString &s2 = 0 ) : QListViewItem ( lv, str, s1, s2 ) { m_key = QString ( QChar ( 'a' + pos )); @@ -39,13 +39,13 @@ public: private: QString m_key; bool m_def; }; -RemapDlg::RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget *parent, const char *name ) +RemapDlg::RemapDlg ( const Opie::Core::ODeviceButton *b, bool hold, QWidget *parent, const char *name ) : RemapDlgBase ( parent, name, true, WStyle_ContextHelp ) { setCaption ( tr( "%1 %2", "(hold|press) buttoname" ). arg( hold ? tr( "Held" ) : tr( "Pressed" )). arg ( b-> userText ( ))); m_current = 0; diff --git a/core/settings/button/remapdlg.h b/core/settings/button/remapdlg.h index 046a22f..6cdd678 100644 --- a/core/settings/button/remapdlg.h +++ b/core/settings/button/remapdlg.h @@ -1,35 +1,35 @@ #ifndef __REMAPDLG_H__ #define __REMAPDLG_H__ -#include <opie/odevicebutton.h> +#include <opie2/odevicebutton.h> #include "remapdlgbase.h" class QListViewItem; class RemapDlg : public RemapDlgBase { Q_OBJECT public: - RemapDlg ( const Opie::ODeviceButton *b, bool hold, QWidget* parent = 0, const char* name = 0 ); + RemapDlg ( const Opie::Core::ODeviceButton *b, bool hold, QWidget* parent = 0, const char* name = 0 ); ~RemapDlg ( ); - Opie::OQCopMessage message ( ); + Opie::Core::OQCopMessage message ( ); public slots: virtual void itemChanged ( QListViewItem * ); virtual void textChanged ( const QString & ); private slots: void delayedInit ( ); private: - Opie::OQCopMessage m_msg; - Opie::OQCopMessage m_msg_preset; + Opie::Core::OQCopMessage m_msg; + Opie::Core::OQCopMessage m_msg_preset; QListViewItem *m_current; QListViewItem *m_map_none; QListViewItem *m_map_preset; QListViewItem *m_map_custom; |