-rw-r--r-- | core/apps/helpbrowser/helpbrowser.cpp | 11 | ||||
-rw-r--r-- | core/apps/taboapp/main.cpp | 20 | ||||
-rw-r--r-- | core/apps/textedit/filePermissions.cpp | 2 | ||||
-rw-r--r-- | core/apps/textedit/textedit.cpp | 77 |
4 files changed, 59 insertions, 51 deletions
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 | |||
@@ -23,6 +23,11 @@ | |||
23 | #include "helpbrowser.h" | 23 | #include "helpbrowser.h" |
24 | #include "magictextbrowser.h" | ||
24 | 25 | ||
26 | /* OPIE */ | ||
27 | #include <opie2/odebug.h> | ||
25 | #include <qpe/qpeapplication.h> | 28 | #include <qpe/qpeapplication.h> |
26 | #include <qpe/resource.h> | 29 | #include <qpe/resource.h> |
30 | using namespace Opie::Core; | ||
27 | 31 | ||
32 | /* QT */ | ||
28 | #include <qmenubar.h> | 33 | #include <qmenubar.h> |
@@ -33,6 +38,2 @@ | |||
33 | 38 | ||
34 | #include <cctype> | ||
35 | |||
36 | #include "magictextbrowser.h" | ||
37 | |||
38 | HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f ) | 39 | HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f ) |
@@ -119,3 +120,3 @@ void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data) | |||
119 | { | 120 | { |
120 | qDebug("reached appMessage"); | 121 | odebug << "reached appMessage" << oendl; |
121 | if ( msg == "showFile(QString)" ) { | 122 | if ( msg == "showFile(QString)" ) { |
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,9 +1,13 @@ | |||
1 | #include <qdir.h> | 1 | /* OPIE */ |
2 | |||
3 | #include <qpe/qpeapplication.h> | ||
4 | #include <qpe/qlibrary.h> | ||
5 | #include <oappinterface.h> | 2 | #include <oappinterface.h> |
6 | #include <oappplugin.h> | 3 | #include <oappplugin.h> |
7 | 4 | #include <opie2/odebug.h> | |
8 | #include <opie2/otabwidget.h> | 5 | #include <opie2/otabwidget.h> |
6 | #include <qpe/qpeapplication.h> | ||
7 | #include <qpe/qlibrary.h> | ||
8 | using namespace Opie::Core; | ||
9 | using namespace Opie::Ui; | ||
10 | |||
11 | /* QT */ | ||
12 | #include <qdir.h> | ||
9 | 13 | ||
@@ -13,3 +17,3 @@ int main( int argc, char **argv ) | |||
13 | 17 | ||
14 | Opie::Ui::OTabWidget *tabwidget = new Opie::Ui::OTabWidget(0, "tab widget"); | 18 | OTabWidget *tabwidget = new OTabWidget(0, "tab widget"); |
15 | 19 | ||
@@ -25,5 +29,5 @@ int main( int argc, char **argv ) | |||
25 | 29 | ||
26 | qDebug( "querying: %s", QString( path + "/" + *it ).latin1() ); | 30 | odebug << "querying: " << QString( path + "/" + *it ) << "" << oendl; |
27 | if ( lib->queryInterface( IID_OAppInterface, (QUnknownInterface**)&iface ) == QS_OK ) { | 31 | if ( lib->queryInterface( IID_OAppInterface, (QUnknownInterface**)&iface ) == QS_OK ) { |
28 | qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() ); | 32 | odebug << "accepted: " << QString( path + "/" + *it ) << "" << oendl; |
29 | 33 | ||
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 | |||
@@ -34,3 +34,3 @@ filePermissions::filePermissions( QWidget* parent, const char* name, bool modal | |||
34 | setName( tr("File Permissions") ); | 34 | setName( tr("File Permissions") ); |
35 | // qDebug("FilePermissions "+fileName); | 35 | // odebug << "FilePermissions "+fileName << oendl; |
36 | resize( 236, 210 ); | 36 | resize( 236, 210 ); |
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 | |||
@@ -13,2 +13,3 @@ | |||
13 | // changes added by L. J. Potter Sun 02-17-2002 21:31:31 | 13 | // changes added by L. J. Potter Sun 02-17-2002 21:31:31 |
14 | |||
14 | #include "textedit.h" | 15 | #include "textedit.h" |
@@ -16,3 +17,4 @@ | |||
16 | 17 | ||
17 | 18 | /* OPIE */ | |
19 | #include <opie2/odebug.h> | ||
18 | #include <opie2/ofileselector.h> | 20 | #include <opie2/ofileselector.h> |
@@ -20,3 +22,2 @@ | |||
20 | #include <opie2/ofontselector.h> | 22 | #include <opie2/ofontselector.h> |
21 | |||
22 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
@@ -24,5 +25,8 @@ | |||
24 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
26 | using namespace Opie::Core; | ||
27 | using namespace Opie::Ui; | ||
28 | |||
29 | /* QT */ | ||
25 | #include <qmenubar.h> | 30 | #include <qmenubar.h> |
26 | #include <qtoolbar.h> | 31 | #include <qtoolbar.h> |
27 | |||
28 | #include <qtextstream.h> | 32 | #include <qtextstream.h> |
@@ -35,2 +39,4 @@ | |||
35 | #include <qdir.h> | 39 | #include <qdir.h> |
40 | |||
41 | /* STD */ | ||
36 | #include <unistd.h> | 42 | #include <unistd.h> |
@@ -39,6 +45,3 @@ | |||
39 | 45 | ||
40 | using namespace Opie::Ui; | ||
41 | |||
42 | #if QT_VERSION < 300 | 46 | #if QT_VERSION < 300 |
43 | |||
44 | class QpeEditor : public QMultiLineEdit | 47 | class QpeEditor : public QMultiLineEdit |
@@ -413,3 +416,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f ) | |||
413 | TextEdit::~TextEdit() { | 416 | TextEdit::~TextEdit() { |
414 | qWarning("textedit d'tor"); | 417 | owarn << "textedit d'tor" << oendl; |
415 | delete editor; | 418 | delete editor; |
@@ -648,3 +651,3 @@ void TextEdit::newFile( const DocLnk &f ) { | |||
648 | currentFileName = "Unnamed"; | 651 | currentFileName = "Unnamed"; |
649 | qDebug("newFile "+currentFileName); | 652 | odebug << "newFile "+currentFileName << oendl; |
650 | updateCaption( currentFileName); | 653 | updateCaption( currentFileName); |
@@ -657,3 +660,3 @@ void TextEdit::openDotFile( const QString &f ) { | |||
657 | 660 | ||
658 | qDebug("openFile dotfile " + currentFileName); | 661 | odebug << "openFile dotfile " + currentFileName << oendl; |
659 | QString txt; | 662 | QString txt; |
@@ -676,3 +679,3 @@ void TextEdit::openDotFile( const QString &f ) { | |||
676 | void TextEdit::openFile( const QString &f ) { | 679 | void TextEdit::openFile( const QString &f ) { |
677 | qDebug("filename is "+ f); | 680 | odebug << "filename is "+ f << oendl; |
678 | QString filer; | 681 | QString filer; |
@@ -695,3 +698,3 @@ void TextEdit::openFile( const QString &f ) { | |||
695 | { | 698 | { |
696 | qDebug("opening dotfile"); | 699 | odebug << "opening dotfile" << oendl; |
697 | currentFileName=f; | 700 | currentFileName=f; |
@@ -723,3 +726,3 @@ void TextEdit::openFile( const QString &f ) { | |||
723 | 726 | ||
724 | qDebug("openFile string "+currentFileName); | 727 | odebug << "openFile string "+currentFileName << oendl; |
725 | 728 | ||
@@ -740,6 +743,6 @@ void TextEdit::openFile( const DocLnk &f ) { | |||
740 | currentFileName=f.file(); | 743 | currentFileName=f.file(); |
741 | qDebug("openFile doclnk " + currentFileName); | 744 | odebug << "openFile doclnk " + currentFileName << oendl; |
742 | if ( !fm.loadFile( f, txt ) ) { | 745 | if ( !fm.loadFile( f, txt ) ) { |
743 | // ####### could be a new file | 746 | // ####### could be a new file |
744 | qDebug( "Cannot open file" ); | 747 | odebug << "Cannot open file" << oendl; |
745 | } | 748 | } |
@@ -772,3 +775,3 @@ void TextEdit::showEditTools() { | |||
772 | bool TextEdit::save() { | 775 | bool TextEdit::save() { |
773 | qDebug("saveAsFile " + currentFileName); | 776 | odebug << "saveAsFile " + currentFileName << oendl; |
774 | if(currentFileName.isEmpty()) { | 777 | if(currentFileName.isEmpty()) { |
@@ -779,5 +782,5 @@ bool TextEdit::save() { | |||
779 | QString file = doc->file(); | 782 | QString file = doc->file(); |
780 | qDebug("saver file "+file); | 783 | odebug << "saver file "+file << oendl; |
781 | QString name= doc->name(); | 784 | QString name= doc->name(); |
782 | qDebug("File named "+name); | 785 | odebug << "File named "+name << oendl; |
783 | QString rt = editor->text(); | 786 | QString rt = editor->text(); |
@@ -788,3 +791,3 @@ bool TextEdit::save() { | |||
788 | currentFileName= name ; | 791 | currentFileName= name ; |
789 | qDebug("saveFile "+currentFileName); | 792 | odebug << "saveFile "+currentFileName << oendl; |
790 | 793 | ||
@@ -803,3 +806,3 @@ bool TextEdit::save() { | |||
803 | } else { | 806 | } else { |
804 | qDebug("regular save file"); | 807 | odebug << "regular save file" << oendl; |
805 | QFile f(file); | 808 | QFile f(file); |
@@ -834,3 +837,3 @@ bool TextEdit::saveAs() { | |||
834 | return false; | 837 | return false; |
835 | qDebug("saveAsFile " + currentFileName); | 838 | odebug << "saveAsFile " + currentFileName << oendl; |
836 | // case of nothing to save... | 839 | // case of nothing to save... |
@@ -838,3 +841,3 @@ bool TextEdit::saveAs() { | |||
838 | // //|| !bFromDocView) | 841 | // //|| !bFromDocView) |
839 | // qDebug("no doc"); | 842 | // odebug << "no doc" << oendl; |
840 | // return true; | 843 | // return true; |
@@ -848,3 +851,3 @@ bool TextEdit::saveAs() { | |||
848 | QString rt = editor->text(); | 851 | QString rt = editor->text(); |
849 | qDebug(currentFileName); | 852 | odebug << currentFileName << oendl; |
850 | 853 | ||
@@ -853,3 +856,3 @@ bool TextEdit::saveAs() { | |||
853 | || currentFileName == tr("Text Editor")) { | 856 | || currentFileName == tr("Text Editor")) { |
854 | qDebug("do silly TT filename thing"); | 857 | odebug << "do silly TT filename thing" << oendl; |
855 | // if ( doc && doc->name().isEmpty() ) { | 858 | // if ( doc && doc->name().isEmpty() ) { |
@@ -874,3 +877,3 @@ bool TextEdit::saveAs() { | |||
874 | // else | 877 | // else |
875 | // qDebug("hmmmmmm"); | 878 | // odebug << "hmmmmmm" << oendl; |
876 | } | 879 | } |
@@ -902,3 +905,3 @@ bool TextEdit::saveAs() { | |||
902 | 905 | ||
903 | qDebug("saving filename "+fileNm); | 906 | odebug << "saving filename "+fileNm << oendl; |
904 | QFileInfo fi(fileNm); | 907 | QFileInfo fi(fileNm); |
@@ -914,3 +917,3 @@ bool TextEdit::saveAs() { | |||
914 | // editor->setText(rt); | 917 | // editor->setText(rt); |
915 | qDebug("Saving file as "+currentFileName); | 918 | odebug << "Saving file as "+currentFileName << oendl; |
916 | doc->setName( currentFileName); | 919 | doc->setName( currentFileName); |
@@ -943,3 +946,3 @@ bool TextEdit::saveAs() { | |||
943 | } | 946 | } |
944 | qDebug("returning false"); | 947 | odebug << "returning false" << oendl; |
945 | return false; | 948 | return false; |
@@ -974,5 +977,5 @@ void TextEdit::setDocument(const QString& fileref) { | |||
974 | currentFileName=fileref; | 977 | currentFileName=fileref; |
975 | qDebug("setDocument"); | 978 | odebug << "setDocument" << oendl; |
976 | QFileInfo fi(currentFileName); | 979 | QFileInfo fi(currentFileName); |
977 | qDebug("basename:"+fi.baseName()+": current filenmame "+currentFileName); | 980 | odebug << "basename:"+fi.baseName()+": current filenmame "+currentFileName << oendl; |
978 | if( (fi.baseName().left(1)).isEmpty() ) { | 981 | if( (fi.baseName().left(1)).isEmpty() ) { |
@@ -981,3 +984,3 @@ void TextEdit::setDocument(const QString& fileref) { | |||
981 | } else { | 984 | } else { |
982 | qDebug("setDoc open"); | 985 | odebug << "setDoc open" << oendl; |
983 | bFromDocView = true; | 986 | bFromDocView = true; |
@@ -1036,3 +1039,3 @@ void TextEdit::changeStartConfig( bool b ) { | |||
1036 | void TextEdit::editorChanged() { | 1039 | void TextEdit::editorChanged() { |
1037 | // qDebug("editor changed"); | 1040 | // odebug << "editor changed" << oendl; |
1038 | if( /*editor->edited() &&*/ /*edited && */!edited1) { | 1041 | if( /*editor->edited() &&*/ /*edited && */!edited1) { |
@@ -1045,5 +1048,5 @@ void TextEdit::editorChanged() { | |||
1045 | void TextEdit::receive(const QCString&msg, const QByteArray &) { | 1048 | void TextEdit::receive(const QCString&msg, const QByteArray &) { |
1046 | qDebug("QCop "+msg); | 1049 | odebug << "QCop "+msg << oendl; |
1047 | if ( msg == "setDocument(QString)" ) { | 1050 | if ( msg == "setDocument(QString)" ) { |
1048 | qDebug("bugger all"); | 1051 | odebug << "bugger all" << oendl; |
1049 | 1052 | ||
@@ -1131,3 +1134,3 @@ void TextEdit::timerCrank() | |||
1131 | { | 1134 | { |
1132 | // qDebug("autosave"); | 1135 | // odebug << "autosave" << oendl; |
1133 | save(); | 1136 | save(); |
@@ -1147,3 +1150,3 @@ void TextEdit::doTimer(bool b) | |||
1147 | { | 1150 | { |
1148 | // qDebug("doTimer true"); | 1151 | // odebug << "doTimer true" << oendl; |
1149 | setTimer(); | 1152 | setTimer(); |
@@ -1151,3 +1154,3 @@ void TextEdit::doTimer(bool b) | |||
1151 | // else | 1154 | // else |
1152 | // qDebug("doTimer false"); | 1155 | // odebug << "doTimer false" << oendl; |
1153 | } | 1156 | } |
@@ -1158,3 +1161,3 @@ if(featureAutoSave) | |||
1158 | { | 1161 | { |
1159 | // qDebug("setting autosave"); | 1162 | // odebug << "setting autosave" << oendl; |
1160 | QTimer *timer = new QTimer(this ); | 1163 | QTimer *timer = new QTimer(this ); |