23 files changed, 45 insertions, 38 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 @@ -8,12 +8,12 @@ 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 @@ -25,23 +25,23 @@ */ #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; 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 @@ -25,21 +25,20 @@ */ #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 ); @@ -56,17 +55,17 @@ private slots: 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; }; 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 @@ -5,16 +5,17 @@ #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 [] = { 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 @@ -23,17 +23,17 @@ 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 ( )) @@ -46,17 +46,17 @@ 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 ( ); static void cleanup ( ); 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 @@ -22,11 +22,12 @@ -- :-=` 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,17 +1,17 @@ #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; } @@ -37,17 +37,17 @@ 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; static const char * const def_channels [] = { "QPE/Application/", "QPE/Launcher", "QPE/System", "QPE/TaskBar", "QPE/", 0 }; w_channel-> insertStrList ((const char **) def_channels ); 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,37 +1,37 @@ #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; }; diff --git a/core/settings/citytime/config.in b/core/settings/citytime/config.in index 295b8b8..be1bb71 100644 --- a/core/settings/citytime/config.in +++ b/core/settings/citytime/config.in @@ -1,4 +1,4 @@ config CITYTIME boolean "opie-citytime (Time-zone / world clock settings)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 diff --git a/core/settings/citytime/main.cpp b/core/settings/citytime/main.cpp index 7fb76ec..3f22621 100644 --- a/core/settings/citytime/main.cpp +++ b/core/settings/citytime/main.cpp @@ -16,9 +16,10 @@ ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "citytime.h" #include <opie2/oapplicationfactory.h> +using namespace Opie::Core; OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<CityTime> ) diff --git a/core/settings/launcher/config.in b/core/settings/launcher/config.in index e167313..226da3c 100644 --- a/core/settings/launcher/config.in +++ b/core/settings/launcher/config.in @@ -1,4 +1,4 @@ config LAUNCHER-SETTINGS boolean "opie-launcher-settings (Opie taskbar settings)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBQTAUX diff --git a/core/settings/launcher/launcher.pro b/core/settings/launcher/launcher.pro index 3261ee8..e3f1060 100644 --- a/core/settings/launcher/launcher.pro +++ b/core/settings/launcher/launcher.pro @@ -14,15 +14,15 @@ SOURCES = main.cpp \ taskbarsettings.cpp \ menusettings.cpp \ inputmethodsettings.cpp \ doctabsettings.cpp \ tabdialog.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2 TARGET = launchersettings include ( $(OPIEDIR)/include.pro ) diff --git a/core/settings/launcher/launchersettings.cpp b/core/settings/launcher/launchersettings.cpp index 5c11cc8..5efd297 100644 --- a/core/settings/launcher/launchersettings.cpp +++ b/core/settings/launcher/launchersettings.cpp @@ -23,25 +23,26 @@ -- :-=` Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <qlayout.h> -#include <opie/otabwidget.h> +#include <opie2/otabwidget.h> #include "launchersettings.h" #include "tabssettings.h" #include "menusettings.h" #include "taskbarsettings.h" #include "inputmethodsettings.h" #include "doctabsettings.h" +using namespace Opie::Ui; LauncherSettings::LauncherSettings (QWidget*,const char*, WFlags) : QDialog ( 0, "LauncherSettings", false, WStyle_ContextHelp ) { setCaption ( tr( "Launcher Settings" )); QVBoxLayout *lay = new QVBoxLayout ( this, 4, 4 ); OTabWidget *tw = new OTabWidget ( this, "otab" ); diff --git a/core/settings/launcher/main.cpp b/core/settings/launcher/main.cpp index bcfdcf6..b27381a 100644 --- a/core/settings/launcher/main.cpp +++ b/core/settings/launcher/main.cpp @@ -22,13 +22,14 @@ -- :-=` Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "launchersettings.h" -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> +using namespace Opie::Core; OPIE_EXPORT_APP( OApplicationFactory<LauncherSettings> ) diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index c0d1cf2..763b360 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp @@ -33,24 +33,25 @@ #include <qiconview.h> #include <qapplication.h> #include <qlabel.h> #include <qradiobutton.h> #include <qbuttongroup.h> #include <qwhatsthis.h> #include <qcheckbox.h> -#include <opie/ofontselector.h> -#include <opie/otabwidget.h> -#include <opie/ocolorbutton.h> -#include <opie/ofiledialog.h> +#include <opie2/ofontselector.h> +#include <opie2/otabwidget.h> +#include <opie2/ocolorbutton.h> +#include <opie2/ofiledialog.h> #include "tabdialog.h" +using namespace Opie::Ui; class SampleItem : public QIconViewItem { public: SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text ) { m_large = pix; m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 )); } @@ -348,17 +349,17 @@ QWidget *TabDialog::createBgTab ( QWidget *parent ) QHBoxLayout *hb = new QHBoxLayout ( ); hb-> setSpacing ( 3 ); rb = new QRadioButton( tr( "Solid color" ), tab, "solid" ); m_bgtype-> insert ( rb, TabConfig::SolidColor ); hb-> addWidget ( rb ); hb-> addSpacing ( 10 ); - m_solidcolor = new OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); + m_solidcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_bg_color ) ); connect ( m_solidcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( bgColorClicked(const QColor&))); hb-> addWidget ( m_solidcolor ); hb-> addStretch ( 10 ); gridLayout-> addLayout ( hb, 1, 1 ); hb = new QHBoxLayout ( ); hb-> setSpacing ( 3 ); @@ -414,17 +415,17 @@ QWidget *TabDialog::createIconTab ( QWidget *parent ) // vertLayout-> addSpacing ( 8 ); // gridLayout = new QGridLayout ( vertLayout ); gridLayout-> addRowSpacing ( 2, 8 ); label = new QLabel ( tr( "Color:" ), tab ); gridLayout-> addWidget ( label, 3, 0 ); - m_iconcolor = new OColorButton ( tab, QColor ( m_tc. m_text_color ) ); + m_iconcolor = new Opie::OColorButton ( tab, QColor ( m_tc. m_text_color ) ); connect ( m_iconcolor, SIGNAL( colorSelected(const QColor&)), this, SLOT( iconColorClicked(const QColor&))); gridLayout-> addWidget ( m_iconcolor, 3, 1, AlignLeft ); vertLayout-> addStretch ( 10 ); return tab; } diff --git a/core/settings/launcher/tabdialog.h b/core/settings/launcher/tabdialog.h index 4f99d5d..46b7ae9 100644 --- a/core/settings/launcher/tabdialog.h +++ b/core/settings/launcher/tabdialog.h @@ -27,19 +27,19 @@ #ifndef __TABDIALOG_H__ #define __TABDIALOG_H__ #include <qdialog.h> #include "tabconfig.h" class QButtonGroup; -class OFontSelector; +namespace Opie {namespace Ui {class OFontSelector;}} class SampleView; -class OColorButton; +namespace Opie {class OColorButton;} class QPushButton; class QCheckBox; class TabDialog : public QDialog { Q_OBJECT public: TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig &cfg, QWidget *parent = 0, const char *dname = 0, bool modal = false, WFlags = 0 ); @@ -61,19 +61,19 @@ private: QWidget *createBgTab ( QWidget *parent ); QWidget *createFontTab ( QWidget *parent ); QWidget *createIconTab ( QWidget *parent ); private: SampleView *m_sample; QButtonGroup *m_iconsize; - OFontSelector *m_fontselect; - OColorButton *m_solidcolor; - OColorButton *m_iconcolor; + Opie::Ui::OFontSelector *m_fontselect; + Opie::OColorButton *m_solidcolor; + Opie::OColorButton *m_iconcolor; QPushButton *m_imagebrowse; QString m_bgimage; QButtonGroup *m_bgtype; QCheckBox *m_fontuse; TabConfig &m_tc; }; diff --git a/core/settings/light-and-power/config.in b/core/settings/light-and-power/config.in index 96346bb..ef2a42f 100644 --- a/core/settings/light-and-power/config.in +++ b/core/settings/light-and-power/config.in @@ -1,4 +1,4 @@ config LIGHT-AND-POWER boolean "opie-light-and-power (apm and energy saving settings)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp index 09fb767..ebcc25c 100644 --- a/core/settings/light-and-power/light.cpp +++ b/core/settings/light-and-power/light.cpp @@ -43,17 +43,17 @@ #include <qslider.h> #include <qspinbox.h> #include <qpushbutton.h> #include <qgroupbox.h> #include <qcombobox.h> -using namespace Opie; +using namespace Opie::Core; LightSettings::LightSettings( QWidget* parent, const char* name, WFlags ) : LightSettingsBase( parent, name, false, WStyle_ContextHelp ) { m_bres = ODevice::inst ( )-> displayBrightnessResolution ( ); m_cres = ODevice::inst ( )-> displayContrastResolution ( ); // check whether to show the light sensor stuff diff --git a/core/settings/light-and-power/main.cpp b/core/settings/light-and-power/main.cpp index 7a47b0b..1fc167d 100644 --- a/core/settings/light-and-power/main.cpp +++ b/core/settings/light-and-power/main.cpp @@ -18,9 +18,10 @@ ** **********************************************************************/ #include "light.h" #include <opie2/oapplicationfactory.h> +using namespace Opie::Core; OPIE_EXPORT_APP( OApplicationFactory<LightSettings> ) diff --git a/core/settings/light-and-power/sensor.cpp b/core/settings/light-and-power/sensor.cpp index 53c3aed..a700a64 100644 --- a/core/settings/light-and-power/sensor.cpp +++ b/core/settings/light-and-power/sensor.cpp @@ -30,17 +30,17 @@ #include "sensor.h" #include <opie2/odevice.h> #include <qlayout.h> #include <qslider.h> #include <qspinbox.h> -using namespace Opie; +using namespace Opie::Core; Sensor::Sensor ( QStringList ¶ms, QWidget *parent, const char *name ) : SensorBase ( parent, name, true, WStyle_ContextHelp ), m_params ( params ) { int steps = 12; int inter = 2; int smin = 40; diff --git a/core/settings/security/config.in b/core/settings/security/config.in index 0973349..14876da 100644 --- a/core/settings/security/config.in +++ b/core/settings/security/config.in @@ -1,4 +1,4 @@ config SECURITY boolean "opie-security (to set a pin for PDA usage protection)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) diff --git a/core/settings/security/main.cpp b/core/settings/security/main.cpp index aed8ab2..200a541 100644 --- a/core/settings/security/main.cpp +++ b/core/settings/security/main.cpp @@ -16,14 +16,15 @@ ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "security.h" -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> +using namespace Opie::Core; OPIE_EXPORT_APP( OApplicationFactory<Security> ) |