summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make1
-rw-r--r--noncore/apps/opie-gutenbrowser/NetworkDialog.cpp4
-rw-r--r--noncore/net/opieftp/opieftp.cpp2
3 files changed, 4 insertions, 3 deletions
diff --git a/Rules.make b/Rules.make
index e86f662..f0e463b 100644
--- a/Rules.make
+++ b/Rules.make
@@ -163,24 +163,25 @@ endif
163 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) 163 ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
164 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) 164 ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
165 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) 165 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
166 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) 166 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
167 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; ) 167 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/backends/*.h .; )
168 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) 168 ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
169 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) 169 ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
170 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) 170 ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
171 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) 171 ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
172 # auxilliary libraries 172 # auxilliary libraries
173 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) 173 ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
174 ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) 174 ( cd include/sl && ln -sf ../../libslcompat/*.h .; )
175 ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
175 # all 176 # all
176ifeq ($(CONFIG_LIBOPIE),y) 177ifeq ($(CONFIG_LIBOPIE),y)
177 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 178 ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
178 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done ) 179 ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
179endif 180endif
180 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 181 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
181 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) 182 ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
182 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ 183 ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
183 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) 184 ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
184 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h 185 ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
185 touch $@ 186 touch $@
186 187
diff --git a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
index e8ade87..aed53c6 100644
--- a/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
+++ b/noncore/apps/opie-gutenbrowser/NetworkDialog.cpp
@@ -2,29 +2,29 @@
2// NetworkDialog.cpp - description 2// NetworkDialog.cpp - description
3// begin : Sun Aug 27 2000 3// begin : Sun Aug 27 2000
4// copyright : (C) 2000 - 2004 by L.J. Potter 4// copyright : (C) 2000 - 2004 by L.J. Potter
5// email : ljp@llornkcor.com 5// email : ljp@llornkcor.com
6// * This program is free software; you can redistribute it and/or modify * 6// * This program is free software; you can redistribute it and/or modify *
7// * it under the terms of the GNU General Public License as published by * 7// * it under the terms of the GNU General Public License as published by *
8// * the Free Software Foundation; either version 2 of the License, or * 8// * the Free Software Foundation; either version 2 of the License, or *
9// * (at your option) any later version. * 9// * (at your option) any later version. *
10// ***************************************************************************/ 10// ***************************************************************************/
11// // half-assed attempt at providing a network dialog. 11// // half-assed attempt at providing a network dialog.
12// /* Created: Sun Aug 27 15:24:52 2000*/ 12// /* Created: Sun Aug 27 15:24:52 2000*/
13#include <unistd.h> 13#include <unistd.h>
14
14extern "C" { 15extern "C" {
15#include "../../net/ftplib/ftplib.h" 16#include <ftplib.h>
16} 17}
17 18
18
19#include "NetworkDialog.h" 19#include "NetworkDialog.h"
20#include "gutenbrowser.h" 20#include "gutenbrowser.h"
21 21
22#include <qprogressbar.h> 22#include <qprogressbar.h>
23#include <qstringlist.h> 23#include <qstringlist.h>
24#include <qpe/config.h> 24#include <qpe/config.h>
25#include <qvaluelist.h> 25#include <qvaluelist.h>
26#include <qapplication.h> 26#include <qapplication.h>
27#include <qfile.h> 27#include <qfile.h>
28#include <qstringlist.h> 28#include <qstringlist.h>
29#include <qlabel.h> 29#include <qlabel.h>
30#include <qpushbutton.h> 30#include <qpushbutton.h>
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index fe96103..aa4314a 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -5,25 +5,25 @@
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//#define DEVELOPERS_VERSION 12//#define DEVELOPERS_VERSION
13 13
14#include "opieftp.h" 14#include "opieftp.h"
15 15
16extern "C" { 16extern "C" {
17#include "../ftplib/ftplib.h" 17#include <ftplib.h>
18} 18}
19 19
20#include "inputDialog.h" 20#include "inputDialog.h"
21 21
22/* OPIE */ 22/* OPIE */
23#include <opie2/odebug.h> 23#include <opie2/odebug.h>
24#include <qpe/qpeapplication.h> 24#include <qpe/qpeapplication.h>
25#include <qpe/resource.h> 25#include <qpe/resource.h>
26#include <qpe/config.h> 26#include <qpe/config.h>
27#include <qpe/mimetype.h> 27#include <qpe/mimetype.h>
28using namespace Opie::Core; 28using namespace Opie::Core;
29 29