summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 17:01:11 (UTC)
committer zecke <zecke>2004-03-14 17:01:11 (UTC)
commit64820b76cc9d1c06a6967cd34114f3b95896aaeb (patch) (side-by-side diff)
tree0d285b9d61392587b38f779688f518070a9e3e7b
parent52169e2469a1edcca986e9f0404c3ca815d5833b (diff)
downloadopie-64820b76cc9d1c06a6967cd34114f3b95896aaeb.zip
opie-64820b76cc9d1c06a6967cd34114f3b95896aaeb.tar.gz
opie-64820b76cc9d1c06a6967cd34114f3b95896aaeb.tar.bz2
Only use ODP
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-reader/config.in2
-rw-r--r--noncore/apps/qashmoney/config.in2
-rw-r--r--noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp18
-rw-r--r--noncore/apps/tinykate/libkate/document/katesyntaxdocument.h8
-rw-r--r--noncore/apps/tinykate/libkate/view/kateviewdialog.cpp3
-rw-r--r--noncore/apps/tinykate/libkate/view/kateviewdialog.h2
6 files changed, 17 insertions, 18 deletions
diff --git a/noncore/apps/opie-reader/config.in b/noncore/apps/opie-reader/config.in
index 9f1e02e..8ade941 100644
--- a/noncore/apps/opie-reader/config.in
+++ b/noncore/apps/opie-reader/config.in
@@ -1,4 +1,4 @@
config OPIE-READER
boolean "opie-reader (E-Text reader)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 )
diff --git a/noncore/apps/qashmoney/config.in b/noncore/apps/qashmoney/config.in
index 94c39b6..91739fe 100644
--- a/noncore/apps/qashmoney/config.in
+++ b/noncore/apps/qashmoney/config.in
@@ -1,4 +1,4 @@
config QASHMONEY
boolean "opie-qashmoney (money manager)"
default "n"
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 )
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index f90a5f8..6059e9b 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -28,25 +28,25 @@
#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);
+ m_root=Opie::Core::XMLElement::load(identifier);
if (!m_root) KMessageBox::error( 0L, i18n("Can't open %1").arg(identifier) );
}
SyntaxDocument::~SyntaxDocument()
{
}
void SyntaxDocument::setupModeList(bool force)
{
if (myModeList.count() > 0) return;
@@ -69,25 +69,25 @@ void SyntaxDocument::setupModeList(bool force)
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 = path+*it;
myModeList.append(mli);
}
else
{
qDebug("Found a description file:"+path+(*it));
setIdentifier(path+(*it));
- Opie::XMLElement *e=m_root;
+ Opie::Core::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));
@@ -186,33 +186,33 @@ syntaxContextData* SyntaxDocument::getSubItems(syntaxContextData* data)
if (data != 0)
{
retval->parent=data->currentGroup;
retval->currentGroup=data->item;
retval->item=0;
}
return retval;
}
syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const QString &Config)
{
- Opie::XMLElement *e = m_root->firstChild()->firstChild();
+ Opie::Core::XMLElement *e = m_root->firstChild()->firstChild();
while (e)
{
kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (outer loop) " <<endl;
if (e->tagName().compare(mainGroupName)==0 )
{
- Opie::XMLElement *e1=e->firstChild();
+ Opie::Core::XMLElement *e1=e->firstChild();
while (e1)
{
kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (inner loop) " <<endl;
if (e1->tagName()==Config)
{
syntaxContextData *data=new ( syntaxContextData);
data->currentGroup=0;
data->parent=0;
data->item=e1;
return data;
@@ -228,33 +228,33 @@ syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const
e=e->nextChild();
}
kdDebug(13010) << "WARNING :returning null 4" << endl;
return 0;
}
syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, const QString &group)
{
- Opie::XMLElement *e=m_root->firstChild()->firstChild();
+ Opie::Core::XMLElement *e=m_root->firstChild()->firstChild();
while (e)
{
kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (outer loop) " <<endl;
if (e->tagName().compare(mainGroupName)==0 )
{
- Opie::XMLElement *e1=e->firstChild();
+ Opie::Core::XMLElement *e1=e->firstChild();
while (e1)
{
kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (inner loop) " <<endl;
if (e1->tagName()==group+"s")
{
syntaxContextData *data=new ( syntaxContextData);
data->parent=e1;
data->currentGroup=0;
data->item=0;
return data;
}
@@ -267,39 +267,39 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
}
e=e->nextChild();
}
kdDebug(13010) << "WARNING : getGroupInfo returning null :2" << endl;
return 0;
}
QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& type,bool clearList)
{
- Opie::XMLElement *e = m_root->firstChild();
+ Opie::Core::XMLElement *e = m_root->firstChild();
if (clearList)
m_data.clear();
for(e=e->firstChild(); e; e=e->nextChild())
{
if (e->tagName()==mainGroup)
{
- for (Opie::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild())
+ for (Opie::Core::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild())
{
if (e1->tagName()!="list") continue;
if (e1->attribute("name")==type)
{
- for (Opie::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
+ for (Opie::Core::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
{
qDebug("FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value());
m_data+=e2->firstChild()->value().stripWhiteSpace();
}
break;
}
}
break;
}
}
return m_data;
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h
index 5eefc77..072f5f0 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.h
@@ -27,47 +27,47 @@ class syntaxModeListItem
{
public:
QString name;
QString section;
QString mimetype;
QString extension;
QString identifier;
};
class syntaxContextData
{
public:
- Opie::XMLElement *parent;
- Opie::XMLElement *currentGroup;
- Opie::XMLElement *item;
+ Opie::Core::XMLElement *parent;
+ Opie::Core::XMLElement *currentGroup;
+ Opie::Core::XMLElement *item;
};
typedef QList<syntaxModeListItem> SyntaxModeList;
class SyntaxDocument
{
public:
SyntaxDocument();
~SyntaxDocument();
QStringList& finddata(const QString& mainGroup,const QString& type,bool clearList=true);
SyntaxModeList modeList();
syntaxContextData* getGroupInfo(const QString& langName, const QString &group);
void freeGroupInfo(syntaxContextData* data);
syntaxContextData* getConfig(const QString& mainGroupName, const QString &Config);
bool nextItem(syntaxContextData* data);
bool nextGroup(syntaxContextData* data);
syntaxContextData* getSubItems(syntaxContextData* data);
QString groupItemData(syntaxContextData* data,QString name);
QString groupData(syntaxContextData* data,QString name);
void setIdentifier(const QString& identifier);
private:
- Opie::XMLElement *m_root;
+ Opie::Core::XMLElement *m_root;
void setupModeList(bool force=false);
QString currentFile;
SyntaxModeList myModeList;
QStringList m_data;
};
#endif
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
index c3a0a2e..f82356b 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
@@ -39,25 +39,24 @@
#include <kglobal.h>
#include <qvbox.h>
#include <qspinbox.h>
#include <qcombobox.h>
#include <kfontdialog.h>
#include "../document/katedocument.h"
#include "kateviewdialog.h"
#include <opie2/ofontselector.h>
using namespace Opie::Ui;
-using namespace Opie::Ui;
SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags )
: KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok )
, m_replace( 0L )
{
QWidget *page = new QWidget( this );
setMainWidget( page );
QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() );
m_search = new QComboBox( true, page );
m_search->insertStringList( searchFor );
m_search->setMinimumWidth( m_search->sizeHint().width() );
@@ -523,25 +522,25 @@ void ColorConfig::getColors(QColor *colors)
}
FontConfig::FontConfig( QWidget *parent, char *name )
: QWidget( parent, name )
{
// sizemanagment
QGridLayout *grid = new QGridLayout( this, 1, 1 );
// QString familyStr = cfg. readEntry ( "FontFamily", "Helvetica" );
// QString styleStr = cfg. readEntry ( "FontStyle", "Regular" );
// int size = cfg. readNumEntry ( "FontSize", 10 );
// OFontSelector *m_fontselect;
- m_fontselect = new Opie::OFontSelector ( false, this, "FontTab" );
+ m_fontselect = new OFontSelector ( false, this, "FontTab" );
// m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
// QWhatsThis::add( m_fontselect,
// tr( "Select the desired name, style and size of the default font applications will use." ) );
connect( m_fontselect, SIGNAL( fontSelected(const QFont&)),
this, SLOT( slotFontSelected(const QFont&)));
grid->addWidget( m_fontselect, 0, 0);
// #if 0
// m_fontchooser = new KFontChooser ( this );
// m_fontchooser->enableColumn(KFontChooser::StyleList, false);
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.h b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
index d081152..65f2dca 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.h
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
@@ -175,22 +175,22 @@ class FontConfig : public QWidget
{
Q_OBJECT
public:
FontConfig( QWidget *parent = 0, char *name = 0 );
~FontConfig();
void setFont ( const QFont &font );
QFont getFont ( ) { return myFont; };
private:
- Opie::Opie::Ui::OFontSelector *m_fontselect;
+ Opie::Ui::OFontSelector *m_fontselect;
// class KFontChooser *m_fontchooser;
QFont myFont;
private slots:
void slotFontSelected( const QFont &font );
};
#endif //_KWDIALOG_H_