Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 3 insertions, 6 deletions

diff --git a/library/global.h b/library/global.h
index fdf8754..1136b12 100644
--- a/library/global.h
+++ b/library/global.h
@@ -1,93 +1,90 @@
 /**********************************************************************
-** Copyright (C) 2002 Holger 'zecke' Freyther <freyther@kde.org>
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** 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 GLOBAL_H
 #define GLOBAL_H
 
 #include <qstringlist.h>
 #include <qguardedptr.h>
 class QDawg;
 class QLabel;
 class QWidget;
 class AppLnk;
 class DocLnkSet;
 
 class Global
 {
 public:
     Global();
 
     // Dictionaries
     static const QDawg& fixedDawg();
     static const QDawg& addedDawg();
     static const QDawg& dawg(const QString& name);
 
     static void addWords(const QStringList& word);
     static void addWords(const QString& dictname, const QStringList& word);
     // static void removeWords(const QStringList& word); -- if someone wants it
 
     static void createDocDir();
 
     static void findDocuments(DocLnkSet* folder, const QString &mimefilter=QString::null);
-    // we don't need a mimefilter. Same as above but this is fast as light speed or not ;)
-    //static void findNewDocuments( DocLnkSet* folder ); 
 
     static QString applicationFileName(const QString& appname, const QString& filename);
 
     struct Command {
         const char *file;
         QWidget *(*func)( bool );
         bool maximized;
         bool documentary;
     };
     static void setBuiltinCommands( Command* );
 
-    static void invoke( const QString &exec);
     static void execute( const QString &exec, const QString &document=QString::null );
     static void setDocument( QWidget* receiver, const QString& document );
     static bool terminateBuiltin( const QString& );
     static void terminate( const AppLnk* );
 
     static bool isBuiltinCommand( const QString &name );
 
     // system messaging
     static void applyStyle();
     static void statusMessage(const QString&);
     static QWidget *shutdown( bool = FALSE );
     static QWidget *restart( bool = FALSE );
     static void hideInputMethod();
     static void showInputMethod();
 
     static void writeHWClock();
 
     static QString shellQuote(const QString& s);
     static QString stringQuote(const QString& s);
 
 #ifdef QTOPIA_INTERNAL_LANGLIST
     static QStringList languageList();
     static QStringList helpPath();
 #endif
 
 private:
+    static void invoke( const QString &exec);
     static Command* builtin;
     static QGuardedPtr<QWidget> *running;
 };
 
 #endif