summaryrefslogtreecommitdiff
path: root/core/settings/button
Side-by-side diff
Diffstat (limited to 'core/settings/button') (more/less context) (show whitespace changes)
-rw-r--r--core/settings/button/button.pro2
-rw-r--r--core/settings/button/buttonsettings.cpp4
-rw-r--r--core/settings/button/buttonsettings.h5
-rw-r--r--core/settings/button/buttonutils.cpp1
-rw-r--r--core/settings/button/buttonutils.h4
-rw-r--r--core/settings/button/config.in2
-rw-r--r--core/settings/button/main.cpp3
-rw-r--r--core/settings/button/remapdlg.cpp4
-rw-r--r--core/settings/button/remapdlg.h10
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
@@ -4,16 +4,16 @@ HEADERS = buttonsettings.h \
buttonutils.h \
remapdlg.h
SOURCES = main.cpp \
buttonsettings.cpp \
buttonutils.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
@@ -21,31 +21,31 @@
  -_. . .   )=.  = see the file COPYING. If not, write to the
    --        :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#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;
QLabel *m_picon;
QLabel *m_plabel;
OQCopMessage m_hmsg;
QLabel *m_hicon;
QLabel *m_hlabel;
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
@@ -21,29 +21,28 @@
  -_. . .   )=.  = see the file COPYING. If not, write to the
    --        :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#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
public:
ButtonSettings ( QWidget *parent = 0, const char *name = 0, bool modal = FALSE,WFlags f = 0 );
~ButtonSettings ( );
static QString appName() { return QString::fromLatin1("buttonsettings"); }
virtual void accept ( );
@@ -52,25 +51,25 @@ public:
private slots:
void keyTimeout ( );
void updateLabels ( );
protected:
virtual void keyPressEvent ( QKeyEvent *e );
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;
bool m_lock;
};
#endif
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
@@ -1,24 +1,25 @@
#include <stdlib.h>
#include <qapplication.h>
#include <qlistview.h>
#include <qpe/applnk.h>
#include <qpe/mimetype.h>
#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;
};
static const predef_qcop predef [] = {
{ QT_TRANSLATE_NOOP( "ButtonSettings", "Beam VCard" ), "beam", "QPE/Application/addressbook", "beamBusinessCard()" },
{ QT_TRANSLATE_NOOP( "ButtonSettings", "Send eMail" ), "buttonsettings/mail", "QPE/Application/mail", "newMail()" },
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
@@ -19,48 +19,48 @@
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
  -_. . .   )=.  = see the file COPYING. If not, write to the
    --        :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
#ifndef __BUTTON_UTILS_H__
#define __BUTTON_UTILS_H__
-#include <opie/odevicebutton.h>
+#include <opie2/odevicebutton.h>
class AppLnkSet;
class QListViewItem;
class qCopInfo {
public:
qCopInfo ( const QString &str, const QPixmap &pix = QPixmap ( ))
: m_name ( str ), m_icon ( pix )
{ }
QString m_name;
QPixmap m_icon;
};
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 ( );
static void cleanup ( );
private:
AppLnkSet *m_apps;
};
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
@@ -18,15 +18,16 @@
++=   -.     .`     .:
 :     =  ...= . :.=- You should have received a copy of the GNU
 -.   .:....=;==+<; General Public License along with this file;
  -_. . .   )=.  = see the file COPYING. If not, write to the
    --        :-=` Free Software Foundation, Inc.,
59 Temple Place - Suite 330,
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
@@ -1,21 +1,21 @@
#include <qlistview.h>
#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 ));
m_def = false;
}
void setDefault ( bool b )
{
m_def = b;
@@ -33,25 +33,25 @@ public:
f. setBold ( true );
p-> setFont ( f );
}
QListViewItem::paintCell ( p, cg, column, width, align );
}
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;
static const char * const def_channels [] = { "QPE/Application/", "QPE/Launcher", "QPE/System", "QPE/TaskBar", "QPE/", 0 };
w_channel-> insertStrList ((const char **) def_channels );
m_msg = hold ? b-> heldAction ( ) : b-> pressedAction ( );
m_msg_preset = hold ? b-> factoryPresetHeldAction ( ) : b-> factoryPresetPressedAction ( );
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,39 +1,39 @@
#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;
QListViewItem *m_map_show;
};
#endif