summaryrefslogtreecommitdiff
Unidiff
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 @@
1 config OPIE-READER 1 config OPIE-READER
2 boolean "opie-reader (E-Text reader)" 2 boolean "opie-reader (E-Text reader)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 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 @@
1 config QASHMONEY 1 config QASHMONEY
2 boolean "opie-qashmoney (money manager)" 2 boolean "opie-qashmoney (money manager)"
3 default "n" 3 default "n"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 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()
36 36
37void SyntaxDocument::setIdentifier(const QString& identifier) 37void SyntaxDocument::setIdentifier(const QString& identifier)
38{ 38{
39#warning FIXME delete m_root; 39#warning FIXME delete m_root;
40 m_root=Opie::XMLElement::load(identifier); 40 m_root=Opie::Core::XMLElement::load(identifier);
41 if (!m_root) KMessageBox::error( 0L, i18n("Can't open %1").arg(identifier) ); 41 if (!m_root) KMessageBox::error( 0L, i18n("Can't open %1").arg(identifier) );
42 42
43} 43}
44 44
@@ -77,9 +77,9 @@ void SyntaxDocument::setupModeList(bool force)
77 else 77 else
78 { 78 {
79 qDebug("Found a description file:"+path+(*it)); 79 qDebug("Found a description file:"+path+(*it));
80 setIdentifier(path+(*it)); 80 setIdentifier(path+(*it));
81 Opie::XMLElement *e=m_root; 81 Opie::Core::XMLElement *e=m_root;
82 if (e) 82 if (e)
83 { 83 {
84 e=e->firstChild(); 84 e=e->firstChild();
85 qDebug(e->tagName()); 85 qDebug(e->tagName());
@@ -194,17 +194,17 @@ syntaxContextData* SyntaxDocument::getSubItems(syntaxContextData* data)
194} 194}
195 195
196syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const QString &Config) 196syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const QString &Config)
197{ 197{
198 Opie::XMLElement *e = m_root->firstChild()->firstChild(); 198 Opie::Core::XMLElement *e = m_root->firstChild()->firstChild();
199 199
200 while (e) 200 while (e)
201 { 201 {
202 kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (outer loop) " <<endl; 202 kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (outer loop) " <<endl;
203 203
204 if (e->tagName().compare(mainGroupName)==0 ) 204 if (e->tagName().compare(mainGroupName)==0 )
205 { 205 {
206 Opie::XMLElement *e1=e->firstChild(); 206 Opie::Core::XMLElement *e1=e->firstChild();
207 207
208 while (e1) 208 while (e1)
209 { 209 {
210 kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (inner loop) " <<endl; 210 kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (inner loop) " <<endl;
@@ -236,17 +236,17 @@ syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const
236 236
237syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, const QString &group) 237syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, const QString &group)
238{ 238{
239 239
240 Opie::XMLElement *e=m_root->firstChild()->firstChild(); 240 Opie::Core::XMLElement *e=m_root->firstChild()->firstChild();
241 241
242 while (e) 242 while (e)
243 { 243 {
244 kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (outer loop) " <<endl; 244 kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (outer loop) " <<endl;
245 245
246 if (e->tagName().compare(mainGroupName)==0 ) 246 if (e->tagName().compare(mainGroupName)==0 )
247 { 247 {
248 Opie::XMLElement *e1=e->firstChild(); 248 Opie::Core::XMLElement *e1=e->firstChild();
249 249
250 while (e1) 250 while (e1)
251 { 251 {
252 kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (inner loop) " <<endl; 252 kdDebug(13010)<<"in SyntaxDocument::getGroupInfo (inner loop) " <<endl;
@@ -275,23 +275,23 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
275 275
276 276
277QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& type,bool clearList) 277QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& type,bool clearList)
278{ 278{
279 Opie::XMLElement *e = m_root->firstChild(); 279 Opie::Core::XMLElement *e = m_root->firstChild();
280 if (clearList) 280 if (clearList)
281 m_data.clear(); 281 m_data.clear();
282 282
283 for(e=e->firstChild(); e; e=e->nextChild()) 283 for(e=e->firstChild(); e; e=e->nextChild())
284 { 284 {
285 if (e->tagName()==mainGroup) 285 if (e->tagName()==mainGroup)
286 { 286 {
287 for (Opie::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild()) 287 for (Opie::Core::XMLElement *e1=e->firstChild();e1;e1=e1->nextChild())
288 { 288 {
289 if (e1->tagName()!="list") continue; 289 if (e1->tagName()!="list") continue;
290 290
291 if (e1->attribute("name")==type) 291 if (e1->attribute("name")==type)
292 { 292 {
293 for (Opie::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild()) 293 for (Opie::Core::XMLElement *e2=e1->firstChild();e2;e2=e2->nextChild())
294 { 294 {
295 qDebug("FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value()); 295 qDebug("FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value());
296 m_data+=e2->firstChild()->value().stripWhiteSpace(); 296 m_data+=e2->firstChild()->value().stripWhiteSpace();
297 } 297 }
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
35 35
36class syntaxContextData 36class syntaxContextData
37{ 37{
38 public: 38 public:
39 Opie::XMLElement *parent; 39 Opie::Core::XMLElement *parent;
40 Opie::XMLElement *currentGroup; 40 Opie::Core::XMLElement *currentGroup;
41 Opie::XMLElement *item; 41 Opie::Core::XMLElement *item;
42}; 42};
43 43
44typedef QList<syntaxModeListItem> SyntaxModeList; 44typedef QList<syntaxModeListItem> SyntaxModeList;
45 45
@@ -62,9 +62,9 @@ class SyntaxDocument
62 QString groupData(syntaxContextData* data,QString name); 62 QString groupData(syntaxContextData* data,QString name);
63 void setIdentifier(const QString& identifier); 63 void setIdentifier(const QString& identifier);
64 64
65 private: 65 private:
66 Opie::XMLElement *m_root; 66 Opie::Core::XMLElement *m_root;
67 void setupModeList(bool force=false); 67 void setupModeList(bool force=false);
68 QString currentFile; 68 QString currentFile;
69 SyntaxModeList myModeList; 69 SyntaxModeList myModeList;
70 QStringList m_data; 70 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 @@
47#include <opie2/ofontselector.h> 47#include <opie2/ofontselector.h>
48 48
49 49
50using namespace Opie::Ui; 50using namespace Opie::Ui;
51using namespace Opie::Ui;
52SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags ) 51SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags )
53 : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok ) 52 : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok )
54 , m_replace( 0L ) 53 , m_replace( 0L )
55{ 54{
@@ -531,9 +530,9 @@ FontConfig::FontConfig( QWidget *parent, char *name )
531// QString styleStr = cfg. readEntry ( "FontStyle", "Regular" ); 530// QString styleStr = cfg. readEntry ( "FontStyle", "Regular" );
532// int size = cfg. readNumEntry ( "FontSize", 10 ); 531// int size = cfg. readNumEntry ( "FontSize", 10 );
533// OFontSelector *m_fontselect; 532// OFontSelector *m_fontselect;
534 533
535 m_fontselect = new Opie::OFontSelector ( false, this, "FontTab" ); 534 m_fontselect = new OFontSelector ( false, this, "FontTab" );
536// m_fontselect-> setSelectedFont ( familyStr, styleStr, size ); 535// m_fontselect-> setSelectedFont ( familyStr, styleStr, size );
537// QWhatsThis::add( m_fontselect, 536// QWhatsThis::add( m_fontselect,
538// tr( "Select the desired name, style and size of the default font applications will use." ) ); 537// tr( "Select the desired name, style and size of the default font applications will use." ) );
539 538
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:
183 void setFont ( const QFont &font ); 183 void setFont ( const QFont &font );
184 QFont getFont ( ) { return myFont; }; 184 QFont getFont ( ) { return myFont; };
185 185
186 private: 186 private:
187 Opie::Opie::Ui::OFontSelector *m_fontselect; 187 Opie::Ui::OFontSelector *m_fontselect;
188// class KFontChooser *m_fontchooser; 188// class KFontChooser *m_fontchooser;
189 QFont myFont; 189 QFont myFont;
190 190
191 private slots: 191 private slots: