summaryrefslogtreecommitdiff
authorzecke <zecke>2004-10-15 21:04:08 (UTC)
committer zecke <zecke>2004-10-15 21:04:08 (UTC)
commit0bdebb46227ea403a07707cf0a967c8ea036e03f (patch) (side-by-side diff)
treed6e724a055475f3938ee5a8955692209d490ba37
parentac36bfe2794741188da1d6d4b471f96fd15d47ee (diff)
downloadopie-0bdebb46227ea403a07707cf0a967c8ea036e03f.zip
opie-0bdebb46227ea403a07707cf0a967c8ea036e03f.tar.gz
opie-0bdebb46227ea403a07707cf0a967c8ea036e03f.tar.bz2
Make sure that qpeDir() has a QDir::seperator() as last character. This code
comes from Qtopia1.7 Conversion to it is done by myself
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp27
1 files changed, 20 insertions, 7 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 3efba20..0b6d56d 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -391,3 +391,3 @@ public:
{
- QString path = QPEApplication::qpeDir() + "/plugins/textcodecs";
+ QString path = QPEApplication::qpeDir() + "plugins/textcodecs";
#ifdef Q_OS_MACX
@@ -420,3 +420,3 @@ public:
{
- QString path = QPEApplication::qpeDir() + "/plugins/imagecodecs";
+ QString path = QPEApplication::qpeDir() + "plugins/imagecodecs";
#ifdef Q_OS_MACX
@@ -1189,7 +1189,20 @@ QString QPEApplication::qpeDir()
{
- const char * base = getenv( "OPIEDIR" );
- if ( base )
- return QString( base ) + "/";
+ QString base, dir;
+
+ if (getenv( "OPIEDIR" ))
+ base = QString(getenv("OPIEDIR")).stripWhiteSpace();
+ if ( !base.isNull() && (base.length() > 0 )){
+#ifdef Q_OS_WIN32
+ QString temp(base);
+ if (temp[(int)temp.length()-1] != QDir::separator())
+ temp.append(QDir::separator());
+ dir = temp;
+#else
+ dir = QString( base ) + "/";
+#endif
+ }else{
+ dir = QString( ".." ) + QDir::separator();
+ }
- return QString( "../" );
+ return dir;
}
@@ -1837,3 +1850,3 @@ void QPEApplication::internalSetStyle( const QString &style )
QStyle *sty = 0;
- QString path = QPEApplication::qpeDir ( ) + "/plugins/styles/";
+ QString path = QPEApplication::qpeDir ( ) + "plugins/styles/";