1 files changed, 16 insertions, 24 deletions

diff --git a/core/launcher/startmenu.h b/core/launcher/startmenu.h
index 0a91bb8..99df0f0 100644
--- a/core/launcher/startmenu.h
+++ b/core/launcher/startmenu.h
@@ -23,5 +23,6 @@
 
+#include <qtopia/applnk.h>
+#include <qintdict.h>
 #include <qstring.h>
 #include <qlist.h>
-#include <qintdict.h>
 #include <qlabel.h>
@@ -29,6 +30,3 @@
 
-#include <qpe/menuappletinterface.h>
-
-class AppLnkSet;
-class AppLnk;
+#include <qtopia/menuappletinterface.h>
 
@@ -44,7 +42,5 @@ class QLibrary;
 
-struct MenuApplet
-{
-#ifndef QT_NO_COMPONENT
+
+struct MenuApplet {
     QLibrary *library;
-#endif
     MenuAppletInterface *iface;
@@ -54,3 +50,2 @@ struct MenuApplet
             
-
 class StartMenu : public QLabel {
@@ -61,3 +56,3 @@ public:
 
-    const AppLnk* execToLink(const QString& appname);
+    void refreshMenu();
 
@@ -66,8 +61,8 @@ public:
 
+signals:
+    void tabSelected(const QString&);
+
 public slots:
     void launch( );
-    void loadOptions( );
     void createMenu( );
-    void reloadApps( );
-    void reloadApplets( );
 
@@ -78,8 +73,8 @@ protected:
     virtual void mousePressEvent( QMouseEvent * );
-    virtual void timerEvent ( QTimerEvent * );
     
 private:
-    bool loadMenu( AppLnkSet *folder, QPopupMenu *menu );
     void loadApplets( );
     void clearApplets( );
+    void addApplets( QPopupMenu* menu );
+    bool loadMenu( QPopupMenu *menu );
 
@@ -92,10 +87,7 @@ private:
 
-    AppLnkSet *apps;
-
-	QIntDict<MenuApplet> applets;
-	QIntDict<QPopupMenu> tabdict;
-	
-//    QValueList<MenuApplet> appletList;
-    int safety_tid;
-    int sepId;
+    QStringList tabs;
+    QList<AppLnk> other;
+    QIntDict<MenuApplet> m_applets;
+    int ntabs;
+    int nother;
 };