author | zecke <zecke> | 2004-03-13 22:41:59 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 22:41:59 (UTC) |
commit | 3d27828732fe7e499219ad6e208dc13dead86431 (patch) (side-by-side diff) | |
tree | faa42dec364ad1e0470a370c81d0a7dc0cd2f9bc /noncore/apps/tinykate | |
parent | ee753c0009da5bec4a71d3263e9623d04dddc5c4 (diff) | |
download | opie-3d27828732fe7e499219ad6e208dc13dead86431.zip opie-3d27828732fe7e499219ad6e208dc13dead86431.tar.gz opie-3d27828732fe7e499219ad6e208dc13dead86431.tar.bz2 |
Namespace changes for Apps
QAshMoney and Reader need to be valgrinded
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateviewdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/view/kateviewdialog.h | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/main.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/tinykate/tinykate.cpp | 7 | ||||
-rw-r--r-- | noncore/apps/tinykate/tinykate.h | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp index 8e68262..c3a0a2e 100644 --- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp +++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp @@ -44,12 +44,14 @@ #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 ); diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.h b/noncore/apps/tinykate/libkate/view/kateviewdialog.h index 98d8799..d081152 100644 --- a/noncore/apps/tinykate/libkate/view/kateviewdialog.h +++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.h @@ -181,13 +181,13 @@ public: ~FontConfig(); void setFont ( const QFont &font ); QFont getFont ( ) { return myFont; }; private: - Opie::OFontSelector *m_fontselect; + Opie::Opie::Ui::OFontSelector *m_fontselect; // class KFontChooser *m_fontchooser; QFont myFont; private slots: void slotFontSelected( const QFont &font ); }; diff --git a/noncore/apps/tinykate/main.cpp b/noncore/apps/tinykate/main.cpp index e62930c..c14d10a 100644 --- a/noncore/apps/tinykate/main.cpp +++ b/noncore/apps/tinykate/main.cpp @@ -1,7 +1,8 @@ /*************************************************************************** + main.cpp ------------------- begin : November 2002 copyright : (C) 2002 by Joseph Wenninger <jowenn@kde.org> ***************************************************************************/ @@ -15,8 +16,10 @@ ***************************************************************************/ #include <opie2/oapplicationfactory.h> #include "tinykate.h" +using namespace Opie::Core; + OPIE_EXPORT_APP( OApplicationFactory<TinyKate> ) diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp index 32c1eab..3c9a637 100644 --- a/noncore/apps/tinykate/tinykate.cpp +++ b/noncore/apps/tinykate/tinykate.cpp @@ -24,12 +24,13 @@ #include "tinykate.h" #include <katedocument.h> #include <kglobal.h> +using namespace Opie::Ui; TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) : QMainWindow( parent, name, f ) { shutDown=false; nextUnnamed=0; currentView=0; @@ -163,13 +164,13 @@ TinyKate::~TinyKate( ) delete KGlobal::config(); } } void TinyKate::slotOpen( ) { - QString filename = Opie::OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, + QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL, QString::null); if (!filename.isEmpty()) { open(filename); } } @@ -258,14 +259,14 @@ void TinyKate::slotSave() { } void TinyKate::slotSaveAs() { if (currentView==0) return; KateDocument *kd = (KateDocument*) currentView->document(); - QString filename= Opie::OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, - QString::null); + QString filename= OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, + QString::null); if (!filename.isEmpty()) { qDebug("saving file "+filename); QFileInfo fi(filename); QString filenamed = fi.fileName(); kd->setDocFile( filename); kd->setDocName( filenamed); diff --git a/noncore/apps/tinykate/tinykate.h b/noncore/apps/tinykate/tinykate.h index f844c55..f435c03 100644 --- a/noncore/apps/tinykate/tinykate.h +++ b/noncore/apps/tinykate/tinykate.h @@ -47,13 +47,13 @@ protected slots: void slotSave(); void slotSaveAs(); protected: void open(const QString&); private: QString currentFileName; - OTabWidget *tabwidget; + Opie::Ui::OTabWidget *tabwidget; KTextEditor::View *currentView; bool shutDown; QToolButton *editCopy, *editCut, *editPaste, *editUndo, *editRedo, *editFindReplace; QAction *viewIncFontSizes, *viewDecFontSizes, *utilSettings; |