1 files changed, 9 insertions, 11 deletions

diff --git a/kabc/plugins/qtopia/resourceqtopia.h b/kabc/plugins/qtopia/resourceqtopia.h
index ea0b5ee..bf9dd45 100644
--- a/kabc/plugins/qtopia/resourceqtopia.h
+++ b/kabc/plugins/qtopia/resourceqtopia.h
@@ -5,92 +5,90 @@
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library 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.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 
-#ifndef KABC_RESOURCEQTOPIA_H
-#define KABC_RESOURCEQTOPIA_H
+#ifndef KABC_RESOURCEOPIE_H
+#define KABC_RESOURCEOPIE_H
 
 #include <kconfig.h>
 #include <kdirwatch.h>
 
 #include <sys/types.h>
 
 #include "resource.h"
 
 
-//class QTimer;
-//class FormatPlugin;
-
 namespace KABC {
 
 //US class FormatPlugin;
 class ResourceConfigWidget;
-class OpieConverter;
+class QtopiaConverter;
+
 /**
   @internal
 */
-class ResourceOpie : public Resource
+class ResourceQtopia : public Resource
 {
   Q_OBJECT
 
 public:
 
   /**
     Constructor.
 
     @param cfg The config object where custom resource settings are stored.
   */
-  ResourceOpie( const KConfig *cfg );
+  ResourceQtopia( const KConfig *cfg );
 
   /**
     Construct file resource on file @arg fileName using format @arg formatName.
   */
-  ResourceOpie( const QString &fileName );
+  ResourceQtopia( const QString &fileName );
 
   /**
    * Destructor.
    */
-  ~ResourceOpie();
+  ~ResourceQtopia();
 
   /**
     Writes the config back.
    */
   virtual void writeConfig( KConfig *cfg );
 
   /**
    * Tries to open the file and checks for the proper format.
    * This method should be called before @ref load().
    */
   virtual bool doOpen();
 
   /**
    * Closes the file again.
    */
   virtual void doClose();
   
   /**
    * Requests a save ticket, that is used by @ref save()
    */
   virtual Ticket *requestSaveTicket();
 
   /**
    * Loads all addressees from file to the address book.
@@ -117,36 +115,36 @@ public:
   QString fileName() const;
 
   /**
    * Remove a addressee from its source.
    * This method is mainly called by KABC::AddressBook.
    */
   virtual void removeAddressee( const Addressee& addr );
 
   /**
    * This method is called by an error handler if the application
    * crashed
    */
   virtual void cleanUp();
 
 protected slots:
   void fileChanged();
 
 protected:
   void init( const QString &fileName );
 
   bool lock( const QString &fileName );
   void unlock( const QString &fileName );
 
 private:
-  OpieConverter* mConverter;
+  QtopiaConverter* mConverter;
   
   QString mFileName;
 
   QString mLockUniqueName;
     
   KDirWatch mDirWatch;
 };
 
 }
 
 #endif