Diffstat (limited to 'noncore/settings/packagemanager/installdlg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/packagemanager/installdlg.cpp | 60 |
1 files changed, 28 insertions, 32 deletions
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp index 0cb30e2..945dfed 100644 --- a/noncore/settings/packagemanager/installdlg.cpp +++ b/noncore/settings/packagemanager/installdlg.cpp @@ -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. - .>+-= - _;:, .> :=|. This file is free software; you can -.> <`_, > . <= redistribute it and/or modify it under -:`=1 )Y*s>-.-- : the terms of the GNU General Public -.="- .-=="i, .._ License as published by the Free Software - - . .-<_> .<> Foundation; either version 2 of the License, - ._= =} : or (at your option) any later version. - .%`+i> _;_. - .i_,=:_. -<s. This file is distributed in the hope that - + . -:. = it will be useful, but WITHOUT ANY WARRANTY; - : .. .:, . . . without even the implied warranty of - =_ + =;=|` MERCHANTABILITY or FITNESS FOR A - _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General -..}^=.= = ; Public License for more details. -++= -. .` .: - : = ...= . :.=- You should have received a copy of the GNU - -. .:....=;==+<; General Public License along with this file; - -_. . . )=. = see the file COPYING. If not, write to the - -- :-=` Free Software Foundation, Inc., + .=l. + .>+-= +_;:, .> :=|. This file is free software; you can +.> <`_, > . <= redistribute it and/or modify it under +:`=1 )Y*s>-.-- : the terms of the GNU General Public +.="- .-=="i, .._ License as published by the Free Software +- . .-<_> .<> Foundation; either version 2 of the License, + ._= =} : or (at your option) any later version. + .%`+i> _;_. + .i_,=:_. -<s. This file is distributed in the hope that + + . -:. = it will be useful, but WITHOUT ANY WARRANTY; + : .. .:, . . . without even the implied warranty of + =_ + =;=|` MERCHANTABILITY or FITNESS FOR A + _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU General +..}^=.= = ; Public License for more details. +++= -. .` .: +: = ...= . :.=- You should have received a copy of the GNU +-. .:....=;==+<; General Public License along with this file; + -_. . . )=. = see the file COPYING. If not, write to the + -- :-=` Free Software Foundation, Inc., 59 Temple Place - Suite 330, @@ -52,5 +52,5 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo, - OPackage::Command command1, QStringList *packages1, - OPackage::Command command2, QStringList *packages2, - OPackage::Command command3, QStringList *packages3 ) + OPackage::Command command1, const QStringList &packages1, + OPackage::Command command2, const QStringList &packages2, + OPackage::Command command3, const QStringList &packages3 ) : QWidget( 0x0 ) @@ -91,3 +91,3 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap m_destination = new QComboBox( this ); - m_destination->insertStringList( *(m_packman->destinations()) ); + m_destination->insertStringList( m_packman->destinations() ); layout->addWidget( m_destination, 0, 1 ); @@ -131,3 +131,3 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap { - if ( m_packages[ i ] ) + if ( !m_packages[ i ].isEmpty() ) { @@ -150,3 +150,4 @@ InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &cap - for ( QStringList::Iterator it = m_packages[ i ]->begin(); it != m_packages[ i ]->end(); ++it ) + QStringList tmpPackage = m_packages[ i ]; + for ( QStringList::Iterator it = tmpPackage.begin(); it != tmpPackage.end(); ++it ) { @@ -166,7 +167,2 @@ InstallDlg::~InstallDlg() { - for( int i = 0; i < m_numCommands; i++ ) - { - if ( m_packages[ i ] ) - delete m_packages[ i ]; - } } |