summaryrefslogtreecommitdiff
path: root/library
Side-by-side diff
Diffstat (limited to 'library') (more/less context) (ignore whitespace changes)
-rw-r--r--library/config.cpp2
-rw-r--r--library/qpedialog.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/library/config.cpp b/library/config.cpp
index 72bd4d2..73ddeb5 100644
--- a/library/config.cpp
+++ b/library/config.cpp
@@ -1,87 +1,87 @@
/**********************************************************************
** Copyright (C) 2000,2004 Trolltech AS. All rights reserved.
**
** This file is part of 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.
**
**********************************************************************/
#include <qdir.h>
#include <qmessagebox.h>
#if QT_VERSION <= 230 && defined(QT_NO_CODECS)
#include <qtextcodec.h>
#endif
#include <qtextstream.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/time.h>
#include <fcntl.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
#define QTOPIA_INTERNAL_LANGLIST
#include "config.h"
#include "global.h"
-#include "qpeapplication.h"
+#include <qtopia/qpeapplication.h>
/*
* Internal Class
*/
class ConfigPrivate {
public:
ConfigPrivate() : multilang(FALSE) {}
ConfigPrivate(const ConfigPrivate& o) :
trfile(o.trfile),
trcontext(o.trcontext),
multilang(o.multilang)
{}
ConfigPrivate& operator=(const ConfigPrivate& o)
{
trfile = o.trfile;
trcontext = o.trcontext;
multilang = o.multilang;
return *this;
}
QString trfile;
QCString trcontext;
bool multilang;
};
/////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////
#ifndef Q_OS_WIN32
//#define DEBUG_CONFIG_CACHE
class ConfigData
{
public:
ConfigData() {}
ConfigData( const ConfigGroupMap& cf, const ConfigPrivate& pri,
struct stat sbuf )
: cfg( cf ), priv( pri ), mtime( sbuf.st_mtime ),
size( sbuf.st_size )
{
gettimeofday(&used, 0 );
}
ConfigGroupMap cfg;
ConfigPrivate priv; // Owned by this object
time_t mtime;
unsigned int size;
diff --git a/library/qpedialog.cpp b/library/qpedialog.cpp
index f52171f..8da0ca6 100644
--- a/library/qpedialog.cpp
+++ b/library/qpedialog.cpp
@@ -1,73 +1,73 @@
/**********************************************************************
** 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.
**
**********************************************************************/
#include "qpedialog.h"
#include <qdialog.h>
-#include <qpeapplication.h>
+#include <qtopia/qpeapplication.h>
// Allow access to nornally protected accept and reject functions
class HackedPrivateQDialog : public QDialog{
public:
void accept() { QDialog::accept();}
void reject() { QDialog::reject();}
};
/**
* \brief This is the only c'tor.
*
* The parent of this Listener is the Dialog you pass. This means once
* the dialog is deleted this listener will be deleted too.
* This Listener listens on QPEApplication::appMessage signal and implements
* accept() and reject().
*
* \code
* QDialog *dialog = new YourDialog();
(void)new QPEDialogListener(dialog);
if( QPEApplication::execDialog(dialog) == QDialog::Accept ){
// do some stuff
}
delete dialog;
* \endcode
*
* @param di The dialog to handle
*/
QPEDialogListener::QPEDialogListener(QDialog *di ) : QObject(di)
{
dialog = di;
connect(qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)),
this, SLOT(appMessage(const QCString&,const QByteArray&)) );
}
/**
* d'tor
*/
QPEDialogListener::~QPEDialogListener() {}
/**
* \internal
*/
void QPEDialogListener::appMessage( const QCString &msg, const QByteArray & )
{