summaryrefslogtreecommitdiff
authorjowenn <jowenn>2002-11-10 21:47:40 (UTC)
committer jowenn <jowenn>2002-11-10 21:47:40 (UTC)
commit727eb9283d10cf61cc7f7a8506124cab9f37f2ed (patch) (side-by-side diff)
treeeab18cc8dcb30b390bcded5c9107af9bff42da0a
parent846ab99d6f52efaf3b2cc98231fe5fc985878516 (diff)
downloadopie-727eb9283d10cf61cc7f7a8506124cab9f37f2ed.zip
opie-727eb9283d10cf61cc7f7a8506124cab9f37f2ed.tar.gz
opie-727eb9283d10cf61cc7f7a8506124cab9f37f2ed.tar.bz2
Look in the correct directory for hl files
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index c51221b..3390bdb 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -15,26 +15,26 @@
* *
***************************************************************************/
#include "katesyntaxdocument.h"
#include <qfile.h>
#include <kdebug.h>
#include <kstddirs.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <qstringlist.h>
#include <kconfig.h>
#include <kglobal.h>
-
-
+#include <qpe/qpeapplication.h>
+#include <qdir.h>
SyntaxDocument::SyntaxDocument()
{
m_root=0;
currentFile="";
setupModeList();
}
void SyntaxDocument::setIdentifier(const QString& identifier)
{
#warning FIXME delete m_root;
m_root=Opie::XMLElement::load(identifier);
@@ -45,62 +45,66 @@ void SyntaxDocument::setIdentifier(const QString& identifier)
SyntaxDocument::~SyntaxDocument()
{
}
void SyntaxDocument::setupModeList(bool force)
{
if (myModeList.count() > 0) return;
KConfig *config=KGlobal::config();
KStandardDirs *dirs = KGlobal::dirs();
- QStringList list=dirs->findAllResources("data","kate/syntax/*.xml",false,true);
+// QStringList list=dirs->findAllResources("data","kate/syntax/*.xml",false,true);
+ QString path=QPEApplication::qpeDir() +"share/tinykate/syntax/";
+
+ QDir dir(path);
+ QStringList list=dir.entryList("*.xml");
for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
- QString Group="Highlighting_Cache"+*it;
+ QString Group="Highlighting_Cache"+path+*it;
if ((config->hasGroup(Group)) && (!force))
{
config->setGroup(Group);
syntaxModeListItem *mli=new syntaxModeListItem;
mli->name = config->readEntry("name","");
mli->section = config->readEntry("section","");
mli->mimetype = config->readEntry("mimetype","");
mli->extension = config->readEntry("extension","");
mli->identifier = *it;
myModeList.append(mli);
}
else
{
- qDebug("Found a description file:"+(*it));
- setIdentifier(*it);
+ qDebug("Found a description file:"+path+(*it));
+ setIdentifier(path+(*it));
Opie::XMLElement *e=m_root;
if (e)
{
e=e->firstChild();
qDebug(e->tagName());
if (e->tagName()=="language")
{
syntaxModeListItem *mli=new syntaxModeListItem;
mli->name = e->attribute("name");
mli->section = e->attribute("section");
mli->mimetype = e->attribute("mimetype");
mli->extension = e->attribute("extensions");
qDebug(QString("valid description for: %1/%2").arg(mli->section).arg(mli->name));
if (mli->section.isEmpty())
mli->section=i18n("Other");
- mli->identifier = *it;
+ mli->identifier = path+(*it);
#warning fixme
/*
config->setGroup(Group);
config->writeEntry("name",mli->name);
config->writeEntry("section",mli->section);
config->writeEntry("mimetype",mli->mimetype);
config->writeEntry("extension",mli->extension);
*/
myModeList.append(mli);
}
}
}