1 files changed, 8 insertions, 6 deletions

diff --git a/kaddressbook/kaddressbookmain.h b/kaddressbook/kaddressbookmain.h
index b6d9b4b..d3f5cc7 100644
--- a/kaddressbook/kaddressbookmain.h
+++ b/kaddressbook/kaddressbookmain.h
@@ -19,20 +19,22 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 #ifndef KADDRESSBOOKMAIN_H
 #define KADDRESSBOOKMAIN_H
 
-#include <qptrlist.h>
+#include <q3ptrlist.h>
+//Added by qt3to4:
+#include <QCloseEvent>
 
 #ifdef KAB_EMBEDDED
-class QToolBar;
+class Q3ToolBar;
 #include <qaction.h>
 //#include <qmainwindow.h>
 #include <kmainwindow.h>
 #else //KAB_EMBEDDED
 #include <kaction.h>
 #include <kapplication.h>
 #include <kmainwindow.h>
 #include "kaddressbookiface.h"
@@ -47,19 +49,19 @@ class KConfig;
  
   @short Main window class
   @author Don Sanders <dsanders@kde.org>
   @version 0.1
  */
 #ifdef KAB_EMBEDDED
 class KAddressBookMain : public KMainWindow
 #else //KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
 class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
-//MOC_SKIP_END
+#endif
 #endif //KAB_EMBEDDED
 {
   Q_OBJECT
 
   public:
     KAddressBookMain();
     virtual ~KAddressBookMain();
 
@@ -68,19 +70,19 @@ class KAddressBookMain : public KMainWindow, virtual public KAddressBookIface
     // QToolBar * getIconToolBar();
 #endif //KAB_EMBEDDED
 
     
   public slots:
     void showMinimized () ;
     virtual void addEmail( QString addr );
 #ifndef KAB_EMBEDDED
-//MOC_SKIP_BEGIN
+#ifndef Q_MOC_RUN
     virtual ASYNC showContactEditor( QString uid );
-//MOC_SKIP_END
+#endif
 #endif //KAB_EMBEDDED
     virtual void newContact();
     virtual QString getNameByPhone( QString phone );
     virtual void save();
     virtual void exit();
   protected:
     void initActions();
 #ifdef KAB_EMBEDDED