author | mickeyl <mickeyl> | 2003-12-02 15:29:06 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-02 15:29:06 (UTC) |
commit | e215d4b2bc542b557913ba3dcd57fd20a5a2a0fe (patch) (side-by-side diff) | |
tree | 8bb36647649cebf7c204ce58adcb820f4f0c19d6 /libopie2/opiecore/oapplication.h | |
parent | 7a7683d435cfbb4fa2d6ed99fd4a94d388402aec (diff) | |
download | opie-e215d4b2bc542b557913ba3dcd57fd20a5a2a0fe.zip opie-e215d4b2bc542b557913ba3dcd57fd20a5a2a0fe.tar.gz opie-e215d4b2bc542b557913ba3dcd57fd20a5a2a0fe.tar.bz2 |
revert the changes approaching to compile libopie2 under X11
it broke signals and slots and has to be done like zecke did it with libqpe
Diffstat (limited to 'libopie2/opiecore/oapplication.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/oapplication.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libopie2/opiecore/oapplication.h b/libopie2/opiecore/oapplication.h index a3f2201..72a659e 100644 --- a/libopie2/opiecore/oapplication.h +++ b/libopie2/opiecore/oapplication.h @@ -13,56 +13,56 @@ ._= =} : or (at your option) any later version. .%`+i> _;_. .i_,=:_. -<s. This program is distributed in the hope that + . -:. = it will be useful, but WITHOUT ANY WARRANTY; : .. .:, . . . without even the implied warranty of =_ + =;=|` MERCHANTABILITY or FITNESS FOR A _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef OAPPLICATION_H #define OAPPLICATION_H #define oApp OApplication::oApplication() -#include "opieapplication.h" +#include <qpe/qpeapplication.h> class OApplicationPrivate; class OConfig; -class OApplication : public OpieApplication +class OApplication : public QPEApplication { Q_OBJECT public: /** * Constructor. Parses command-line arguments and sets the window caption. * * @param rAppName application name. Will be used for finding the * associated message, icon and configuration files * */ OApplication( int& argc, char** argv, const QCString& rAppName ); /** * Destructor. Destroys the application object and its children. */ virtual ~OApplication(); /** * @returns the process-wide application object * * This is similar to the global @ref QApplication pointer qApp. It * allows access to the single global OApplication object, since * more than one cannot be created in the same application. It * saves you the trouble of having to pass the pointer explicitly * to every function that may require it. @@ -71,40 +71,35 @@ class OApplication : public OpieApplication /** * Returns the application name as given during creation. * * @returns a reference to the application name */ const QCString& appName() const { return _appname; }; /** * @returns the application session config object. * * @see OConfig */ OConfig* config(); /** * Shows the main @a widget and sets the name of the application as window caption. */ virtual void showMainWidget( QWidget* widget, bool nomax = false ); /** * Set the application title. The application title will be concatenated * to the application name given in the constructor. * * @param title the title. If not given, resets caption to appname */ virtual void setTitle( const QString& title = QString::null ) const; - /** - * see qpeDir() - */ - static QString opieDir() {return qpeDir();}; - protected: void init(); private: const QCString _appname; static OApplication* _instance; OConfig* _config; OApplicationPrivate* d; }; #endif // OAPPLICATION_H |