author | zecke <zecke> | 2004-03-14 16:13:28 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 16:13:28 (UTC) |
commit | f3d284849df36ef281dcb5aa2d00f613e3a354d8 (patch) (unidiff) | |
tree | 65406b10a839ffa1ba683f59e61ef7227a0093d1 | |
parent | f12af18557c8f376f0c6c30e80a85737ff6c592e (diff) | |
download | opie-f3d284849df36ef281dcb5aa2d00f613e3a354d8.zip opie-f3d284849df36ef281dcb5aa2d00f613e3a354d8.tar.gz opie-f3d284849df36ef281dcb5aa2d00f613e3a354d8.tar.bz2 |
Fix up depends on LIBOPIE1
Proper signature for signal and slots and namespaces
22 files changed, 43 insertions, 48 deletions
diff --git a/noncore/applets/notesapplet/config.in b/noncore/applets/notesapplet/config.in index 866adfb..27a8187 100644 --- a/noncore/applets/notesapplet/config.in +++ b/noncore/applets/notesapplet/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config NOTESAPPLET | 1 | config NOTESAPPLET |
2 | boolean "opie-notesapplet (quick note taking applet)" | 2 | boolean "opie-notesapplet (quick note taking applet)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | depends ( LIBQPE || LIBQPE-X11 ) |
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index a694b70..6d41ac3 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -1,84 +1,84 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | AdvancedFm.cpp | 2 | AdvancedFm.cpp |
3 | ------------------- | 3 | ------------------- |
4 | ** Created: Sat Mar 9 23:33:09 2002 | 4 | ** Created: Sat Mar 9 23:33:09 2002 |
5 | copyright : (C) 2002 by ljp | 5 | copyright : (C) 2002 by ljp |
6 | email : ljp@llornkcor.com | 6 | email : ljp@llornkcor.com |
7 | * This program is free software; you can redistribute it and/or modify * | 7 | * This program is free software; you can redistribute it and/or modify * |
8 | * it under the terms of the GNU General Public License as published by * | 8 | * it under the terms of the GNU General Public License as published by * |
9 | * the Free Software Foundation; either version 2 of the License, or * | 9 | * the Free Software Foundation; either version 2 of the License, or * |
10 | * (at your option) any later version. * | 10 | * (at your option) any later version. * |
11 | ***************************************************************************/ | 11 | ***************************************************************************/ |
12 | #include "advancedfm.h" | 12 | #include "advancedfm.h" |
13 | #include "output.h" | 13 | #include "output.h" |
14 | #include "filePermissions.h" | 14 | #include "filePermissions.h" |
15 | 15 | ||
16 | #include <qpe/lnkproperties.h> | 16 | #include <qpe/lnkproperties.h> |
17 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
18 | #include <qpe/applnk.h> | 18 | #include <qpe/applnk.h> |
19 | 19 | ||
20 | #include <qmessagebox.h> | 20 | #include <qmessagebox.h> |
21 | 21 | ||
22 | 22 | ||
23 | #include <qpopupmenu.h> | 23 | #include <qpopupmenu.h> |
24 | #include <qlistview.h> | 24 | #include <qlistview.h> |
25 | 25 | ||
26 | #include <errno.h> | 26 | #include <errno.h> |
27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
28 | #include <unistd.h> | 28 | #include <unistd.h> |
29 | #include <sys/stat.h> | 29 | #include <sys/stat.h> |
30 | #include <dirent.h> | 30 | #include <dirent.h> |
31 | #include <sys/sendfile.h> | 31 | #include <sys/sendfile.h> |
32 | #include <fcntl.h> | 32 | #include <fcntl.h> |
33 | 33 | ||
34 | 34 | ||
35 | using namespace Opie::Core; | 35 | using namespace Opie::Core; |
36 | using namespace Opie::Core; | 36 | using namespace Opie::Core; |
37 | void AdvancedFm::doDirChange() { | 37 | void AdvancedFm::doDirChange() { |
38 | QString pathItem = CurrentView()->currentItem()->text(0); | 38 | QString pathItem = CurrentView()->currentItem()->text(0); |
39 | if( pathItem == "../") { | 39 | if( pathItem == "../") { |
40 | ListClicked( CurrentView()->currentItem()); | 40 | ListClicked( CurrentView()->currentItem()); |
41 | } else { | 41 | } else { |
42 | if( pathItem.find(" -> ",0,TRUE) != -1) | 42 | if( pathItem.find(" -> ",0,TRUE) != -1) |
43 | pathItem = dealWithSymName((const QString&)pathItem)+"/"; | 43 | pathItem = dealWithSymName((const QString&)pathItem)+"/"; |
44 | // qWarning(pathItem); | 44 | // qWarning(pathItem); |
45 | gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) ); | 45 | gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) ); |
46 | } | 46 | } |
47 | } | 47 | } |
48 | 48 | ||
49 | void AdvancedFm::showMenuHidden() { | 49 | void AdvancedFm::showMenuHidden() { |
50 | if (b) { | 50 | if (b) { |
51 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 51 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
52 | OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 52 | OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
53 | fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); | 53 | fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); |
54 | } else { | 54 | } else { |
55 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 55 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
56 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 56 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
57 | fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); | 57 | fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); |
58 | } | 58 | } |
59 | b = !b; | 59 | b = !b; |
60 | populateView(); | 60 | populateView(); |
61 | } | 61 | } |
62 | 62 | ||
63 | void AdvancedFm::showHidden() { | 63 | void AdvancedFm::showHidden() { |
64 | if (b) { | 64 | if (b) { |
65 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 65 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
66 | OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); | 66 | OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); |
67 | } else { | 67 | } else { |
68 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 68 | CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
69 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); | 69 | OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); |
70 | } | 70 | } |
71 | populateView(); | 71 | populateView(); |
72 | } | 72 | } |
73 | 73 | ||
74 | QString AdvancedFm::dealWithSymName(const QString &fileName) { | 74 | QString AdvancedFm::dealWithSymName(const QString &fileName) { |
75 | QString strItem = fileName; | 75 | QString strItem = fileName; |
76 | return strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); | 76 | return strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); |
77 | } | 77 | } |
78 | 78 | ||
79 | void AdvancedFm::runThis() { | 79 | void AdvancedFm::runThis() { |
80 | if( !CurrentView()->currentItem()) return; | 80 | if( !CurrentView()->currentItem()) return; |
81 | QString fs; | 81 | QString fs; |
82 | QDir *thisDir = CurrentDir(); | 82 | QDir *thisDir = CurrentDir(); |
83 | 83 | ||
84 | QString curFile = CurrentView()->currentItem()->text(0); | 84 | QString curFile = CurrentView()->currentItem()->text(0); |
@@ -660,100 +660,100 @@ void AdvancedFm::mkSym() { | |||
660 | if( curFile.right(1) == "/") { | 660 | if( curFile.right(1) == "/") { |
661 | curFile = curFile.left( curFile.length() -1); | 661 | curFile = curFile.left( curFile.length() -1); |
662 | } | 662 | } |
663 | 663 | ||
664 | cmd = "ln -s "+curFile+" "+destName; | 664 | cmd = "ln -s "+curFile+" "+destName; |
665 | // qDebug(cmd); | 665 | // qDebug(cmd); |
666 | startProcess( (const QString)cmd ); | 666 | startProcess( (const QString)cmd ); |
667 | } | 667 | } |
668 | rePopulate(); | 668 | rePopulate(); |
669 | setOtherTabCurrent(); | 669 | setOtherTabCurrent(); |
670 | } | 670 | } |
671 | } | 671 | } |
672 | 672 | ||
673 | void AdvancedFm::doBeam() { | 673 | void AdvancedFm::doBeam() { |
674 | Ir ir; | 674 | Ir ir; |
675 | if(!ir.supported()) { | 675 | if(!ir.supported()) { |
676 | } else { | 676 | } else { |
677 | QStringList curFileList = getPath(); | 677 | QStringList curFileList = getPath(); |
678 | if( curFileList.count() > 0) { | 678 | if( curFileList.count() > 0) { |
679 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { | 679 | for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { |
680 | QString curFile = (*it); | 680 | QString curFile = (*it); |
681 | QString curFilePath = CurrentDir()->canonicalPath()+"/"+curFile; | 681 | QString curFilePath = CurrentDir()->canonicalPath()+"/"+curFile; |
682 | if( curFilePath.right(1) == "/") { | 682 | if( curFilePath.right(1) == "/") { |
683 | curFilePath = curFilePath.left( curFilePath.length() -1); | 683 | curFilePath = curFilePath.left( curFilePath.length() -1); |
684 | } | 684 | } |
685 | Ir *file = new Ir(this, "IR"); | 685 | Ir *file = new Ir(this, "IR"); |
686 | connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished(Ir*))); | 686 | connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished(Ir*))); |
687 | file->send( curFilePath, curFile ); | 687 | file->send( curFilePath, curFile ); |
688 | } | 688 | } |
689 | } | 689 | } |
690 | } | 690 | } |
691 | } | 691 | } |
692 | 692 | ||
693 | void AdvancedFm::fileBeamFinished( Ir *) { | 693 | void AdvancedFm::fileBeamFinished( Ir *) { |
694 | QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") ); | 694 | QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") ); |
695 | } | 695 | } |
696 | 696 | ||
697 | void AdvancedFm::selectAll() { | 697 | void AdvancedFm::selectAll() { |
698 | QListView *thisView = CurrentView(); | 698 | QListView *thisView = CurrentView(); |
699 | thisView->selectAll(true); | 699 | thisView->selectAll(true); |
700 | thisView->setSelected( thisView->firstChild(),false); | 700 | thisView->setSelected( thisView->firstChild(),false); |
701 | } | 701 | } |
702 | 702 | ||
703 | void AdvancedFm::startProcess(const QString & cmd) { | 703 | void AdvancedFm::startProcess(const QString & cmd) { |
704 | QStringList command; | 704 | QStringList command; |
705 | OProcess *process; | 705 | OProcess *process; |
706 | process = new OProcess(); | 706 | process = new OProcess(); |
707 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), | 707 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), |
708 | this, SLOT( processEnded(OProcess*))); | 708 | this, SLOT( processEnded(Opie::Core::OProcess*))); |
709 | 709 | ||
710 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), | 710 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), |
711 | this, SLOT( oprocessStderr(OProcess*,char*,int))); | 711 | this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); |
712 | 712 | ||
713 | command << "/bin/sh"; | 713 | command << "/bin/sh"; |
714 | command << "-c"; | 714 | command << "-c"; |
715 | command << cmd.latin1(); | 715 | command << cmd.latin1(); |
716 | *process << command; | 716 | *process << command; |
717 | if(!process->start(OProcess::NotifyOnExit, OProcess::All) ) | 717 | if(!process->start(OProcess::NotifyOnExit, OProcess::All) ) |
718 | qDebug("could not start process"); | 718 | qDebug("could not start process"); |
719 | } | 719 | } |
720 | 720 | ||
721 | void AdvancedFm::processEnded(OProcess *) { | 721 | void AdvancedFm::processEnded(OProcess *) { |
722 | rePopulate(); | 722 | rePopulate(); |
723 | } | 723 | } |
724 | 724 | ||
725 | void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) { | 725 | void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) { |
726 | // qWarning("received stderrt %d bytes", buflen); | 726 | // qWarning("received stderrt %d bytes", buflen); |
727 | 727 | ||
728 | QString lineStr = buffer; | 728 | QString lineStr = buffer; |
729 | QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") ); | 729 | QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") ); |
730 | } | 730 | } |
731 | 731 | ||
732 | bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { | 732 | bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { |
733 | if ( o->inherits( "QLineEdit" ) ) { | 733 | if ( o->inherits( "QLineEdit" ) ) { |
734 | if ( e->type() == QEvent::KeyPress ) { | 734 | if ( e->type() == QEvent::KeyPress ) { |
735 | QKeyEvent *ke = (QKeyEvent*)e; | 735 | QKeyEvent *ke = (QKeyEvent*)e; |
736 | if ( ke->key() == Key_Return || | 736 | if ( ke->key() == Key_Return || |
737 | ke->key() == Key_Enter ) { | 737 | ke->key() == Key_Enter ) { |
738 | okRename(); | 738 | okRename(); |
739 | return true; | 739 | return true; |
740 | } | 740 | } |
741 | else if ( ke->key() == Key_Escape ) { | 741 | else if ( ke->key() == Key_Escape ) { |
742 | cancelRename(); | 742 | cancelRename(); |
743 | return true; | 743 | return true; |
744 | } | 744 | } |
745 | } | 745 | } |
746 | else if ( e->type() == QEvent::FocusOut ) { | 746 | else if ( e->type() == QEvent::FocusOut ) { |
747 | cancelRename(); | 747 | cancelRename(); |
748 | return true; | 748 | return true; |
749 | } | 749 | } |
750 | } | 750 | } |
751 | if ( o->inherits( "QListView" ) ) { | 751 | if ( o->inherits( "QListView" ) ) { |
752 | if ( e->type() == QEvent::FocusIn ) { | 752 | if ( e->type() == QEvent::FocusIn ) { |
753 | if( o == Local_View) { //keep track of which view | 753 | if( o == Local_View) { //keep track of which view |
754 | whichTab=1; | 754 | whichTab=1; |
755 | } | 755 | } |
756 | else { | 756 | else { |
757 | whichTab=2; | 757 | whichTab=2; |
758 | } | 758 | } |
759 | } | 759 | } |
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp index 16a0992..6906298 100644 --- a/noncore/apps/advancedfm/output.cpp +++ b/noncore/apps/advancedfm/output.cpp | |||
@@ -102,100 +102,100 @@ static char * filesave_xpm[] = { | |||
102 | " @#$%&..+ ", | 102 | " @#$%&..+ ", |
103 | " .*=-;;>,..+ ", | 103 | " .*=-;;>,..+ ", |
104 | " ')!~;;;;;;{]..", | 104 | " ')!~;;;;;;{]..", |
105 | " ^/(-;;;;;;;_:<", | 105 | " ^/(-;;;;;;;_:<", |
106 | " [}|;;;;;;;{12$", | 106 | " [}|;;;;;;;{12$", |
107 | " #34-55;;;;678$+", | 107 | " #34-55;;;;678$+", |
108 | " 90ab=c;dd;e1fg ", | 108 | " 90ab=c;dd;e1fg ", |
109 | " [ahij((kbl0mn$ ", | 109 | " [ahij((kbl0mn$ ", |
110 | " op^q^^7r&]s/$+ ", | 110 | " op^q^^7r&]s/$+ ", |
111 | "@btu;vbwxy]zAB ", | 111 | "@btu;vbwxy]zAB ", |
112 | "CzDEvEv;;DssF$ ", | 112 | "CzDEvEv;;DssF$ ", |
113 | "G.H{E{E{IxsJ$+ ", | 113 | "G.H{E{E{IxsJ$+ ", |
114 | " +...vEKxzLM ", | 114 | " +...vEKxzLM ", |
115 | " +...z]n$ ", | 115 | " +...z]n$ ", |
116 | " +... "}; | 116 | " +... "}; |
117 | 117 | ||
118 | Output::Output( const QStringList commands, QWidget* parent, const char* name, bool modal, WFlags fl) | 118 | Output::Output( const QStringList commands, QWidget* parent, const char* name, bool modal, WFlags fl) |
119 | : QDialog( parent, name, modal, fl ) | 119 | : QDialog( parent, name, modal, fl ) |
120 | { | 120 | { |
121 | QStringList cmmds; | 121 | QStringList cmmds; |
122 | // cmmds=QStringList::split( " ", commands, false); | 122 | // cmmds=QStringList::split( " ", commands, false); |
123 | cmmds=commands; | 123 | cmmds=commands; |
124 | // qDebug("count %d", cmmds.count()); | 124 | // qDebug("count %d", cmmds.count()); |
125 | if ( !name ) | 125 | if ( !name ) |
126 | setName( tr("Output")); | 126 | setName( tr("Output")); |
127 | resize( 196, 269 ); | 127 | resize( 196, 269 ); |
128 | setCaption( name ); | 128 | setCaption( name ); |
129 | 129 | ||
130 | OutputLayout = new QGridLayout( this ); | 130 | OutputLayout = new QGridLayout( this ); |
131 | OutputLayout->setSpacing( 2); | 131 | OutputLayout->setSpacing( 2); |
132 | OutputLayout->setMargin( 2); | 132 | OutputLayout->setMargin( 2); |
133 | 133 | ||
134 | QPushButton *docButton; | 134 | QPushButton *docButton; |
135 | docButton = new QPushButton( QPixmap(( const char** ) filesave_xpm ) ,"",this,"saveButton"); | 135 | docButton = new QPushButton( QPixmap(( const char** ) filesave_xpm ) ,"",this,"saveButton"); |
136 | docButton->setFixedSize( QSize( 20, 20 ) ); | 136 | docButton->setFixedSize( QSize( 20, 20 ) ); |
137 | connect( docButton,SIGNAL(released()),this,SLOT( saveOutput() )); | 137 | connect( docButton,SIGNAL(released()),this,SLOT( saveOutput() )); |
138 | // docButton->setFlat(TRUE); | 138 | // docButton->setFlat(TRUE); |
139 | OutputLayout->addMultiCellWidget( docButton, 0,0,3,3 ); | 139 | OutputLayout->addMultiCellWidget( docButton, 0,0,3,3 ); |
140 | 140 | ||
141 | OutputEdit = new QMultiLineEdit( this, "OutputEdit" ); | 141 | OutputEdit = new QMultiLineEdit( this, "OutputEdit" ); |
142 | OutputLayout->addMultiCellWidget( OutputEdit, 1,1,0,3 ); | 142 | OutputLayout->addMultiCellWidget( OutputEdit, 1,1,0,3 ); |
143 | 143 | ||
144 | proc = new OProcess(); | 144 | proc = new OProcess(); |
145 | 145 | ||
146 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), | 146 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), |
147 | this, SLOT( processFinished())); | 147 | this, SLOT( processFinished())); |
148 | 148 | ||
149 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 149 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
150 | this, SLOT(commandStdout(OProcess*,char*,int))); | 150 | this, SLOT(commandStdout(Opie::Core::OProcess*,char*,int))); |
151 | 151 | ||
152 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), | 152 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
153 | this, SLOT(commandStderr(OProcess*,char*,int))); | 153 | this, SLOT(commandStderr(Opie::Core::OProcess*,char*,int))); |
154 | 154 | ||
155 | // connect( , SIGNAL(received(const QByteArray&)), | 155 | // connect( , SIGNAL(received(const QByteArray&)), |
156 | // this, SLOT(commandStdin(const QByteArray&))); | 156 | // this, SLOT(commandStdin(const QByteArray&))); |
157 | 157 | ||
158 | // * proc << commands.latin1(); | 158 | // * proc << commands.latin1(); |
159 | for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) { | 159 | for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) { |
160 | qDebug( "%s", (*it).latin1() ); | 160 | qDebug( "%s", (*it).latin1() ); |
161 | * proc << (*it).latin1(); | 161 | * proc << (*it).latin1(); |
162 | } | 162 | } |
163 | 163 | ||
164 | if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) { | 164 | if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) { |
165 | 165 | ||
166 | OutputEdit->append(tr("Process could not start") ); | 166 | OutputEdit->append(tr("Process could not start") ); |
167 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); | 167 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); |
168 | perror("Error: "); | 168 | perror("Error: "); |
169 | QString errorMsg=tr("Error\n")+(QString)strerror(errno); | 169 | QString errorMsg=tr("Error\n")+(QString)strerror(errno); |
170 | OutputEdit->append( errorMsg); | 170 | OutputEdit->append( errorMsg); |
171 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); | 171 | OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE); |
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | Output::~Output() { | 175 | Output::~Output() { |
176 | } | 176 | } |
177 | 177 | ||
178 | void Output::saveOutput() { | 178 | void Output::saveOutput() { |
179 | 179 | ||
180 | InputDialog *fileDlg; | 180 | InputDialog *fileDlg; |
181 | fileDlg = new InputDialog(this,tr("Save output to file (name only)"),TRUE, 0); | 181 | fileDlg = new InputDialog(this,tr("Save output to file (name only)"),TRUE, 0); |
182 | fileDlg->exec(); | 182 | fileDlg->exec(); |
183 | if( fileDlg->result() == 1 ) { | 183 | if( fileDlg->result() == 1 ) { |
184 | QString filename = QPEApplication::documentDir(); | 184 | QString filename = QPEApplication::documentDir(); |
185 | if(filename.right(1).find('/') == -1) | 185 | if(filename.right(1).find('/') == -1) |
186 | filename+="/"; | 186 | filename+="/"; |
187 | QString name = fileDlg->LineEdit1->text(); | 187 | QString name = fileDlg->LineEdit1->text(); |
188 | filename+="text/plain/"+name; | 188 | filename+="text/plain/"+name; |
189 | qDebug(filename); | 189 | qDebug(filename); |
190 | 190 | ||
191 | QFile f(filename); | 191 | QFile f(filename); |
192 | f.open( IO_WriteOnly); | 192 | f.open( IO_WriteOnly); |
193 | if( f.writeBlock( OutputEdit->text(), qstrlen( OutputEdit->text()) ) != -1) { | 193 | if( f.writeBlock( OutputEdit->text(), qstrlen( OutputEdit->text()) ) != -1) { |
194 | DocLnk lnk; | 194 | DocLnk lnk; |
195 | lnk.setName(name); //sets file name | 195 | lnk.setName(name); //sets file name |
196 | lnk.setFile(filename); //sets File property | 196 | lnk.setFile(filename); //sets File property |
197 | lnk.setType("text/plain"); | 197 | lnk.setType("text/plain"); |
198 | if(!lnk.writeLink()) { | 198 | if(!lnk.writeLink()) { |
199 | qDebug("Writing doclink did not work"); | 199 | qDebug("Writing doclink did not work"); |
200 | } | 200 | } |
201 | } else | 201 | } else |
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp index 35a328f..a29fa8e 100644 --- a/noncore/apps/opie-console/io_bt.cpp +++ b/noncore/apps/opie-console/io_bt.cpp | |||
@@ -1,90 +1,89 @@ | |||
1 | 1 | ||
2 | #include "io_bt.h" | 2 | #include "io_bt.h" |
3 | 3 | ||
4 | using namespace Opie::Core; | 4 | using namespace Opie::Core; |
5 | using namespace Opie::Core; | ||
6 | IOBt::IOBt( const Profile &config ) : IOSerial( config ) { | 5 | IOBt::IOBt( const Profile &config ) : IOSerial( config ) { |
7 | m_attach = 0; | 6 | m_attach = 0; |
8 | } | 7 | } |
9 | 8 | ||
10 | 9 | ||
11 | IOBt::~IOBt() { | 10 | IOBt::~IOBt() { |
12 | if ( m_attach ) { | 11 | if ( m_attach ) { |
13 | delete m_attach; | 12 | delete m_attach; |
14 | } | 13 | } |
15 | } | 14 | } |
16 | 15 | ||
17 | 16 | ||
18 | void IOBt::close() { | 17 | void IOBt::close() { |
19 | 18 | ||
20 | IOSerial::close(); | 19 | IOSerial::close(); |
21 | // still need error handling | 20 | // still need error handling |
22 | if ( m_attach ) { | 21 | if ( m_attach ) { |
23 | delete m_attach; | 22 | delete m_attach; |
24 | m_attach = 0; | 23 | m_attach = 0; |
25 | } | 24 | } |
26 | } | 25 | } |
27 | 26 | ||
28 | bool IOBt::open() { | 27 | bool IOBt::open() { |
29 | bool ret = false; | 28 | bool ret = false; |
30 | 29 | ||
31 | // only set up bt stuff if mac address was set, otherwise use the device set | 30 | // only set up bt stuff if mac address was set, otherwise use the device set |
32 | if ( !m_mac.isEmpty() ) { | 31 | if ( !m_mac.isEmpty() ) { |
33 | 32 | ||
34 | // now it should also be checked, if there is a connection to the device with that mac allready | 33 | // now it should also be checked, if there is a connection to the device with that mac allready |
35 | // hciattach here | 34 | // hciattach here |
36 | m_attach = new OProcess(); | 35 | m_attach = new OProcess(); |
37 | *m_attach << "hciattach /dev/ttyS2 any 57600"; | 36 | *m_attach << "hciattach /dev/ttyS2 any 57600"; |
38 | 37 | ||
39 | // then start hcid, then rcfomm handling (m_mac) | 38 | // then start hcid, then rcfomm handling (m_mac) |
40 | 39 | ||
41 | connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), | 40 | connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), |
42 | this, SLOT( slotExited(OProcess*) ) ); | 41 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
43 | 42 | ||
44 | if ( m_attach->start() ) { | 43 | if ( m_attach->start() ) { |
45 | ret = IOSerial::open(); | 44 | ret = IOSerial::open(); |
46 | } else { | 45 | } else { |
47 | qWarning("could not attach to device"); | 46 | qWarning("could not attach to device"); |
48 | delete m_attach; | 47 | delete m_attach; |
49 | m_attach = 0; | 48 | m_attach = 0; |
50 | } | 49 | } |
51 | } else { | 50 | } else { |
52 | // directly to the normal serial | 51 | // directly to the normal serial |
53 | // TODO: look first if the connection really exists. ( is set up ) | 52 | // TODO: look first if the connection really exists. ( is set up ) |
54 | 53 | ||
55 | ret =IOSerial::open(); | 54 | ret =IOSerial::open(); |
56 | } | 55 | } |
57 | return ret; | 56 | return ret; |
58 | } | 57 | } |
59 | 58 | ||
60 | void IOBt::reload( const Profile &config ) { | 59 | void IOBt::reload( const Profile &config ) { |
61 | m_device = config.readEntry("Device", BT_DEFAULT_DEVICE); | 60 | m_device = config.readEntry("Device", BT_DEFAULT_DEVICE); |
62 | m_mac = config.readEntry("Mac", BT_DEFAULT_MAC); | 61 | m_mac = config.readEntry("Mac", BT_DEFAULT_MAC); |
63 | m_baud = config.readNumEntry("Baud", BT_DEFAULT_BAUD); | 62 | m_baud = config.readNumEntry("Baud", BT_DEFAULT_BAUD); |
64 | m_parity = config.readNumEntry("Parity", BT_DEFAULT_PARITY); | 63 | m_parity = config.readNumEntry("Parity", BT_DEFAULT_PARITY); |
65 | m_dbits = config.readNumEntry("DataBits", BT_DEFAULT_DBITS); | 64 | m_dbits = config.readNumEntry("DataBits", BT_DEFAULT_DBITS); |
66 | m_sbits = config.readNumEntry("StopBits", BT_DEFAULT_SBITS); | 65 | m_sbits = config.readNumEntry("StopBits", BT_DEFAULT_SBITS); |
67 | m_flow = config.readNumEntry("Flow", BT_DEFAULT_FLOW); | 66 | m_flow = config.readNumEntry("Flow", BT_DEFAULT_FLOW); |
68 | } | 67 | } |
69 | 68 | ||
70 | 69 | ||
71 | QString IOBt::identifier() const { | 70 | QString IOBt::identifier() const { |
72 | return "bluetooth"; | 71 | return "bluetooth"; |
73 | } | 72 | } |
74 | 73 | ||
75 | QString IOBt::name() const { | 74 | QString IOBt::name() const { |
76 | return "BLuetooth IO Layer"; | 75 | return "BLuetooth IO Layer"; |
77 | } | 76 | } |
78 | 77 | ||
79 | void IOBt::slotExited( OProcess* proc ){ | 78 | void IOBt::slotExited( OProcess* proc ){ |
80 | close(); | 79 | close(); |
81 | delete proc; | 80 | delete proc; |
82 | } | 81 | } |
83 | 82 | ||
84 | QBitArray IOBt::supports() const { | 83 | QBitArray IOBt::supports() const { |
85 | return QBitArray( 3 ); | 84 | return QBitArray( 3 ); |
86 | } | 85 | } |
87 | 86 | ||
88 | bool IOBt::isConnected() { | 87 | bool IOBt::isConnected() { |
89 | return false; | 88 | return false; |
90 | } | 89 | } |
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp index ba0b0e5..07c2b62 100644 --- a/noncore/apps/opie-console/io_irda.cpp +++ b/noncore/apps/opie-console/io_irda.cpp | |||
@@ -1,79 +1,78 @@ | |||
1 | 1 | ||
2 | #include "io_irda.h" | 2 | #include "io_irda.h" |
3 | 3 | ||
4 | using namespace Opie::Core; | 4 | using namespace Opie::Core; |
5 | using namespace Opie::Core; | ||
6 | IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) { | 5 | IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) { |
7 | m_attach = 0; | 6 | m_attach = 0; |
8 | } | 7 | } |
9 | 8 | ||
10 | 9 | ||
11 | IOIrda::~IOIrda() { | 10 | IOIrda::~IOIrda() { |
12 | if ( m_attach ) { | 11 | if ( m_attach ) { |
13 | delete m_attach; | 12 | delete m_attach; |
14 | } | 13 | } |
15 | } | 14 | } |
16 | 15 | ||
17 | 16 | ||
18 | void IOIrda::close() { | 17 | void IOIrda::close() { |
19 | 18 | ||
20 | IOSerial::close(); | 19 | IOSerial::close(); |
21 | // still need error handling | 20 | // still need error handling |
22 | delete m_attach; | 21 | delete m_attach; |
23 | } | 22 | } |
24 | 23 | ||
25 | bool IOIrda::open() { | 24 | bool IOIrda::open() { |
26 | bool ret; | 25 | bool ret; |
27 | 26 | ||
28 | // irdaattach here | 27 | // irdaattach here |
29 | m_attach = new OProcess(); | 28 | m_attach = new OProcess(); |
30 | *m_attach << "irattach /dev/ttyS2 -s"; | 29 | *m_attach << "irattach /dev/ttyS2 -s"; |
31 | 30 | ||
32 | connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), | 31 | connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ), |
33 | this, SLOT( slotExited(OProcess*) ) ); | 32 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
34 | 33 | ||
35 | if ( m_attach->start() ) { | 34 | if ( m_attach->start() ) { |
36 | ret= IOSerial::open(); | 35 | ret= IOSerial::open(); |
37 | } else { | 36 | } else { |
38 | // emit error!!! | 37 | // emit error!!! |
39 | qWarning("could not attach to device"); | 38 | qWarning("could not attach to device"); |
40 | delete m_attach; | 39 | delete m_attach; |
41 | m_attach = 0l; | 40 | m_attach = 0l; |
42 | } | 41 | } |
43 | return ret; | 42 | return ret; |
44 | } | 43 | } |
45 | 44 | ||
46 | void IOIrda::reload( const Profile &config ) { | 45 | void IOIrda::reload( const Profile &config ) { |
47 | m_device = config.readEntry("Device", IRDA_DEFAULT_DEVICE); | 46 | m_device = config.readEntry("Device", IRDA_DEFAULT_DEVICE); |
48 | m_baud = config.readNumEntry("Baud", IRDA_DEFAULT_BAUD); | 47 | m_baud = config.readNumEntry("Baud", IRDA_DEFAULT_BAUD); |
49 | m_parity = config.readNumEntry("Parity", IRDA_DEFAULT_PARITY); | 48 | m_parity = config.readNumEntry("Parity", IRDA_DEFAULT_PARITY); |
50 | m_dbits = config.readNumEntry("DataBits", IRDA_DEFAULT_DBITS); | 49 | m_dbits = config.readNumEntry("DataBits", IRDA_DEFAULT_DBITS); |
51 | m_sbits = config.readNumEntry("StopBits", IRDA_DEFAULT_SBITS); | 50 | m_sbits = config.readNumEntry("StopBits", IRDA_DEFAULT_SBITS); |
52 | m_flow = config.readNumEntry("Flow", IRDA_DEFAULT_FLOW); | 51 | m_flow = config.readNumEntry("Flow", IRDA_DEFAULT_FLOW); |
53 | } | 52 | } |
54 | 53 | ||
55 | 54 | ||
56 | QString IOIrda::identifier() const { | 55 | QString IOIrda::identifier() const { |
57 | return "irda"; | 56 | return "irda"; |
58 | } | 57 | } |
59 | 58 | ||
60 | QString IOIrda::name() const { | 59 | QString IOIrda::name() const { |
61 | return "Irda IO Layer"; | 60 | return "Irda IO Layer"; |
62 | } | 61 | } |
63 | 62 | ||
64 | void IOIrda::slotExited(OProcess* proc ){ | 63 | void IOIrda::slotExited(OProcess* proc ){ |
65 | close(); | 64 | close(); |
66 | delete proc; | 65 | delete proc; |
67 | } | 66 | } |
68 | 67 | ||
69 | QBitArray IOIrda::supports()const { | 68 | QBitArray IOIrda::supports()const { |
70 | return QBitArray( 3 ); | 69 | return QBitArray( 3 ); |
71 | } | 70 | } |
72 | 71 | ||
73 | bool IOIrda::isConnected() { | 72 | bool IOIrda::isConnected() { |
74 | return false; | 73 | return false; |
75 | } | 74 | } |
76 | 75 | ||
77 | void IOIrda::send(const QByteArray &data) { | 76 | void IOIrda::send(const QByteArray &data) { |
78 | qDebug( "Please overload me..." ); | 77 | qDebug( "Please overload me..." ); |
79 | } | 78 | } |
diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp index 5958e93..fbc5306 100644 --- a/noncore/apps/opie-console/sz_transfer.cpp +++ b/noncore/apps/opie-console/sz_transfer.cpp | |||
@@ -1,83 +1,83 @@ | |||
1 | 1 | ||
2 | #include "sz_transfer.h" | 2 | #include "sz_transfer.h" |
3 | #include <qfile.h> | 3 | #include <qfile.h> |
4 | #include <stdio.h> | 4 | #include <stdio.h> |
5 | #include <sys/termios.h> | 5 | #include <sys/termios.h> |
6 | 6 | ||
7 | 7 | ||
8 | 8 | ||
9 | using namespace Opie::Core; | 9 | using namespace Opie::Core; |
10 | using namespace Opie::Core; | 10 | using namespace Opie::Core; |
11 | SzTransfer::SzTransfer(Type t, IOLayer *layer) : FileTransferLayer(layer), m_t(t) | 11 | SzTransfer::SzTransfer(Type t, IOLayer *layer) : FileTransferLayer(layer), m_t(t) |
12 | { | 12 | { |
13 | } | 13 | } |
14 | 14 | ||
15 | SzTransfer::~SzTransfer() { | 15 | SzTransfer::~SzTransfer() { |
16 | } | 16 | } |
17 | 17 | ||
18 | void SzTransfer::sendFile(const QFile& file) { | 18 | void SzTransfer::sendFile(const QFile& file) { |
19 | 19 | ||
20 | sendFile(file.name()); | 20 | sendFile(file.name()); |
21 | } | 21 | } |
22 | 22 | ||
23 | void SzTransfer::sendFile(const QString& file) { | 23 | void SzTransfer::sendFile(const QString& file) { |
24 | 24 | ||
25 | //setcbreak(2); /* raw no echo */ | 25 | //setcbreak(2); /* raw no echo */ |
26 | 26 | ||
27 | proc = new OProcess; | 27 | proc = new OProcess; |
28 | *proc << "sz"; | 28 | *proc << "sz"; |
29 | *proc << "-v" << "-v" << "-b" << file; | 29 | *proc << "-v" << "-v" << "-b" << file; |
30 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), | 30 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), |
31 | this, SLOT(sent())); | 31 | this, SLOT(sent())); |
32 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), | 32 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
33 | this, SLOT(SzReceivedStdout(OProcess*,char*,int))); | 33 | this, SLOT(SzReceivedStdout(Opie::Core::OProcess*,char*,int))); |
34 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), | 34 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
35 | this, SLOT(SzReceivedStderr(OProcess*,char*,int))); | 35 | this, SLOT(SzReceivedStderr(Opie::Core::OProcess*,char*,int))); |
36 | connect(layer(), SIGNAL(received(const QByteArray&)), | 36 | connect(layer(), SIGNAL(received(const QByteArray&)), |
37 | this, SLOT(receivedStdin(const QByteArray&))); | 37 | this, SLOT(receivedStdin(const QByteArray&))); |
38 | proc->start(OProcess::NotifyOnExit, OProcess::All); | 38 | proc->start(OProcess::NotifyOnExit, OProcess::All); |
39 | 39 | ||
40 | } | 40 | } |
41 | 41 | ||
42 | void SzTransfer::SzReceivedStdout(OProcess *, char *buffer, int buflen) { | 42 | void SzTransfer::SzReceivedStdout(OProcess *, char *buffer, int buflen) { |
43 | 43 | ||
44 | qWarning("recieved from sz on stdout %d bytes", buflen); | 44 | qWarning("recieved from sz on stdout %d bytes", buflen); |
45 | 45 | ||
46 | QByteArray data(buflen); | 46 | QByteArray data(buflen); |
47 | data.fill(*buffer, buflen); | 47 | data.fill(*buffer, buflen); |
48 | for (uint i = 0; i < data.count(); i++ ) { | 48 | for (uint i = 0; i < data.count(); i++ ) { |
49 | printf("%c", buffer[i] ); | 49 | printf("%c", buffer[i] ); |
50 | } | 50 | } |
51 | printf("\n"); | 51 | printf("\n"); |
52 | 52 | ||
53 | // send out through the io layer | 53 | // send out through the io layer |
54 | layer()->send(data); | 54 | layer()->send(data); |
55 | } | 55 | } |
56 | 56 | ||
57 | void SzTransfer::SzReceivedStderr(OProcess *, char *buffer, int length) { | 57 | void SzTransfer::SzReceivedStderr(OProcess *, char *buffer, int length) { |
58 | 58 | ||
59 | // parse and show data in a progress dialog/widget | 59 | // parse and show data in a progress dialog/widget |
60 | printf("stderr:\n"); | 60 | printf("stderr:\n"); |
61 | //for (int i = 0; i < length; i++) | 61 | //for (int i = 0; i < length; i++) |
62 | // printf("%c", buffer[i]); | 62 | // printf("%c", buffer[i]); |
63 | //printf("\n"); | 63 | //printf("\n"); |
64 | } | 64 | } |
65 | 65 | ||
66 | void SzTransfer::receivedStdin(const QByteArray &data) { | 66 | void SzTransfer::receivedStdin(const QByteArray &data) { |
67 | 67 | ||
68 | qWarning("recieved from io_serial %d bytes", data.size()); | 68 | qWarning("recieved from io_serial %d bytes", data.size()); |
69 | 69 | ||
70 | // recieved data from the io layer goes to sz | 70 | // recieved data from the io layer goes to sz |
71 | proc->writeStdin(data.data(), data.size()); | 71 | proc->writeStdin(data.data(), data.size()); |
72 | 72 | ||
73 | } | 73 | } |
74 | 74 | ||
75 | void SzTransfer::sent() { | 75 | void SzTransfer::sent() { |
76 | 76 | ||
77 | qWarning("sent file"); | 77 | qWarning("sent file"); |
78 | 78 | ||
79 | //setcbreak(0); /* default */ | 79 | //setcbreak(0); /* default */ |
80 | 80 | ||
81 | 81 | ||
82 | delete proc; | 82 | delete proc; |
83 | disconnect(layer(), SIGNAL(received(const QByteArray&)), | 83 | disconnect(layer(), SIGNAL(received(const QByteArray&)), |
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp index 21e24a0..5eae31f 100644 --- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp | |||
@@ -1,61 +1,59 @@ | |||
1 | #include "mhwrapper.h" | 1 | #include "mhwrapper.h" |
2 | #include "mailtypes.h" | 2 | #include "mailtypes.h" |
3 | #include "mailwrapper.h" | 3 | #include "mailwrapper.h" |
4 | #include <libetpan/libetpan.h> | 4 | #include <libetpan/libetpan.h> |
5 | #include <qdir.h> | 5 | #include <qdir.h> |
6 | #include <qmessagebox.h> | 6 | #include <qmessagebox.h> |
7 | #include <stdlib.h> | 7 | #include <stdlib.h> |
8 | #include <qpe/global.h> | 8 | #include <qpe/global.h> |
9 | #include <opie2/oprocess.h> | 9 | #include <opie2/oprocess.h> |
10 | 10 | ||
11 | using namespace Opie::Core; | 11 | using namespace Opie::Core; |
12 | using namespace Opie::Core; | ||
13 | using namespace Opie::Core; | ||
14 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) | 12 | MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name) |
15 | : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name) | 13 | : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name) |
16 | { | 14 | { |
17 | if (MHPath.length()>0) { | 15 | if (MHPath.length()>0) { |
18 | if (MHPath[MHPath.length()-1]=='/') { | 16 | if (MHPath[MHPath.length()-1]=='/') { |
19 | MHPath=MHPath.left(MHPath.length()-1); | 17 | MHPath=MHPath.left(MHPath.length()-1); |
20 | } | 18 | } |
21 | qDebug(MHPath); | 19 | qDebug(MHPath); |
22 | QDir dir(MHPath); | 20 | QDir dir(MHPath); |
23 | if (!dir.exists()) { | 21 | if (!dir.exists()) { |
24 | dir.mkdir(MHPath); | 22 | dir.mkdir(MHPath); |
25 | } | 23 | } |
26 | init_storage(); | 24 | init_storage(); |
27 | } | 25 | } |
28 | } | 26 | } |
29 | 27 | ||
30 | void MHwrapper::init_storage() | 28 | void MHwrapper::init_storage() |
31 | { | 29 | { |
32 | int r; | 30 | int r; |
33 | QString pre = MHPath; | 31 | QString pre = MHPath; |
34 | if (!m_storage) { | 32 | if (!m_storage) { |
35 | m_storage = mailstorage_new(NULL); | 33 | m_storage = mailstorage_new(NULL); |
36 | r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0); | 34 | r = mh_mailstorage_init(m_storage,(char*)pre.latin1(),0,0,0); |
37 | if (r != MAIL_NO_ERROR) { | 35 | if (r != MAIL_NO_ERROR) { |
38 | qDebug("error initializing storage"); | 36 | qDebug("error initializing storage"); |
39 | mailstorage_free(m_storage); | 37 | mailstorage_free(m_storage); |
40 | m_storage = 0; | 38 | m_storage = 0; |
41 | return; | 39 | return; |
42 | } | 40 | } |
43 | } | 41 | } |
44 | r = mailstorage_connect(m_storage); | 42 | r = mailstorage_connect(m_storage); |
45 | if (r!=MAIL_NO_ERROR) { | 43 | if (r!=MAIL_NO_ERROR) { |
46 | qDebug("error connecting storage"); | 44 | qDebug("error connecting storage"); |
47 | mailstorage_free(m_storage); | 45 | mailstorage_free(m_storage); |
48 | m_storage = 0; | 46 | m_storage = 0; |
49 | } | 47 | } |
50 | } | 48 | } |
51 | 49 | ||
52 | void MHwrapper::clean_storage() | 50 | void MHwrapper::clean_storage() |
53 | { | 51 | { |
54 | if (m_storage) { | 52 | if (m_storage) { |
55 | mailstorage_disconnect(m_storage); | 53 | mailstorage_disconnect(m_storage); |
56 | mailstorage_free(m_storage); | 54 | mailstorage_free(m_storage); |
57 | m_storage = 0; | 55 | m_storage = 0; |
58 | } | 56 | } |
59 | } | 57 | } |
60 | 58 | ||
61 | MHwrapper::~MHwrapper() | 59 | MHwrapper::~MHwrapper() |
@@ -276,99 +274,99 @@ int MHwrapper::deleteAllMail(const FolderP&tfolder) | |||
276 | qDebug("error selecting folder!"); | 274 | qDebug("error selecting folder!"); |
277 | return 0; | 275 | return 0; |
278 | } | 276 | } |
279 | mailmessage_list*l=0; | 277 | mailmessage_list*l=0; |
280 | r = mailsession_get_messages_list(m_storage->sto_session,&l); | 278 | r = mailsession_get_messages_list(m_storage->sto_session,&l); |
281 | if (r != MAIL_NO_ERROR) { | 279 | if (r != MAIL_NO_ERROR) { |
282 | qDebug("Error message list"); | 280 | qDebug("Error message list"); |
283 | res = 0; | 281 | res = 0; |
284 | } | 282 | } |
285 | unsigned j = 0; | 283 | unsigned j = 0; |
286 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { | 284 | for(unsigned int i = 0 ; l!= 0 && res==1 && i < carray_count(l->msg_tab) ; ++i) { |
287 | mailmessage * msg; | 285 | mailmessage * msg; |
288 | msg = (mailmessage*)carray_get(l->msg_tab, i); | 286 | msg = (mailmessage*)carray_get(l->msg_tab, i); |
289 | j = msg->msg_index; | 287 | j = msg->msg_index; |
290 | r = mailsession_remove_message(m_storage->sto_session,j); | 288 | r = mailsession_remove_message(m_storage->sto_session,j); |
291 | if (r != MAIL_NO_ERROR) { | 289 | if (r != MAIL_NO_ERROR) { |
292 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); | 290 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); |
293 | res = 0; | 291 | res = 0; |
294 | break; | 292 | break; |
295 | } | 293 | } |
296 | } | 294 | } |
297 | if (l) mailmessage_list_free(l); | 295 | if (l) mailmessage_list_free(l); |
298 | return res; | 296 | return res; |
299 | } | 297 | } |
300 | 298 | ||
301 | int MHwrapper::deleteMbox(const FolderP&tfolder) | 299 | int MHwrapper::deleteMbox(const FolderP&tfolder) |
302 | { | 300 | { |
303 | init_storage(); | 301 | init_storage(); |
304 | if (!m_storage) { | 302 | if (!m_storage) { |
305 | return 0; | 303 | return 0; |
306 | } | 304 | } |
307 | if (!tfolder) return 0; | 305 | if (!tfolder) return 0; |
308 | if (tfolder->getName()=="/" || tfolder->getName().isEmpty()) return 0; | 306 | if (tfolder->getName()=="/" || tfolder->getName().isEmpty()) return 0; |
309 | 307 | ||
310 | int r = mailsession_delete_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); | 308 | int r = mailsession_delete_folder(m_storage->sto_session,(char*)tfolder->getName().latin1()); |
311 | 309 | ||
312 | if (r != MAIL_NO_ERROR) { | 310 | if (r != MAIL_NO_ERROR) { |
313 | qDebug("error deleting mail box"); | 311 | qDebug("error deleting mail box"); |
314 | return 0; | 312 | return 0; |
315 | } | 313 | } |
316 | QString cmd = "rm -rf "+tfolder->getName(); | 314 | QString cmd = "rm -rf "+tfolder->getName(); |
317 | QStringList command; | 315 | QStringList command; |
318 | command << "/bin/sh"; | 316 | command << "/bin/sh"; |
319 | command << "-c"; | 317 | command << "-c"; |
320 | command << cmd.latin1(); | 318 | command << cmd.latin1(); |
321 | OProcess *process = new OProcess(); | 319 | OProcess *process = new OProcess(); |
322 | 320 | ||
323 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), | 321 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), |
324 | this, SLOT( processEnded(OProcess*))); | 322 | this, SLOT( processEnded(Opie::Core::OProcess*))); |
325 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), | 323 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), |
326 | this, SLOT( oprocessStderr(OProcess*,char*,int))); | 324 | this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); |
327 | 325 | ||
328 | *process << command; | 326 | *process << command; |
329 | removeMboxfailed = false; | 327 | removeMboxfailed = false; |
330 | if(!process->start(OProcess::Block, OProcess::All) ) { | 328 | if(!process->start(OProcess::Block, OProcess::All) ) { |
331 | qDebug("could not start process"); | 329 | qDebug("could not start process"); |
332 | return 0; | 330 | return 0; |
333 | } | 331 | } |
334 | qDebug("mail box deleted"); | 332 | qDebug("mail box deleted"); |
335 | return 1; | 333 | return 1; |
336 | } | 334 | } |
337 | 335 | ||
338 | void MHwrapper::processEnded(OProcess *p) | 336 | void MHwrapper::processEnded(OProcess *p) |
339 | { | 337 | { |
340 | if (p) delete p; | 338 | if (p) delete p; |
341 | } | 339 | } |
342 | 340 | ||
343 | void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) | 341 | void MHwrapper::oprocessStderr(OProcess*, char *buffer, int ) |
344 | { | 342 | { |
345 | QString lineStr = buffer; | 343 | QString lineStr = buffer; |
346 | QMessageBox::warning( 0, tr("Error"), lineStr ,tr("Ok") ); | 344 | QMessageBox::warning( 0, tr("Error"), lineStr ,tr("Ok") ); |
347 | removeMboxfailed = true; | 345 | removeMboxfailed = true; |
348 | } | 346 | } |
349 | 347 | ||
350 | void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) | 348 | void MHwrapper::statusFolder(folderStat&target_stat,const QString & mailbox) |
351 | { | 349 | { |
352 | init_storage(); | 350 | init_storage(); |
353 | if (!m_storage) { | 351 | if (!m_storage) { |
354 | return; | 352 | return; |
355 | } | 353 | } |
356 | target_stat.message_count = 0; | 354 | target_stat.message_count = 0; |
357 | target_stat.message_unseen = 0; | 355 | target_stat.message_unseen = 0; |
358 | target_stat.message_recent = 0; | 356 | target_stat.message_recent = 0; |
359 | QString f = buildPath(mailbox); | 357 | QString f = buildPath(mailbox); |
360 | int r = mailsession_status_folder(m_storage->sto_session,(char*)f.latin1(),&target_stat.message_count, | 358 | int r = mailsession_status_folder(m_storage->sto_session,(char*)f.latin1(),&target_stat.message_count, |
361 | &target_stat.message_recent,&target_stat.message_unseen); | 359 | &target_stat.message_recent,&target_stat.message_unseen); |
362 | if (r != MAIL_NO_ERROR) { | 360 | if (r != MAIL_NO_ERROR) { |
363 | Global::statusMessage(tr("Error retrieving status")); | 361 | Global::statusMessage(tr("Error retrieving status")); |
364 | } | 362 | } |
365 | } | 363 | } |
366 | 364 | ||
367 | MAILLIB::ATYPE MHwrapper::getType()const | 365 | MAILLIB::ATYPE MHwrapper::getType()const |
368 | { | 366 | { |
369 | return MAILLIB::A_MH; | 367 | return MAILLIB::A_MH; |
370 | } | 368 | } |
371 | 369 | ||
372 | const QString&MHwrapper::getName()const | 370 | const QString&MHwrapper::getName()const |
373 | { | 371 | { |
374 | return MHName; | 372 | return MHName; |
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc index d913853..18d26e4 100644 --- a/noncore/net/opietooth/lib/device.cc +++ b/noncore/net/opietooth/lib/device.cc | |||
@@ -1,150 +1,149 @@ | |||
1 | 1 | ||
2 | #include <signal.h> | 2 | #include <signal.h> |
3 | 3 | ||
4 | #include <opie2/oprocess.h> | 4 | #include <opie2/oprocess.h> |
5 | 5 | ||
6 | #include "device.h" | 6 | #include "device.h" |
7 | 7 | ||
8 | using namespace OpieTooth; | 8 | using namespace OpieTooth; |
9 | 9 | ||
10 | using namespace Opie::Core; | 10 | using namespace Opie::Core; |
11 | using namespace Opie::Core; | ||
12 | namespace { | 11 | namespace { |
13 | int parsePid( const QCString& par ){ | 12 | int parsePid( const QCString& par ){ |
14 | int id=0; | 13 | int id=0; |
15 | QString string( par ); | 14 | QString string( par ); |
16 | QStringList list = QStringList::split( '\n', string ); | 15 | QStringList list = QStringList::split( '\n', string ); |
17 | for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ | 16 | for( QStringList::Iterator it = list.begin(); it != list.end(); ++it ){ |
18 | qWarning("parsePID: %s", (*it).latin1() ); | 17 | qWarning("parsePID: %s", (*it).latin1() ); |
19 | if( !(*it).startsWith("CSR") ){ | 18 | if( !(*it).startsWith("CSR") ){ |
20 | id = (*it).toInt(); | 19 | id = (*it).toInt(); |
21 | break; | 20 | break; |
22 | } | 21 | } |
23 | } | 22 | } |
24 | return id; | 23 | return id; |
25 | } | 24 | } |
26 | } | 25 | } |
27 | 26 | ||
28 | Device::Device(const QString &device, const QString &mode, const QString &speed ) | 27 | Device::Device(const QString &device, const QString &mode, const QString &speed ) |
29 | : QObject(0, "device") { | 28 | : QObject(0, "device") { |
30 | 29 | ||
31 | qWarning("OpieTooth::Device create" ); | 30 | qWarning("OpieTooth::Device create" ); |
32 | m_hci = 0; | 31 | m_hci = 0; |
33 | m_process = 0; | 32 | m_process = 0; |
34 | m_attached = false; | 33 | m_attached = false; |
35 | m_device = device; | 34 | m_device = device; |
36 | m_mode = mode; | 35 | m_mode = mode; |
37 | m_speed = speed; | 36 | m_speed = speed; |
38 | attach(); | 37 | attach(); |
39 | } | 38 | } |
40 | Device::~Device(){ | 39 | Device::~Device(){ |
41 | detach(); | 40 | detach(); |
42 | } | 41 | } |
43 | void Device::attach(){ | 42 | void Device::attach(){ |
44 | qWarning("attaching %s %s %s", m_device.latin1(), m_mode.latin1(), m_speed.latin1() ); | 43 | qWarning("attaching %s %s %s", m_device.latin1(), m_mode.latin1(), m_speed.latin1() ); |
45 | if(m_process == 0 ){ | 44 | if(m_process == 0 ){ |
46 | m_output.resize(0); | 45 | m_output.resize(0); |
47 | qWarning("new process to create" ); | 46 | qWarning("new process to create" ); |
48 | m_process = new OProcess(); | 47 | m_process = new OProcess(); |
49 | *m_process << "hciattach"; | 48 | *m_process << "hciattach"; |
50 | *m_process << "-p"; | 49 | *m_process << "-p"; |
51 | *m_process << m_device << m_mode << m_speed; | 50 | *m_process << m_device << m_mode << m_speed; |
52 | connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ), | 51 | connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ), |
53 | this, SLOT( slotExited(OProcess* ) ) ); | 52 | this, SLOT( slotExited(Opie::Core::OProcess* ) ) ); |
54 | connect(m_process, SIGNAL( receivedStdout(Opie::Core::OProcess*, char*, int) ), | 53 | connect(m_process, SIGNAL( receivedStdout(Opie::Core::OProcess*, char*, int) ), |
55 | this, SLOT(slotStdOut(OProcess*,char*,int ) ) ); | 54 | this, SLOT(slotStdOut(Opie::Core::OProcess*,char*,int ) ) ); |
56 | connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ), | 55 | connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ), |
57 | this, SLOT(slotStdErr(OProcess*,char*,int) ) ); | 56 | this, SLOT(slotStdErr(Opie::Core::OProcess*,char*,int) ) ); |
58 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){ | 57 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){ |
59 | qWarning("Could not start" ); | 58 | qWarning("Could not start" ); |
60 | delete m_process; | 59 | delete m_process; |
61 | m_process = 0; | 60 | m_process = 0; |
62 | } | 61 | } |
63 | }; | 62 | }; |
64 | } | 63 | } |
65 | void Device::detach(){ | 64 | void Device::detach(){ |
66 | delete m_hci; | 65 | delete m_hci; |
67 | delete m_process; | 66 | delete m_process; |
68 | // kill the pid we got | 67 | // kill the pid we got |
69 | if(m_attached ){ | 68 | if(m_attached ){ |
70 | //kill the pid | 69 | //kill the pid |
71 | qWarning( "killing" ); | 70 | qWarning( "killing" ); |
72 | kill(pid, 9); | 71 | kill(pid, 9); |
73 | } | 72 | } |
74 | qWarning("detached" ); | 73 | qWarning("detached" ); |
75 | } | 74 | } |
76 | bool Device::isLoaded()const{ | 75 | bool Device::isLoaded()const{ |
77 | return m_attached; | 76 | return m_attached; |
78 | } | 77 | } |
79 | QString Device::devName()const { | 78 | QString Device::devName()const { |
80 | return QString::fromLatin1("hci0"); | 79 | return QString::fromLatin1("hci0"); |
81 | }; | 80 | }; |
82 | void Device::slotExited( OProcess* proc) | 81 | void Device::slotExited( OProcess* proc) |
83 | { | 82 | { |
84 | qWarning("prcess exited" ); | 83 | qWarning("prcess exited" ); |
85 | if(proc== m_process ){ | 84 | if(proc== m_process ){ |
86 | qWarning("proc == m_process" ); | 85 | qWarning("proc == m_process" ); |
87 | if( m_process->normalExit() ){ // normal exit | 86 | if( m_process->normalExit() ){ // normal exit |
88 | qWarning("normalExit" ); | 87 | qWarning("normalExit" ); |
89 | int ret = m_process->exitStatus(); | 88 | int ret = m_process->exitStatus(); |
90 | if( ret == 0 ){ // attached | 89 | if( ret == 0 ){ // attached |
91 | qWarning("attached" ); | 90 | qWarning("attached" ); |
92 | qWarning("Output: %s", m_output.data() ); | 91 | qWarning("Output: %s", m_output.data() ); |
93 | pid = parsePid( m_output ); | 92 | pid = parsePid( m_output ); |
94 | qWarning("Pid = %d", pid ); | 93 | qWarning("Pid = %d", pid ); |
95 | // now hciconfig hci0 up ( determine hciX FIXME) | 94 | // now hciconfig hci0 up ( determine hciX FIXME) |
96 | // and call hciconfig hci0 up | 95 | // and call hciconfig hci0 up |
97 | // FIXME hardcoded to hci0 now :( | 96 | // FIXME hardcoded to hci0 now :( |
98 | m_hci = new OProcess( ); | 97 | m_hci = new OProcess( ); |
99 | *m_hci << "hciconfig"; | 98 | *m_hci << "hciconfig"; |
100 | *m_hci << "hci0 up"; | 99 | *m_hci << "hci0 up"; |
101 | connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ), | 100 | connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ), |
102 | this, SLOT( slotExited(OProcess* ) ) ); | 101 | this, SLOT( slotExited(Opie::Core::OProcess* ) ) ); |
103 | if(!m_hci->start() ){ | 102 | if(!m_hci->start() ){ |
104 | qWarning("could not start" ); | 103 | qWarning("could not start" ); |
105 | m_attached = false; | 104 | m_attached = false; |
106 | emit device("hci0", false ); | 105 | emit device("hci0", false ); |
107 | } | 106 | } |
108 | }else{ | 107 | }else{ |
109 | qWarning("crass" ); | 108 | qWarning("crass" ); |
110 | m_attached = false; | 109 | m_attached = false; |
111 | emit device("hci0", false ); | 110 | emit device("hci0", false ); |
112 | 111 | ||
113 | } | 112 | } |
114 | } | 113 | } |
115 | delete m_process; | 114 | delete m_process; |
116 | m_process = 0; | 115 | m_process = 0; |
117 | }else if(proc== m_hci ){ | 116 | }else if(proc== m_hci ){ |
118 | qWarning("M HCI exited" ); | 117 | qWarning("M HCI exited" ); |
119 | if( m_hci->normalExit() ){ | 118 | if( m_hci->normalExit() ){ |
120 | qWarning("normal exit" ); | 119 | qWarning("normal exit" ); |
121 | int ret = m_hci->exitStatus(); | 120 | int ret = m_hci->exitStatus(); |
122 | if( ret == 0 ){ | 121 | if( ret == 0 ){ |
123 | qWarning("attached really really attached" ); | 122 | qWarning("attached really really attached" ); |
124 | m_attached = true; | 123 | m_attached = true; |
125 | emit device("hci0", true ); | 124 | emit device("hci0", true ); |
126 | }else{ | 125 | }else{ |
127 | qWarning( "failed" ); | 126 | qWarning( "failed" ); |
128 | emit device("hci0", false ); | 127 | emit device("hci0", false ); |
129 | m_attached = false; | 128 | m_attached = false; |
130 | } | 129 | } |
131 | }// normal exit | 130 | }// normal exit |
132 | delete m_hci; | 131 | delete m_hci; |
133 | m_hci = 0; | 132 | m_hci = 0; |
134 | } | 133 | } |
135 | } | 134 | } |
136 | void Device::slotStdOut(OProcess* proc, char* chars, int len) | 135 | void Device::slotStdOut(OProcess* proc, char* chars, int len) |
137 | { | 136 | { |
138 | qWarning("std out" ); | 137 | qWarning("std out" ); |
139 | if( len <1 ){ | 138 | if( len <1 ){ |
140 | qWarning( "len < 1 " ); | 139 | qWarning( "len < 1 " ); |
141 | return; | 140 | return; |
142 | } | 141 | } |
143 | if(proc == m_process ){ | 142 | if(proc == m_process ){ |
144 | QCString string( chars, len+1 ); // \0 == +1 | 143 | QCString string( chars, len+1 ); // \0 == +1 |
145 | qWarning("output: %s", string.data() ); | 144 | qWarning("output: %s", string.data() ); |
146 | m_output.append( string.data() ); | 145 | m_output.append( string.data() ); |
147 | } | 146 | } |
148 | } | 147 | } |
149 | void Device::slotStdErr(OProcess* proc, char* chars, int len) | 148 | void Device::slotStdErr(OProcess* proc, char* chars, int len) |
150 | { | 149 | { |
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc index 56156a8..7c9ea5b 100644 --- a/noncore/net/opietooth/lib/manager.cc +++ b/noncore/net/opietooth/lib/manager.cc | |||
@@ -1,163 +1,163 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | #include <opie2/oprocess.h> | 3 | #include <opie2/oprocess.h> |
4 | 4 | ||
5 | #include "parser.h" | 5 | #include "parser.h" |
6 | #include "manager.h" | 6 | #include "manager.h" |
7 | 7 | ||
8 | 8 | ||
9 | using namespace OpieTooth; | 9 | using namespace OpieTooth; |
10 | 10 | ||
11 | using namespace Opie::Core; | 11 | using namespace Opie::Core; |
12 | using namespace Opie::Core; | 12 | using namespace Opie::Core; |
13 | Manager::Manager( const QString& dev ) | 13 | Manager::Manager( const QString& dev ) |
14 | : QObject() | 14 | : QObject() |
15 | { | 15 | { |
16 | qWarning("created"); | 16 | qWarning("created"); |
17 | m_device = dev; | 17 | m_device = dev; |
18 | m_hcitool = 0; | 18 | m_hcitool = 0; |
19 | m_sdp = 0; | 19 | m_sdp = 0; |
20 | } | 20 | } |
21 | Manager::Manager( Device* /*dev*/ ) | 21 | Manager::Manager( Device* /*dev*/ ) |
22 | : QObject() | 22 | : QObject() |
23 | { | 23 | { |
24 | m_hcitool = 0; | 24 | m_hcitool = 0; |
25 | m_sdp = 0; | 25 | m_sdp = 0; |
26 | } | 26 | } |
27 | Manager::Manager() | 27 | Manager::Manager() |
28 | : QObject() | 28 | : QObject() |
29 | { | 29 | { |
30 | m_hcitool = 0; | 30 | m_hcitool = 0; |
31 | m_sdp = 0; | 31 | m_sdp = 0; |
32 | } | 32 | } |
33 | Manager::~Manager(){ | 33 | Manager::~Manager(){ |
34 | delete m_hcitool; | 34 | delete m_hcitool; |
35 | delete m_sdp; | 35 | delete m_sdp; |
36 | } | 36 | } |
37 | void Manager::setDevice( const QString& dev ){ | 37 | void Manager::setDevice( const QString& dev ){ |
38 | m_device = dev; | 38 | m_device = dev; |
39 | } | 39 | } |
40 | void Manager::setDevice( Device* /*dev*/ ){ | 40 | void Manager::setDevice( Device* /*dev*/ ){ |
41 | 41 | ||
42 | } | 42 | } |
43 | void Manager::isAvailable( const QString& device ){ | 43 | void Manager::isAvailable( const QString& device ){ |
44 | OProcess* l2ping = new OProcess(); | 44 | OProcess* l2ping = new OProcess(); |
45 | l2ping->setName( device.latin1() ); | 45 | l2ping->setName( device.latin1() ); |
46 | *l2ping << "l2ping" << "-c1" << device; | 46 | *l2ping << "l2ping" << "-c1" << device; |
47 | connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ), | 47 | connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ), |
48 | this, SLOT(slotProcessExited(OProcess*) ) ); | 48 | this, SLOT(slotProcessExited(Opie::Core::OProcess*) ) ); |
49 | if (!l2ping->start() ) { | 49 | if (!l2ping->start() ) { |
50 | emit available( device, false ); | 50 | emit available( device, false ); |
51 | delete l2ping; | 51 | delete l2ping; |
52 | } | 52 | } |
53 | 53 | ||
54 | } | 54 | } |
55 | 55 | ||
56 | void Manager::isAvailable( Device* /*dev*/ ){ | 56 | void Manager::isAvailable( Device* /*dev*/ ){ |
57 | 57 | ||
58 | 58 | ||
59 | } | 59 | } |
60 | void Manager::searchDevices( const QString& device ){ | 60 | void Manager::searchDevices( const QString& device ){ |
61 | qWarning("search devices"); | 61 | qWarning("search devices"); |
62 | OProcess* hcitool = new OProcess(); | 62 | OProcess* hcitool = new OProcess(); |
63 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); | 63 | hcitool->setName( device.isEmpty() ? "hci0" : device.latin1() ); |
64 | *hcitool << "hcitool" << "scan"; | 64 | *hcitool << "hcitool" << "scan"; |
65 | connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) , | 65 | connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) , |
66 | this, SLOT(slotHCIExited(OProcess* ) ) ); | 66 | this, SLOT(slotHCIExited(Opie::Core::OProcess* ) ) ); |
67 | connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), | 67 | connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
68 | this, SLOT(slotHCIOut(OProcess*, char*, int ) ) ); | 68 | this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) ); |
69 | if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 69 | if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
70 | qWarning("could not start"); | 70 | qWarning("could not start"); |
71 | RemoteDevice::ValueList list; | 71 | RemoteDevice::ValueList list; |
72 | emit foundDevices( device, list ); | 72 | emit foundDevices( device, list ); |
73 | delete hcitool; | 73 | delete hcitool; |
74 | } | 74 | } |
75 | } | 75 | } |
76 | 76 | ||
77 | void Manager::searchDevices(Device* /*d*/ ){ | 77 | void Manager::searchDevices(Device* /*d*/ ){ |
78 | 78 | ||
79 | 79 | ||
80 | } | 80 | } |
81 | void Manager::addService(const QString& name ){ | 81 | void Manager::addService(const QString& name ){ |
82 | OProcess proc; | 82 | OProcess proc; |
83 | proc << "sdptool" << "add" << name; | 83 | proc << "sdptool" << "add" << name; |
84 | bool bo = true; | 84 | bool bo = true; |
85 | if (!proc.start(OProcess::DontCare ) ) | 85 | if (!proc.start(OProcess::DontCare ) ) |
86 | bo = false; | 86 | bo = false; |
87 | emit addedService( name, bo ); | 87 | emit addedService( name, bo ); |
88 | } | 88 | } |
89 | void Manager::addServices(const QStringList& list){ | 89 | void Manager::addServices(const QStringList& list){ |
90 | QStringList::ConstIterator it; | 90 | QStringList::ConstIterator it; |
91 | for (it = list.begin(); it != list.end(); ++it ) | 91 | for (it = list.begin(); it != list.end(); ++it ) |
92 | addService( (*it) ); | 92 | addService( (*it) ); |
93 | } | 93 | } |
94 | void Manager::removeService( const QString& name ){ | 94 | void Manager::removeService( const QString& name ){ |
95 | OProcess prc; | 95 | OProcess prc; |
96 | prc << "sdptool" << "del" << name; | 96 | prc << "sdptool" << "del" << name; |
97 | bool bo = true; | 97 | bool bo = true; |
98 | if (!prc.start(OProcess::DontCare ) ) | 98 | if (!prc.start(OProcess::DontCare ) ) |
99 | bo = false; | 99 | bo = false; |
100 | emit removedService( name, bo ); | 100 | emit removedService( name, bo ); |
101 | } | 101 | } |
102 | void Manager::removeServices( const QStringList& list){ | 102 | void Manager::removeServices( const QStringList& list){ |
103 | QStringList::ConstIterator it; | 103 | QStringList::ConstIterator it; |
104 | for (it = list.begin(); it != list.end(); ++it ) | 104 | for (it = list.begin(); it != list.end(); ++it ) |
105 | removeService( (*it) ); | 105 | removeService( (*it) ); |
106 | } | 106 | } |
107 | void Manager::searchServices( const QString& remDevice ){ | 107 | void Manager::searchServices( const QString& remDevice ){ |
108 | OProcess *m_sdp =new OProcess(); | 108 | OProcess *m_sdp =new OProcess(); |
109 | *m_sdp << "sdptool" << "browse" << remDevice; | 109 | *m_sdp << "sdptool" << "browse" << remDevice; |
110 | m_sdp->setName( remDevice.latin1() ); | 110 | m_sdp->setName( remDevice.latin1() ); |
111 | qWarning("search Services for %s", remDevice.latin1() ); | 111 | qWarning("search Services for %s", remDevice.latin1() ); |
112 | connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ), | 112 | connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ), |
113 | this, SLOT(slotSDPExited(OProcess* ) ) ); | 113 | this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) ); |
114 | connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), | 114 | connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ), |
115 | this, SLOT(slotSDPOut(OProcess*, char*, int) ) ); | 115 | this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) ); |
116 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 116 | if (!m_sdp->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
117 | qWarning("could not start sdptool" ); | 117 | qWarning("could not start sdptool" ); |
118 | delete m_sdp; | 118 | delete m_sdp; |
119 | Services::ValueList list; | 119 | Services::ValueList list; |
120 | emit foundServices( remDevice, list ); | 120 | emit foundServices( remDevice, list ); |
121 | } | 121 | } |
122 | } | 122 | } |
123 | void Manager::searchServices( const RemoteDevice& dev){ | 123 | void Manager::searchServices( const RemoteDevice& dev){ |
124 | searchServices( dev.mac() ); | 124 | searchServices( dev.mac() ); |
125 | } | 125 | } |
126 | QString Manager::toDevice( const QString& /*mac*/ ){ | 126 | QString Manager::toDevice( const QString& /*mac*/ ){ |
127 | return QString::null; | 127 | return QString::null; |
128 | } | 128 | } |
129 | QString Manager::toMac( const QString &/*device*/ ){ | 129 | QString Manager::toMac( const QString &/*device*/ ){ |
130 | return QString::null; | 130 | return QString::null; |
131 | } | 131 | } |
132 | void Manager::slotProcessExited(OProcess* proc ) { | 132 | void Manager::slotProcessExited(OProcess* proc ) { |
133 | bool conn= false; | 133 | bool conn= false; |
134 | if (proc->normalExit() && proc->exitStatus() == 0 ) | 134 | if (proc->normalExit() && proc->exitStatus() == 0 ) |
135 | conn = true; | 135 | conn = true; |
136 | 136 | ||
137 | QString name = QString::fromLatin1(proc->name() ); | 137 | QString name = QString::fromLatin1(proc->name() ); |
138 | emit available( name, conn ); | 138 | emit available( name, conn ); |
139 | delete proc; | 139 | delete proc; |
140 | } | 140 | } |
141 | void Manager::slotSDPOut(OProcess* proc, char* ch, int len) | 141 | void Manager::slotSDPOut(OProcess* proc, char* ch, int len) |
142 | { | 142 | { |
143 | QCString str(ch, len+1 ); | 143 | QCString str(ch, len+1 ); |
144 | qWarning("SDP:%s", str.data() ); | 144 | qWarning("SDP:%s", str.data() ); |
145 | QMap<QString, QString>::Iterator it; | 145 | QMap<QString, QString>::Iterator it; |
146 | it = m_out.find(proc->name() ); | 146 | it = m_out.find(proc->name() ); |
147 | QString string; | 147 | QString string; |
148 | if ( it != m_out.end() ) { | 148 | if ( it != m_out.end() ) { |
149 | string = it.data(); | 149 | string = it.data(); |
150 | } | 150 | } |
151 | string.append( str ); | 151 | string.append( str ); |
152 | m_out.replace( proc->name(), string ); | 152 | m_out.replace( proc->name(), string ); |
153 | 153 | ||
154 | } | 154 | } |
155 | void Manager::slotSDPExited( OProcess* proc) | 155 | void Manager::slotSDPExited( OProcess* proc) |
156 | { | 156 | { |
157 | qWarning("proc name %s", proc->name() ); | 157 | qWarning("proc name %s", proc->name() ); |
158 | Services::ValueList list; | 158 | Services::ValueList list; |
159 | if (proc->normalExit() ) { | 159 | if (proc->normalExit() ) { |
160 | QMap<QString, QString>::Iterator it = m_out.find( proc->name() ); | 160 | QMap<QString, QString>::Iterator it = m_out.find( proc->name() ); |
161 | if ( it != m_out.end() ) { | 161 | if ( it != m_out.end() ) { |
162 | qWarning("found process" ); | 162 | qWarning("found process" ); |
163 | list = parseSDPOutput( it.data() ); | 163 | list = parseSDPOutput( it.data() ); |
@@ -204,133 +204,133 @@ void Manager::slotHCIOut(OProcess* proc, char* ch, int len) { | |||
204 | string.append( str ); | 204 | string.append( str ); |
205 | 205 | ||
206 | m_devices.replace( proc->name(), string ); | 206 | m_devices.replace( proc->name(), string ); |
207 | } | 207 | } |
208 | RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) { | 208 | RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) { |
209 | qWarning("parseHCI %s", output.latin1() ); | 209 | qWarning("parseHCI %s", output.latin1() ); |
210 | RemoteDevice::ValueList list; | 210 | RemoteDevice::ValueList list; |
211 | QStringList strList = QStringList::split('\n', output ); | 211 | QStringList strList = QStringList::split('\n', output ); |
212 | QStringList::Iterator it; | 212 | QStringList::Iterator it; |
213 | QString str; | 213 | QString str; |
214 | for ( it = strList.begin(); it != strList.end(); ++it ) { | 214 | for ( it = strList.begin(); it != strList.end(); ++it ) { |
215 | str = (*it).stripWhiteSpace(); | 215 | str = (*it).stripWhiteSpace(); |
216 | qWarning("OpieTooth %s", str.latin1() ); | 216 | qWarning("OpieTooth %s", str.latin1() ); |
217 | int pos = str.findRev(':' ); | 217 | int pos = str.findRev(':' ); |
218 | if ( pos > 0 ) { | 218 | if ( pos > 0 ) { |
219 | QString mac = str.left(17 ); | 219 | QString mac = str.left(17 ); |
220 | str.remove( 0, 17 ); | 220 | str.remove( 0, 17 ); |
221 | qWarning("mac %s", mac.latin1() ); | 221 | qWarning("mac %s", mac.latin1() ); |
222 | qWarning("rest:%s", str.latin1() ); | 222 | qWarning("rest:%s", str.latin1() ); |
223 | RemoteDevice rem( mac , str.stripWhiteSpace() ); | 223 | RemoteDevice rem( mac , str.stripWhiteSpace() ); |
224 | list.append( rem ); | 224 | list.append( rem ); |
225 | } | 225 | } |
226 | } | 226 | } |
227 | return list; | 227 | return list; |
228 | } | 228 | } |
229 | 229 | ||
230 | ////// hcitool cc and hcitool con | 230 | ////// hcitool cc and hcitool con |
231 | 231 | ||
232 | /** | 232 | /** |
233 | * Create it on the stack as don't care | 233 | * Create it on the stack as don't care |
234 | * so we don't need to care for it | 234 | * so we don't need to care for it |
235 | * cause hcitool gets reparented | 235 | * cause hcitool gets reparented |
236 | */ | 236 | */ |
237 | void Manager::connectTo( const QString& mac) { | 237 | void Manager::connectTo( const QString& mac) { |
238 | OProcess proc; | 238 | OProcess proc; |
239 | proc << "hcitool"; | 239 | proc << "hcitool"; |
240 | proc << "cc"; | 240 | proc << "cc"; |
241 | proc << mac; | 241 | proc << mac; |
242 | proc.start(OProcess::DontCare); // the lib does not care at this point | 242 | proc.start(OProcess::DontCare); // the lib does not care at this point |
243 | } | 243 | } |
244 | 244 | ||
245 | 245 | ||
246 | void Manager::searchConnections() { | 246 | void Manager::searchConnections() { |
247 | qWarning("searching connections?"); | 247 | qWarning("searching connections?"); |
248 | OProcess* proc = new OProcess(); | 248 | OProcess* proc = new OProcess(); |
249 | m_hcitoolCon = QString::null; | 249 | m_hcitoolCon = QString::null; |
250 | 250 | ||
251 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ), | 251 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ), |
252 | this, SLOT(slotConnectionExited( OProcess*) ) ); | 252 | this, SLOT(slotConnectionExited( Opie::Core::OProcess*) ) ); |
253 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), | 253 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), |
254 | this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) ); | 254 | this, SLOT(slotConnectionOutput(Opie::Core::OProcess*, char*, int) ) ); |
255 | *proc << "hcitool"; | 255 | *proc << "hcitool"; |
256 | *proc << "con"; | 256 | *proc << "con"; |
257 | 257 | ||
258 | if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 258 | if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
259 | ConnectionState::ValueList list; | 259 | ConnectionState::ValueList list; |
260 | emit connections( list ); | 260 | emit connections( list ); |
261 | delete proc; | 261 | delete proc; |
262 | } | 262 | } |
263 | } | 263 | } |
264 | void Manager::slotConnectionExited( OProcess* proc ) { | 264 | void Manager::slotConnectionExited( OProcess* proc ) { |
265 | ConnectionState::ValueList list; | 265 | ConnectionState::ValueList list; |
266 | list = parseConnections( m_hcitoolCon ); | 266 | list = parseConnections( m_hcitoolCon ); |
267 | emit connections(list ); | 267 | emit connections(list ); |
268 | delete proc; | 268 | delete proc; |
269 | } | 269 | } |
270 | void Manager::slotConnectionOutput(OProcess* /*proc*/, char* cha, int len) { | 270 | void Manager::slotConnectionOutput(OProcess* /*proc*/, char* cha, int len) { |
271 | QCString str(cha, len ); | 271 | QCString str(cha, len ); |
272 | m_hcitoolCon.append( str ); | 272 | m_hcitoolCon.append( str ); |
273 | //delete proc; | 273 | //delete proc; |
274 | } | 274 | } |
275 | ConnectionState::ValueList Manager::parseConnections( const QString& out ) { | 275 | ConnectionState::ValueList Manager::parseConnections( const QString& out ) { |
276 | ConnectionState::ValueList list2; | 276 | ConnectionState::ValueList list2; |
277 | QStringList list = QStringList::split('\n', out ); | 277 | QStringList list = QStringList::split('\n', out ); |
278 | QStringList::Iterator it; | 278 | QStringList::Iterator it; |
279 | // remove the first line ( "Connections:") | 279 | // remove the first line ( "Connections:") |
280 | it = list.begin(); | 280 | it = list.begin(); |
281 | it = list.remove( it ); | 281 | it = list.remove( it ); |
282 | for (; it != list.end(); ++it ) { | 282 | for (; it != list.end(); ++it ) { |
283 | QString row = (*it).stripWhiteSpace(); | 283 | QString row = (*it).stripWhiteSpace(); |
284 | QStringList value = QStringList::split(' ', row ); | 284 | QStringList value = QStringList::split(' ', row ); |
285 | qWarning("0: %s", value[0].latin1() ); | 285 | qWarning("0: %s", value[0].latin1() ); |
286 | qWarning("1: %s", value[1].latin1() ); | 286 | qWarning("1: %s", value[1].latin1() ); |
287 | qWarning("2: %s", value[2].latin1() ); | 287 | qWarning("2: %s", value[2].latin1() ); |
288 | qWarning("3: %s", value[3].latin1() ); | 288 | qWarning("3: %s", value[3].latin1() ); |
289 | qWarning("4: %s", value[4].latin1() ); | 289 | qWarning("4: %s", value[4].latin1() ); |
290 | qWarning("5: %s", value[5].latin1() ); | 290 | qWarning("5: %s", value[5].latin1() ); |
291 | qWarning("6: %s", value[6].latin1() ); | 291 | qWarning("6: %s", value[6].latin1() ); |
292 | qWarning("7: %s", value[7].latin1() ); | 292 | qWarning("7: %s", value[7].latin1() ); |
293 | qWarning("8: %s", value[8].latin1() ); | 293 | qWarning("8: %s", value[8].latin1() ); |
294 | ConnectionState con; | 294 | ConnectionState con; |
295 | con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming ); | 295 | con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming ); |
296 | con.setConnectionMode( value[1] ); | 296 | con.setConnectionMode( value[1] ); |
297 | con.setMac( value[2] ); | 297 | con.setMac( value[2] ); |
298 | con.setHandle( value[4].toInt() ); | 298 | con.setHandle( value[4].toInt() ); |
299 | con.setState( value[6].toInt() ); | 299 | con.setState( value[6].toInt() ); |
300 | con.setLinkMode( value[8] == QString::fromLatin1("MASTER") ? Master : Client ); | 300 | con.setLinkMode( value[8] == QString::fromLatin1("MASTER") ? Master : Client ); |
301 | list2.append( con ); | 301 | list2.append( con ); |
302 | } | 302 | } |
303 | return list2; | 303 | return list2; |
304 | } | 304 | } |
305 | 305 | ||
306 | void Manager::signalStrength( const QString &mac ) { | 306 | void Manager::signalStrength( const QString &mac ) { |
307 | 307 | ||
308 | OProcess* sig_proc = new OProcess(); | 308 | OProcess* sig_proc = new OProcess(); |
309 | 309 | ||
310 | connect(sig_proc, SIGNAL(processExited(Opie::Core::OProcess*) ), | 310 | connect(sig_proc, SIGNAL(processExited(Opie::Core::OProcess*) ), |
311 | this, SLOT(slotSignalStrengthExited( OProcess*) ) ); | 311 | this, SLOT(slotSignalStrengthExited( Opie::Core::OProcess*) ) ); |
312 | connect(sig_proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), | 312 | connect(sig_proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ), |
313 | this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) ); | 313 | this, SLOT(slotSignalStrengthOutput(Opie::Core::OProcess*, char*, int) ) ); |
314 | *sig_proc << "hcitool"; | 314 | *sig_proc << "hcitool"; |
315 | *sig_proc << "lq"; | 315 | *sig_proc << "lq"; |
316 | *sig_proc << mac; | 316 | *sig_proc << mac; |
317 | 317 | ||
318 | sig_proc->setName( mac.latin1() ); | 318 | sig_proc->setName( mac.latin1() ); |
319 | 319 | ||
320 | if (!sig_proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 320 | if (!sig_proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
321 | emit signalStrength( mac, "-1" ); | 321 | emit signalStrength( mac, "-1" ); |
322 | delete sig_proc; | 322 | delete sig_proc; |
323 | } | 323 | } |
324 | } | 324 | } |
325 | 325 | ||
326 | void Manager::slotSignalStrengthOutput(OProcess* proc, char* cha, int len) { | 326 | void Manager::slotSignalStrengthOutput(OProcess* proc, char* cha, int len) { |
327 | QCString str(cha, len ); | 327 | QCString str(cha, len ); |
328 | QString temp = QString(str).stripWhiteSpace(); | 328 | QString temp = QString(str).stripWhiteSpace(); |
329 | QStringList value = QStringList::split(' ', temp ); | 329 | QStringList value = QStringList::split(' ', temp ); |
330 | emit signalStrength( proc->name(), value[2].latin1() ); | 330 | emit signalStrength( proc->name(), value[2].latin1() ); |
331 | } | 331 | } |
332 | 332 | ||
333 | 333 | ||
334 | void Manager::slotSignalStrengthExited( OProcess* proc ) { | 334 | void Manager::slotSignalStrengthExited( OProcess* proc ) { |
335 | delete proc; | 335 | delete proc; |
336 | } | 336 | } |
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp index 90ef04a..09b19d2 100644 --- a/noncore/net/opietooth/lib/startdunconnection.cpp +++ b/noncore/net/opietooth/lib/startdunconnection.cpp | |||
@@ -1,69 +1,68 @@ | |||
1 | 1 | ||
2 | #include "startdunconnection.h" | 2 | #include "startdunconnection.h" |
3 | 3 | ||
4 | using namespace OpieTooth; | 4 | using namespace OpieTooth; |
5 | 5 | ||
6 | 6 | ||
7 | using namespace Opie::Core; | 7 | using namespace Opie::Core; |
8 | using namespace Opie::Core; | ||
9 | StartDunConnection::StartDunConnection() { | 8 | StartDunConnection::StartDunConnection() { |
10 | m_dunConnect = 0l; | 9 | m_dunConnect = 0l; |
11 | setConnectionType(); | 10 | setConnectionType(); |
12 | } | 11 | } |
13 | 12 | ||
14 | StartDunConnection::~StartDunConnection() { | 13 | StartDunConnection::~StartDunConnection() { |
15 | delete m_dunConnect; | 14 | delete m_dunConnect; |
16 | } | 15 | } |
17 | 16 | ||
18 | StartDunConnection::StartDunConnection( QString mac ) { | 17 | StartDunConnection::StartDunConnection( QString mac ) { |
19 | m_dunConnect = 0l; | 18 | m_dunConnect = 0l; |
20 | m_mac = mac; | 19 | m_mac = mac; |
21 | setConnectionType(); | 20 | setConnectionType(); |
22 | } | 21 | } |
23 | 22 | ||
24 | void StartDunConnection::setName( QString name ) { | 23 | void StartDunConnection::setName( QString name ) { |
25 | m_name = name; | 24 | m_name = name; |
26 | } | 25 | } |
27 | 26 | ||
28 | QString StartDunConnection::name() { | 27 | QString StartDunConnection::name() { |
29 | return m_name; | 28 | return m_name; |
30 | } | 29 | } |
31 | 30 | ||
32 | void StartDunConnection::setConnectionType() { | 31 | void StartDunConnection::setConnectionType() { |
33 | m_connectionType = Pan; | 32 | m_connectionType = Pan; |
34 | } | 33 | } |
35 | 34 | ||
36 | StartConnection::ConnectionType StartDunConnection::type() { | 35 | StartConnection::ConnectionType StartDunConnection::type() { |
37 | return m_connectionType; | 36 | return m_connectionType; |
38 | } | 37 | } |
39 | 38 | ||
40 | void StartDunConnection::start() { | 39 | void StartDunConnection::start() { |
41 | m_dunConnect = new OProcess(); | 40 | m_dunConnect = new OProcess(); |
42 | *m_dunConnect << "dund" << "--listen" << "--connect" << m_mac; | 41 | *m_dunConnect << "dund" << "--listen" << "--connect" << m_mac; |
43 | 42 | ||
44 | connect( m_dunConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , | 43 | connect( m_dunConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
45 | this, SLOT( slotExited(OProcess*) ) ); | 44 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
46 | connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 45 | connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
47 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); | 46 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
48 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 47 | if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
49 | qWarning( "could not start" ); | 48 | qWarning( "could not start" ); |
50 | delete m_dunConnect; | 49 | delete m_dunConnect; |
51 | } | 50 | } |
52 | } | 51 | } |
53 | 52 | ||
54 | 53 | ||
55 | void StartDunConnection::slotExited( OProcess* proc ) { | 54 | void StartDunConnection::slotExited( OProcess* proc ) { |
56 | delete m_dunConnect; | 55 | delete m_dunConnect; |
57 | } | 56 | } |
58 | 57 | ||
59 | void StartDunConnection::slotStdOut(OProcess* proc, char* chars, int len) | 58 | void StartDunConnection::slotStdOut(OProcess* proc, char* chars, int len) |
60 | {} | 59 | {} |
61 | 60 | ||
62 | 61 | ||
63 | void StartDunConnection::stop() { | 62 | void StartDunConnection::stop() { |
64 | if ( m_dunConnect ) { | 63 | if ( m_dunConnect ) { |
65 | delete m_dunConnect; | 64 | delete m_dunConnect; |
66 | m_dunConnect = 0l; | 65 | m_dunConnect = 0l; |
67 | } | 66 | } |
68 | } | 67 | } |
69 | 68 | ||
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp index fef35d9..24ac530 100644 --- a/noncore/net/opietooth/lib/startpanconnection.cpp +++ b/noncore/net/opietooth/lib/startpanconnection.cpp | |||
@@ -1,84 +1,84 @@ | |||
1 | 1 | ||
2 | #include "startpanconnection.h" | 2 | #include "startpanconnection.h" |
3 | 3 | ||
4 | using namespace OpieTooth; | 4 | using namespace OpieTooth; |
5 | 5 | ||
6 | 6 | ||
7 | using namespace Opie::Core; | 7 | using namespace Opie::Core; |
8 | using namespace Opie::Core; | 8 | using namespace Opie::Core; |
9 | StartPanConnection::StartPanConnection() { | 9 | StartPanConnection::StartPanConnection() { |
10 | m_panConnect = 0l; | 10 | m_panConnect = 0l; |
11 | setConnectionType(); | 11 | setConnectionType(); |
12 | } | 12 | } |
13 | 13 | ||
14 | StartPanConnection::~StartPanConnection() { | 14 | StartPanConnection::~StartPanConnection() { |
15 | delete m_panConnect; | 15 | delete m_panConnect; |
16 | } | 16 | } |
17 | 17 | ||
18 | StartPanConnection::StartPanConnection( QString mac ) { | 18 | StartPanConnection::StartPanConnection( QString mac ) { |
19 | m_panConnect = 0l; | 19 | m_panConnect = 0l; |
20 | m_mac = mac; | 20 | m_mac = mac; |
21 | setConnectionType(); | 21 | setConnectionType(); |
22 | } | 22 | } |
23 | 23 | ||
24 | void StartPanConnection::setName( QString name ) { | 24 | void StartPanConnection::setName( QString name ) { |
25 | m_name = name; | 25 | m_name = name; |
26 | } | 26 | } |
27 | 27 | ||
28 | QString StartPanConnection::name() { | 28 | QString StartPanConnection::name() { |
29 | return m_name; | 29 | return m_name; |
30 | } | 30 | } |
31 | 31 | ||
32 | void StartPanConnection::setConnectionType() { | 32 | void StartPanConnection::setConnectionType() { |
33 | m_connectionType = Pan; | 33 | m_connectionType = Pan; |
34 | } | 34 | } |
35 | 35 | ||
36 | StartConnection::ConnectionType StartPanConnection::type() { | 36 | StartConnection::ConnectionType StartPanConnection::type() { |
37 | return m_connectionType; | 37 | return m_connectionType; |
38 | } | 38 | } |
39 | 39 | ||
40 | void StartPanConnection::start() { | 40 | void StartPanConnection::start() { |
41 | m_panConnect = new OProcess(); | 41 | m_panConnect = new OProcess(); |
42 | qDebug( "IM START " + m_mac ); | 42 | qDebug( "IM START " + m_mac ); |
43 | *m_panConnect << "pand" << "--connect" << m_mac; | 43 | *m_panConnect << "pand" << "--connect" << m_mac; |
44 | 44 | ||
45 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , | 45 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
46 | this, SLOT( slotExited(OProcess*) ) ); | 46 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
47 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 47 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
48 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); | 48 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
49 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 49 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
50 | qWarning( "could not start" ); | 50 | qWarning( "could not start" ); |
51 | delete m_panConnect; | 51 | delete m_panConnect; |
52 | } | 52 | } |
53 | } | 53 | } |
54 | 54 | ||
55 | 55 | ||
56 | void StartPanConnection::slotExited( OProcess* proc ) { | 56 | void StartPanConnection::slotExited( OProcess* proc ) { |
57 | delete m_panConnect; | 57 | delete m_panConnect; |
58 | m_panConnect = 0l; | 58 | m_panConnect = 0l; |
59 | } | 59 | } |
60 | 60 | ||
61 | void StartPanConnection::slotStdOut(OProcess* proc, char* chars, int len) | 61 | void StartPanConnection::slotStdOut(OProcess* proc, char* chars, int len) |
62 | {} | 62 | {} |
63 | 63 | ||
64 | 64 | ||
65 | void StartPanConnection::stop() { | 65 | void StartPanConnection::stop() { |
66 | if ( m_panConnect ) { | 66 | if ( m_panConnect ) { |
67 | delete m_panConnect; | 67 | delete m_panConnect; |
68 | m_panConnect = 0l; | 68 | m_panConnect = 0l; |
69 | } | 69 | } |
70 | m_panConnect = new OProcess(); | 70 | m_panConnect = new OProcess(); |
71 | qDebug("IM STOP " + m_mac); | 71 | qDebug("IM STOP " + m_mac); |
72 | 72 | ||
73 | *m_panConnect << "pand" << "--kill" << m_mac; | 73 | *m_panConnect << "pand" << "--kill" << m_mac; |
74 | 74 | ||
75 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , | 75 | connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) , |
76 | this, SLOT( slotExited(OProcess*) ) ); | 76 | this, SLOT( slotExited(Opie::Core::OProcess*) ) ); |
77 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), | 77 | connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ), |
78 | this, SLOT( slotStdOut(OProcess*,char*,int) ) ); | 78 | this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
79 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 79 | if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
80 | qWarning( "could not stop" ); | 80 | qWarning( "could not stop" ); |
81 | delete m_panConnect; | 81 | delete m_panConnect; |
82 | } | 82 | } |
83 | } | 83 | } |
84 | 84 | ||
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp index 870e7fd..78c1501 100644 --- a/noncore/net/opietooth/manager/pppdialog.cpp +++ b/noncore/net/opietooth/manager/pppdialog.cpp | |||
@@ -1,70 +1,69 @@ | |||
1 | 1 | ||
2 | #include "pppdialog.h" | 2 | #include "pppdialog.h" |
3 | #include <qpushbutton.h> | 3 | #include <qpushbutton.h> |
4 | #include <qmultilineedit.h> | 4 | #include <qmultilineedit.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qlayout.h> | 6 | #include <qlayout.h> |
7 | #include <qlabel.h> | 7 | #include <qlabel.h> |
8 | #include <opie2/oprocess.h> | 8 | #include <opie2/oprocess.h> |
9 | 9 | ||
10 | using namespace OpieTooth; | 10 | using namespace OpieTooth; |
11 | 11 | ||
12 | using namespace Opie::Core; | 12 | using namespace Opie::Core; |
13 | using namespace Opie::Core; | ||
14 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) | 13 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) |
15 | : QDialog( parent, name, modal, fl ) { | 14 | : QDialog( parent, name, modal, fl ) { |
16 | 15 | ||
17 | if ( !name ) | 16 | if ( !name ) |
18 | setName( "PPPDialog" ); | 17 | setName( "PPPDialog" ); |
19 | setCaption( tr( "ppp connection " ) ) ; | 18 | setCaption( tr( "ppp connection " ) ) ; |
20 | 19 | ||
21 | m_device = device; | 20 | m_device = device; |
22 | 21 | ||
23 | layout = new QVBoxLayout( this ); | 22 | layout = new QVBoxLayout( this ); |
24 | 23 | ||
25 | QLabel* info = new QLabel( this ); | 24 | QLabel* info = new QLabel( this ); |
26 | info->setText( tr("Enter an ppp script name:") ); | 25 | info->setText( tr("Enter an ppp script name:") ); |
27 | 26 | ||
28 | cmdLine = new QLineEdit( this ); | 27 | cmdLine = new QLineEdit( this ); |
29 | 28 | ||
30 | outPut = new QMultiLineEdit( this ); | 29 | outPut = new QMultiLineEdit( this ); |
31 | QFont outPut_font( outPut->font() ); | 30 | QFont outPut_font( outPut->font() ); |
32 | outPut_font.setPointSize( 8 ); | 31 | outPut_font.setPointSize( 8 ); |
33 | outPut->setFont( outPut_font ); | 32 | outPut->setFont( outPut_font ); |
34 | outPut->setWordWrap( QMultiLineEdit::WidgetWidth ); | 33 | outPut->setWordWrap( QMultiLineEdit::WidgetWidth ); |
35 | 34 | ||
36 | connectButton = new QPushButton( this ); | 35 | connectButton = new QPushButton( this ); |
37 | connectButton->setText( tr( "Connect" ) ); | 36 | connectButton->setText( tr( "Connect" ) ); |
38 | 37 | ||
39 | layout->addWidget(info); | 38 | layout->addWidget(info); |
40 | layout->addWidget(cmdLine); | 39 | layout->addWidget(cmdLine); |
41 | layout->addWidget(outPut); | 40 | layout->addWidget(outPut); |
42 | layout->addWidget(connectButton); | 41 | layout->addWidget(connectButton); |
43 | 42 | ||
44 | connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); | 43 | connect( connectButton, SIGNAL( clicked() ), this, SLOT( connectToDevice() ) ); |
45 | 44 | ||
46 | } | 45 | } |
47 | 46 | ||
48 | PPPDialog::~PPPDialog() { | 47 | PPPDialog::~PPPDialog() { |
49 | } | 48 | } |
50 | 49 | ||
51 | void PPPDialog::connectToDevice() { | 50 | void PPPDialog::connectToDevice() { |
52 | outPut->clear(); | 51 | outPut->clear(); |
53 | // vom popupmenu beziehen | 52 | // vom popupmenu beziehen |
54 | QString connectScript = "/etc/ppp/peers/" + cmdLine->text(); | 53 | QString connectScript = "/etc/ppp/peers/" + cmdLine->text(); |
55 | OProcess* pppDial = new OProcess(); | 54 | OProcess* pppDial = new OProcess(); |
56 | *pppDial << "pppd" << m_device << "call" << connectScript; | 55 | *pppDial << "pppd" << m_device << "call" << connectScript; |
57 | connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), | 56 | connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), |
58 | this, SLOT(fillOutPut(OProcess*,char*,int) ) ); | 57 | this, SLOT(fillOutPut(Opie::Core::OProcess*,char*,int) ) ); |
59 | if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) { | 58 | if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) { |
60 | qWarning("could not start"); | 59 | qWarning("could not start"); |
61 | delete pppDial; | 60 | delete pppDial; |
62 | } | 61 | } |
63 | } | 62 | } |
64 | 63 | ||
65 | void PPPDialog::fillOutPut( OProcess* pppDial, char* cha, int len ) { | 64 | void PPPDialog::fillOutPut( OProcess* pppDial, char* cha, int len ) { |
66 | QCString str(cha, len ); | 65 | QCString str(cha, len ); |
67 | outPut->insertLine( str ); | 66 | outPut->insertLine( str ); |
68 | delete pppDial; | 67 | delete pppDial; |
69 | } | 68 | } |
70 | 69 | ||
diff --git a/noncore/settings/networksettings/ppp/config.in b/noncore/settings/networksettings/ppp/config.in index 3b8501d..0b71434 100644 --- a/noncore/settings/networksettings/ppp/config.in +++ b/noncore/settings/networksettings/ppp/config.in | |||
@@ -1,4 +1,4 @@ | |||
1 | config PPP | 1 | config PPP |
2 | boolean "opie-networksettingsplugin-kppp (PPP module)" | 2 | boolean "opie-networksettingsplugin-kppp (PPP module)" |
3 | default "n" if NETWORKSETUP | 3 | default "n" if NETWORKSETUP |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES | 4 | depends ( LIBQPE || LIBQPE-X11 ) && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES |
diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in index 97fa468..d4661cb 100644 --- a/noncore/settings/networksettings/wlan/config.in +++ b/noncore/settings/networksettings/wlan/config.in | |||
@@ -1,6 +1,6 @@ | |||
1 | config WLAN | 1 | config WLAN |
2 | boolean "opie-networksettingsplugin-wlan (wireless LAN module)" | 2 | boolean "opie-networksettingsplugin-wlan (wireless LAN module)" |
3 | default "n" if NETWORKSETUP | 3 | default "n" if NETWORKSETUP |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && LIBOPIE2NET | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && LIBOPIE2NET |
5 | #comment "opie-networksettingsplugin-wlan needs libopie2ui, libopie2net and networksetup" | 5 | #comment "opie-networksettingsplugin-wlan needs libopie2ui, libopie2net and networksetup" |
6 | #depends !( LIBOPIE2NET && LIBOPIE && NETWORKSETUP) \ No newline at end of file | 6 | #depends !( LIBOPIE2NET && NETWORKSETUP) \ No newline at end of file |
diff --git a/noncore/unsupported/mail2/bend/bend.cpp b/noncore/unsupported/mail2/bend/bend.cpp index ab6eb45..4ded402 100644 --- a/noncore/unsupported/mail2/bend/bend.cpp +++ b/noncore/unsupported/mail2/bend/bend.cpp | |||
@@ -1,60 +1,60 @@ | |||
1 | #include <qlayout.h> | 1 | #include <qlayout.h> |
2 | #include <qpixmap.h> | 2 | #include <qpixmap.h> |
3 | #include <qlabel.h> | 3 | #include <qlabel.h> |
4 | #include <qsound.h> | 4 | #include <qsound.h> |
5 | #include <qtimer.h> | 5 | #include <qtimer.h> |
6 | #include <qdir.h> | 6 | #include <qdir.h> |
7 | 7 | ||
8 | #include <qpe/qcopenvelope_qws.h> | 8 | #include <qpe/qcopenvelope_qws.h> |
9 | #include <qpe/resource.h> | 9 | #include <qpe/resource.h> |
10 | #include <qpe/config.h> | 10 | #include <qpe/config.h> |
11 | 11 | ||
12 | #include <opie/odevice.h> | 12 | #include <opie2/odevice.h> |
13 | 13 | ||
14 | #include "imapresponse.h" | 14 | #include "imapresponse.h" |
15 | #include "imaphandler.h" | 15 | #include "imaphandler.h" |
16 | #include "configfile.h" | 16 | #include "configfile.h" |
17 | #include "bend.h" | 17 | #include "bend.h" |
18 | 18 | ||
19 | using namespace Opie; | 19 | using namespace Opie; |
20 | 20 | ||
21 | BenD::BenD(QWidget *parent, const char *name, WFlags fl) | 21 | BenD::BenD(QWidget *parent, const char *name, WFlags fl) |
22 | : QButton(parent, name, fl) | 22 | : QButton(parent, name, fl) |
23 | { | 23 | { |
24 | _config = new Config("mail"); | 24 | _config = new Config("mail"); |
25 | _config->setGroup("Settings"); | 25 | _config->setGroup("Settings"); |
26 | 26 | ||
27 | QVBoxLayout *layout = new QVBoxLayout(this); | 27 | QVBoxLayout *layout = new QVBoxLayout(this); |
28 | layout->addItem(new QSpacerItem(0,0)); | 28 | layout->addItem(new QSpacerItem(0,0)); |
29 | 29 | ||
30 | QLabel *pixmap = new QLabel(this); | 30 | QLabel *pixmap = new QLabel(this); |
31 | pixmap->setPixmap(Resource::loadPixmap("mail/mailchecker")); | 31 | pixmap->setPixmap(Resource::loadPixmap("mail/mailchecker")); |
32 | layout->addWidget(pixmap); | 32 | layout->addWidget(pixmap); |
33 | 33 | ||
34 | layout->addItem(new QSpacerItem(0,0)); | 34 | layout->addItem(new QSpacerItem(0,0)); |
35 | 35 | ||
36 | hide(); | 36 | hide(); |
37 | 37 | ||
38 | connect(this, SIGNAL(clicked()), SLOT(slotClicked())); | 38 | connect(this, SIGNAL(clicked()), SLOT(slotClicked())); |
39 | 39 | ||
40 | if (!_config->readBoolEntry("Disabled", false)) { | 40 | if (!_config->readBoolEntry("Disabled", false)) { |
41 | _intervalMs = _config->readNumEntry("CheckEvery", 5) * 60000; | 41 | _intervalMs = _config->readNumEntry("CheckEvery", 5) * 60000; |
42 | _intervalTimer = new QTimer(); | 42 | _intervalTimer = new QTimer(); |
43 | _intervalTimer->start(_intervalMs); | 43 | _intervalTimer->start(_intervalMs); |
44 | connect(_intervalTimer, SIGNAL(timeout()), SLOT(slotCheck())); | 44 | connect(_intervalTimer, SIGNAL(timeout()), SLOT(slotCheck())); |
45 | 45 | ||
46 | QTimer::singleShot(0, this, SLOT(slotCheck())); | 46 | QTimer::singleShot(0, this, SLOT(slotCheck())); |
47 | } | 47 | } |
48 | } | 48 | } |
49 | 49 | ||
50 | void BenD::drawButton(QPainter *) { } | 50 | void BenD::drawButton(QPainter *) { } |
51 | void BenD::drawButtonText(QPainter *) { } | 51 | void BenD::drawButtonText(QPainter *) { } |
52 | 52 | ||
53 | void BenD::slotClicked() | 53 | void BenD::slotClicked() |
54 | { | 54 | { |
55 | QCopEnvelope e("QPE/System", "execute(QString)"); | 55 | QCopEnvelope e("QPE/System", "execute(QString)"); |
56 | e << QString("mail"); | 56 | e << QString("mail"); |
57 | 57 | ||
58 | ODevice *device = ODevice::inst(); | 58 | ODevice *device = ODevice::inst(); |
59 | if ( !device-> ledList ( ). isEmpty ( )) { | 59 | if ( !device-> ledList ( ). isEmpty ( )) { |
60 | OLed led = ( device-> ledList ( ). contains ( Led_Mail )) ? Led_Mail : device-> ledList ( ) [0]; | 60 | OLed led = ( device-> ledList ( ). contains ( Led_Mail )) ? Led_Mail : device-> ledList ( ) [0]; |
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp index 94de15c..cac3f26 100644 --- a/noncore/unsupported/mail2/composerbase.cpp +++ b/noncore/unsupported/mail2/composerbase.cpp | |||
@@ -1,58 +1,58 @@ | |||
1 | #include <qmultilineedit.h> | 1 | #include <qmultilineedit.h> |
2 | #include <qpopupmenu.h> | 2 | #include <qpopupmenu.h> |
3 | #include <qcombobox.h> | 3 | #include <qcombobox.h> |
4 | #include <qlineedit.h> | 4 | #include <qlineedit.h> |
5 | #include <qlayout.h> | 5 | #include <qlayout.h> |
6 | #include <qaction.h> | 6 | #include <qaction.h> |
7 | #include <qlabel.h> | 7 | #include <qlabel.h> |
8 | #include <qvbox.h> | 8 | #include <qvbox.h> |
9 | 9 | ||
10 | #include <qpe/qpetoolbar.h> | 10 | #include <qtoolbar.h> |
11 | #include <qmenubar.h> | 11 | #include <qmenubar.h> |
12 | #include <qpe/resource.h> | 12 | #include <qpe/resource.h> |
13 | 13 | ||
14 | #include "mailstatusbar.h" | 14 | #include "mailstatusbar.h" |
15 | #include "listviewplus.h" | 15 | #include "listviewplus.h" |
16 | #include "composerbase.h" | 16 | #include "composerbase.h" |
17 | 17 | ||
18 | ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) | 18 | ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) |
19 | : QMainWindow(parent, name, fl) | 19 | : QMainWindow(parent, name, fl) |
20 | { | 20 | { |
21 | setCaption(tr("Compose Message")); | 21 | setCaption(tr("Compose Message")); |
22 | setToolBarsMovable(false); | 22 | setToolBarsMovable(false); |
23 | 23 | ||
24 | toolbar = new QToolBar(this); | 24 | toolbar = new QToolBar(this); |
25 | menubar = new QMenuBar( toolbar ); | 25 | menubar = new QMenuBar( toolbar ); |
26 | mailmenu = new QPopupMenu( menubar ); | 26 | mailmenu = new QPopupMenu( menubar ); |
27 | menubar->insertItem( tr( "Mail" ), mailmenu ); | 27 | menubar->insertItem( tr( "Mail" ), mailmenu ); |
28 | addToolBar(toolbar); | 28 | addToolBar(toolbar); |
29 | toolbar->setHorizontalStretchable(true); | 29 | toolbar->setHorizontalStretchable(true); |
30 | 30 | ||
31 | QLabel *spacer = new QLabel(toolbar); | 31 | QLabel *spacer = new QLabel(toolbar); |
32 | spacer->setBackgroundMode(QWidget::PaletteButton); | 32 | spacer->setBackgroundMode(QWidget::PaletteButton); |
33 | toolbar->setStretchableWidget(spacer); | 33 | toolbar->setStretchableWidget(spacer); |
34 | 34 | ||
35 | sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this); | 35 | sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this); |
36 | sendmail->addTo(toolbar); | 36 | sendmail->addTo(toolbar); |
37 | sendmail->addTo(mailmenu); | 37 | sendmail->addTo(mailmenu); |
38 | 38 | ||
39 | queuemail = new QAction(tr("Queue the mail"), QIconSet(Resource::loadPixmap("mail/sendall")), 0, 0, this); | 39 | queuemail = new QAction(tr("Queue the mail"), QIconSet(Resource::loadPixmap("mail/sendall")), 0, 0, this); |
40 | queuemail->addTo(toolbar); | 40 | queuemail->addTo(toolbar); |
41 | queuemail->addTo(mailmenu); | 41 | queuemail->addTo(mailmenu); |
42 | 42 | ||
43 | attachfile = new QAction(tr("Attach a file"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true); | 43 | attachfile = new QAction(tr("Attach a file"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true); |
44 | attachfile->addTo(toolbar); | 44 | attachfile->addTo(toolbar); |
45 | attachfile->addTo(mailmenu); | 45 | attachfile->addTo(mailmenu); |
46 | connect(attachfile, SIGNAL(toggled(bool)), SLOT(slotAttachfileChanged(bool))); | 46 | connect(attachfile, SIGNAL(toggled(bool)), SLOT(slotAttachfileChanged(bool))); |
47 | 47 | ||
48 | addressbook = new QAction(tr("Addressbook"), QIconSet(Resource::loadPixmap("mail/addbook")), 0, 0, this); | 48 | addressbook = new QAction(tr("Addressbook"), QIconSet(Resource::loadPixmap("mail/addbook")), 0, 0, this); |
49 | addressbook->addTo(toolbar); | 49 | addressbook->addTo(toolbar); |
50 | addressbook->addTo(mailmenu); | 50 | addressbook->addTo(mailmenu); |
51 | 51 | ||
52 | QWidget *main = new QWidget(this); | 52 | QWidget *main = new QWidget(this); |
53 | setCentralWidget(main); | 53 | setCentralWidget(main); |
54 | 54 | ||
55 | QGridLayout *layout = new QGridLayout(main); | 55 | QGridLayout *layout = new QGridLayout(main); |
56 | 56 | ||
57 | fromBox = new QComboBox(main); | 57 | fromBox = new QComboBox(main); |
58 | fromBox->insertItem(tr("From"), POPUP_FROM_FROM); | 58 | fromBox->insertItem(tr("From"), POPUP_FROM_FROM); |
diff --git a/noncore/unsupported/mail2/main.cpp b/noncore/unsupported/mail2/main.cpp index a11b4e2..fce9b0b 100644 --- a/noncore/unsupported/mail2/main.cpp +++ b/noncore/unsupported/mail2/main.cpp | |||
@@ -1,9 +1,10 @@ | |||
1 | #include <qpe/qpeapplication.h> | 1 | #include <qpe/qpeapplication.h> |
2 | 2 | ||
3 | using namespace Opie::Core; | ||
3 | #include "mainwindow.h" | 4 | #include "mainwindow.h" |
4 | 5 | ||
5 | #include <opie/oapplicationfactory.h> | 6 | #include <opie/oapplicationfactory.h> |
6 | 7 | ||
7 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 8 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
8 | 9 | ||
9 | 10 | ||
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp index 4e804c2..666cc4a 100644 --- a/noncore/unsupported/mail2/mainwindowbase.cpp +++ b/noncore/unsupported/mail2/mainwindowbase.cpp | |||
@@ -1,55 +1,55 @@ | |||
1 | #include <qpopupmenu.h> | 1 | #include <qpopupmenu.h> |
2 | #include <qaction.h> | 2 | #include <qaction.h> |
3 | #include <qheader.h> | 3 | #include <qheader.h> |
4 | #include <qlabel.h> | 4 | #include <qlabel.h> |
5 | #include <qvbox.h> | 5 | #include <qvbox.h> |
6 | 6 | ||
7 | #include <qpe/qpetoolbar.h> | 7 | #include <qtoolbar.h> |
8 | #include <qmenubar.h> | 8 | #include <qmenubar.h> |
9 | #include <qpe/resource.h> | 9 | #include <qpe/resource.h> |
10 | 10 | ||
11 | #include "mainwindowbase.h" | 11 | #include "mainwindowbase.h" |
12 | #include "mailstatusbar.h" | 12 | #include "mailstatusbar.h" |
13 | #include "folderwidget.h" | 13 | #include "folderwidget.h" |
14 | #include "mailtable.h" | 14 | #include "mailtable.h" |
15 | 15 | ||
16 | MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) | 16 | MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) |
17 | : QMainWindow(parent, name, fl) | 17 | : QMainWindow(parent, name, fl) |
18 | { | 18 | { |
19 | setCaption(tr("E-Mail")); | 19 | setCaption(tr("E-Mail")); |
20 | setToolBarsMovable(false); | 20 | setToolBarsMovable(false); |
21 | 21 | ||
22 | toolbar = new QToolBar(this); | 22 | toolbar = new QToolBar(this); |
23 | menubar = new QMenuBar( toolbar ); | 23 | menubar = new QMenuBar( toolbar ); |
24 | mailmenu = new QPopupMenu( menubar ); | 24 | mailmenu = new QPopupMenu( menubar ); |
25 | servermenu = new QPopupMenu( menubar ); | 25 | servermenu = new QPopupMenu( menubar ); |
26 | menubar->insertItem( tr( "Mail" ), mailmenu ); | 26 | menubar->insertItem( tr( "Mail" ), mailmenu ); |
27 | menubar->insertItem( tr( "Servers" ), servermenu ); | 27 | menubar->insertItem( tr( "Servers" ), servermenu ); |
28 | 28 | ||
29 | addToolBar(toolbar); | 29 | addToolBar(toolbar); |
30 | toolbar->setHorizontalStretchable(true); | 30 | toolbar->setHorizontalStretchable(true); |
31 | 31 | ||
32 | QLabel *spacer = new QLabel(toolbar); | 32 | QLabel *spacer = new QLabel(toolbar); |
33 | spacer->setBackgroundMode(QWidget::PaletteButton); | 33 | spacer->setBackgroundMode(QWidget::PaletteButton); |
34 | toolbar->setStretchableWidget(spacer); | 34 | toolbar->setStretchableWidget(spacer); |
35 | 35 | ||
36 | compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); | 36 | compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); |
37 | compose->addTo(toolbar); | 37 | compose->addTo(toolbar); |
38 | compose->addTo(mailmenu); | 38 | compose->addTo(mailmenu); |
39 | 39 | ||
40 | sendQueue = new QAction(tr("Send queued mails"), QIconSet(Resource::loadPixmap("mail/sendqueue")), 0, 0, this); | 40 | sendQueue = new QAction(tr("Send queued mails"), QIconSet(Resource::loadPixmap("mail/sendqueue")), 0, 0, this); |
41 | sendQueue->addTo(toolbar); | 41 | sendQueue->addTo(toolbar); |
42 | sendQueue->addTo(mailmenu); | 42 | sendQueue->addTo(mailmenu); |
43 | 43 | ||
44 | folders = new QAction(tr("Show/hide folders"), QIconSet(Resource::loadPixmap("mail/folder")), 0, 0, this, 0, true); | 44 | folders = new QAction(tr("Show/hide folders"), QIconSet(Resource::loadPixmap("mail/folder")), 0, 0, this, 0, true); |
45 | folders->addTo(toolbar); | 45 | folders->addTo(toolbar); |
46 | folders->addTo(servermenu); | 46 | folders->addTo(servermenu); |
47 | connect(folders, SIGNAL(toggled(bool)), SLOT(slotFoldersToggled(bool))); | 47 | connect(folders, SIGNAL(toggled(bool)), SLOT(slotFoldersToggled(bool))); |
48 | 48 | ||
49 | findmails = new QAction(tr("Search mails"), QIconSet(Resource::loadPixmap("mail/find")), 0, 0, this); | 49 | findmails = new QAction(tr("Search mails"), QIconSet(Resource::loadPixmap("mail/find")), 0, 0, this); |
50 | findmails->addTo(toolbar); | 50 | findmails->addTo(toolbar); |
51 | findmails->addTo(mailmenu); | 51 | findmails->addTo(mailmenu); |
52 | 52 | ||
53 | configure = new QAction(tr("Configuration"), QIconSet(Resource::loadPixmap("mail/configure")), 0, 0, this); | 53 | configure = new QAction(tr("Configuration"), QIconSet(Resource::loadPixmap("mail/configure")), 0, 0, this); |
54 | configure->addTo(servermenu); | 54 | configure->addTo(servermenu); |
55 | 55 | ||
diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp index f72026f..ff02a7d 100644 --- a/noncore/unsupported/mail2/viewmailbase.cpp +++ b/noncore/unsupported/mail2/viewmailbase.cpp | |||
@@ -1,56 +1,56 @@ | |||
1 | #include <qtextbrowser.h> | 1 | #include <qtextbrowser.h> |
2 | #include <qlistview.h> | 2 | #include <qlistview.h> |
3 | #include <qaction.h> | 3 | #include <qaction.h> |
4 | #include <qlabel.h> | 4 | #include <qlabel.h> |
5 | #include <qvbox.h> | 5 | #include <qvbox.h> |
6 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
7 | 7 | ||
8 | #include <qpe/qpetoolbar.h> | 8 | #include <qtoolbar.h> |
9 | #include <qmenubar.h> | 9 | #include <qmenubar.h> |
10 | #include <qpe/resource.h> | 10 | #include <qpe/resource.h> |
11 | 11 | ||
12 | #include "viewmailbase.h" | 12 | #include "viewmailbase.h" |
13 | #include "opendiag.h" | 13 | #include "opendiag.h" |
14 | 14 | ||
15 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | 15 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) |
16 | : QMainWindow(parent, name, fl) | 16 | : QMainWindow(parent, name, fl) |
17 | { | 17 | { |
18 | setCaption(tr("E-Mail by %1")); | 18 | setCaption(tr("E-Mail by %1")); |
19 | setToolBarsMovable(false); | 19 | setToolBarsMovable(false); |
20 | 20 | ||
21 | toolbar = new QToolBar(this); | 21 | toolbar = new QToolBar(this); |
22 | menubar = new QMenuBar( toolbar ); | 22 | menubar = new QMenuBar( toolbar ); |
23 | mailmenu = new QPopupMenu( menubar ); | 23 | mailmenu = new QPopupMenu( menubar ); |
24 | menubar->insertItem( tr( "Mail" ), mailmenu ); | 24 | menubar->insertItem( tr( "Mail" ), mailmenu ); |
25 | 25 | ||
26 | toolbar->setHorizontalStretchable(true); | 26 | toolbar->setHorizontalStretchable(true); |
27 | addToolBar(toolbar); | 27 | addToolBar(toolbar); |
28 | 28 | ||
29 | QLabel *spacer = new QLabel(toolbar); | 29 | QLabel *spacer = new QLabel(toolbar); |
30 | spacer->setBackgroundMode(QWidget::PaletteButton); | 30 | spacer->setBackgroundMode(QWidget::PaletteButton); |
31 | toolbar->setStretchableWidget(spacer); | 31 | toolbar->setStretchableWidget(spacer); |
32 | 32 | ||
33 | reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this); | 33 | reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this); |
34 | reply->addTo(toolbar); | 34 | reply->addTo(toolbar); |
35 | reply->addTo(mailmenu); | 35 | reply->addTo(mailmenu); |
36 | 36 | ||
37 | forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this); | 37 | forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this); |
38 | forward->addTo(toolbar); | 38 | forward->addTo(toolbar); |
39 | forward->addTo(mailmenu); | 39 | forward->addTo(mailmenu); |
40 | 40 | ||
41 | attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true); | 41 | attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true); |
42 | attachbutton->addTo(toolbar); | 42 | attachbutton->addTo(toolbar); |
43 | attachbutton->addTo(mailmenu); | 43 | attachbutton->addTo(mailmenu); |
44 | connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); | 44 | connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool))); |
45 | 45 | ||
46 | deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); | 46 | deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); |
47 | deleteMail->addTo(toolbar); | 47 | deleteMail->addTo(toolbar); |
48 | deleteMail->addTo(mailmenu); | 48 | deleteMail->addTo(mailmenu); |
49 | 49 | ||
50 | QVBox *view = new QVBox(this); | 50 | QVBox *view = new QVBox(this); |
51 | setCentralWidget(view); | 51 | setCentralWidget(view); |
52 | 52 | ||
53 | attachments = new QListView(view); | 53 | attachments = new QListView(view); |
54 | attachments->setMinimumHeight(90); | 54 | attachments->setMinimumHeight(90); |
55 | attachments->setMaximumHeight(90); | 55 | attachments->setMaximumHeight(90); |
56 | attachments->setAllColumnsShowFocus(true); | 56 | attachments->setAllColumnsShowFocus(true); |
diff --git a/noncore/unsupported/mailit/main.cpp b/noncore/unsupported/mailit/main.cpp index 71f8877..1ccd666 100644 --- a/noncore/unsupported/mailit/main.cpp +++ b/noncore/unsupported/mailit/main.cpp | |||
@@ -1,25 +1,26 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qt Palmtop Environment. | 4 | ** This file is part of Qt Palmtop Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
21 | #include "mailitwindow.h" | 21 | #include "mailitwindow.h" |
22 | 22 | ||
23 | #include <opie/oapplicationfactory.h> | 23 | #include <opie/oapplicationfactory.h> |
24 | 24 | ||
25 | using namespace Opie::Core; | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<MailItWindow> ) \ No newline at end of file | 26 | OPIE_EXPORT_APP( OApplicationFactory<MailItWindow> ) \ No newline at end of file |
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp index cfaadbf..db4db71 100644 --- a/noncore/unsupported/oipkg/pmipkg.cpp +++ b/noncore/unsupported/oipkg/pmipkg.cpp | |||
@@ -1,63 +1,63 @@ | |||
1 | /*************************************************************************** | 1 | /*************************************************************************** |
2 | * * | 2 | * * |
3 | * This program is free software; you can redistribute it and/or modify * | 3 | * This program is free software; you can redistribute it and/or modify * |
4 | * it under the terms of the GNU General Public License as published by * | 4 | * it under the terms of the GNU General Public License as published by * |
5 | * the Free Software Foundation; either version 2 of the License, or * | 5 | * the Free Software Foundation; either version 2 of the License, or * |
6 | * (at your option) any later version. * | 6 | * (at your option) any later version. * |
7 | * * | 7 | * * |
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> | 9 | // (c) 2002 Patrick S. Vogt <tille@handhelds.org> |
10 | #include "pmipkg.h" | 10 | #include "pmipkg.h" |
11 | #include "pksettings.h" | 11 | #include "pksettings.h" |
12 | #include "package.h" | 12 | #include "package.h" |
13 | #include "packagelistitem.h" | 13 | #include "packagelistitem.h" |
14 | 14 | ||
15 | //#include <opie/oprocess.h> | 15 | //#include <opie2/oprocess.h> |
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | #include <qpe/config.h> | 17 | #include <qpe/config.h> |
18 | #include <qpe/stringutil.h> | 18 | #include <qpe/stringutil.h> |
19 | #include <qpe/qpeapplication.h> | 19 | #include <qpe/qpeapplication.h> |
20 | #include <qdir.h> | 20 | #include <qdir.h> |
21 | #include <qfile.h> | 21 | #include <qfile.h> |
22 | #include <qgroupbox.h> | 22 | #include <qgroupbox.h> |
23 | #include <qmultilineedit.h> | 23 | #include <qmultilineedit.h> |
24 | #include <qstring.h> | 24 | #include <qstring.h> |
25 | #include <qcheckbox.h> | 25 | #include <qcheckbox.h> |
26 | #include <qtextstream.h> | 26 | #include <qtextstream.h> |
27 | #include <qtextview.h> | 27 | #include <qtextview.h> |
28 | #include <qmessagebox.h> | 28 | #include <qmessagebox.h> |
29 | #include <qprogressbar.h> | 29 | #include <qprogressbar.h> |
30 | #include <qpushbutton.h> | 30 | #include <qpushbutton.h> |
31 | #include <qlayout.h> | 31 | #include <qlayout.h> |
32 | 32 | ||
33 | #include <stdlib.h> | 33 | #include <stdlib.h> |
34 | #include <unistd.h> | 34 | #include <unistd.h> |
35 | 35 | ||
36 | #include "mainwindow.h" | 36 | #include "mainwindow.h" |
37 | 37 | ||
38 | 38 | ||
39 | 39 | ||
40 | PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f ) | 40 | PmIpkg::PmIpkg( PackageManagerSettings* s, QWidget* p, const char * name, WFlags f ) |
41 | : QObject ( p ) | 41 | : QObject ( p ) |
42 | { | 42 | { |
43 | settings = s; | 43 | settings = s; |
44 | runwindow = new RunWindow( p, name, true, f ); | 44 | runwindow = new RunWindow( p, name, true, f ); |
45 | 45 | ||
46 | Config cfg( "oipkg", Config::User ); | 46 | Config cfg( "oipkg", Config::User ); |
47 | cfg.setGroup( "ipkg" ); | 47 | cfg.setGroup( "ipkg" ); |
48 | ipkg_cmd = cfg.readEntry( "cmd", "ipkg" )+" "; | 48 | ipkg_cmd = cfg.readEntry( "cmd", "ipkg" )+" "; |
49 | } | 49 | } |
50 | 50 | ||
51 | PmIpkg::~PmIpkg() | 51 | PmIpkg::~PmIpkg() |
52 | { | 52 | { |
53 | } | 53 | } |
54 | 54 | ||
55 | bool PmIpkg::runIpkg(const QString& args, const QString& dest ) | 55 | bool PmIpkg::runIpkg(const QString& args, const QString& dest ) |
56 | { | 56 | { |
57 | bool ret=false; | 57 | bool ret=false; |
58 | QDir::setCurrent("/tmp"); | 58 | QDir::setCurrent("/tmp"); |
59 | QString cmd = ipkg_cmd; | 59 | QString cmd = ipkg_cmd; |
60 | pvDebug( 3,"PmIpkg::runIpkg got dest="+dest); | 60 | pvDebug( 3,"PmIpkg::runIpkg got dest="+dest); |
61 | if (!args.contains("update")) | 61 | if (!args.contains("update")) |
62 | { | 62 | { |
63 | if ( dest == "" ) | 63 | if ( dest == "" ) |
diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp index 75e86d0..df9df54 100644 --- a/noncore/unsupported/qpdf/qpdf.cpp +++ b/noncore/unsupported/qpdf/qpdf.cpp | |||
@@ -1,71 +1,71 @@ | |||
1 | //======================================================================== | 1 | //======================================================================== |
2 | // | 2 | // |
3 | // qpdf.cc | 3 | // qpdf.cc |
4 | // | 4 | // |
5 | // Copyright 2001 Robert Griebl | 5 | // Copyright 2001 Robert Griebl |
6 | // | 6 | // |
7 | //======================================================================== | 7 | //======================================================================== |
8 | 8 | ||
9 | #include "aconf.h" | 9 | #include "aconf.h" |
10 | #include "GString.h" | 10 | #include "GString.h" |
11 | #include "PDFDoc.h" | 11 | #include "PDFDoc.h" |
12 | #include "TextOutputDev.h" | 12 | #include "TextOutputDev.h" |
13 | 13 | ||
14 | #include "QPEOutputDev.h" | 14 | #include "QPEOutputDev.h" |
15 | 15 | ||
16 | #include <qpe/qpeapplication.h> | 16 | #include <qpe/qpeapplication.h> |
17 | #include <qpe/resource.h> | 17 | #include <qpe/resource.h> |
18 | #include <qpe/applnk.h> | 18 | #include <qpe/applnk.h> |
19 | #include <qpe/qcopenvelope_qws.h> | 19 | #include <qpe/qcopenvelope_qws.h> |
20 | 20 | ||
21 | 21 | ||
22 | #include <qclipboard.h> | 22 | #include <qclipboard.h> |
23 | #include <qpe/qpetoolbar.h> | 23 | #include <qtoolbar.h> |
24 | #include <qtoolbutton.h> | 24 | #include <qtoolbutton.h> |
25 | #include <qmenubar.h> | 25 | #include <qmenubar.h> |
26 | #include <qpopupmenu.h> | 26 | #include <qpopupmenu.h> |
27 | #include <qwidgetstack.h> | 27 | #include <qwidgetstack.h> |
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |
29 | #include <qfileinfo.h> | 29 | #include <qfileinfo.h> |
30 | #include <qstring.h> | 30 | #include <qstring.h> |
31 | #include <qlineedit.h> | 31 | #include <qlineedit.h> |
32 | #include <qspinbox.h> | 32 | #include <qspinbox.h> |
33 | #include <qlayout.h> | 33 | #include <qlayout.h> |
34 | #include <qdialog.h> | 34 | #include <qdialog.h> |
35 | #include <qlabel.h> | 35 | #include <qlabel.h> |
36 | #include <qmessagebox.h> | 36 | #include <qmessagebox.h> |
37 | 37 | ||
38 | #include "qpdf.h" | 38 | #include "qpdf.h" |
39 | 39 | ||
40 | #ifdef QPDF_QPE_ONLY | 40 | #ifdef QPDF_QPE_ONLY |
41 | #include <qpe/fileselector.h> | 41 | #include <qpe/fileselector.h> |
42 | #else | 42 | #else |
43 | #include <opie/ofileselector.h> | 43 | #include <opie/ofileselector.h> |
44 | #endif | 44 | #endif |
45 | 45 | ||
46 | 46 | ||
47 | int main ( int argc, char **argv ) | 47 | int main ( int argc, char **argv ) |
48 | { | 48 | { |
49 | QPEApplication app ( argc, argv ); | 49 | QPEApplication app ( argc, argv ); |
50 | 50 | ||
51 | // read config file | 51 | // read config file |
52 | globalParams = new GlobalParams ( "" ); | 52 | globalParams = new GlobalParams ( "" ); |
53 | globalParams-> setErrQuiet ( true ); | 53 | globalParams-> setErrQuiet ( true ); |
54 | 54 | ||
55 | QPdfDlg *dlg = new QPdfDlg ( ); | 55 | QPdfDlg *dlg = new QPdfDlg ( ); |
56 | app. showMainDocumentWidget ( dlg ); | 56 | app. showMainDocumentWidget ( dlg ); |
57 | 57 | ||
58 | if (( app. argc ( ) == 3 ) && ( app. argv ( ) [1] == QCString ( "-f" ))) | 58 | if (( app. argc ( ) == 3 ) && ( app. argv ( ) [1] == QCString ( "-f" ))) |
59 | dlg-> openFile ( app. argv ( ) [2] ); | 59 | dlg-> openFile ( app. argv ( ) [2] ); |
60 | 60 | ||
61 | return app. exec ( ); | 61 | return app. exec ( ); |
62 | } | 62 | } |
63 | 63 | ||
64 | 64 | ||
65 | QPdfDlg::QPdfDlg ( ) : QMainWindow ( ) | 65 | QPdfDlg::QPdfDlg ( ) : QMainWindow ( ) |
66 | { | 66 | { |
67 | setCaption ( tr( "QPdf" )); | 67 | setCaption ( tr( "QPdf" )); |
68 | setIcon ( Resource::loadPixmap ( "qpdf_icon" )); | 68 | setIcon ( Resource::loadPixmap ( "qpdf_icon" )); |
69 | 69 | ||
70 | m_busy = false; | 70 | m_busy = false; |
71 | 71 | ||