summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-14 17:01:11 (UTC)
committer zecke <zecke>2004-03-14 17:01:11 (UTC)
commit64820b76cc9d1c06a6967cd34114f3b95896aaeb (patch) (unidiff)
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 @@
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
@@ -28,25 +28,25 @@
28#include <qdir.h> 28#include <qdir.h>
29 29
30SyntaxDocument::SyntaxDocument() 30SyntaxDocument::SyntaxDocument()
31{ 31{
32 m_root=0; 32 m_root=0;
33 currentFile=""; 33 currentFile="";
34 setupModeList(); 34 setupModeList();
35} 35}
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
45SyntaxDocument::~SyntaxDocument() 45SyntaxDocument::~SyntaxDocument()
46{ 46{
47} 47}
48 48
49void SyntaxDocument::setupModeList(bool force) 49void SyntaxDocument::setupModeList(bool force)
50{ 50{
51 51
52 if (myModeList.count() > 0) return; 52 if (myModeList.count() > 0) return;
@@ -69,25 +69,25 @@ void SyntaxDocument::setupModeList(bool force)
69 syntaxModeListItem *mli=new syntaxModeListItem; 69 syntaxModeListItem *mli=new syntaxModeListItem;
70 mli->name = config->readEntry("name",""); 70 mli->name = config->readEntry("name","");
71 mli->section = config->readEntry("section",""); 71 mli->section = config->readEntry("section","");
72 mli->mimetype = config->readEntry("mimetype",""); 72 mli->mimetype = config->readEntry("mimetype","");
73 mli->extension = config->readEntry("extension",""); 73 mli->extension = config->readEntry("extension","");
74 mli->identifier = path+*it; 74 mli->identifier = path+*it;
75 myModeList.append(mli); 75 myModeList.append(mli);
76 } 76 }
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());
86 if (e->tagName()=="language") 86 if (e->tagName()=="language")
87 { 87 {
88 syntaxModeListItem *mli=new syntaxModeListItem; 88 syntaxModeListItem *mli=new syntaxModeListItem;
89 mli->name = e->attribute("name"); 89 mli->name = e->attribute("name");
90 mli->section = e->attribute("section"); 90 mli->section = e->attribute("section");
91 mli->mimetype = e->attribute("mimetype"); 91 mli->mimetype = e->attribute("mimetype");
92 mli->extension = e->attribute("extensions"); 92 mli->extension = e->attribute("extensions");
93 qDebug(QString("valid description for: %1/%2").arg(mli->section).arg(mli->name)); 93 qDebug(QString("valid description for: %1/%2").arg(mli->section).arg(mli->name));
@@ -186,33 +186,33 @@ syntaxContextData* SyntaxDocument::getSubItems(syntaxContextData* data)
186 if (data != 0) 186 if (data != 0)
187 { 187 {
188 retval->parent=data->currentGroup; 188 retval->parent=data->currentGroup;
189 retval->currentGroup=data->item; 189 retval->currentGroup=data->item;
190 retval->item=0; 190 retval->item=0;
191 } 191 }
192 192
193 return retval; 193 return retval;
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;
211 211
212 if (e1->tagName()==Config) 212 if (e1->tagName()==Config)
213 { 213 {
214 syntaxContextData *data=new ( syntaxContextData); 214 syntaxContextData *data=new ( syntaxContextData);
215 data->currentGroup=0; 215 data->currentGroup=0;
216 data->parent=0; 216 data->parent=0;
217 data->item=e1; 217 data->item=e1;
218 return data; 218 return data;
@@ -228,33 +228,33 @@ syntaxContextData* SyntaxDocument::getConfig(const QString& mainGroupName, const
228 e=e->nextChild(); 228 e=e->nextChild();
229 } 229 }
230 230
231 kdDebug(13010) << "WARNING :returning null 4" << endl; 231 kdDebug(13010) << "WARNING :returning null 4" << endl;
232 return 0; 232 return 0;
233} 233}
234 234
235 235
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;
253 if (e1->tagName()==group+"s") 253 if (e1->tagName()==group+"s")
254 { 254 {
255 syntaxContextData *data=new ( syntaxContextData); 255 syntaxContextData *data=new ( syntaxContextData);
256 data->parent=e1; 256 data->parent=e1;
257 data->currentGroup=0; 257 data->currentGroup=0;
258 data->item=0; 258 data->item=0;
259 return data; 259 return data;
260 } 260 }
@@ -267,39 +267,39 @@ syntaxContextData* SyntaxDocument::getGroupInfo(const QString& mainGroupName, co
267 } 267 }
268 268
269 e=e->nextChild(); 269 e=e->nextChild();
270 } 270 }
271 271
272 kdDebug(13010) << "WARNING : getGroupInfo returning null :2" << endl; 272 kdDebug(13010) << "WARNING : getGroupInfo returning null :2" << endl;
273 return 0; 273 return 0;
274} 274}
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 }
298 break; 298 break;
299 } 299 }
300 } 300 }
301 break; 301 break;
302 } 302 }
303 } 303 }
304 304
305 return m_data; 305 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
27{ 27{
28 public: 28 public:
29 QString name; 29 QString name;
30 QString section; 30 QString section;
31 QString mimetype; 31 QString mimetype;
32 QString extension; 32 QString extension;
33 QString identifier; 33 QString identifier;
34}; 34};
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
46class SyntaxDocument 46class SyntaxDocument
47{ 47{
48 public: 48 public:
49 SyntaxDocument(); 49 SyntaxDocument();
50 ~SyntaxDocument(); 50 ~SyntaxDocument();
51 51
52 QStringList& finddata(const QString& mainGroup,const QString& type,bool clearList=true); 52 QStringList& finddata(const QString& mainGroup,const QString& type,bool clearList=true);
53 SyntaxModeList modeList(); 53 SyntaxModeList modeList();
54 54
55 syntaxContextData* getGroupInfo(const QString& langName, const QString &group); 55 syntaxContextData* getGroupInfo(const QString& langName, const QString &group);
56 void freeGroupInfo(syntaxContextData* data); 56 void freeGroupInfo(syntaxContextData* data);
57 syntaxContextData* getConfig(const QString& mainGroupName, const QString &Config); 57 syntaxContextData* getConfig(const QString& mainGroupName, const QString &Config);
58 bool nextItem(syntaxContextData* data); 58 bool nextItem(syntaxContextData* data);
59 bool nextGroup(syntaxContextData* data); 59 bool nextGroup(syntaxContextData* data);
60 syntaxContextData* getSubItems(syntaxContextData* data); 60 syntaxContextData* getSubItems(syntaxContextData* data);
61 QString groupItemData(syntaxContextData* data,QString name); 61 QString groupItemData(syntaxContextData* data,QString name);
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;
71}; 71};
72 72
73#endif 73#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 @@
39#include <kglobal.h> 39#include <kglobal.h>
40#include <qvbox.h> 40#include <qvbox.h>
41#include <qspinbox.h> 41#include <qspinbox.h>
42#include <qcombobox.h> 42#include <qcombobox.h>
43#include <kfontdialog.h> 43#include <kfontdialog.h>
44 44
45#include "../document/katedocument.h" 45#include "../document/katedocument.h"
46#include "kateviewdialog.h" 46#include "kateviewdialog.h"
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{
56 QWidget *page = new QWidget( this ); 55 QWidget *page = new QWidget( this );
57 setMainWidget( page ); 56 setMainWidget( page );
58 57
59 QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() ); 58 QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() );
60 59
61 m_search = new QComboBox( true, page ); 60 m_search = new QComboBox( true, page );
62 m_search->insertStringList( searchFor ); 61 m_search->insertStringList( searchFor );
63 m_search->setMinimumWidth( m_search->sizeHint().width() ); 62 m_search->setMinimumWidth( m_search->sizeHint().width() );
@@ -523,25 +522,25 @@ void ColorConfig::getColors(QColor *colors)
523} 522}
524 523
525FontConfig::FontConfig( QWidget *parent, char *name ) 524FontConfig::FontConfig( QWidget *parent, char *name )
526 : QWidget( parent, name ) 525 : QWidget( parent, name )
527{ 526{
528 // sizemanagment 527 // sizemanagment
529 QGridLayout *grid = new QGridLayout( this, 1, 1 ); 528 QGridLayout *grid = new QGridLayout( this, 1, 1 );
530// QString familyStr = cfg. readEntry ( "FontFamily", "Helvetica" ); 529// QString familyStr = cfg. readEntry ( "FontFamily", "Helvetica" );
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
540 connect( m_fontselect, SIGNAL( fontSelected(const QFont&)), 539 connect( m_fontselect, SIGNAL( fontSelected(const QFont&)),
541 this, SLOT( slotFontSelected(const QFont&))); 540 this, SLOT( slotFontSelected(const QFont&)));
542 grid->addWidget( m_fontselect, 0, 0); 541 grid->addWidget( m_fontselect, 0, 0);
543 542
544 543
545// #if 0 544// #if 0
546// m_fontchooser = new KFontChooser ( this ); 545// m_fontchooser = new KFontChooser ( this );
547// m_fontchooser->enableColumn(KFontChooser::StyleList, false); 546// 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
175{ 175{
176 Q_OBJECT 176 Q_OBJECT
177 177
178public: 178public:
179 179
180 FontConfig( QWidget *parent = 0, char *name = 0 ); 180 FontConfig( QWidget *parent = 0, char *name = 0 );
181 ~FontConfig(); 181 ~FontConfig();
182 182
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:
192 void slotFontSelected( const QFont &font ); 192 void slotFontSelected( const QFont &font );
193}; 193};
194 194
195 195
196#endif //_KWDIALOG_H_ 196#endif //_KWDIALOG_H_