[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

The reason they're deprecated is because they don't associate their dialogs
with the caller widget.  0L just circumvents the warning without fixing the
problem.  Unfortunately it can't be fixed in kstdatasource at this point
because it's part of the library.  Will solve this later with a static of some
sort.


  M +2 -0      kstdatasource.cpp   1.57
  M +1 -0      pluginmanager.ui   1.15
  M +11 -3     pluginmanager.ui.h   1.23
  M +2 -2      vectorsavedialog.ui.h   1.12


--- kdeextragear-2/kst/kst/kstdatasource.cpp  #1.56:1.57
@@ -213,4 +213,6 @@ static QString obtainFile(const QString&
   QString tmpFile;
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
+  // FIXME: come up with a way to indicate the "widget" and fill it in here so
+  //        that KIO dialogs are associated with the proper window
   if (!KIO::NetAccess::download(source, tmpFile, 0L)) {
 #else

--- kdeextragear-2/kst/kst/pluginmanager.ui  #1.14:1.15
@@ -211,4 +211,5 @@
     <include location="global" impldecl="in implementation">kmessagebox.h</include>
     <include location="global" impldecl="in implementation">kfiledialog.h</include>
+    <include location="global" impldecl="in implementation">kdeversion.h</include>
     <include location="global" impldecl="in implementation">kio/netaccess.h</include>
     <include location="global" impldecl="in implementation">qregexp.h</include>

--- kdeextragear-2/kst/kst/pluginmanager.ui.h  #1.22:1.23
@@ -35,5 +35,5 @@ void PluginManager::install()
     QString tmpFile;
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
-    if (!KIO::NetAccess::download(xmlfile, tmpFile, 0L)) {
+    if (!KIO::NetAccess::download(xmlfile, tmpFile, this)) {
 #else
     if (!KIO::NetAccess::download(xmlfile, tmpFile)) {
@@ -61,5 +61,9 @@ void PluginManager::install()
     sofile.setPath(tmpSoFile);
 
-    if (!KIO::NetAccess::dircopy(sofile, pathURL, 0L)) {
+#if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
+    if (!KIO::NetAccess::dircopy(sofile, pathURL, this)) {
+#else
+    if (!KIO::NetAccess::dircopy(sofile, pathURL)) {
+#endif
         KIO::NetAccess::removeTempFile(tmpFile);
         KMessageBox::error(this, i18n("Unable to copy plugin file %1 to %2.").arg(sofile.prettyURL()).arg(pathURL.prettyURL()), i18n("KST Plugin Loader"));
@@ -71,5 +75,9 @@ void PluginManager::install()
     pathURL.setFileName(xmlfile.fileName());
 
-    if (!KIO::NetAccess::dircopy(tmpFileURL, pathURL, 0L)) {
+#if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
+    if (!KIO::NetAccess::dircopy(tmpFileURL, pathURL, this)) {
+#else
+    if (!KIO::NetAccess::dircopy(tmpFileURL, pathURL)) {
+#endif
         KMessageBox::error(this, i18n("Internal temporary file %1 could not be copied to plugin directory %2.").arg(tmpFile).arg(path), i18n("KST Plugin Loader"));
     }

--- kdeextragear-2/kst/kst/vectorsavedialog.ui.h  #1.11:1.12
@@ -46,5 +46,5 @@ void VectorSaveDialog::save()
                     
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
-                    if (KIO::NetAccess::exists(url, false, 0L)) {
+                    if (KIO::NetAccess::exists(url, false, this)) {
 #else
                     if (KIO::NetAccess::exists(url)) {
@@ -85,5 +85,5 @@ void VectorSaveDialog::save()
 
 #if KDE_VERSION >= KDE_MAKE_VERSION(3,3,0)
-                        if (KIO::NetAccess::exists(url2, false, 0L)) {
+                        if (KIO::NetAccess::exists(url2, false, this)) {
 #else
                         if (KIO::NetAccess::exists(url2)) {