summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -36,9 +36,9 @@ SyntaxDocument::SyntaxDocument()
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) );
}
@@ -77,9 +77,9 @@ void SyntaxDocument::setupModeList(bool force)
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());
@@ -194,17 +194,17 @@ syntaxContextData* SyntaxDocument::getSubItems(syntaxContextData* data)
}
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;
@@ -236,17 +236,17 @@ syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const
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;
@@ -275,23 +275,23 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
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();
}
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
@@ -35,11 +35,11 @@ class syntaxModeListItem
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;
@@ -62,9 +62,9 @@ class SyntaxDocument
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;
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
@@ -47,9 +47,8 @@
#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 )
{
@@ -531,9 +530,9 @@ FontConfig::FontConfig( QWidget *parent, char *name )
// 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." ) );
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
@@ -183,9 +183,9 @@ public:
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: