This commit removes the crlf in the startmenu.cpp and startmenu.h files in

core/launcher. This sort of thing must likely means that these files were
commited from either a DOS or Windows based host, where lines end with
these two characters. This commit resolves Opie bug 1865.

Note, there are likely other files in the repo that have this problem. It
would be a good idea to identify and modify them.

1 files changed, 106 insertions, 106 deletions

diff --git a/core/launcher/startmenu.h b/core/launcher/startmenu.h
index 7218035..3e12b36 100644
--- a/core/launcher/startmenu.h
+++ b/core/launcher/startmenu.h
@@ -1,106 +1,106 @@
-/**********************************************************************

-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.

-**

-** This file is part of the Qtopia Environment.

-**

-** This file may be distributed and/or modified under the terms of the

-** GNU General Public License version 2 as published by the Free Software

-** Foundation and appearing in the file LICENSE.GPL included in the

-** packaging of this file.

-**

-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE

-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

-**

-** See http://www.trolltech.com/gpl/ for GPL licensing information.

-**

-** Contact info@trolltech.com if any conditions of this licensing are

-** not clear to you.

-**

-**********************************************************************/

-

-#ifndef __START_MENU_H__

-#define __START_MENU_H__

-

-#include <qtopia/applnk.h>

-#include <qintdict.h>

-#include <qstring.h>

-#include <qlist.h>

-#include <qmap.h>

-#include <qdir.h>

-#include <qlabel.h>

-#include <qpopupmenu.h>

-

-#include <qtopia/menuappletinterface.h>

-

-class StartPopupMenu : public QPopupMenu

-{

-

-public:

-    StartPopupMenu( QWidget *parent ) : QPopupMenu( parent ) {}

-    

-protected:

-    void keyPressEvent( QKeyEvent *e );

-

-};

-

-class QLibrary;

-

-

-struct MenuApplet {

-    QLibrary *library;

-    MenuAppletInterface *iface;

-    int id;

-    QPopupMenu *popup;

-};

-

-class StartMenu : public QLabel {

-    

-    Q_OBJECT

-        

-public:

-    StartMenu( QWidget * );

-    ~StartMenu();

-

-    void refreshMenu();

-

-public:

-    StartPopupMenu *launchMenu;

-

-signals:

-    void tabSelected(const QString&);

-

-public slots:

-    void launch( );

-    void createMenu( );

-

-protected slots:

-    void itemSelected( int id );

-

-protected:

-    virtual void mousePressEvent( QMouseEvent * );

-

-private:

-    void loadApplets();

-    void clearApplets();

-    void addApplets( QPopupMenu* menu );

-    bool loadMenu( QPopupMenu *menu );

-    void createMenuEntries( QPopupMenu *menu, QDir dir, bool ltabs, bool lot );

-    void createDirEntry( QPopupMenu *menu, QDir dir, QString file, bool lot );

-    void createAppEntry( QPopupMenu *menu, QDir dir, QString file );

-

-private:

-    bool useWidePopupMenu;

-    QString popupMenuSidePixmap;

-

-    bool startButtonIsFlat;

-    QString startButtonPixmap;

-

-    int currentItem;

-

-    QIntDict<AppLnk> appLnks;

-    QIntDict<QString> tabNames;

-    QIntDict<MenuApplet> menuApplets;

-    

-};

-

-#endif // __START_MENU_H__

+/**********************************************************************
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the Qtopia Environment.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+
+#ifndef __START_MENU_H__
+#define __START_MENU_H__
+
+#include <qtopia/applnk.h>
+#include <qintdict.h>
+#include <qstring.h>
+#include <qlist.h>
+#include <qmap.h>
+#include <qdir.h>
+#include <qlabel.h>
+#include <qpopupmenu.h>
+
+#include <qtopia/menuappletinterface.h>
+
+class StartPopupMenu : public QPopupMenu
+{
+
+public:
+    StartPopupMenu( QWidget *parent ) : QPopupMenu( parent ) {}
+
+protected:
+    void keyPressEvent( QKeyEvent *e );
+
+};
+
+class QLibrary;
+
+
+struct MenuApplet {
+    QLibrary *library;
+    MenuAppletInterface *iface;
+    int id;
+    QPopupMenu *popup;
+};
+
+class StartMenu : public QLabel {
+
+    Q_OBJECT
+
+public:
+    StartMenu( QWidget * );
+    ~StartMenu();
+
+    void refreshMenu();
+
+public:
+    StartPopupMenu *launchMenu;
+
+signals:
+    void tabSelected(const QString&);
+
+public slots:
+    void launch( );
+    void createMenu( );
+
+protected slots:
+    void itemSelected( int id );
+
+protected:
+    virtual void mousePressEvent( QMouseEvent * );
+
+private:
+    void loadApplets();
+    void clearApplets();
+    void addApplets( QPopupMenu* menu );
+    bool loadMenu( QPopupMenu *menu );
+    void createMenuEntries( QPopupMenu *menu, QDir dir, bool ltabs, bool lot );
+    void createDirEntry( QPopupMenu *menu, QDir dir, QString file, bool lot );
+    void createAppEntry( QPopupMenu *menu, QDir dir, QString file );
+
+private:
+    bool useWidePopupMenu;
+    QString popupMenuSidePixmap;
+
+    bool startButtonIsFlat;
+    QString startButtonPixmap;
+
+    int currentItem;
+
+    QIntDict<AppLnk> appLnks;
+    QIntDict<QString> tabNames;
+    QIntDict<MenuApplet> menuApplets;
+
+};
+
+#endif // __START_MENU_H__