Appearance: libopie->libopie2/libqtaux

5 files changed, 48 insertions, 45 deletions

diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp
index ba12e55..b39203b 100644
--- a/noncore/settings/appearance2/appearance.cpp
+++ b/noncore/settings/appearance2/appearance.cpp
@@ -36,10 +36,9 @@
 #include "sample.h"
 
 /* OPIE */
-#include <opie/ofontselector.h>
-#include <opie/odevice.h>
-#include <opie/ofiledialog.h>
-#include <opie/otabwidget.h>
+#include <opie2/odevice.h>
+#include <opie2/ofiledialog.h>
+#include <opie2/otabwidget.h>
 
 #include <qpe/config.h>
 #include <qpe/global.h>
diff --git a/noncore/settings/appearance2/appearance.h b/noncore/settings/appearance2/appearance.h
index 51e9636..f45f549 100644
--- a/noncore/settings/appearance2/appearance.h
+++ b/noncore/settings/appearance2/appearance.h
@@ -16,7 +16,7 @@
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:       
+++=   -.     .`     .:
  :     =  ...= . :.=-        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
@@ -29,10 +29,14 @@
 #ifndef APPEARANCESETTINGS_H
 #define APPEARANCESETTINGS_H
 
+#include <opie2/ofontselector.h>
+
 #include <qpe/fontdatabase.h>
 
 #include <qdialog.h>
 
+using Opie::OFontSelector;
+
 class QCheckBox;
 class QComboBox;
 class QLabel;
@@ -58,9 +62,9 @@ public:
     static QString appName() { return QString::fromLatin1("appearance"); }
 
 protected:
-        virtual void accept ( );
-        virtual void done ( int r );
-        
+    virtual void accept ( );
+    virtual void done ( int r );
+
 protected slots:
     void styleClicked ( int );
     void styleSettingsClicked ( );
@@ -71,9 +75,9 @@ protected slots:
     void editSchemeClicked();
     void saveSchemeClicked();
     void deleteSchemeClicked();
-    
+
     void tabChanged ( QWidget * );
-    
+
     void addExcept ( );
     void delExcept ( );
     void upExcept ( );
@@ -82,12 +86,12 @@ protected slots:
 
 private:
     void changeText();
-        
-        QWidget *createStyleTab ( QWidget *parent, Config &cfg );
-        QWidget *createDecoTab ( QWidget *parent, Config &cfg );
-        QWidget *createFontTab ( QWidget *parent, Config &cfg );
-        QWidget *createColorTab ( QWidget *parent, Config &cfg );
-        QWidget *createAdvancedTab ( QWidget *parent, Config &cfg );
+
+    QWidget *createStyleTab ( QWidget *parent, Config &cfg );
+    QWidget *createDecoTab ( QWidget *parent, Config &cfg );
+    QWidget *createFontTab ( QWidget *parent, Config &cfg );
+    QWidget *createColorTab ( QWidget *parent, Config &cfg );
+    QWidget *createAdvancedTab ( QWidget *parent, Config &cfg );
 
 private:
     bool m_style_changed;
@@ -100,7 +104,7 @@ private:
     int  m_original_deco;
     int  m_original_tabstyle;
     bool m_original_tabpos;
-    
+
     QListBox *    m_style_list;
     QPushButton * m_style_settings;
 
@@ -108,10 +112,10 @@ private:
 
     QListBox *    m_color_list;
 
-        OFontSelector *m_fontselect;
+    OFontSelector *m_fontselect;
+
+    SampleWindow *m_sample;
 
-        SampleWindow *m_sample;
-    
     QComboBox *   m_tabstyle_list;
     QRadioButton *m_tabstyle_top;
     QRadioButton *m_tabstyle_bottom;
@@ -120,7 +124,7 @@ private:
     QRadioButton *m_rotdir_ccw;
     QRadioButton *m_rotdir_flip;
 
-        QWidget *     m_advtab;
+    QWidget *     m_advtab;
     QListView *   m_except;
     QCheckBox *   m_force;
 };
diff --git a/noncore/settings/appearance2/appearance2.pro b/noncore/settings/appearance2/appearance2.pro
index ca5a4ec..e2d73c2 100644
--- a/noncore/settings/appearance2/appearance2.pro
+++ b/noncore/settings/appearance2/appearance2.pro
@@ -2,11 +2,9 @@ CONFIG    = qt warn_on release quick-app
 HEADERS   = appearance.h editScheme.h sample.h
 SOURCES   = appearance.cpp editScheme.cpp main.cpp sample.cpp
 INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH  += ../$(OPIEDIR)/include
-LIBS            += -lqpe -lopie
-INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
+LIBS            += -lqpe -lopiecore2 -lopieui2 -lqtaux2
 
-        TARGET          = appearance
+TARGET         = appearance
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/appearance2/editScheme.cpp b/noncore/settings/appearance2/editScheme.cpp
index 7e5225f..0f3702f 100644
--- a/noncore/settings/appearance2/editScheme.cpp
+++ b/noncore/settings/appearance2/editScheme.cpp
@@ -28,8 +28,6 @@
 
 #include "editScheme.h"
 
-#include <opie/ocolorbutton.h>
-
 #include <qaction.h>
 #include <qlabel.h>
 #include <qlayout.h>
@@ -39,10 +37,10 @@
 #include <qwhatsthis.h>
 
 EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent,  const char* name, bool modal, WFlags )
-        : QDialog ( parent, name, modal, WStyle_ContextHelp )
+    : QDialog ( parent, name, modal, WStyle_ContextHelp )
 {
-        setCaption ( tr( "Edit scheme" ) );
-        QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 );
+    setCaption ( tr( "Edit scheme" ) );
+    QGridLayout *layout = new QGridLayout ( this, 0, 0, 4, 4 );
 
     m_count = cnt;
     m_buttons = new OColorButton * [cnt];
@@ -52,24 +50,24 @@ EditScheme::EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget
     {
         QLabel *l = new QLabel ( labels [i], this );
         layout-> addWidget ( l, i, 0 );
-                QWhatsThis::add( l, tr( "Click here to select a color for: " ).arg( labels [i] ) );
+        QWhatsThis::add( l, tr( "Click here to select a color for: " ).arg( labels [i] ) );
 
         m_buttons [i] = new OColorButton ( this, colors [i] );
         layout-> addWidget ( m_buttons [i], i, 1 );
-                QWhatsThis::add( m_buttons [i], tr( "Click here to select a color for: " ).arg( labels [i] ) );
+        QWhatsThis::add( m_buttons [i], tr( "Click here to select a color for: " ).arg( labels [i] ) );
     }
 }
 
 EditScheme::~EditScheme ( )
 {
-        delete [] m_buttons;
+    delete [] m_buttons;
 }
 
 void EditScheme::accept ( )
 {
-        for ( int i = 0; i < m_count; i++ ) 
-                m_colors [i] = m_buttons [i]-> color ( );
-                
-        QDialog::accept ( );
+    for ( int i = 0; i < m_count; i++ )
+        m_colors [i] = m_buttons [i]-> color ( );
+
+    QDialog::accept ( );
 }
 
diff --git a/noncore/settings/appearance2/editScheme.h b/noncore/settings/appearance2/editScheme.h
index 93dc50d..c7539cb 100644
--- a/noncore/settings/appearance2/editScheme.h
+++ b/noncore/settings/appearance2/editScheme.h
@@ -16,7 +16,7 @@
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
-++=   -.     .`     .:       
+++=   -.     .`     .:
  :     =  ...= . :.=-        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
@@ -29,25 +29,29 @@
 #ifndef EDITSCHEME_H
 #define EDITSCHEME_H
 
+#include <opie2/ocolorbutton.h>
+
 #include <qdialog.h>
 
+using Opie::OColorButton;
+
 class QColor;
 class OColorButton;
 
 class EditScheme : public QDialog {
-        Q_OBJECT
+    Q_OBJECT
 
 public:
-        EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
-        virtual ~EditScheme ( );
+    EditScheme ( int cnt, const QString *labels, QColor *colors, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    virtual ~EditScheme ( );
 
 protected slots:
-        virtual void accept ( );
+    virtual void accept ( );
 
 private:
-        int m_count;
-        QColor *m_colors;
-        OColorButton **m_buttons;
+    int m_count;
+    QColor *m_colors;
+    OColorButton **m_buttons;
 };
 
 #endif