summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp4
-rw-r--r--core/applets/vmemo/vmemo.cpp1
-rw-r--r--libopie/ofileselector.cc4
-rw-r--r--noncore/net/opieftp/opieftp.cpp8
-rw-r--r--noncore/settings/sound/soundsettings.cpp4
-rw-r--r--noncore/tools/opie-sh/fviewer.cpp2
-rw-r--r--noncore/tools/opie-sh/inputdialog.cpp3
-rw-r--r--noncore/tools/opie-sh/mbox.cpp2
-rw-r--r--noncore/tools/opie-sh/opie-sh.cpp3
-rw-r--r--noncore/tools/remote/buttondialog.cpp10
-rw-r--r--noncore/tools/remote/channelgroup.cpp2
-rw-r--r--noncore/tools/remote/channelgroupconf.cpp2
-rw-r--r--noncore/tools/remote/configtab.cpp2
-rw-r--r--noncore/tools/remote/dvdgroup.cpp2
-rw-r--r--noncore/tools/remote/dvdgroupconf.cpp2
-rw-r--r--noncore/tools/remote/learntab.cpp2
-rw-r--r--noncore/tools/remote/mainview.cpp2
-rw-r--r--noncore/tools/remote/remotetab.cpp8
-rw-r--r--noncore/tools/remote/topgroup.cpp2
-rw-r--r--noncore/tools/remote/topgroupconf.cpp2
-rw-r--r--noncore/tools/remote/vcrgroup.cpp2
-rw-r--r--noncore/tools/remote/vcrgroupconf.cpp2
-rw-r--r--noncore/unsupported/mail2/libmail/imaphandler.cpp2
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp2
-rw-r--r--noncore/unsupported/oipkg/package.cpp10
-rw-r--r--noncore/unsupported/oipkg/packagelist.cpp4
-rw-r--r--noncore/unsupported/oipkg/packagelistdoclnk.cpp4
-rw-r--r--noncore/unsupported/oipkg/packagelistitem.cpp2
-rw-r--r--noncore/unsupported/qpdf/fixed.h4
29 files changed, 51 insertions, 48 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 3dd9f54..93bc97a 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -143,25 +143,25 @@ void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) {
143 // qDebug("Pcmcia: stabchanged"); 143 // qDebug("Pcmcia: stabchanged");
144 if ( getStatusPcmcia() ) { 144 if ( getStatusPcmcia() ) {
145 repaint(FALSE); 145 repaint(FALSE);
146 } 146 }
147 } else if ( msg == "mtabChanged()" ) { 147 } else if ( msg == "mtabChanged()" ) {
148 // qDebug("Pcmcia: mtabchanged"); 148 // qDebug("Pcmcia: mtabchanged");
149 if ( getStatusSd() ) { 149 if ( getStatusSd() ) {
150 repaint(FALSE); 150 repaint(FALSE);
151 } 151 }
152 } 152 }
153} 153}
154 154
155bool CardMonitor::getStatusPcmcia( int showPopUp = FALSE ) { 155bool CardMonitor::getStatusPcmcia( int showPopUp ) {
156 156
157 bool cardWas0 = cardInPcmcia0; // remember last state 157 bool cardWas0 = cardInPcmcia0; // remember last state
158 bool cardWas1 = cardInPcmcia1; 158 bool cardWas1 = cardInPcmcia1;
159 159
160 QString fileName; 160 QString fileName;
161 161
162 // one of these 3 files should exist 162 // one of these 3 files should exist
163 if (QFile::exists("/var/run/stab")) { 163 if (QFile::exists("/var/run/stab")) {
164 fileName = "/var/run/stab"; 164 fileName = "/var/run/stab";
165 } else if (QFile::exists("/var/state/pcmcia/stab")) { 165 } else if (QFile::exists("/var/state/pcmcia/stab")) {
166 fileName="/var/state/pcmcia/stab"; 166 fileName="/var/state/pcmcia/stab";
167 } else { 167 } else {
@@ -226,25 +226,25 @@ bool CardMonitor::getStatusPcmcia( int showPopUp = FALSE ) {
226 else { text += tr("Ejected: "); } 226 else { text += tr("Ejected: "); }
227 text += cardInPcmcia1Name; 227 text += cardInPcmcia1Name;
228 } 228 }
229 popUp( text ); 229 popUp( text );
230 } 230 }
231 231
232 f.close(); 232 f.close();
233 233
234 return ((cardWas0 == cardInPcmcia0 || cardWas1 == cardInPcmcia1) ? FALSE : TRUE); 234 return ((cardWas0 == cardInPcmcia0 || cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
235} 235}
236 236
237 237
238bool CardMonitor::getStatusSd( int showPopUp = FALSE ) { 238bool CardMonitor::getStatusSd( int showPopUp ) {
239 239
240 bool cardWas=cardInSd; // remember last state 240 bool cardWas=cardInSd; // remember last state
241 cardInSd=false; 241 cardInSd=false;
242 242
243#if defined(_OS_LINUX_) || defined(Q_OS_LINUX) 243#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
244 struct mntent *me; 244 struct mntent *me;
245 FILE *mntfp = setmntent( "/etc/mtab", "r" ); 245 FILE *mntfp = setmntent( "/etc/mtab", "r" );
246 246
247 if ( mntfp ) { 247 if ( mntfp ) {
248 while ( (me = getmntent( mntfp )) != 0 ) { 248 while ( (me = getmntent( mntfp )) != 0 ) {
249 QString fs = me->mnt_fsname; 249 QString fs = me->mnt_fsname;
250 if ( fs.left(7)=="/dev/sd" || fs.left(9) == "/dev/mmcd" ) { 250 if ( fs.left(7)=="/dev/sd" || fs.left(9) == "/dev/mmcd" ) {
diff --git a/core/applets/vmemo/vmemo.cpp b/core/applets/vmemo/vmemo.cpp
index b29ee62..4278f46 100644
--- a/core/applets/vmemo/vmemo.cpp
+++ b/core/applets/vmemo/vmemo.cpp
@@ -617,13 +617,14 @@ int VMemo::setToggleButton(int tog) {
617 break; 617 break;
618 case 6: 618 case 6:
619 return Key_F10; 619 return Key_F10;
620 break; 620 break;
621 case 7: 621 case 7:
622 return Key_F11; 622 return Key_F11;
623 break; 623 break;
624 case 8: 624 case 8:
625 return Key_F13; 625 return Key_F13;
626 break; 626 break;
627 }; 627 };
628 } 628 }
629 return -1;
629} 630}
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 8299b3d..7a67ab2 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -104,26 +104,26 @@ OFileSelector::OFileSelector( QWidget *wid, int mode, int selector,
104 : QWidget( wid, "OFileSelector") 104 : QWidget( wid, "OFileSelector")
105{ 105{
106 m_mimetypes = mimeTypes; 106 m_mimetypes = mimeTypes;
107 initVars(); 107 initVars();
108 m_mode = mode; 108 m_mode = mode;
109 m_selector = selector; 109 m_selector = selector;
110 m_currentDir = dirName; 110 m_currentDir = dirName;
111 init(); 111 init();
112QTimer::singleShot(6*1000, this, SLOT( slotTest() ) ); 112QTimer::singleShot(6*1000, this, SLOT( slotTest() ) );
113} 113}
114 114
115OFileSelector::OFileSelector(const QString &mimeFilter, QWidget *parent, 115OFileSelector::OFileSelector(const QString &mimeFilter, QWidget *parent,
116 const char *name, bool newVisible = TRUE, 116 const char *name, bool newVisible,
117 bool closeVisible = FALSE ) 117 bool closeVisible )
118 : QWidget( parent, name ) 118 : QWidget( parent, name )
119{ 119{
120 m_mimetypes = QStringList::split(";", mimeFilter ); 120 m_mimetypes = QStringList::split(";", mimeFilter );
121 initVars(); 121 initVars();
122 m_currentDir = QPEApplication::documentDir(); 122 m_currentDir = QPEApplication::documentDir();
123 m_mode = OPEN; 123 m_mode = OPEN;
124 m_selector = NORMAL; 124 m_selector = NORMAL;
125 m_shClose = closeVisible; 125 m_shClose = closeVisible;
126 m_shNew = newVisible; 126 m_shNew = newVisible;
127 m_shLne = false; 127 m_shLne = false;
128 m_shPerm = false; 128 m_shPerm = false;
129 m_shYesNo = false; 129 m_shYesNo = false;
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 293c391..8f2b9c9 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -490,28 +490,28 @@ void OpieFtp::localUpload()
490 } 490 }
491 for ( ; it.current(); ++it ) { 491 for ( ; it.current(); ++it ) {
492 Local_View->clearSelection(); 492 Local_View->clearSelection();
493 } 493 }
494 Local_View->clearFocus(); 494 Local_View->clearFocus();
495 TabWidget->setCurrentPage(1); 495 TabWidget->setCurrentPage(1);
496 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate 496 remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
497// QCopEnvelope ( "QPE/System", "notBusy()" ); 497// QCopEnvelope ( "QPE/System", "notBusy()" );
498} 498}
499 499
500void OpieFtp::nullifyCallBack() 500void OpieFtp::nullifyCallBack()
501{ 501{
502 FtpOptions(FTPLIB_CALLBACK, NULL, conn); 502 FtpOptions(FTPLIB_CALLBACK, 0, conn);
503 FtpOptions(FTPLIB_IDLETIME, NULL, conn); 503 FtpOptions(FTPLIB_IDLETIME, 0, conn);
504 FtpOptions(FTPLIB_CALLBACKARG, NULL, conn); 504 FtpOptions(FTPLIB_CALLBACKARG, 0, conn);
505 FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn); 505 FtpOptions(FTPLIB_CALLBACKBYTES, 0, conn);
506} 506}
507 507
508void OpieFtp::remoteDownload() 508void OpieFtp::remoteDownload()
509{ 509{
510// qApp->processEvents(); 510// qApp->processEvents();
511 int fsz; 511 int fsz;
512// QCopEnvelope ( "QPE/System", "busy()" ); 512// QCopEnvelope ( "QPE/System", "busy()" );
513 513
514 QList<QListViewItem> * getSelectedItems( QListView * Remote_View ); 514 QList<QListViewItem> * getSelectedItems( QListView * Remote_View );
515 QListViewItemIterator it( Remote_View ); 515 QListViewItemIterator it( Remote_View );
516 for ( ; it.current(); ++it ) { 516 for ( ; it.current(); ++it ) {
517 if ( it.current()->isSelected() ) { 517 if ( it.current()->isSelected() ) {
diff --git a/noncore/settings/sound/soundsettings.cpp b/noncore/settings/sound/soundsettings.cpp
index b490072..672548f 100644
--- a/noncore/settings/sound/soundsettings.cpp
+++ b/noncore/settings/sound/soundsettings.cpp
@@ -29,26 +29,26 @@
29#include <qslider.h> 29#include <qslider.h>
30#include <qcheckbox.h> 30#include <qcheckbox.h>
31#include <qlineedit.h> 31#include <qlineedit.h>
32#include <qcombobox.h> 32#include <qcombobox.h>
33 33
34#include <sys/utsname.h> 34#include <sys/utsname.h>
35#include <sys/time.h> 35#include <sys/time.h>
36#include <sys/types.h> 36#include <sys/types.h>
37#include <unistd.h> 37#include <unistd.h>
38#include <stdio.h> 38#include <stdio.h>
39#include <sys/stat.h> 39#include <sys/stat.h>
40 40
41SoundSettings::SoundSettings( QWidget* parent, const char* name, WFlags fl ) 41SoundSettings::SoundSettings( QWidget* parent, const char* objname, WFlags fl )
42 : SoundSettingsBase( parent, name, TRUE, fl ) 42 : SoundSettingsBase( parent, objname, TRUE, fl )
43{ 43{
44 keyReset=FALSE; 44 keyReset=FALSE;
45 45
46 Config config( "qpe"); 46 Config config( "qpe");
47 config.setGroup( "Volume" ); 47 config.setGroup( "Volume" );
48 volume->setValue(100-config.readNumEntry("VolumePercent")); 48 volume->setValue(100-config.readNumEntry("VolumePercent"));
49 mic->setValue(100-config.readNumEntry("Mic")); 49 mic->setValue(100-config.readNumEntry("Mic"));
50// touchsound->setChecked(config.readBoolEntry("TouchSound")); 50// touchsound->setChecked(config.readBoolEntry("TouchSound"));
51// keysound->setChecked(config.readBoolEntry("KeySound")); 51// keysound->setChecked(config.readBoolEntry("KeySound"));
52 Config cfg("Vmemo"); 52 Config cfg("Vmemo");
53 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 53 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
54 AlertCheckBox->setChecked(cfg.readBoolEntry("Alert")); 54 AlertCheckBox->setChecked(cfg.readBoolEntry("Alert"));
diff --git a/noncore/tools/opie-sh/fviewer.cpp b/noncore/tools/opie-sh/fviewer.cpp
index 882c72c..6f8f054 100644
--- a/noncore/tools/opie-sh/fviewer.cpp
+++ b/noncore/tools/opie-sh/fviewer.cpp
@@ -6,25 +6,25 @@ This program is free software; you can redistribute it and/or modify it under th
6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16#include "fviewer.h" 16#include "fviewer.h"
17 17
18FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent=0, const char*name=0):QWidget(parent, name) 18FViewer::FViewer(QString icon, QString filename, QString title, QWidget *parent, const char*name):QWidget(parent, name)
19{ 19{
20 QVBoxLayout *layout = new QVBoxLayout(this); 20 QVBoxLayout *layout = new QVBoxLayout(this);
21 21
22 setIcon(Resource::loadPixmap("opie-sh")); 22 setIcon(Resource::loadPixmap("opie-sh"));
23 23
24 textView = new QTextBrowser(this, "textview"); 24 textView = new QTextBrowser(this, "textview");
25 layout->addWidget(textView); 25 layout->addWidget(textView);
26 26
27 QString string; 27 QString string;
28 28
29 if(title.isNull()) 29 if(title.isNull())
30 { 30 {
diff --git a/noncore/tools/opie-sh/inputdialog.cpp b/noncore/tools/opie-sh/inputdialog.cpp
index 0780def..1c4e688 100644
--- a/noncore/tools/opie-sh/inputdialog.cpp
+++ b/noncore/tools/opie-sh/inputdialog.cpp
@@ -6,25 +6,25 @@ This program is free software; you can redistribute it and/or modify it under th
6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later 6License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16#include "inputdialog.h" 16#include "inputdialog.h"
17 17
18InputDialog::InputDialog(int w, int h, int newtype, QString labelString, QString title, QString filename, bool edit, QWidget *parent=0, const char *name=0, bool modal=true, WFlags f=0):QDialog(parent, name, modal, f) 18InputDialog::InputDialog(int w, int h, int newtype, QString labelString, QString title, QString filename, bool edit, QWidget *parent, const char *name, bool modal, WFlags f):QDialog(parent, name, modal, f)
19{ 19{
20 type = newtype; 20 type = newtype;
21 QHBoxLayout *layout = new QHBoxLayout(this); 21 QHBoxLayout *layout = new QHBoxLayout(this);
22 layout->addStrut(32); 22 layout->addStrut(32);
23 QLabel *label = new QLabel(labelString, this, "label"); 23 QLabel *label = new QLabel(labelString, this, "label");
24 setCaption(title); 24 setCaption(title);
25 int x, y; 25 int x, y;
26 26
27 layout->addSpacing(5); 27 layout->addSpacing(5);
28 layout->addWidget(label); 28 layout->addWidget(label);
29 layout->addSpacing(5); 29 layout->addSpacing(5);
30 30
@@ -105,13 +105,14 @@ QString InputDialog::getString()
105 { 105 {
106 if(listBox->isSelected(i)) 106 if(listBox->isSelected(i))
107 { 107 {
108 string+=listBox->text(i)+'\n'; 108 string+=listBox->text(i)+'\n';
109 } 109 }
110 } 110 }
111 if(string[string.length()-1] == '\n') 111 if(string[string.length()-1] == '\n')
112 { 112 {
113 string.truncate(string.length()-1); 113 string.truncate(string.length()-1);
114 } 114 }
115 return string; 115 return string;
116 } 116 }
117 return QString::null;
117} 118}
diff --git a/noncore/tools/opie-sh/mbox.cpp b/noncore/tools/opie-sh/mbox.cpp
index cb3ea1b..04b397d 100644
--- a/noncore/tools/opie-sh/mbox.cpp
+++ b/noncore/tools/opie-sh/mbox.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "mbox.h" 17#include "mbox.h"
18 18
19MBox::MBox(int w, int h, int type, QString title, QString message, QString *btext0 = 0, QString *btext1= 0, QString *btext2 = 0, QWidget *parent=0, const char*name=0, bool modal=true, WFlags f=0):QDialog(parent, name, modal, f) 19MBox::MBox(int w, int h, int type, QString title, QString message, QString *btext0, QString *btext1, QString *btext2, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f)
20{ 20{
21 QVBoxLayout *layout = new QVBoxLayout(this); 21 QVBoxLayout *layout = new QVBoxLayout(this);
22 22
23 QHBoxLayout *hlayout1 = new QHBoxLayout(this); 23 QHBoxLayout *hlayout1 = new QHBoxLayout(this);
24 QHBoxLayout *hlayout2 = new QHBoxLayout(this); 24 QHBoxLayout *hlayout2 = new QHBoxLayout(this);
25 25
26 int x, y; 26 int x, y;
27 27
28 layout->addLayout(hlayout1); 28 layout->addLayout(hlayout1);
29 layout->addLayout(hlayout2); 29 layout->addLayout(hlayout2);
30 30
31 setCaption(title); 31 setCaption(title);
diff --git a/noncore/tools/opie-sh/opie-sh.cpp b/noncore/tools/opie-sh/opie-sh.cpp
index e898cb1..96b4b93 100644
--- a/noncore/tools/opie-sh/opie-sh.cpp
+++ b/noncore/tools/opie-sh/opie-sh.cpp
@@ -90,24 +90,25 @@ int myMessageBox(int wi, int h, QWidget *w, int argc, QStringList args)
90 switch(mbox->exec() ) 90 switch(mbox->exec() )
91 { 91 {
92 case 0: 92 case 0:
93 return -1; 93 return -1;
94 case 1: 94 case 1:
95 return -1; 95 return -1;
96 case 2: 96 case 2:
97 return 0; 97 return 0;
98 case 3: 98 case 3:
99 return 1; 99 return 1;
100 case 4: 100 case 4:
101 return 2; 101 return 2;
102 default: return -1;
102 } 103 }
103} 104}
104 105
105void printusage() 106void printusage()
106{ 107{
107 printf("Usage instructions for Opie-sh\n"); 108 printf("Usage instructions for Opie-sh\n");
108 printf("Usage: opie-sh [dialog type] [type specific options]\n"); 109 printf("Usage: opie-sh [dialog type] [type specific options]\n");
109 printf("Types:\n"); 110 printf("Types:\n");
110 printf(" -m Message Box\n"); 111 printf(" -m Message Box\n");
111 printf(" -f [filename] View file [Default = stdin]\n"); 112 printf(" -f [filename] View file [Default = stdin]\n");
112 printf(" -i Input dialog\n"); 113 printf(" -i Input dialog\n");
113 printf(" -h --help These instructions\n"); 114 printf(" -h --help These instructions\n");
@@ -119,25 +120,25 @@ void printusage()
119 printf(" -e Use the error icon\n"); 120 printf(" -e Use the error icon\n");
120 printf(" -0 [text] First button text [Default = OK]\n"); 121 printf(" -0 [text] First button text [Default = OK]\n");
121 printf(" -1 [text] Second button text\n"); 122 printf(" -1 [text] Second button text\n");
122 printf(" -2 [text] Third button text\n"); 123 printf(" -2 [text] Third button text\n");
123 printf(" -g Disable fullscreen\n"); 124 printf(" -g Disable fullscreen\n");
124 printf("Input Dialog options:\n"); 125 printf("Input Dialog options:\n");
125 printf(" -s A single line of input (output to console)\n"); 126 printf(" -s A single line of input (output to console)\n");
126 printf(" -l List input (newline separated list read in from file)\n"); 127 printf(" -l List input (newline separated list read in from file)\n");
127 printf(" -b A list box, enabling multiple selections (input same as -l)\n"); 128 printf(" -b A list box, enabling multiple selections (input same as -l)\n");
128 printf(" -L [label] The label for the input field\n"); 129 printf(" -L [label] The label for the input field\n");
129 printf(" -F [filename] An input file (for when it makes sense) [Default = stdin]\n"); 130 printf(" -F [filename] An input file (for when it makes sense) [Default = stdin]\n");
130 printf(" -E Makes list input editable\n"); 131 printf(" -E Makes list input editable\n");
131 printf(" -g Disable fullscreen\n\0"); 132 printf(" -g Disable fullscreen\n");
132} 133}
133 134
134int fileviewer(QPEApplication *a, int argc, QStringList args) 135int fileviewer(QPEApplication *a, int argc, QStringList args)
135{ 136{
136 int i; 137 int i;
137 QString filename, title, icon; 138 QString filename, title, icon;
138 bool update=false; 139 bool update=false;
139 140
140 for(i=0; i < argc; i++) 141 for(i=0; i < argc; i++)
141 { 142 {
142 if(args[i] == "-f") 143 if(args[i] == "-f")
143 { 144 {
diff --git a/noncore/tools/remote/buttondialog.cpp b/noncore/tools/remote/buttondialog.cpp
index 7479e85..6ea4801 100644
--- a/noncore/tools/remote/buttondialog.cpp
+++ b/noncore/tools/remote/buttondialog.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "buttondialog.h" 17#include "buttondialog.h"
18 18
19ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent=0, const char*name=0, bool modal=FALSE, WFlags f=0):QDialog(parent, name, modal, f) 19ButtonDialog::ButtonDialog(QString buttonName, QWidget *parent, const char*name, bool modal, WFlags f):QDialog(parent, name, modal, f)
20{ 20{
21 setCaption(tr(buttonName)); 21 setCaption(tr(buttonName));
22 22
23 QVBoxLayout *layout = new QVBoxLayout(this); 23 QVBoxLayout *layout = new QVBoxLayout(this);
24 24
25 QHBoxLayout *hlayout1 = new QHBoxLayout(this); 25 QHBoxLayout *hlayout1 = new QHBoxLayout(this);
26 QHBoxLayout *hlayout2 = new QHBoxLayout(this); 26 QHBoxLayout *hlayout2 = new QHBoxLayout(this);
27 QHBoxLayout *hlayout3 = new QHBoxLayout(this); 27 QHBoxLayout *hlayout3 = new QHBoxLayout(this);
28 28
29 layout->addSpacing(5); 29 layout->addSpacing(5);
30 layout->addLayout(hlayout1); 30 layout->addLayout(hlayout1);
31 layout->addSpacing(5); 31 layout->addSpacing(5);
@@ -102,25 +102,25 @@ QStringList ButtonDialog::getRemotes()
102 { 102 {
103 QMessageBox *mb = new QMessageBox("Error!", 103 QMessageBox *mb = new QMessageBox("Error!",
104 "couldnt connect to socket", 104 "couldnt connect to socket",
105 QMessageBox::NoIcon, 105 QMessageBox::NoIcon,
106 QMessageBox::Ok, 106 QMessageBox::Ok,
107 QMessageBox::NoButton, 107 QMessageBox::NoButton,
108 QMessageBox::NoButton); 108 QMessageBox::NoButton);
109 mb->exec(); 109 mb->exec();
110 perror("ButtonDialog::GetRemotes"); 110 perror("ButtonDialog::GetRemotes");
111 return NULL; 111 return NULL;
112 } 112 }
113 113
114 if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) 114 if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
115 { 115 {
116 QMessageBox *mb = new QMessageBox("Error!", 116 QMessageBox *mb = new QMessageBox("Error!",
117 "couldnt connect to socket", 117 "couldnt connect to socket",
118 QMessageBox::NoIcon, 118 QMessageBox::NoIcon,
119 QMessageBox::Ok, 119 QMessageBox::Ok,
120 QMessageBox::NoButton, 120 QMessageBox::NoButton,
121 QMessageBox::NoButton); 121 QMessageBox::NoButton);
122 mb->exec(); 122 mb->exec();
123 perror("ButtonDialog::GetRemotes"); 123 perror("ButtonDialog::GetRemotes");
124 return NULL; 124 return NULL;
125 } 125 }
126 126
@@ -145,25 +145,25 @@ QStringList ButtonDialog::getRemotes()
145 { 145 {
146 QMessageBox *mb = new QMessageBox("Error!", 146 QMessageBox *mb = new QMessageBox("Error!",
147 "bad packet", 147 "bad packet",
148 QMessageBox::NoIcon, 148 QMessageBox::NoIcon,
149 QMessageBox::Ok, 149 QMessageBox::Ok,
150 QMessageBox::NoButton, 150 QMessageBox::NoButton,
151 QMessageBox::NoButton); 151 QMessageBox::NoButton);
152 mb->exec(); 152 mb->exec();
153 perror("ButtonDialog::GetRemotes"); 153 perror("ButtonDialog::GetRemotes");
154 return NULL; 154 return NULL;
155 } 155 }
156 156
157 std::close(fd); 157 ::close(fd);
158 return list; 158 return list;
159} 159}
160 160
161QStringList ButtonDialog::getButtons(const char *remoteName) 161QStringList ButtonDialog::getButtons(const char *remoteName)
162{ 162{
163 QString write_buffer = "LIST "; 163 QString write_buffer = "LIST ";
164 const char *readbuffer; 164 const char *readbuffer;
165 int i, j, numlines; 165 int i, j, numlines;
166 QStringList list; 166 QStringList list;
167 QString string; 167 QString string;
168 168
169 write_buffer += remoteName; 169 write_buffer += remoteName;
@@ -175,25 +175,25 @@ QStringList ButtonDialog::getButtons(const char *remoteName)
175 QMessageBox *mb = new QMessageBox("Error!", 175 QMessageBox *mb = new QMessageBox("Error!",
176 "couldnt connect to socket", 176 "couldnt connect to socket",
177 QMessageBox::NoIcon, 177 QMessageBox::NoIcon,
178 QMessageBox::Ok, 178 QMessageBox::Ok,
179 QMessageBox::NoButton, 179 QMessageBox::NoButton,
180 QMessageBox::NoButton); 180 QMessageBox::NoButton);
181 mb->exec(); 181 mb->exec();
182 perror("ButtonDialog::GetButtons"); 182 perror("ButtonDialog::GetButtons");
183 return NULL; 183 return NULL;
184 } 184 }
185 185
186 186
187 if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) 187 if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
188 { 188 {
189 QMessageBox *mb = new QMessageBox("Error!", 189 QMessageBox *mb = new QMessageBox("Error!",
190 "couldnt connect to socket", 190 "couldnt connect to socket",
191 QMessageBox::NoIcon, 191 QMessageBox::NoIcon,
192 QMessageBox::Ok, 192 QMessageBox::Ok,
193 QMessageBox::NoButton, 193 QMessageBox::NoButton,
194 QMessageBox::NoButton); 194 QMessageBox::NoButton);
195 mb->exec(); 195 mb->exec();
196 perror("ButtonDialog::GetButtons"); 196 perror("ButtonDialog::GetButtons");
197 return NULL; 197 return NULL;
198 } 198 }
199 199
@@ -221,25 +221,25 @@ QStringList ButtonDialog::getButtons(const char *remoteName)
221 { 221 {
222 QMessageBox *mb = new QMessageBox("Error!", 222 QMessageBox *mb = new QMessageBox("Error!",
223 "bad packet", 223 "bad packet",
224 QMessageBox::NoIcon, 224 QMessageBox::NoIcon,
225 QMessageBox::Ok, 225 QMessageBox::Ok,
226 QMessageBox::NoButton, 226 QMessageBox::NoButton,
227 QMessageBox::NoButton); 227 QMessageBox::NoButton);
228 mb->exec(); 228 mb->exec();
229 perror("ButtonDialog::GetButtons"); 229 perror("ButtonDialog::GetButtons");
230 return NULL; 230 return NULL;
231 } 231 }
232 232
233 std::close(fd); 233 ::close(fd);
234 return list; 234 return list;
235} 235}
236 236
237 237
238//this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html 238//this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html
239const char *ButtonDialog::readPacket() 239const char *ButtonDialog::readPacket()
240{ 240{
241 static char buffer[PACKET_SIZE+1]=""; 241 static char buffer[PACKET_SIZE+1]="";
242 char *end; 242 char *end;
243 static int ptr=0,end_len=0; 243 static int ptr=0,end_len=0;
244 ssize_t ret; 244 ssize_t ret;
245 timeout = 0; 245 timeout = 0;
diff --git a/noncore/tools/remote/channelgroup.cpp b/noncore/tools/remote/channelgroup.cpp
index 9f90284..7c33674 100644
--- a/noncore/tools/remote/channelgroup.cpp
+++ b/noncore/tools/remote/channelgroup.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "channelgroup.h" 17#include "channelgroup.h"
18 18
19ChannelGroup::ChannelGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) 19ChannelGroup::ChannelGroup(QWidget *parent, const char *name):QWidget(parent,name)
20{ 20{
21 QGridLayout *layout = new QGridLayout(this); 21 QGridLayout *layout = new QGridLayout(this);
22 QVBoxLayout *volLayout = new QVBoxLayout(this); 22 QVBoxLayout *volLayout = new QVBoxLayout(this);
23 QVBoxLayout *chanLayout = new QVBoxLayout(this); 23 QVBoxLayout *chanLayout = new QVBoxLayout(this);
24 24
25 layout->addRowSpacing(1,1); 25 layout->addRowSpacing(1,1);
26 layout->addRowSpacing(3,1); 26 layout->addRowSpacing(3,1);
27 layout->addRowSpacing(5,1); 27 layout->addRowSpacing(5,1);
28 28
29 layout->addColSpacing(1,1); 29 layout->addColSpacing(1,1);
30 layout->addColSpacing(3,1); 30 layout->addColSpacing(3,1);
31 layout->addColSpacing(5,1); 31 layout->addColSpacing(5,1);
diff --git a/noncore/tools/remote/channelgroupconf.cpp b/noncore/tools/remote/channelgroupconf.cpp
index 2d98115..e39121e 100644
--- a/noncore/tools/remote/channelgroupconf.cpp
+++ b/noncore/tools/remote/channelgroupconf.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "channelgroupconf.h" 17#include "channelgroupconf.h"
18 18
19ChannelGroupConf::ChannelGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) 19ChannelGroupConf::ChannelGroupConf(QWidget *parent, const char *name):QWidget(parent,name)
20{ 20{
21 QGridLayout *layout = new QGridLayout(this); 21 QGridLayout *layout = new QGridLayout(this);
22 QVBoxLayout *volLayout = new QVBoxLayout(this); 22 QVBoxLayout *volLayout = new QVBoxLayout(this);
23 QVBoxLayout *chanLayout = new QVBoxLayout(this); 23 QVBoxLayout *chanLayout = new QVBoxLayout(this);
24 24
25 layout->addRowSpacing(1,5); 25 layout->addRowSpacing(1,5);
26 layout->addRowSpacing(3,5); 26 layout->addRowSpacing(3,5);
27 layout->addRowSpacing(5,5); 27 layout->addRowSpacing(5,5);
28 28
29 layout->addColSpacing(1,1); 29 layout->addColSpacing(1,1);
30 layout->addColSpacing(3,1); 30 layout->addColSpacing(3,1);
31 layout->addColSpacing(5,1); 31 layout->addColSpacing(5,1);
diff --git a/noncore/tools/remote/configtab.cpp b/noncore/tools/remote/configtab.cpp
index f5896a9..17cdc6a 100644
--- a/noncore/tools/remote/configtab.cpp
+++ b/noncore/tools/remote/configtab.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "configtab.h" 17#include "configtab.h"
18 18
19ConfigTab::ConfigTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) 19ConfigTab::ConfigTab(QWidget *parent, const char *name):QWidget(parent,name)
20{ 20{
21 21
22 QVBoxLayout *layout = new QVBoxLayout(this); 22 QVBoxLayout *layout = new QVBoxLayout(this);
23 23
24 topGroupConf = new TopGroupConf(this, "topGroupConf"); 24 topGroupConf = new TopGroupConf(this, "topGroupConf");
25 layout->addWidget(topGroupConf, 1); 25 layout->addWidget(topGroupConf, 1);
26 layout->addSpacing(1); 26 layout->addSpacing(1);
27 27
28 dvdGroupConf = new DVDGroupConf(this, "dvdGroupConf"); 28 dvdGroupConf = new DVDGroupConf(this, "dvdGroupConf");
29 layout->addWidget(dvdGroupConf, 1); 29 layout->addWidget(dvdGroupConf, 1);
30 layout->addSpacing(1); 30 layout->addSpacing(1);
31 31
diff --git a/noncore/tools/remote/dvdgroup.cpp b/noncore/tools/remote/dvdgroup.cpp
index a75c48a..d7ff515 100644
--- a/noncore/tools/remote/dvdgroup.cpp
+++ b/noncore/tools/remote/dvdgroup.cpp
@@ -13,25 +13,25 @@ WARRANTY; without even the
13implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 14
15GNU General 15GNU General
16Public License for more details. 16Public License for more details.
17 17
18You should have received a copy of the GNU General Public License along with 18You should have received a copy of the GNU General Public License along with
19this program; if not, write to the Free 19this program; if not, write to the Free
20Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21*/ 21*/
22 22
23#include "dvdgroup.h" 23#include "dvdgroup.h"
24 24
25DVDGroup::DVDGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) 25DVDGroup::DVDGroup(QWidget *parent, const char *name):QWidget(parent,name)
26{ 26{
27 QGridLayout *layout = new QGridLayout(this); 27 QGridLayout *layout = new QGridLayout(this);
28 28
29//put rows between the buttons of size 1 29//put rows between the buttons of size 1
30 layout->addRowSpacing(1,1); 30 layout->addRowSpacing(1,1);
31 layout->addRowSpacing(3,1); 31 layout->addRowSpacing(3,1);
32 32
33//put collumns between the buttons of size 5 33//put collumns between the buttons of size 5
34 layout->addColSpacing(1,5); 34 layout->addColSpacing(1,5);
35 layout->addColSpacing(3,5); 35 layout->addColSpacing(3,5);
36 layout->addColSpacing(5,5); 36 layout->addColSpacing(5,5);
37 layout->addColSpacing(7,5); 37 layout->addColSpacing(7,5);
diff --git a/noncore/tools/remote/dvdgroupconf.cpp b/noncore/tools/remote/dvdgroupconf.cpp
index 5bfe393..2a08ab6 100644
--- a/noncore/tools/remote/dvdgroupconf.cpp
+++ b/noncore/tools/remote/dvdgroupconf.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "dvdgroupconf.h" 17#include "dvdgroupconf.h"
18 18
19DVDGroupConf::DVDGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) 19DVDGroupConf::DVDGroupConf(QWidget *parent, const char *name):QWidget(parent,name)
20{ 20{
21 QGridLayout *layout = new QGridLayout(this); 21 QGridLayout *layout = new QGridLayout(this);
22 22
23//put rows between the buttons of size 1 23//put rows between the buttons of size 1
24 layout->addRowSpacing(1,1); 24 layout->addRowSpacing(1,1);
25 layout->addRowSpacing(3,1); 25 layout->addRowSpacing(3,1);
26 26
27//put collumns between the buttons of size 5 27//put collumns between the buttons of size 5
28 layout->addColSpacing(1,5); 28 layout->addColSpacing(1,5);
29 layout->addColSpacing(3,5); 29 layout->addColSpacing(3,5);
30 layout->addColSpacing(5,5); 30 layout->addColSpacing(5,5);
31 layout->addColSpacing(7,5); 31 layout->addColSpacing(7,5);
diff --git a/noncore/tools/remote/learntab.cpp b/noncore/tools/remote/learntab.cpp
index 054bc7b..998f449 100644
--- a/noncore/tools/remote/learntab.cpp
+++ b/noncore/tools/remote/learntab.cpp
@@ -7,20 +7,20 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "learntab.h" 17#include "learntab.h"
18 18
19LearnTab::LearnTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) 19LearnTab::LearnTab(QWidget *parent, const char *name):QWidget(parent,name)
20{ 20{
21 QVBoxLayout *layout = new QVBoxLayout(this); 21 QVBoxLayout *layout = new QVBoxLayout(this);
22 QString *string = new QString("<qt><h1>Opie-Remote Usage Instructions</h1><p>First, some definitions. A Remote is a remote entry in an lircd.conf file, it represents one remote you want to emulate. A Remote Layout is one entry in your ~/Settings/Remote.conf file. It represents the buttons that you see on your screen. Each button on a Remote Layout can be mapped to any button in a Remote. This way you can have, for example, a vcr remote layout, in which all the play/pause/etc buttons are mapped to the buttons on your vcr's remote. However, most VCR's don't have volume controls, so the volume buttons can be mapped to the volume buttons on your TV.</p><p>The first things you need the lirc and lirc-modules ipkgs. If you installed this from an ipkg, they should already be there, thanks to the wonderful world of dependencies. If not, get them. The next thing you need is an lircd.conf file. you can get these at <a href=http://www.lirc.org/>http://www.lirc.org/</a>. Read the documentation there to figure out how to make your own, if one for your remote doesn't exist, or how to have multiple remotes in one lircd.conf file. Once you have a good lircd.conf file, put it in /etc, kill the lircd daemon (if its running) and do a modprobe lirc_sir. Then, run lircd again.</p><p>The next thing you want to do is to create a remote layout. Go to the config tab, and enter a name for your remote layout in the pulldown menu. Dont use the name Remotes, as that could confuse the app. Hopefully, that will be fixed soon. after entering the name you want to use, press New, and then select the name again from the pulldown menu (another oddity that i hope to fix). Then, press each button that you want to map, and a dialog should appear. Select the remote and button that you want to use, and click OK. Once you are done, go to the Remote tab, and select the new remote from the dropdown menu. It should works fine. If at any time you want to change a remote layout, go to the Config tab, select the layout from the dropdown menu, and change the buttons you want to change.</p><p>This is program is written and maintaned by Thomas (spiralman) Stephens. <a href=mailto:spiralman@softhome.net>spiralman@softhome.net</a>. Or, look for me on #opie or #handhelds.org on irc.openprojects.net.</p></qt>"); 22 QString *string = new QString("<qt><h1>Opie-Remote Usage Instructions</h1><p>First, some definitions. A Remote is a remote entry in an lircd.conf file, it represents one remote you want to emulate. A Remote Layout is one entry in your ~/Settings/Remote.conf file. It represents the buttons that you see on your screen. Each button on a Remote Layout can be mapped to any button in a Remote. This way you can have, for example, a vcr remote layout, in which all the play/pause/etc buttons are mapped to the buttons on your vcr's remote. However, most VCR's don't have volume controls, so the volume buttons can be mapped to the volume buttons on your TV.</p><p>The first things you need the lirc and lirc-modules ipkgs. If you installed this from an ipkg, they should already be there, thanks to the wonderful world of dependencies. If not, get them. The next thing you need is an lircd.conf file. you can get these at <a href=http://www.lirc.org/>http://www.lirc.org/</a>. Read the documentation there to figure out how to make your own, if one for your remote doesn't exist, or how to have multiple remotes in one lircd.conf file. Once you have a good lircd.conf file, put it in /etc, kill the lircd daemon (if its running) and do a modprobe lirc_sir. Then, run lircd again.</p><p>The next thing you want to do is to create a remote layout. Go to the config tab, and enter a name for your remote layout in the pulldown menu. Dont use the name Remotes, as that could confuse the app. Hopefully, that will be fixed soon. after entering the name you want to use, press New, and then select the name again from the pulldown menu (another oddity that i hope to fix). Then, press each button that you want to map, and a dialog should appear. Select the remote and button that you want to use, and click OK. Once you are done, go to the Remote tab, and select the new remote from the dropdown menu. It should works fine. If at any time you want to change a remote layout, go to the Config tab, select the layout from the dropdown menu, and change the buttons you want to change.</p><p>This is program is written and maintaned by Thomas (spiralman) Stephens. <a href=mailto:spiralman@softhome.net>spiralman@softhome.net</a>. Or, look for me on #opie or #handhelds.org on irc.openprojects.net.</p></qt>");
23 23
24 QTextView *textView = new QTextView(*string, 0, this); 24 QTextView *textView = new QTextView(*string, 0, this);
25 layout->addWidget(textView); 25 layout->addWidget(textView);
26} 26}
diff --git a/noncore/tools/remote/mainview.cpp b/noncore/tools/remote/mainview.cpp
index 47027fb..a7be9e3 100644
--- a/noncore/tools/remote/mainview.cpp
+++ b/noncore/tools/remote/mainview.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "mainview.h" 17#include "mainview.h"
18 18
19MainView::MainView(QWidget *parent, const char *name=0) : QWidget(parent, name) 19MainView::MainView(QWidget *parent, const char *name) : QWidget(parent, name)
20{ 20{
21 setIcon( Resource::loadPixmap( "remote" ) ); 21 setIcon( Resource::loadPixmap( "remote" ) );
22 setCaption(tr("Remote") ); 22 setCaption(tr("Remote") );
23 23
24 QVBoxLayout *layout = new QVBoxLayout(this); 24 QVBoxLayout *layout = new QVBoxLayout(this);
25 QTabWidget *tabs = new QTabWidget(this); 25 QTabWidget *tabs = new QTabWidget(this);
26 26
27 layout->addWidget(tabs); 27 layout->addWidget(tabs);
28 28
29 printf("MainView: 1\n"); 29 printf("MainView: 1\n");
30 remote = new RemoteTab(tabs); 30 remote = new RemoteTab(tabs);
31 printf("MainView: 2\n"); 31 printf("MainView: 2\n");
diff --git a/noncore/tools/remote/remotetab.cpp b/noncore/tools/remote/remotetab.cpp
index 64b8ee4..5b02e94 100644
--- a/noncore/tools/remote/remotetab.cpp
+++ b/noncore/tools/remote/remotetab.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "remotetab.h" 17#include "remotetab.h"
18 18
19RemoteTab::RemoteTab(QWidget *parent=0, const char *name=0):QWidget(parent,name) 19RemoteTab::RemoteTab(QWidget *parent, const char *name):QWidget(parent,name)
20{ 20{
21 QVBoxLayout *layout = new QVBoxLayout(this); 21 QVBoxLayout *layout = new QVBoxLayout(this);
22 22
23 topGroup = new TopGroup(this); 23 topGroup = new TopGroup(this);
24 //topGroup->setMaximumHeight(22); 24 //topGroup->setMaximumHeight(22);
25 layout->addWidget(topGroup, 0, 0); 25 layout->addWidget(topGroup, 0, 0);
26 printf("%d %d", topGroup->width(), topGroup->height()); 26 printf("%d %d", topGroup->width(), topGroup->height());
27 27
28 layout->addSpacing(1); 28 layout->addSpacing(1);
29 29
30 dvdGroup = new DVDGroup(this); 30 dvdGroup = new DVDGroup(this);
31 //dvdGroup->setMaximumHeight(68); 31 //dvdGroup->setMaximumHeight(68);
@@ -62,29 +62,29 @@ int RemoteTab::sendIR()
62 62
63 fd = socket(AF_UNIX, SOCK_STREAM, 0); 63 fd = socket(AF_UNIX, SOCK_STREAM, 0);
64 if(fd == -1) 64 if(fd == -1)
65 { 65 {
66 QMessageBox *mb = new QMessageBox("Error!", 66 QMessageBox *mb = new QMessageBox("Error!",
67 "couldnt connect to socket", 67 "couldnt connect to socket",
68 QMessageBox::NoIcon, 68 QMessageBox::NoIcon,
69 QMessageBox::Ok, 69 QMessageBox::Ok,
70 QMessageBox::NoButton, 70 QMessageBox::NoButton,
71 QMessageBox::NoButton); 71 QMessageBox::NoButton);
72 mb->exec(); 72 mb->exec();
73 perror("RemoteTab::SendIR"); 73 perror("RemoteTab::SendIR");
74 return NULL; 74 return 0;
75 } 75 }
76 76
77 77
78 if(std::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1) 78 if(::connect(fd,(struct sockaddr *) &addr, sizeof(addr) ) == -1)
79 { 79 {
80 QMessageBox *mb = new QMessageBox("Error!", 80 QMessageBox *mb = new QMessageBox("Error!",
81 "couldnt connect to socket", 81 "couldnt connect to socket",
82 QMessageBox::NoIcon, 82 QMessageBox::NoIcon,
83 QMessageBox::Ok, 83 QMessageBox::Ok,
84 QMessageBox::NoButton, 84 QMessageBox::NoButton,
85 QMessageBox::NoButton); 85 QMessageBox::NoButton);
86 mb->exec(); 86 mb->exec();
87 perror("RemoteTab::SendIR"); 87 perror("RemoteTab::SendIR");
88 } 88 }
89 89
90 printf("fd2: %d\n", fd); 90 printf("fd2: %d\n", fd);
@@ -94,25 +94,25 @@ int RemoteTab::sendIR()
94 printf("%d\n", write(fd, write_buffer, strlen(write_buffer) ) ); 94 printf("%d\n", write(fd, write_buffer, strlen(write_buffer) ) );
95 printf("2\n"); 95 printf("2\n");
96 while(!done) 96 while(!done)
97 { 97 {
98 read_buffer=readPacket(); 98 read_buffer=readPacket();
99 printf("%s\n", read_buffer); 99 printf("%s\n", read_buffer);
100 if(strcasecmp(read_buffer, "END") == 0) 100 if(strcasecmp(read_buffer, "END") == 0)
101 { 101 {
102 printf("done reading packet\n"); 102 printf("done reading packet\n");
103 done=true; 103 done=true;
104 } 104 }
105 } 105 }
106 std::close(fd); 106 ::close(fd);
107} 107}
108 108
109 // printf("%s\n", readPacket()); 109 // printf("%s\n", readPacket());
110 // printf("%d\n", read(fd, read_buffer,sizeof(read_buffer)) ); 110 // printf("%d\n", read(fd, read_buffer,sizeof(read_buffer)) );
111 // printf("%s", read_buffer); 111 // printf("%s", read_buffer);
112 112
113//this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html 113//this function was ripped for rc.c in xrc, it is available here: http://www.lirc.org/software.html
114const char *RemoteTab::readPacket() 114const char *RemoteTab::readPacket()
115{ 115{
116 static char buffer[PACKET_SIZE+1]=""; 116 static char buffer[PACKET_SIZE+1]="";
117 char *end; 117 char *end;
118 static int ptr=0,end_len=0; 118 static int ptr=0,end_len=0;
diff --git a/noncore/tools/remote/topgroup.cpp b/noncore/tools/remote/topgroup.cpp
index 94ea622..93cffbb 100644
--- a/noncore/tools/remote/topgroup.cpp
+++ b/noncore/tools/remote/topgroup.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "topgroup.h" 17#include "topgroup.h"
18 18
19TopGroup::TopGroup(QWidget *parent=0, const char *name=0):QWidget(parent,name) 19TopGroup::TopGroup(QWidget *parent, const char *name):QWidget(parent,name)
20{ 20{
21 QHBoxLayout *layout = new QHBoxLayout(this, 0, -1, 0); 21 QHBoxLayout *layout = new QHBoxLayout(this, 0, -1, 0);
22 22
23 QPushButton *power = new QPushButton("Power",this,"power"); 23 QPushButton *power = new QPushButton("Power",this,"power");
24 layout->addWidget(power); 24 layout->addWidget(power);
25 connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) ); 25 connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(sendIR()) );
26 //power->setGeometry(5, 5,40, 20); 26 //power->setGeometry(5, 5,40, 20);
27 27
28 layout->addSpacing(5); 28 layout->addSpacing(5);
29 29
30 QPushButton *source = new QPushButton("Source",this,"source"); 30 QPushButton *source = new QPushButton("Source",this,"source");
31 layout->addWidget(source); 31 layout->addWidget(source);
diff --git a/noncore/tools/remote/topgroupconf.cpp b/noncore/tools/remote/topgroupconf.cpp
index eb071fb..d763a3a 100644
--- a/noncore/tools/remote/topgroupconf.cpp
+++ b/noncore/tools/remote/topgroupconf.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "topgroupconf.h" 17#include "topgroupconf.h"
18 18
19TopGroupConf::TopGroupConf(QWidget *parent=0, const char *name=0):QWidget(parent,name) 19TopGroupConf::TopGroupConf(QWidget *parent, const char *name):QWidget(parent,name)
20{ 20{
21 QHBoxLayout *layout = new QHBoxLayout(this); 21 QHBoxLayout *layout = new QHBoxLayout(this);
22 22
23 QPushButton *power = new QPushButton("Power",this,"power"); 23 QPushButton *power = new QPushButton("Power",this,"power");
24 layout->addWidget(power); 24 layout->addWidget(power);
25 connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) ); 25 connect(power, SIGNAL(pressed()), this->parentWidget(), SLOT(buttonPressed()) );
26 //power->setGeometry(5, 5,40, 20); 26 //power->setGeometry(5, 5,40, 20);
27 27
28 layout->addSpacing(5); 28 layout->addSpacing(5);
29 29
30 QPushButton *source = new QPushButton("Source",this,"source"); 30 QPushButton *source = new QPushButton("Source",this,"source");
31 layout->addWidget(source); 31 layout->addWidget(source);
diff --git a/noncore/tools/remote/vcrgroup.cpp b/noncore/tools/remote/vcrgroup.cpp
index 4f07ca3..10ebe5d 100644
--- a/noncore/tools/remote/vcrgroup.cpp
+++ b/noncore/tools/remote/vcrgroup.cpp
@@ -13,25 +13,25 @@ WARRANTY; without even the
13implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 14
15GNU General 15GNU General
16Public License for more details. 16Public License for more details.
17 17
18You should have received a copy of the GNU General Public License along with 18You should have received a copy of the GNU General Public License along with
19this program; if not, write to the Free 19this program; if not, write to the Free
20Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
21*/ 21*/
22 22
23#include "vcrgroup.h" 23#include "vcrgroup.h"
24 24
25VCRGroup::VCRGroup(QWidget *parent=0, const char *name=0) : QWidget(parent, 25VCRGroup::VCRGroup(QWidget *parent, const char *name) : QWidget(parent,
26name) 26name)
27{ 27{
28 QVBoxLayout *vlayout = new QVBoxLayout(this); 28 QVBoxLayout *vlayout = new QVBoxLayout(this);
29 29
30 QHBoxLayout *hlayout1 = new QHBoxLayout(this); 30 QHBoxLayout *hlayout1 = new QHBoxLayout(this);
31 QHBoxLayout *hlayout2 = new QHBoxLayout(this); 31 QHBoxLayout *hlayout2 = new QHBoxLayout(this);
32 32
33 vlayout->addLayout(hlayout1); 33 vlayout->addLayout(hlayout1);
34 vlayout->addSpacing(1); 34 vlayout->addSpacing(1);
35 vlayout->addLayout(hlayout2); 35 vlayout->addLayout(hlayout2);
36 36
37 QPushButton *play = new 37 QPushButton *play = new
diff --git a/noncore/tools/remote/vcrgroupconf.cpp b/noncore/tools/remote/vcrgroupconf.cpp
index a50ed0a..2158d43 100644
--- a/noncore/tools/remote/vcrgroupconf.cpp
+++ b/noncore/tools/remote/vcrgroupconf.cpp
@@ -7,25 +7,25 @@ License as published by the Free Software Foundation; either version 2 of the Li
7version. 7version.
8 8
9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the 9This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General 10implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
11Public License for more details. 11Public License for more details.
12 12
13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free 13You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 14Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15*/ 15*/
16 16
17#include "vcrgroupconf.h" 17#include "vcrgroupconf.h"
18 18
19VCRGroupConf::VCRGroupConf(QWidget *parent=0, const char *name=0) : QWidget(parent, name) 19VCRGroupConf::VCRGroupConf(QWidget *parent, const char *name) : QWidget(parent, name)
20{ 20{
21 QVBoxLayout *vlayout = new QVBoxLayout(this); 21 QVBoxLayout *vlayout = new QVBoxLayout(this);
22 22
23 QHBoxLayout *hlayout1 = new QHBoxLayout(this); 23 QHBoxLayout *hlayout1 = new QHBoxLayout(this);
24 QHBoxLayout *hlayout2 = new QHBoxLayout(this); 24 QHBoxLayout *hlayout2 = new QHBoxLayout(this);
25 25
26 vlayout->addLayout(hlayout1); 26 vlayout->addLayout(hlayout1);
27 vlayout->addSpacing(1); 27 vlayout->addSpacing(1);
28 vlayout->addLayout(hlayout2); 28 vlayout->addLayout(hlayout2);
29 29
30 QPushButton *play = new QPushButton("Play",this, "play"); 30 QPushButton *play = new QPushButton("Play",this, "play");
31 hlayout1->addWidget(play); 31 hlayout1->addWidget(play);
diff --git a/noncore/unsupported/mail2/libmail/imaphandler.cpp b/noncore/unsupported/mail2/libmail/imaphandler.cpp
index 730a004..7493240 100644
--- a/noncore/unsupported/mail2/libmail/imaphandler.cpp
+++ b/noncore/unsupported/mail2/libmail/imaphandler.cpp
@@ -161,25 +161,25 @@ QString IMAPHandler::iLsub(const QString &reference, const QString &mailbox)
161 161
162QString IMAPHandler::iStatus(const QString &mailbox, const QString &items) 162QString IMAPHandler::iStatus(const QString &mailbox, const QString &items)
163{ 163{
164 doLogin(); 164 doLogin();
165 165
166 _ibase->sendCommand(QString("%1 STATUS \"%2\" (%3)\r\n") 166 _ibase->sendCommand(QString("%1 STATUS \"%2\" (%3)\r\n")
167 .arg(tag()) 167 .arg(tag())
168 .arg(escape(mailbox)) 168 .arg(escape(mailbox))
169 .arg(escape(items))); 169 .arg(escape(items)));
170 return tag(false); 170 return tag(false);
171} 171}
172 172
173QString IMAPHandler::iAppend(const QString &mailbox, const QString &literal, const QString &flags, const QString &datetime = 0) 173QString IMAPHandler::iAppend(const QString &mailbox, const QString &literal, const QString &flags, const QString &datetime)
174{ 174{
175 doLogin(); 175 doLogin();
176 176
177 _ibase->sendCommand(QString("%1 APPEND \"%2\" (%3) \"%4\" {%5}\r\n%6\r\n") 177 _ibase->sendCommand(QString("%1 APPEND \"%2\" (%3) \"%4\" {%5}\r\n%6\r\n")
178 .arg(tag()) 178 .arg(tag())
179 .arg(escape(mailbox)) 179 .arg(escape(mailbox))
180 .arg(flags) 180 .arg(flags)
181 .arg(escape(datetime)) 181 .arg(escape(datetime))
182 .arg(literal.length()) 182 .arg(literal.length())
183 .arg(literal)); 183 .arg(literal));
184 return tag(false); 184 return tag(false);
185} 185}
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 7df1d6b..05f2f06 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -22,25 +22,25 @@
22#include <qlineedit.h> 22#include <qlineedit.h>
23#include <qtabwidget.h> 23#include <qtabwidget.h>
24#include <qcombobox.h> 24#include <qcombobox.h>
25#include <qmessagebox.h> 25#include <qmessagebox.h>
26#include <qpushbutton.h> 26#include <qpushbutton.h>
27#include <qlayout.h> 27#include <qlayout.h>
28 28
29#include "pksettingsbase.h" 29#include "pksettingsbase.h"
30#include "utils.h" 30#include "utils.h"
31#include "packagelistitem.h" 31#include "packagelistitem.h"
32 32
33 33
34MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f = 0 ) : 34MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
35 QMainWindow( parent, name, f ) 35 QMainWindow( parent, name, f )
36// packageListServers( QObject(parent), name ), 36// packageListServers( QObject(parent), name ),
37// packageListSearch( parent, name ), 37// packageListSearch( parent, name ),
38// packageListDocLnk( parent, name ) 38// packageListDocLnk( parent, name )
39 { 39 {
40 setCaption( tr("Package Manager") ); 40 setCaption( tr("Package Manager") );
41 settings = new PackageManagerSettings(this,0,TRUE); 41 settings = new PackageManagerSettings(this,0,TRUE);
42 listViewPackages = new PackageListView( this,"listViewPackages",settings ); 42 listViewPackages = new PackageListView( this,"listViewPackages",settings );
43 setCentralWidget( listViewPackages ); 43 setCentralWidget( listViewPackages );
44 listViewPackages->addList( tr("feeds"), &packageListServers ); 44 listViewPackages->addList( tr("feeds"), &packageListServers );
45 listViewPackages->addList( tr("ipkgfind"), &packageListSearch ); 45 listViewPackages->addList( tr("ipkgfind"), &packageListSearch );
46//listViewPackages->addList( tr("documents"), &packageListDocLnk ); 46//listViewPackages->addList( tr("documents"), &packageListDocLnk );
diff --git a/noncore/unsupported/oipkg/package.cpp b/noncore/unsupported/oipkg/package.cpp
index 97f7813..517b37a 100644
--- a/noncore/unsupported/oipkg/package.cpp
+++ b/noncore/unsupported/oipkg/package.cpp
@@ -1,34 +1,34 @@
1#include "package.h" 1#include "package.h"
2 2
3#include <qpe/process.h> 3#include <qpe/process.h>
4#include <qpe/stringutil.h> 4#include <qpe/stringutil.h>
5#include <qfile.h> 5#include <qfile.h>
6#include <qtextstream.h> 6#include <qtextstream.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <unistd.h> 8#include <unistd.h>
9 9
10#include "debug.h" 10#include "debug.h"
11 11
12Package::Package( QObject *parent=0, const char *name=0 ) 12Package::Package( QObject *parent, const char *name )
13 : QObject(parent,name) 13 : QObject(parent,name)
14{ 14{
15 15
16} 16}
17 17
18Package::~Package() 18Package::~Package()
19{ 19{
20} 20}
21 21
22Package::Package( PackageManagerSettings *s, QObject *parent=0, const char *name=0 ) 22Package::Package( PackageManagerSettings *s, QObject *parent, const char *name )
23 : QObject(parent,name) 23 : QObject(parent,name)
24{ 24{
25 Package(parent,name); 25 Package(parent,name);
26 init(s); 26 init(s);
27} 27}
28 28
29void Package::init( PackageManagerSettings *s ) 29void Package::init( PackageManagerSettings *s )
30{ 30{
31 settings = s; 31 settings = s;
32 _size = ""; 32 _size = "";
33 _section = ""; 33 _section = "";
34 _subsection = ""; 34 _subsection = "";
@@ -36,46 +36,46 @@ void Package::init( PackageManagerSettings *s )
36 _desc = ""; 36 _desc = "";
37 _name = ""; 37 _name = "";
38 _toProcess = false; 38 _toProcess = false;
39 _useFileName = false; 39 _useFileName = false;
40 _old = false; 40 _old = false;
41 _status = ""; 41 _status = "";
42 _dest = settings->getDestinationName(); 42 _dest = settings->getDestinationName();
43 _link = settings->createLinks(); 43 _link = settings->createLinks();
44 _versions=0; 44 _versions=0;
45 _version=""; 45 _version="";
46} 46}
47 47
48Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent=0, const char *name=0 ) 48Package::Package( QStringList pack, PackageManagerSettings *s , QObject *parent, const char *name )
49 : QObject(parent,name) 49 : QObject(parent,name)
50 { 50 {
51 init(s); 51 init(s);
52 parsePackage( pack ); 52 parsePackage( pack );
53} 53}
54 54
55Package::Package( QString n, PackageManagerSettings *s, QObject *parent=0, const char *name=0 ) 55Package::Package( QString n, PackageManagerSettings *s, QObject *parent, const char *name )
56 { 56 {
57 init(s); 57 init(s);
58 if ( !QFile::exists( n ) ) 58 if ( !QFile::exists( n ) )
59 { 59 {
60 _name = QString( n ); 60 _name = QString( n );
61 }else{ 61 }else{
62 pvDebug(4,"remote file: "+n); 62 pvDebug(4,"remote file: "+n);
63 parseIpkgFile( n ); 63 parseIpkgFile( n );
64 _useFileName = true; 64 _useFileName = true;
65 _fileName = QString( n ); 65 _fileName = QString( n );
66 } 66 }
67} 67}
68 68
69Package::Package( Package *pi, QObject *parent=0, const char *name=0 ) 69Package::Package( Package *pi, QObject *parent, const char *name )
70{ 70{
71 init(pi->settings); 71 init(pi->settings);
72 copyValues( pi ); 72 copyValues( pi );
73} 73}
74 74
75 75
76void Package::setValue( QString n, QString t ) 76void Package::setValue( QString n, QString t )
77{ 77{
78 if ( n == "Package" ) 78 if ( n == "Package" )
79 { 79 {
80 _name = QString( t ); 80 _name = QString( t );
81 }else if ( n == "Installed-Size" ) 81 }else if ( n == "Installed-Size" )
diff --git a/noncore/unsupported/oipkg/packagelist.cpp b/noncore/unsupported/oipkg/packagelist.cpp
index 3cc0443..e445570 100644
--- a/noncore/unsupported/oipkg/packagelist.cpp
+++ b/noncore/unsupported/oipkg/packagelist.cpp
@@ -1,25 +1,25 @@
1#include "packagelist.h" 1#include "packagelist.h"
2 2
3#include <assert.h> 3#include <assert.h>
4#include <qfile.h> 4#include <qfile.h>
5#include <qfileinfo.h> 5#include <qfileinfo.h>
6#include <qtextstream.h> 6#include <qtextstream.h>
7 7
8#include "debug.h" 8#include "debug.h"
9 9
10static QDict<Package> *packageListAll; 10static QDict<Package> *packageListAll;
11static int packageListAllRefCount = 0; 11static int packageListAllRefCount = 0;
12 12
13PackageList::PackageList(QObject *parent=0, const char *name=0) 13PackageList::PackageList(QObject *parent, const char *name)
14 : QObject(parent,name), packageIter( packageList ) 14 : QObject(parent,name), packageIter( packageList )
15{ 15{
16 empty=true; 16 empty=true;
17 if (!packageListAll) packageListAll = new QDict<Package>(); 17 if (!packageListAll) packageListAll = new QDict<Package>();
18 packageListAllRefCount++; 18 packageListAllRefCount++;
19 sections << "All"; 19 sections << "All";
20 subSections.insert("All", new QStringList() ); 20 subSections.insert("All", new QStringList() );
21 QStringList *ss = subSections["All"]; 21 QStringList *ss = subSections["All"];
22 *ss << "All"; 22 *ss << "All";
23 aktSection = "All"; 23 aktSection = "All";
24 aktSubSection = "All"; 24 aktSubSection = "All";
25} 25}
@@ -188,25 +188,25 @@ void PackageList::readFileEntries( QString filename, QString dest )
188 } 188 }
189 delete statusStream; 189 delete statusStream;
190 return; 190 return;
191} 191}
192 192
193void PackageList::setSettings( PackageManagerSettings *s ) 193void PackageList::setSettings( PackageManagerSettings *s )
194{ 194{
195 settings = s; 195 settings = s;
196} 196}
197 197
198Package* PackageList::getByName( QString n ) 198Package* PackageList::getByName( QString n )
199{ 199{
200 origPackageList[n]; 200 return origPackageList[n];
201} 201}
202 202
203void PackageList::clear() 203void PackageList::clear()
204{ 204{
205 origPackageList.clear(); 205 origPackageList.clear();
206 packageList.clear(); 206 packageList.clear();
207} 207}
208 208
209void PackageList::allPackages() 209void PackageList::allPackages()
210{ 210{
211 packageList.clear(); 211 packageList.clear();
212 QDictIterator<Package> filterIter( origPackageList ); 212 QDictIterator<Package> filterIter( origPackageList );
diff --git a/noncore/unsupported/oipkg/packagelistdoclnk.cpp b/noncore/unsupported/oipkg/packagelistdoclnk.cpp
index b42cfdd..deb8a6d 100644
--- a/noncore/unsupported/oipkg/packagelistdoclnk.cpp
+++ b/noncore/unsupported/oipkg/packagelistdoclnk.cpp
@@ -1,29 +1,29 @@
1 1
2#include "packagelistdoclnk.h" 2#include "packagelistdoclnk.h"
3 3
4#include <qpe/applnk.h> 4#include <qpe/applnk.h>
5#include <qpe/config.h> 5#include <qpe/config.h>
6#include <qlist.h> 6#include <qlist.h>
7 7
8#include "package.h" 8#include "package.h"
9#include "pksettings.h" 9#include "pksettings.h"
10 10
11PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s, QObject *parent=0, const char *name=0) 11PackageListDocLnk::PackageListDocLnk(PackageManagerSettings* s, QObject *parent, const char *name)
12 : PackageList(s) 12 : PackageList(s)
13{ 13{
14 PackageListDocLnk(parent, name); 14 PackageListDocLnk(parent, name);
15} 15}
16 16
17PackageListDocLnk::PackageListDocLnk(QObject *parent=0, const char *name=0) 17PackageListDocLnk::PackageListDocLnk(QObject *parent, const char *name)
18 : PackageList(parent, name) 18 : PackageList(parent, name)
19{ 19{
20 Config cfg( "oipkg", Config::User ); 20 Config cfg( "oipkg", Config::User );
21 cfg.setGroup( "Common" ); 21 cfg.setGroup( "Common" );
22 docLnkDir = cfg.readEntry( "docLnkDir", "/root/" ); 22 docLnkDir = cfg.readEntry( "docLnkDir", "/root/" );
23 pvDebug(2,"opening DocLnkSet "+docLnkDir); 23 pvDebug(2,"opening DocLnkSet "+docLnkDir);
24 doclnkset = new DocLnkSet(docLnkDir,"application/ipkg"); 24 doclnkset = new DocLnkSet(docLnkDir,"application/ipkg");
25} 25}
26 26
27PackageListDocLnk::~PackageListDocLnk() 27PackageListDocLnk::~PackageListDocLnk()
28{ 28{
29 Config cfg( "oipkg", Config::User ); 29 Config cfg( "oipkg", Config::User );
diff --git a/noncore/unsupported/oipkg/packagelistitem.cpp b/noncore/unsupported/oipkg/packagelistitem.cpp
index 0c9c676..7c54441 100644
--- a/noncore/unsupported/oipkg/packagelistitem.cpp
+++ b/noncore/unsupported/oipkg/packagelistitem.cpp
@@ -150,17 +150,17 @@ void PackageListItem::setOn( bool b )
150 displayDetails(); 150 displayDetails();
151} 151}
152 152
153void PackageListItem::displayDetails() 153void PackageListItem::displayDetails()
154{ 154{
155 QString sod; 155 QString sod;
156 sod += package->sizeUnits().isEmpty()?QString(""):QString(package->sizeUnits()); 156 sod += package->sizeUnits().isEmpty()?QString(""):QString(package->sizeUnits());
157 //sod += QString(package->dest().isEmpty()?"":QObject::tr(" on ")+package->dest()); 157 //sod += QString(package->dest().isEmpty()?"":QObject::tr(" on ")+package->dest());
158 sod += package->dest().isEmpty()?QString(""):QString(QObject::tr(" on ")+package->dest()); 158 sod += package->dest().isEmpty()?QString(""):QString(QObject::tr(" on ")+package->dest());
159 sod = sod.isEmpty()?QString(""):QString(" ("+sod+")"); 159 sod = sod.isEmpty()?QString(""):QString(" ("+sod+")");
160 setText(0, package->name()+sod ); 160 setText(0, package->name()+sod );
161 nameItem->setText( 0, QObject::tr("Name: ")+package->name()); 161 nameItem->setText( 0, QObject::tr("Name: ")+package->name());
162 linkItem->setText( 0, QObject::tr("Link: ")+package->link()?QObject::tr("Yes"):QObject::tr("No")); 162 linkItem->setText( 0, QObject::tr("Link: ")+(package->link()?QObject::tr("Yes"):QObject::tr("No")));
163 destItem->setText( 0, QObject::tr("Destination: ")+package->dest() ); 163 destItem->setText( 0, QObject::tr("Destination: ")+package->dest() );
164 statusItem->setText( 0, QObject::tr("Status: ")+package->status() ); 164 statusItem->setText( 0, QObject::tr("Status: ")+package->status() );
165 repaint(); 165 repaint();
166} 166}
diff --git a/noncore/unsupported/qpdf/fixed.h b/noncore/unsupported/qpdf/fixed.h
index d073421..ec0e696 100644
--- a/noncore/unsupported/qpdf/fixed.h
+++ b/noncore/unsupported/qpdf/fixed.h
@@ -160,26 +160,26 @@ template <unsigned int SH> inline long int lrint ( const fixed<SH> &f )
160 160
161template <unsigned int SH> inline fixed<SH> fabs ( const fixed<SH> &f ) 161template <unsigned int SH> inline fixed<SH> fabs ( const fixed<SH> &f )
162{ 162{
163 return ( f. m_f < 0 ) ? fixed<SH> ( -f. m_f, true ) : f; 163 return ( f. m_f < 0 ) ? fixed<SH> ( -f. m_f, true ) : f;
164} 164}
165 165
166// roughly from QPE / qmath.h 166// roughly from QPE / qmath.h
167template <unsigned int SH> inline fixed<SH> sqrt ( const fixed<SH> &f ) 167template <unsigned int SH> inline fixed<SH> sqrt ( const fixed<SH> &f )
168{ 168{
169 if ( f. m_f <= 0 ) 169 if ( f. m_f <= 0 )
170 return fixed<SH> ( 0, true ); 170 return fixed<SH> ( 0, true );
171 171
172 fixed<SH>::fix_t a0 = 0; 172 typename fixed<SH>::fix_t a0 = 0;
173 fixed<SH>::fix_t a1 = f. m_f; // take value as first approximation 173 typename fixed<SH>::fix_t a1 = f. m_f; // take value as first approximation
174 174
175 do { 175 do {
176 a0 = a1; 176 a0 = a1;
177 a1 = ( a0 + fixed<SH>::div ( f. m_f, a0 )) >> 1; 177 a1 = ( a0 + fixed<SH>::div ( f. m_f, a0 )) >> 1;
178 } while ( abs ( fixed<SH>::div ( a1 - a0, a1 )) > 1 ); 178 } while ( abs ( fixed<SH>::div ( a1 - a0, a1 )) > 1 );
179 179
180 return fixed<SH> ( a1, true ); 180 return fixed<SH> ( a1, true );
181} 181}
182 182
183#if 0 // no std::ostream needed in OPIE 183#if 0 // no std::ostream needed in OPIE
184template <unsigned int SH> inline std::ostream &operator << ( std::ostream &o, const fixed<SH> &f ) 184template <unsigned int SH> inline std::ostream &operator << ( std::ostream &o, const fixed<SH> &f )
185{ 185{