summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/apps/helpbrowser/helpbrowser.cpp11
-rw-r--r--core/apps/taboapp/main.cpp20
-rw-r--r--core/apps/textedit/filePermissions.cpp2
-rw-r--r--core/apps/textedit/textedit.cpp77
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
@@ -21,20 +21,21 @@
21#define QTOPIA_INTERNAL_LANGLIST 21#define QTOPIA_INTERNAL_LANGLIST
22 22
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>
30using namespace Opie::Core;
27 31
32/* QT */
28#include <qmenubar.h> 33#include <qmenubar.h>
29#include <qtoolbar.h> 34#include <qtoolbar.h>
30#include <qpe/qcopenvelope_qws.h> 35#include <qpe/qcopenvelope_qws.h>
31#include <qfileinfo.h> 36#include <qfileinfo.h>
32#include <qaction.h> 37#include <qaction.h>
33 38
34#include <cctype>
35
36#include "magictextbrowser.h"
37
38HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f ) 39HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f )
39 : QMainWindow( parent, name, f ), 40 : QMainWindow( parent, name, f ),
40 selectedURL() 41 selectedURL()
@@ -117,7 +118,7 @@ void HelpBrowser::init( const QString& _home )
117 118
118void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data) 119void 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)" ) {
122 QDataStream ds(data,IO_ReadOnly); 123 QDataStream ds(data,IO_ReadOnly);
123 QString fn; 124 QString fn;
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 @@
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>
8using namespace Opie::Core;
9using namespace Opie::Ui;
10
11/* QT */
12#include <qdir.h>
9 13
10int main( int argc, char **argv ) 14int main( int argc, char **argv )
11{ 15{
12 QPEApplication a( argc, argv ); 16 QPEApplication a( argc, 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
16 QString path = QPEApplication::qpeDir() + "/plugins/app"; 20 QString path = QPEApplication::qpeDir() + "/plugins/app";
17 QDir dir( path, "lib*.so" ); 21 QDir dir( path, "lib*.so" );
@@ -23,9 +27,9 @@ int main( int argc, char **argv )
23 for ( it = list.begin(); it != list.end(); ++it ) { 27 for ( it = list.begin(); it != list.end(); ++it ) {
24 QLibrary *lib = new QLibrary( path + "/" + *it ); 28 QLibrary *lib = new QLibrary( path + "/" + *it );
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
30 QList<QWidget> list = iface->widgets(); 34 QList<QWidget> list = iface->widgets();
31 QWidget *widget; 35 QWidget *widget;
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
32{ 32{
33 if ( !name ) 33 if ( !name )
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 );
37 setMaximumSize( QSize( 236, 210 ) ); 37 setMaximumSize( QSize( 236, 210 ) );
38 setCaption( tr( "Set File Permissions" ) ); 38 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 @@
11** 11**
12**********************************************************************/ 12**********************************************************************/
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"
15#include "filePermissions.h" 16#include "filePermissions.h"
16 17
17 18/* OPIE */
19#include <opie2/odebug.h>
18#include <opie2/ofileselector.h> 20#include <opie2/ofileselector.h>
19#include <opie2/ofiledialog.h> 21#include <opie2/ofiledialog.h>
20#include <opie2/ofontselector.h> 22#include <opie2/ofontselector.h>
21
22#include <qpe/resource.h> 23#include <qpe/resource.h>
23#include <qpe/config.h> 24#include <qpe/config.h>
24#include <qpe/qpeapplication.h> 25#include <qpe/qpeapplication.h>
26using namespace Opie::Core;
27using 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>
29#include <qclipboard.h> 33#include <qclipboard.h>
30#include <qaction.h> 34#include <qaction.h>
@@ -33,14 +37,13 @@
33#include <qlayout.h> 37#include <qlayout.h>
34#include <qtimer.h> 38#include <qtimer.h>
35#include <qdir.h> 39#include <qdir.h>
40
41/* STD */
36#include <unistd.h> 42#include <unistd.h>
37#include <sys/stat.h> 43#include <sys/stat.h>
38#include <stdlib.h> //getenv 44#include <stdlib.h> //getenv
39 45
40using namespace Opie::Ui;
41
42#if QT_VERSION < 300 46#if QT_VERSION < 300
43
44class QpeEditor : public QMultiLineEdit 47class QpeEditor : public QMultiLineEdit
45{ 48{
46 49
@@ -411,7 +414,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
411} 414}
412 415
413TextEdit::~TextEdit() { 416TextEdit::~TextEdit() {
414 qWarning("textedit d'tor"); 417 owarn << "textedit d'tor" << oendl;
415 delete editor; 418 delete editor;
416} 419}
417 420
@@ -646,7 +649,7 @@ void TextEdit::newFile( const DocLnk &f ) {
646 editor->setFocus(); 649 editor->setFocus();
647 doc = new DocLnk(nf); 650 doc = new DocLnk(nf);
648 currentFileName = "Unnamed"; 651 currentFileName = "Unnamed";
649 qDebug("newFile "+currentFileName); 652 odebug << "newFile "+currentFileName << oendl;
650 updateCaption( currentFileName); 653 updateCaption( currentFileName);
651// editor->setEdited( false); 654// editor->setEdited( false);
652} 655}
@@ -655,7 +658,7 @@ void TextEdit::openDotFile( const QString &f ) {
655 if(!currentFileName.isEmpty()) { 658 if(!currentFileName.isEmpty()) {
656 currentFileName=f; 659 currentFileName=f;
657 660
658 qDebug("openFile dotfile " + currentFileName); 661 odebug << "openFile dotfile " + currentFileName << oendl;
659 QString txt; 662 QString txt;
660 QFile file(f); 663 QFile file(f);
661 file.open(IO_ReadWrite); 664 file.open(IO_ReadWrite);
@@ -674,7 +677,7 @@ void TextEdit::openDotFile( const QString &f ) {
674} 677}
675 678
676void TextEdit::openFile( const QString &f ) { 679void TextEdit::openFile( const QString &f ) {
677 qDebug("filename is "+ f); 680 odebug << "filename is "+ f << oendl;
678 QString filer; 681 QString filer;
679 QFileInfo fi( f); 682 QFileInfo fi( f);
680// bFromDocView = true; 683// bFromDocView = true;
@@ -693,7 +696,7 @@ void TextEdit::openFile( const QString &f ) {
693 } 696 }
694 else if(fi.baseName().left(1) == "") 697 else if(fi.baseName().left(1) == "")
695 { 698 {
696 qDebug("opening dotfile"); 699 odebug << "opening dotfile" << oendl;
697 currentFileName=f; 700 currentFileName=f;
698 openDotFile(currentFileName); 701 openDotFile(currentFileName);
699 return; 702 return;
@@ -721,7 +724,7 @@ void TextEdit::openFile( const QString &f ) {
721 nf.setName(fi.baseName()); 724 nf.setName(fi.baseName());
722 openFile(nf); 725 openFile(nf);
723 726
724 qDebug("openFile string "+currentFileName); 727 odebug << "openFile string "+currentFileName << oendl;
725 728
726 showEditTools(); 729 showEditTools();
727 // Show filename in caption 730 // Show filename in caption
@@ -738,10 +741,10 @@ void TextEdit::openFile( const DocLnk &f ) {
738 FileManager fm; 741 FileManager fm;
739 QString txt; 742 QString txt;
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 }
746// fileNew(); 749// fileNew();
747 if ( doc ) 750 if ( doc )
@@ -770,23 +773,23 @@ void TextEdit::showEditTools() {
770/*! 773/*!
771 unprompted save */ 774 unprompted save */
772bool TextEdit::save() { 775bool TextEdit::save() {
773 qDebug("saveAsFile " + currentFileName); 776 odebug << "saveAsFile " + currentFileName << oendl;
774 if(currentFileName.isEmpty()) { 777 if(currentFileName.isEmpty()) {
775 saveAs(); 778 saveAs();
776 return false; 779 return false;
777 } 780 }
778 781
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();
784 if( !rt.isEmpty() ) { 787 if( !rt.isEmpty() ) {
785 if(name.isEmpty()) { 788 if(name.isEmpty()) {
786 saveAs(); 789 saveAs();
787 } else { 790 } else {
788 currentFileName= name ; 791 currentFileName= name ;
789 qDebug("saveFile "+currentFileName); 792 odebug << "saveFile "+currentFileName << oendl;
790 793
791 struct stat buf; 794 struct stat buf;
792 mode_t mode; 795 mode_t mode;
@@ -801,7 +804,7 @@ bool TextEdit::save() {
801 return false; 804 return false;
802 } 805 }
803 } else { 806 } else {
804 qDebug("regular save file"); 807 odebug << "regular save file" << oendl;
805 QFile f(file); 808 QFile f(file);
806 if( f.open(IO_WriteOnly)) { 809 if( f.open(IO_WriteOnly)) {
807 QCString crt = rt.utf8(); 810 QCString crt = rt.utf8();
@@ -832,11 +835,11 @@ bool TextEdit::saveAs() {
832 835
833 if(caption() == tr("Text Editor")) 836 if(caption() == tr("Text Editor"))
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...
837// if ( !doc && !currentFileName.isEmpty()) { 840// if ( !doc && !currentFileName.isEmpty()) {
838// //|| !bFromDocView) 841// //|| !bFromDocView)
839// qDebug("no doc"); 842// odebug << "no doc" << oendl;
840// return true; 843// return true;
841// } 844// }
842// if ( !editor->edited() ) { 845// if ( !editor->edited() ) {
@@ -846,12 +849,12 @@ bool TextEdit::saveAs() {
846// } 849// }
847 850
848 QString rt = editor->text(); 851 QString rt = editor->text();
849 qDebug(currentFileName); 852 odebug << currentFileName << oendl;
850 853
851 if( currentFileName.isEmpty() 854 if( currentFileName.isEmpty()
852 || currentFileName == tr("Unnamed") 855 || currentFileName == tr("Unnamed")
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() ) {
856 QString pt = rt.simplifyWhiteSpace(); 859 QString pt = rt.simplifyWhiteSpace();
857 int i = pt.find( ' ' ); 860 int i = pt.find( ' ' );
@@ -872,7 +875,7 @@ bool TextEdit::saveAs() {
872 currentFileName=docname; 875 currentFileName=docname;
873// } 876// }
874// else 877// else
875// qDebug("hmmmmmm"); 878// odebug << "hmmmmmm" << oendl;
876 } 879 }
877 880
878 881
@@ -900,7 +903,7 @@ bool TextEdit::saveAs() {
900 if(!str.isEmpty()) { 903 if(!str.isEmpty()) {
901 QString fileNm=str; 904 QString fileNm=str;
902 905
903 qDebug("saving filename "+fileNm); 906 odebug << "saving filename "+fileNm << oendl;
904 QFileInfo fi(fileNm); 907 QFileInfo fi(fileNm);
905 currentFileName=fi.fileName(); 908 currentFileName=fi.fileName();
906 if(doc) 909 if(doc)
@@ -912,7 +915,7 @@ bool TextEdit::saveAs() {
912 nf.setFile( fileNm); 915 nf.setFile( fileNm);
913 doc = new DocLnk(nf); 916 doc = new DocLnk(nf);
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);
917 updateCaption( currentFileName); 920 updateCaption( currentFileName);
918 921
@@ -941,7 +944,7 @@ bool TextEdit::saveAs() {
941 944
942 return true; 945 return true;
943 } 946 }
944 qDebug("returning false"); 947 odebug << "returning false" << oendl;
945 return false; 948 return false;
946} //end saveAs 949} //end saveAs
947 950
@@ -972,14 +975,14 @@ void TextEdit::updateCaption( const QString &name ) {
972void TextEdit::setDocument(const QString& fileref) { 975void TextEdit::setDocument(const QString& fileref) {
973 if(fileref != "Unnamed") { 976 if(fileref != "Unnamed") {
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() ) {
979 openDotFile(currentFileName); 982 openDotFile(currentFileName);
980 983
981 } else { 984 } else {
982 qDebug("setDoc open"); 985 odebug << "setDoc open" << oendl;
983 bFromDocView = true; 986 bFromDocView = true;
984 openFile(fileref); 987 openFile(fileref);
985 editor->setEdited(true); 988 editor->setEdited(true);
@@ -1034,7 +1037,7 @@ void TextEdit::changeStartConfig( bool b ) {
1034} 1037}
1035 1038
1036void TextEdit::editorChanged() { 1039void TextEdit::editorChanged() {
1037// qDebug("editor changed"); 1040// odebug << "editor changed" << oendl;
1038 if( /*editor->edited() &&*/ /*edited && */!edited1) { 1041 if( /*editor->edited() &&*/ /*edited && */!edited1) {
1039 setCaption( "*"+caption()); 1042 setCaption( "*"+caption());
1040 edited1=true; 1043 edited1=true;
@@ -1043,9 +1046,9 @@ void TextEdit::editorChanged() {
1043} 1046}
1044 1047
1045void TextEdit::receive(const QCString&msg, const QByteArray &) { 1048void 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
1050 } 1053 }
1051 1054
@@ -1129,7 +1132,7 @@ void TextEdit::timerCrank()
1129 } 1132 }
1130 else 1133 else
1131 { 1134 {
1132// qDebug("autosave"); 1135// odebug << "autosave" << oendl;
1133 save(); 1136 save();
1134 } 1137 }
1135 setTimer(); 1138 setTimer();
@@ -1145,18 +1148,18 @@ void TextEdit::doTimer(bool b)
1145 nAutoSave->setOn(b); 1148 nAutoSave->setOn(b);
1146 if(b) 1149 if(b)
1147 { 1150 {
1148// qDebug("doTimer true"); 1151// odebug << "doTimer true" << oendl;
1149 setTimer(); 1152 setTimer();
1150 } 1153 }
1151// else 1154// else
1152// qDebug("doTimer false"); 1155// odebug << "doTimer false" << oendl;
1153} 1156}
1154 1157
1155void TextEdit::setTimer() 1158void TextEdit::setTimer()
1156{ 1159{
1157if(featureAutoSave) 1160if(featureAutoSave)
1158 { 1161 {
1159// qDebug("setting autosave"); 1162// odebug << "setting autosave" << oendl;
1160 QTimer *timer = new QTimer(this ); 1163 QTimer *timer = new QTimer(this );
1161 connect( timer, SIGNAL(timeout()), this, SLOT(timerCrank()) ); 1164 connect( timer, SIGNAL(timeout()), this, SLOT(timerCrank()) );
1162 timer->start( 300000, true); //5 minutes 1165 timer->start( 300000, true); //5 minutes