[patch] kdelibs/kdeprint cleanups

[Brad Hards]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Currently there are some warnings when building kdelibs/kdeprint. Some
are simple to fix, although I have changed behaviour a bit (see apidox for
KIO::NetAccess::download()). Nothing major here.

Is this OK to commit?

Brad

Index: kfilelist.cpp
===================================================================
RCS file: /home/kde/kdelibs/kdeprint/kfilelist.cpp,v
retrieving revision 1.13
diff -u -4 -p -r1.13 kfilelist.cpp
- --- kfilelist.cpp       16 May 2003 11:13:29 -0000      1.13
+++ kfilelist.cpp       29 Sep 2003 11:32:05 -0000
@@ -127,9 +127,9 @@ void KFileList::addFiles(const KURL::Lis

                // for each file, download it (if necessary) and add it
                QString downloaded;
                for (KURL::List::ConstIterator it=files.begin(); it!=files.end(); ++it)
- -                       if (KIO::NetAccess::download(*it, downloaded))
+                       if (KIO::NetAccess::download(*it, downloaded, m_files))
                        {
                                KURL    url;
                                url.setPath(downloaded);
                                KMimeType::Ptr  mime = KMimeType::findByURL(url, 0, true, false);
Index: cups/cupsdconf2/main.cpp
===================================================================
RCS file: /home/kde/kdelibs/kdeprint/cups/cupsdconf2/main.cpp,v
retrieving revision 1.2
diff -u -4 -p -r1.2 main.cpp
- --- cups/cupsdconf2/main.cpp    10 Oct 2001 17:40:38 -0000      1.2
+++ cups/cupsdconf2/main.cpp    29 Sep 2003 11:32:05 -0000
@@ -31,9 +31,11 @@ static KCmdLineOptions options[] =
 };

 int main(int argc, char *argv[])
 {
- -       KCmdLineArgs::init(argc,argv,"cupsdconf",I18N_NOOP("A CUPS configuration tool"),"0.0.1");
+       KCmdLineArgs::init(argc,argv,"cupsdconf",
+                          I18N_NOOP("CUPS configuration tool"),
+                          I18N_NOOP("A CUPS configuration tool"),"0.0.1");
        KCmdLineArgs::addCmdLineOptions(options);
        KApplication    app;
        KCmdLineArgs    *args = KCmdLineArgs::parsedArgs();

Index: management/kaddprinterwizard.cpp
===================================================================
RCS file: /home/kde/kdelibs/kdeprint/management/kaddprinterwizard.cpp,v
retrieving revision 1.6
diff -u -4 -p -r1.6 kaddprinterwizard.cpp
- --- management/kaddprinterwizard.cpp    2 Sep 2003 17:01:02 -0000       1.6
+++ management/kaddprinterwizard.cpp    29 Sep 2003 11:32:05 -0000
@@ -13,8 +13,9 @@ static KCmdLineOptions options[] =

 extern "C" int kdemain(int argc, char *argv[])
 {
        KCmdLineArgs::init(argc, argv, "kaddprinterwizard",
+                       I18N_NOOP("Add printer wizard"),
                        I18N_NOOP("Start the add printer wizard"),
                        "0.1");
        KCmdLineArgs::addCmdLineOptions(options);

Index: management/kmjobviewer.cpp
===================================================================
RCS file: /home/kde/kdelibs/kdeprint/management/kmjobviewer.cpp,v
retrieving revision 1.42
diff -u -4 -p -r1.42 kmjobviewer.cpp
- --- management/kmjobviewer.cpp  13 Aug 2003 19:47:41 -0000      1.42
+++ management/kmjobviewer.cpp  29 Sep 2003 11:32:05 -0000
@@ -722,9 +722,9 @@ void KMJobViewer::slotDropped( QDropEven
        KURLDrag::decode( e, uris );
        for ( KURL::List::ConstIterator it = uris.begin();
              it != uris.end(); ++it)
        {
- -               if ( KIO::NetAccess::download( *it, target ) )
+               if ( KIO::NetAccess::download( *it, target, NULL ) )
                        files << target;
        }

        if ( files.count() > 0 )
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQE/eBmMW6pHgIdAuOMRAoe8AJ9tpwcgZ5l8gK7TlPhM2jqZ/43/BQCghgaT
AxzwCBcPifFbFIdS3HwDfJQ=
=JVLH
-----END PGP SIGNATURE-----