1 files changed, 31 insertions, 28 deletions
diff --git a/noncore/settings/packagemanager/installdlg.h b/noncore/settings/packagemanager/installdlg.h
index 4da9cf6..cddc911 100644
--- a/noncore/settings/packagemanager/installdlg.h
+++ b/noncore/settings/packagemanager/installdlg.h
@@ -1,25 +1,25 @@
 /*
-                            This file is part of the OPIE Project
+                    This file is part of the OPIE Project
               =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
-             .=l.
+      .=l.
-           .>+-=
+     .>+-=
- _;:,     .>    :=|.         This file is free software; you can
+_;:,   .>  :=|.         This file is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or modify it under
+.> <`_,  > .  <=          redistribute it and/or modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+:`=1 )Y*s>-.--  :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
+.="- .-=="i,   .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
+- .  .-<_>   .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
+  ._= =}    :          or (at your option) any later version.
-    .%`+i>       _;_.
+  .%`+i>    _;_.
-    .i_,=:_.      -<s.       This file is distributed in the hope that
+  .i_,=:_.   -<s.       This file is distributed in the hope that
-     +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
+  + . -:.    =       it will be useful, but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
+  : ..  .:,   . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  =_    +   =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
+ _.=:.    :  :=>`:     PARTICULAR PURPOSE. See the GNU General
-..}^=.=       =       ;      Public License for more details.
+..}^=.=    =    ;      Public License for more details.
-++=   -.     .`     .:
++=  -.   .`   .:
- :     =  ...= . :.=-        You should have received a copy of the GNU
+:   = ...= . :.=-        You should have received a copy of the GNU
- -.   .:....=;==+<;          General Public License along with this file;
+-.  .:....=;==+<;          General Public License along with this file;
-  -_. . .   )=.  =           see the file COPYING. If not, write to the
+ -_. . .  )=. =           see the file COPYING. If not, write to the
-    --        :-=`           Free Software Foundation, Inc.,
+  --    :-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
@@ -50,5 +50,8 @@ public:
                bool showDestInfo = true,
-                OPackage::Command command1 = OPackage::NotDefined, QStringList *packages1 = 0x0,
+                OPackage::Command command1 = OPackage::NotDefined,
-                OPackage::Command command2 = OPackage::NotDefined, QStringList *packages2 = 0x0,
+                const QStringList &packages1 = QStringList(),
-                OPackage::Command command3 = OPackage::NotDefined, QStringList *packages3 = 0x0 );
+                OPackage::Command command2 = OPackage::NotDefined,
+                const QStringList &packages2 = QStringList(),
+                OPackage::Command command3 = OPackage::NotDefined,
+                const QStringList &packages3 = QStringList() );
    ~InstallDlg();
@@ -66,6 +69,6 @@ private:
    // Commands and packages to execute
-    int                m_numCommands; // Number of commands to be executed
+    int               m_numCommands; // Number of commands to be executed
-    int                m_currCommand; // Number of currently executing command
+    int               m_currCommand; // Number of currently executing command
-    OPackage::Command  m_command[3];  // List of commands to be executed
+    OPackage::Command m_command[3];  // List of commands to be executed
-    QStringList       *m_packages[3]; // Lists of package names associated to commands (m_command[])
+    QStringList       m_packages[3]; // Lists of package names associated to commands (m_command[])

diff --git a/noncore/settings/packagemanager/installdlg.h b/noncore/settings/packagemanager/installdlg.h index 4da9cf6..cddc911 100644 --- a/noncore/settings/packagemanager/installdlg.h +++ b/noncore/settings/packagemanager/installdlg.h
@@ -1,25 +1,25 @@
1	/*	1	/*
2	This file is part of the OPIE Project	2	This file is part of the OPIE Project
3		3
4	=. Copyright (c) 2003 Dan Williams <drw@handhelds.org>	4	=. Copyright (c) 2003 Dan Williams <drw@handhelds.org>
5	.=l.	5	.=l.
6	.>+-=	6	.>+-=
7	_;:, .> :=\|. This file is free software; you can	7	_;:, .> :=\|. This file is free software; you can
8	.> <`_, > . <= redistribute it and/or modify it under	8	.> <`_, > . <= redistribute it and/or modify it under
9	:`=1 )Y*s>-.-- : the terms of the GNU General Public	9	:`=1 )Y*s>-.-- : the terms of the GNU General Public
10	.="- .-=="i, .._ License as published by the Free Software	10	.="- .-=="i, .._ License as published by the Free Software
11	- . .-<_> .<> Foundation; either version 2 of the License,	11	- . .-<_> .<> Foundation; either version 2 of the License,
12	._= =} : or (at your option) any later version.	12	._= =} : or (at your option) any later version.
13	.%`+i> _;_.	13	.%`+i> _;_.
14	.i_,=:_. -<s. This file is distributed in the hope that	14	.i_,=:_. -<s. This file is distributed in the hope that
15	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;	15	+ . -:. = it will be useful, but WITHOUT ANY WARRANTY;
16	: .. .:, . . . without even the implied warranty of	16	: .. .:, . . . without even the implied warranty of
17	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A	17	=_ + =;=\|` MERCHANTABILITY or FITNESS FOR A
18	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General	18	_.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General
19	..}^=.= = ; Public License for more details.	19	..}^=.= = ; Public License for more details.
20	++= -. .` .:	20	++= -. .` .:
21	: = ...= . :.=- You should have received a copy of the GNU	21	: = ...= . :.=- You should have received a copy of the GNU
22	-. .:....=;==+<; General Public License along with this file;	22	-. .:....=;==+<; General Public License along with this file;
23	-_. . . )=. = see the file COPYING. If not, write to the	23	-_. . . )=. = see the file COPYING. If not, write to the
24	-- :-=` Free Software Foundation, Inc.,	24	-- :-=` Free Software Foundation, Inc.,
25	59 Temple Place - Suite 330,	25	59 Temple Place - Suite 330,
@@ -50,5 +50,8 @@ public:
50	bool showDestInfo = true,	50	bool showDestInfo = true,
51	OPackage::Command command1 = OPackage::NotDefined, QStringList *packages1 = 0x0,	51	OPackage::Command command1 = OPackage::NotDefined,
52	OPackage::Command command2 = OPackage::NotDefined, QStringList *packages2 = 0x0,	52	const QStringList &packages1 = QStringList(),
53	OPackage::Command command3 = OPackage::NotDefined, QStringList *packages3 = 0x0 );	53	OPackage::Command command2 = OPackage::NotDefined,
		54	const QStringList &packages2 = QStringList(),
		55	OPackage::Command command3 = OPackage::NotDefined,
		56	const QStringList &packages3 = QStringList() );
54	~InstallDlg();	57	~InstallDlg();
@@ -66,6 +69,6 @@ private:
66	// Commands and packages to execute	69	// Commands and packages to execute
67	int m_numCommands; // Number of commands to be executed	70	int m_numCommands; // Number of commands to be executed
68	int m_currCommand; // Number of currently executing command	71	int m_currCommand; // Number of currently executing command
69	OPackage::Command m_command[3]; // List of commands to be executed	72	OPackage::Command m_command[3]; // List of commands to be executed
70	QStringList *m_packages[3]; // Lists of package names associated to commands (m_command[])	73	QStringList m_packages[3]; // Lists of package names associated to commands (m_command[])
71		74