From 743adf3ed3032feb15e71002613a4643d059aa09 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Mon, 05 Apr 2004 13:30:36 +0000 Subject: convert helpbrowser, taboapp and textedit to Opie debugging framework qcop and embeddedkonsole needs more work. the diagnostics part uses printf --- (limited to 'core/apps') diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp index 336d9fb..cbb4059 100644 --- a/core/apps/helpbrowser/helpbrowser.cpp +++ b/core/apps/helpbrowser/helpbrowser.cpp @@ -21,20 +21,21 @@ #define QTOPIA_INTERNAL_LANGLIST #include "helpbrowser.h" +#include "magictextbrowser.h" +/* OPIE */ +#include #include #include +using namespace Opie::Core; +/* QT */ #include #include #include #include #include -#include - -#include "magictextbrowser.h" - HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f ) : QMainWindow( parent, name, f ), selectedURL() @@ -52,13 +53,13 @@ void HelpBrowser::init( const QString& _home ) browser = new MagicTextBrowser( this ); browser->setFrameStyle( QFrame::Panel | QFrame::Sunken ); connect( browser, SIGNAL( textChanged() ), - this, SLOT( textChanged() ) ); + this, SLOT( textChanged() ) ); setCentralWidget( browser ); setToolBarsMovable( FALSE ); if ( !_home.isEmpty() ) - browser->setSource( _home ); + browser->setSource( _home ); QToolBar* toolbar = new QToolBar( this ); toolbar->setHorizontalStretchable( TRUE ); @@ -71,7 +72,7 @@ void HelpBrowser::init( const QString& _home ) backAction = new QAction( tr( "Backward" ), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 ); connect( backAction, SIGNAL( activated() ), browser, SLOT( backward() ) ); connect( browser, SIGNAL( backwardAvailable(bool) ), - backAction, SLOT( setEnabled(bool) ) ); + backAction, SLOT( setEnabled(bool) ) ); backAction->addTo( go ); backAction->addTo( toolbar ); backAction->setEnabled( FALSE ); @@ -79,7 +80,7 @@ void HelpBrowser::init( const QString& _home ) forwardAction = new QAction( tr( "Forward" ), Resource::loadIconSet( "forward" ), QString::null, 0, this, 0 ); connect( forwardAction, SIGNAL( activated() ), browser, SLOT( forward() ) ); connect( browser, SIGNAL( forwardAvailable(bool) ), - forwardAction, SLOT( setEnabled(bool) ) ); + forwardAction, SLOT( setEnabled(bool) ) ); forwardAction->addTo( go ); forwardAction->addTo( toolbar ); forwardAction->setEnabled( FALSE ); @@ -94,7 +95,7 @@ void HelpBrowser::init( const QString& _home ) bookm->insertItem( tr( "Remove from Bookmarks" ), this, SLOT( removeBookmark() ) ); bookm->insertSeparator(); connect( bookm, SIGNAL( activated(int) ), - this, SLOT( bookmChosen(int) ) ); + this, SLOT( bookmChosen(int) ) ); readBookmarks(); @@ -112,30 +113,30 @@ void HelpBrowser::init( const QString& _home ) #endif connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)), - this, SLOT(appMessage(const QCString&,const QByteArray&)) ); + this, SLOT(appMessage(const QCString&,const QByteArray&)) ); } void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data) { - qDebug("reached appMessage"); + odebug << "reached appMessage" << oendl; if ( msg == "showFile(QString)" ) { - QDataStream ds(data,IO_ReadOnly); - QString fn; - ds >> fn; - setDocument( fn ); + QDataStream ds(data,IO_ReadOnly); + QString fn; + ds >> fn; + setDocument( fn ); QPEApplication::setKeepRunning(); - showMaximized(); - setActiveWindow(); - raise(); + showMaximized(); + setActiveWindow(); + raise(); } } void HelpBrowser::setDocument( const QString &doc ) { if ( !doc.isEmpty() ) - browser->setSource( doc ); + browser->setSource( doc ); raise(); } @@ -143,9 +144,9 @@ void HelpBrowser::setDocument( const QString &doc ) void HelpBrowser::textChanged() { if ( browser->documentTitle().isNull() ) - setCaption( tr("Help Browser") ); + setCaption( tr("Help Browser") ); else - setCaption( browser->documentTitle() ) ; + setCaption( browser->documentTitle() ) ; selectedURL = caption(); } @@ -155,13 +156,13 @@ HelpBrowser::~HelpBrowser() QStringList bookmarks; QMap::Iterator it2 = mBookmarks.begin(); for ( ; it2 != mBookmarks.end(); ++it2 ) - bookmarks.append( (*it2).name + "=" + (*it2).file ); + bookmarks.append( (*it2).name + "=" + (*it2).file ); QFile f2( Global::applicationFileName("helpbrowser", "bookmarks") ); if ( f2.open( IO_WriteOnly ) ) { - QDataStream s2( &f2 ); - s2 << bookmarks; - f2.close(); + QDataStream s2( &f2 ); + s2 << bookmarks; + f2.close(); } } @@ -174,31 +175,31 @@ void HelpBrowser::readBookmarks() { QString file = Global::applicationFileName("helpbrowser", "bookmarks"); if ( QFile::exists( file ) ) { - QStringList bookmarks; - QFile f( file ); - if ( f.open( IO_ReadOnly ) ) { - QDataStream s( &f ); - s >> bookmarks; - f.close(); - } - QStringList::Iterator it = bookmarks.begin(); - for ( ; it != bookmarks.end(); ++it ) { - Bookmark b; - QString current = *it; - int equal = current.find( "=" ); - if ( equal < 1 || equal == (int)current.length() - 1 ) - continue; - b.name = current.left( equal ); - b.file = current.mid( equal + 1 ); - mBookmarks[ bookm->insertItem( b.name ) ] = b; - } + QStringList bookmarks; + QFile f( file ); + if ( f.open( IO_ReadOnly ) ) { + QDataStream s( &f ); + s >> bookmarks; + f.close(); + } + QStringList::Iterator it = bookmarks.begin(); + for ( ; it != bookmarks.end(); ++it ) { + Bookmark b; + QString current = *it; + int equal = current.find( "=" ); + if ( equal < 1 || equal == (int)current.length() - 1 ) + continue; + b.name = current.left( equal ); + b.file = current.mid( equal + 1 ); + mBookmarks[ bookm->insertItem( b.name ) ] = b; + } } } void HelpBrowser::bookmChosen( int i ) { if ( mBookmarks.contains( i ) ) - browser->setSource( mBookmarks[ i ].file ); + browser->setSource( mBookmarks[ i ].file ); } void HelpBrowser::addBookmark() @@ -207,11 +208,11 @@ void HelpBrowser::addBookmark() b.name = browser->documentTitle(); b.file = browser->source(); if (b.name.isEmpty() ) { - b.name = b.file.left( b.file.length() - 5 ); // remove .html + b.name = b.file.left( b.file.length() - 5 ); // remove .html } QMap::Iterator it; for( it = mBookmarks.begin(); it != mBookmarks.end(); ++it ) - if ( (*it).file == b.file ) return; + if ( (*it).file == b.file ) return; mBookmarks[ bookm->insertItem( b.name ) ] = b; } @@ -220,9 +221,9 @@ void HelpBrowser::removeBookmark() QString file = browser->source(); QMap::Iterator it = mBookmarks.begin(); for( ; it != mBookmarks.end(); ++it ) - if ( (*it).file == file ) { - bookm->removeItem( it.key() ); - mBookmarks.remove( it ); - break; - } + if ( (*it).file == file ) { + bookm->removeItem( it.key() ); + mBookmarks.remove( it ); + break; + } } diff --git a/core/apps/taboapp/main.cpp b/core/apps/taboapp/main.cpp index e46c71f..e43f118 100644 --- a/core/apps/taboapp/main.cpp +++ b/core/apps/taboapp/main.cpp @@ -1,17 +1,21 @@ -#include - -#include -#include +/* OPIE */ #include #include - +#include #include +#include +#include +using namespace Opie::Core; +using namespace Opie::Ui; + +/* QT */ +#include int main( int argc, char **argv ) { QPEApplication a( argc, argv ); - Opie::Ui::OTabWidget *tabwidget = new Opie::Ui::OTabWidget(0, "tab widget"); + OTabWidget *tabwidget = new OTabWidget(0, "tab widget"); QString path = QPEApplication::qpeDir() + "/plugins/app"; QDir dir( path, "lib*.so" ); @@ -23,29 +27,29 @@ int main( int argc, char **argv ) for ( it = list.begin(); it != list.end(); ++it ) { QLibrary *lib = new QLibrary( path + "/" + *it ); - qDebug( "querying: %s", QString( path + "/" + *it ).latin1() ); + odebug << "querying: " << QString( path + "/" + *it ) << "" << oendl; if ( lib->queryInterface( IID_OAppInterface, (QUnknownInterface**)&iface ) == QS_OK ) { - qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() ); + odebug << "accepted: " << QString( path + "/" + *it ) << "" << oendl; - QList list = iface->widgets(); + QList list = iface->widgets(); QWidget *widget; for ( widget = list.first(); widget != 0; widget = list.next() ) tabwidget->addTab(widget, QString(*it), QString(*it)); QString lang = getenv( "LANG" ); - if (lang.isNull()) - lang = "en"; - QTranslator *trans = new QTranslator(qApp); - QString type = (*it).left( (*it).find(".") ); - if (type.left(3) == "lib") - type = type.mid(3); - type = type.right( type.find("lib") ); - QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm"; - if ( trans->load( tfn )) - qApp->installTranslator( trans ); - else - delete trans; - } + if (lang.isNull()) + lang = "en"; + QTranslator *trans = new QTranslator(qApp); + QString type = (*it).left( (*it).find(".") ); + if (type.left(3) == "lib") + type = type.mid(3); + type = type.right( type.find("lib") ); + QString tfn = QPEApplication::qpeDir()+"/i18n/"+lang+"/"+type+".qm"; + if ( trans->load( tfn )) + qApp->installTranslator( trans ); + else + delete trans; + } } a.showMainDocumentWidget(tabwidget); diff --git a/core/apps/textedit/filePermissions.cpp b/core/apps/textedit/filePermissions.cpp index db353a9..a059dce 100644 --- a/core/apps/textedit/filePermissions.cpp +++ b/core/apps/textedit/filePermissions.cpp @@ -32,7 +32,7 @@ filePermissions::filePermissions( QWidget* parent, const char* name, bool modal { if ( !name ) setName( tr("File Permissions") ); -// qDebug("FilePermissions "+fileName); +// odebug << "FilePermissions "+fileName << oendl; resize( 236, 210 ); setMaximumSize( QSize( 236, 210 ) ); setCaption( tr( "Set File Permissions" ) ); diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index 5bb65a9..c9178a5 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp @@ -11,20 +11,24 @@ ** **********************************************************************/ // changes added by L. J. Potter Sun 02-17-2002 21:31:31 + #include "textedit.h" #include "filePermissions.h" - +/* OPIE */ +#include #include #include #include - #include #include #include +using namespace Opie::Core; +using namespace Opie::Ui; + +/* QT */ #include #include - #include #include #include @@ -33,14 +37,13 @@ #include #include #include + +/* STD */ #include #include #include //getenv -using namespace Opie::Ui; - #if QT_VERSION < 300 - class QpeEditor : public QMultiLineEdit { @@ -411,7 +414,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) } TextEdit::~TextEdit() { - qWarning("textedit d'tor"); + owarn << "textedit d'tor" << oendl; delete editor; } @@ -646,7 +649,7 @@ void TextEdit::newFile( const DocLnk &f ) { editor->setFocus(); doc = new DocLnk(nf); currentFileName = "Unnamed"; - qDebug("newFile "+currentFileName); + odebug << "newFile "+currentFileName << oendl; updateCaption( currentFileName); // editor->setEdited( false); } @@ -655,7 +658,7 @@ void TextEdit::openDotFile( const QString &f ) { if(!currentFileName.isEmpty()) { currentFileName=f; - qDebug("openFile dotfile " + currentFileName); + odebug << "openFile dotfile " + currentFileName << oendl; QString txt; QFile file(f); file.open(IO_ReadWrite); @@ -674,7 +677,7 @@ void TextEdit::openDotFile( const QString &f ) { } void TextEdit::openFile( const QString &f ) { - qDebug("filename is "+ f); + odebug << "filename is "+ f << oendl; QString filer; QFileInfo fi( f); // bFromDocView = true; @@ -693,7 +696,7 @@ void TextEdit::openFile( const QString &f ) { } else if(fi.baseName().left(1) == "") { - qDebug("opening dotfile"); + odebug << "opening dotfile" << oendl; currentFileName=f; openDotFile(currentFileName); return; @@ -721,7 +724,7 @@ void TextEdit::openFile( const QString &f ) { nf.setName(fi.baseName()); openFile(nf); - qDebug("openFile string "+currentFileName); + odebug << "openFile string "+currentFileName << oendl; showEditTools(); // Show filename in caption @@ -738,10 +741,10 @@ void TextEdit::openFile( const DocLnk &f ) { FileManager fm; QString txt; currentFileName=f.file(); - qDebug("openFile doclnk " + currentFileName); + odebug << "openFile doclnk " + currentFileName << oendl; if ( !fm.loadFile( f, txt ) ) { // ####### could be a new file - qDebug( "Cannot open file" ); + odebug << "Cannot open file" << oendl; } // fileNew(); if ( doc ) @@ -770,23 +773,23 @@ void TextEdit::showEditTools() { /*! unprompted save */ bool TextEdit::save() { - qDebug("saveAsFile " + currentFileName); + odebug << "saveAsFile " + currentFileName << oendl; if(currentFileName.isEmpty()) { saveAs(); return false; } QString file = doc->file(); - qDebug("saver file "+file); + odebug << "saver file "+file << oendl; QString name= doc->name(); - qDebug("File named "+name); + odebug << "File named "+name << oendl; QString rt = editor->text(); if( !rt.isEmpty() ) { if(name.isEmpty()) { saveAs(); } else { currentFileName= name ; - qDebug("saveFile "+currentFileName); + odebug << "saveFile "+currentFileName << oendl; struct stat buf; mode_t mode; @@ -797,18 +800,18 @@ bool TextEdit::save() { doc->setName( name); FileManager fm; if ( !fm.saveFile( *doc, rt ) ) { - QMessageBox::message(tr("Text Edit"),tr("Save Failed")); + QMessageBox::message(tr("Text Edit"),tr("Save Failed")); return false; } } else { - qDebug("regular save file"); + odebug << "regular save file" << oendl; QFile f(file); if( f.open(IO_WriteOnly)) { QCString crt = rt.utf8(); f.writeBlock(crt,crt.length()); } else { QMessageBox::message(tr("Text Edit"),tr("Write Failed")); - return false; + return false; } } @@ -832,11 +835,11 @@ bool TextEdit::saveAs() { if(caption() == tr("Text Editor")) return false; - qDebug("saveAsFile " + currentFileName); + odebug << "saveAsFile " + currentFileName << oendl; // case of nothing to save... // if ( !doc && !currentFileName.isEmpty()) { // //|| !bFromDocView) -// qDebug("no doc"); +// odebug << "no doc" << oendl; // return true; // } // if ( !editor->edited() ) { @@ -846,12 +849,12 @@ bool TextEdit::saveAs() { // } QString rt = editor->text(); - qDebug(currentFileName); + odebug << currentFileName << oendl; if( currentFileName.isEmpty() || currentFileName == tr("Unnamed") || currentFileName == tr("Text Editor")) { - qDebug("do silly TT filename thing"); + odebug << "do silly TT filename thing" << oendl; // if ( doc && doc->name().isEmpty() ) { QString pt = rt.simplifyWhiteSpace(); int i = pt.find( ' ' ); @@ -872,7 +875,7 @@ bool TextEdit::saveAs() { currentFileName=docname; // } // else -// qDebug("hmmmmmm"); +// odebug << "hmmmmmm" << oendl; } @@ -900,7 +903,7 @@ bool TextEdit::saveAs() { if(!str.isEmpty()) { QString fileNm=str; - qDebug("saving filename "+fileNm); + odebug << "saving filename "+fileNm << oendl; QFileInfo fi(fileNm); currentFileName=fi.fileName(); if(doc) @@ -912,13 +915,13 @@ bool TextEdit::saveAs() { nf.setFile( fileNm); doc = new DocLnk(nf); // editor->setText(rt); - qDebug("Saving file as "+currentFileName); + odebug << "Saving file as "+currentFileName << oendl; doc->setName( currentFileName); updateCaption( currentFileName); FileManager fm; if ( !fm.saveFile( *doc, rt ) ) { - QMessageBox::message(tr("Text Edit"),tr("Save Failed")); + QMessageBox::message(tr("Text Edit"),tr("Save Failed")); return false; } @@ -941,7 +944,7 @@ bool TextEdit::saveAs() { return true; } - qDebug("returning false"); + odebug << "returning false" << oendl; return false; } //end saveAs @@ -972,14 +975,14 @@ void TextEdit::updateCaption( const QString &name ) { void TextEdit::setDocument(const QString& fileref) { if(fileref != "Unnamed") { currentFileName=fileref; - qDebug("setDocument"); + odebug << "setDocument" << oendl; QFileInfo fi(currentFileName); - qDebug("basename:"+fi.baseName()+": current filenmame "+currentFileName); + odebug << "basename:"+fi.baseName()+": current filenmame "+currentFileName << oendl; if( (fi.baseName().left(1)).isEmpty() ) { openDotFile(currentFileName); } else { - qDebug("setDoc open"); + odebug << "setDoc open" << oendl; bFromDocView = true; openFile(fileref); editor->setEdited(true); @@ -1034,7 +1037,7 @@ void TextEdit::changeStartConfig( bool b ) { } void TextEdit::editorChanged() { -// qDebug("editor changed"); +// odebug << "editor changed" << oendl; if( /*editor->edited() &&*/ /*edited && */!edited1) { setCaption( "*"+caption()); edited1=true; @@ -1043,9 +1046,9 @@ void TextEdit::editorChanged() { } void TextEdit::receive(const QCString&msg, const QByteArray &) { - qDebug("QCop "+msg); + odebug << "QCop "+msg << oendl; if ( msg == "setDocument(QString)" ) { - qDebug("bugger all"); + odebug << "bugger all" << oendl; } @@ -1129,7 +1132,7 @@ void TextEdit::timerCrank() } else { -// qDebug("autosave"); +// odebug << "autosave" << oendl; save(); } setTimer(); @@ -1145,18 +1148,18 @@ void TextEdit::doTimer(bool b) nAutoSave->setOn(b); if(b) { -// qDebug("doTimer true"); +// odebug << "doTimer true" << oendl; setTimer(); } // else -// qDebug("doTimer false"); +// odebug << "doTimer false" << oendl; } void TextEdit::setTimer() { if(featureAutoSave) { -// qDebug("setting autosave"); +// odebug << "setting autosave" << oendl; QTimer *timer = new QTimer(this ); connect( timer, SIGNAL(timeout()), this, SLOT(timerCrank()) ); timer->start( 300000, true); //5 minutes -- cgit v0.9.0.2