author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (side-by-side diff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/global.h | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
-rw-r--r-- | library/global.h | 9 |
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,9 +1,8 @@ /********************************************************************** -** 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 @@ -45,10 +44,8 @@ public: 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 { @@ -58,9 +55,8 @@ public: 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* ); @@ -85,8 +81,9 @@ public: static QStringList helpPath(); #endif private: + static void invoke( const QString &exec); static Command* builtin; static QGuardedPtr<QWidget> *running; }; |