1 files changed, 3 insertions, 3 deletions

diff --git a/libopie2/opiecore/oconfig.h b/libopie2/opiecore/oconfig.h
index 75aa170..444d280 100644
--- a/libopie2/opiecore/oconfig.h
+++ b/libopie2/opiecore/oconfig.h
@@ -14,77 +14,77 @@
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef OCONFIG_H
 #define OCONFIG_H
 
 //FIXME: Implement for X11 or reuse libqpe/Config there also?
 //FIXME: Or rather use QSettings also for libqpe?
 
-#include "opieconfig.h"
+#include <qpe/config.h>
 
 class QColor;
 class QFont;
 
 /**
   * A Configuration class based on the Qtopia @ref Config class
   * featuring additional handling of color and font entries
   */
 
-class OConfig : public OpieConfig
+class OConfig : public Config
 {
   public:
     /**
      * Constructs a OConfig object with a @a name.
      */
     OConfig( const QString &name, Domain domain = User );
     /**
      * Destructs the OConfig object.
      *
      * Writes back any dirty configuration entries, and destroys
      * dynamically created objects.
      */
     virtual ~OConfig();
     /**
      * @returns the name of the current group.
      * The current group is used for searching keys and accessing entries.
      */
-    const QString& group() { return OpieConfig::group(); };
+    const QString& group() { return git.key(); };
     /**
      * @returns a @ref QColor entry or a @a default value if the key is not found.
      */
     QColor readColorEntry( const QString& key, const QColor* pDefault ) const;
     /**
      * @returns a @ref QFont value or a @a default value if the key is not found.
      */
     QFont readFontEntry( const QString& key, const QFont* pDefault ) const;
 };
 
 /**
  * @brief Helper class for easier use of OConfig groups.
  *
  * Careful programmers always set the group of a
  * @ref OConfig object to the group they want to read from
  * and set it back to the old one of afterwards. This is usually
  * written as:
  * <pre>
  *
  * QString oldgroup config()->group();
  * config()->setGroup( "TheGroupThatIWant" );
  * ...
  * config()->writeEntry( "Blah", "Blubb" );
  *