rev 3074 - trunk/packages/kdewebdev/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Thu Feb 2 16:23:26 UTC 2006
Author: chrsmrtn
Date: 2006-02-02 16:23:25 +0000 (Thu, 02 Feb 2006)
New Revision: 3074
Added:
trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r504937.diff
Removed:
trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r486078.diff
trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r490330.diff
trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r497528.diff
Log:
kdewebdev branch pulls, update.
Deleted: trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r486078.diff
Deleted: trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r490330.diff
Deleted: trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r497528.diff
Added: trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r504937.diff
===================================================================
--- trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r504937.diff 2006-02-02 16:07:40 UTC (rev 3073)
+++ trunk/packages/kdewebdev/debian/patches/01_kdewebdev_branch_r504937.diff 2006-02-02 16:23:25 UTC (rev 3074)
@@ -0,0 +1,831 @@
+#DPATCHLEVEL=0
+--- kfilereplace/knewprojectdlg.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ kfilereplace/knewprojectdlg.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -346,12 +346,12 @@
+
+ void KNewProjectDlg::loadLocationsList()
+ {
+- m_cbLocation->insertStringList(QStringList::split(",",m_option->m_directories));
++ m_cbLocation->insertStringList(m_option->m_directories);
+ }
+
+ void KNewProjectDlg::loadFiltersList()
+ {
+- m_cbFilter->insertStringList(QStringList::split(",",m_option->m_filters));
++ m_cbFilter->insertStringList(m_option->m_filters);
+ }
+
+ void KNewProjectDlg::loadBackupExtensionOptions()
+@@ -447,7 +447,8 @@
+
+ void KNewProjectDlg::saveLocationsList()
+ {
+- QString current = m_cbLocation->currentText(), list = current;
++ QString current = m_cbLocation->currentText();
++ QStringList list = current;
+
+ int count = m_cbLocation->listBox()->count(),
+ i;
+@@ -455,14 +456,15 @@
+ {
+ QString text = m_cbLocation->listBox()->item(i)->text();
+ if(text != current)
+- list += ","+text;
++ list.append(text);
+ }
+ m_option->m_directories = list;
+ }
+
+ void KNewProjectDlg::saveFiltersList()
+ {
+- QString current = m_cbFilter->currentText(), list = current;
++ QString current = m_cbFilter->currentText();
++ QStringList list = current;
+
+ int count = m_cbFilter->listBox()->count(),
+ i;
+@@ -470,7 +472,7 @@
+ {
+ QString text = m_cbFilter->listBox()->item(i)->text();
+ if(text != current)
+- list += ","+text;
++ list.append(text);
+ }
+ m_option->m_filters = list;
+ }
+--- kfilereplace/configurationclasses.h (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ kfilereplace/configurationclasses.h (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -82,9 +82,9 @@
+ bool m_askConfirmReplace,
+ m_dontAskAgain;
+
+- QString m_directories,
+- m_filters,
+- m_currentDirectory;
++ QStringList m_directories;
++ QStringList m_filters;
++ QString m_currentDirectory;
+
+ int m_minSize,
+ m_maxSize;
+--- kfilereplace/kfilereplacepart.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ kfilereplace/kfilereplacepart.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -120,8 +120,8 @@
+
+ setOptionMask();
+
+- QString currentDirectory = QStringList::split(",",m_option->m_directories)[0],
+- currentFilter = QStringList::split(",",m_option->m_filters)[0];
++ QString currentDirectory = m_option->m_directories[0],
++ currentFilter = m_option->m_filters[0];
+
+ //m_currentDir = currentDirectory;
+
+@@ -189,7 +189,7 @@
+
+ m_view->showSemaphore("green");
+
+- QString currentDirectory = QStringList::split(",",m_option->m_directories)[0];
++ QString currentDirectory = m_option->m_directories[0];
+
+ m_view->showSemaphore("red");
+
+@@ -730,7 +730,7 @@
+ {
+ m_config->setGroup("Owner options");
+
+- QStringList ownerList = QStringList::split(",",m_config->readEntry(rcOwnerUser, OwnerOption),true);
++ QStringList ownerList = QStringList::split(',',m_config->readEntry(rcOwnerUser, OwnerOption),true);
+ if(ownerList[0] == "true")
+ m_option->m_ownerUserIsChecked = true;
+ else
+@@ -740,7 +740,7 @@
+ m_option->m_ownerUserBool = ownerList[2];
+ m_option->m_ownerUserValue = ownerList[3];
+
+- ownerList = QStringList::split(",",m_config->readEntry(rcOwnerGroup, OwnerOption),true);
++ ownerList = QStringList::split(',',m_config->readEntry(rcOwnerGroup, OwnerOption),true);
+
+ if(ownerList[0] == "true")
+ m_option->m_ownerGroupIsChecked = true;
+@@ -755,29 +755,32 @@
+ void KFileReplacePart::loadLocationsList()
+ {
+ m_config->setGroup("Directories");
++ QStringList locationsEntryList;
+ #if KDE_IS_VERSION(3,1,3)
+- QString locationsEntryList = m_config->readPathEntry(rcDirectoriesList);
++ locationsEntryList = m_config->readPathListEntry(rcDirectoriesList);
+ #else
+- QString locationsEntryList = m_config->readEntry(rcDirectoriesList);
++ locationsEntryList = m_config->readListEntry(rcDirectoriesList);
+ #endif
+
+ if(locationsEntryList.isEmpty())
+- locationsEntryList = QDir::current().path();
++ locationsEntryList.append(QDir::current().path());
+
+ m_option->m_directories = locationsEntryList;
+ }
+
+ void KFileReplacePart::loadFiltersList()
+ {
++ QStringList filtersEntryList;
++
+ m_config->setGroup("Filters");
+ #if KDE_IS_VERSION(3,1,3)
+- QString filtersEntryList = m_config->readPathEntry(rcFiltersList);
++ filtersEntryList = m_config->readPathListEntry(rcFiltersList);
+ #else
+- QString filtersEntryList = m_config->readEntry(rcFiltersList);
++ filtersEntryList = m_config->readListEntry(rcFiltersList);
+ #endif
+
+ if(filtersEntryList.isEmpty())
+- filtersEntryList = "*.htm;*.html;*.xml;*.xhtml;*.css;*.js;*.php";
++ filtersEntryList.append("*.htm;*.html;*.xml;*.xhtml;*.css;*.js;*.php");
+
+ m_option->m_filters = filtersEntryList;
+ }
+@@ -785,7 +788,7 @@
+ void KFileReplacePart::loadBackupExtensionOptions()
+ {
+ m_config->setGroup("Options");
+- QStringList bkList = QStringList::split(",",
++ QStringList bkList = QStringList::split(',',
+ m_config->readEntry(rcBackupExtension, BackupExtensionOption),
+ true);
+ if(bkList[0] == "true")
+@@ -895,7 +898,11 @@
+ void KFileReplacePart::saveLocationsList()
+ {
+ m_config->setGroup("Directories");
++ #if KDE_IS_VERSION(3,1,3)
++ m_config->writePathEntry(rcDirectoriesList, m_option->m_directories);
++ #else
+ m_config->writeEntry(rcDirectoriesList, m_option->m_directories);
++ #endif
+ m_config->sync();
+ }
+
+@@ -921,12 +928,12 @@
+
+ void KFileReplacePart::fileReplace()
+ {
+- QString directoryName = QStringList::split(",",m_option->m_directories)[0];
++ QString directoryName = m_option->m_directories[0];
+ QDir d(directoryName);
+ d.setMatchAllDirs(true);
+ d.setFilter(m_optionMask);
+
+- QString currentFilter = QStringList::split(",",m_option->m_filters)[0];
++ QString currentFilter = m_option->m_filters[0];
+ QStringList filesList = d.entryList(currentFilter);
+ QStringList::iterator filesIt;
+ int filesNumber = 0;
+@@ -967,7 +974,7 @@
+ d.setMatchAllDirs(true);
+ d.setFilter(m_optionMask);
+
+- QString currentFilter = QStringList::split(",",m_option->m_filters)[0];
++ QString currentFilter = m_option->m_filters[0];
+ QStringList filesList = d.entryList(currentFilter);
+ QStringList::iterator filesIt;
+
+@@ -1579,7 +1586,7 @@
+ bool KFileReplacePart::launchNewProjectDialog(const KURL & startURL)
+ {
+ if(!startURL.isEmpty())
+- m_option->m_directories = QString(startURL.path()+","+m_option->m_directories);
++ m_option->m_directories.prepend(startURL.path());
+
+ /* This dlg reads options from m_option, then execs, finally returns options.*/
+ KNewProjectDlg dlg(m_option);
+@@ -1624,7 +1631,7 @@
+ }
+
+ // Checks if the main directory can be accessed
+- QString currentDirectory = QStringList::split(",",m_option->m_directories)[0];
++ QString currentDirectory = m_option->m_directories[0];
+ QDir dir;
+
+ dir.setPath(currentDirectory);
+--- quanta/dialogs/copyto.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/dialogs/copyto.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -46,7 +46,7 @@
+ targetDirURL.adjustPath(1);
+
+ bool doCopy = true;
+- if (!QExtFileInfo::exists(targetDirURL, 0L))
++ if (!QExtFileInfo::exists(targetDirURL, false, 0L))
+ {
+ doCopy = QExtFileInfo::createDir(targetDirURL, 0L);
+ }
+@@ -91,7 +91,7 @@
+ targetDirURL = destination;
+ }
+ bool doCopy = true;
+- if (!QExtFileInfo::exists(targetDirURL, 0L))
++ if (!QExtFileInfo::exists(targetDirURL, false, 0L))
+ {
+ doCopy = QExtFileInfo::createDir(targetDirURL, 0L);
+ }
+--- quanta/components/debugger/pathmapper.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/components/debugger/pathmapper.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -110,21 +110,21 @@
+ newpath = translate(serverpath, m_serverBasedir, m_localBasedir);
+
+ // Check if this dir is matched by the basedirs
+- if(QExtFileInfo::exists(newpath, 0L))
++ if(QExtFileInfo::exists(newpath, true, 0L))
+ return newpath;
+
+ // Check if any previous mappings fit...
+ for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ )
+ {
+ newpath = translate(serverpath, m_serverlist[cnt], m_locallist[cnt]);
+- if(QExtFileInfo::exists(newpath, 0L))
++ if(QExtFileInfo::exists(newpath, true, 0L))
+ return newpath;
+ }
+
+ // If the basedirs didnt match, check if the file exists,
+ // otherwise scan through the mapping history or show the
+ // mapping dialog
+- if(!QExtFileInfo::exists(serverpath, 0L))
++ if(!QExtFileInfo::exists(serverpath, true, 0L))
+ {
+ PathMapperDialog pmdlg(serverpath, PathMapperDialog::ServerToLocal);
+ for (unsigned int cnt = 0; cnt < m_serverlist.count(); cnt++ )
+--- quanta/components/debugger/debuggermanager.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/components/debugger/debuggermanager.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -601,7 +601,7 @@
+ return true;
+
+ // Find new position in editor
+- if(ViewManager::ref()->isOpened(filename) || QExtFileInfo::exists(filename, 0L))
++ if(ViewManager::ref()->isOpened(filename) || QExtFileInfo::exists(filename, true, 0L))
+ quantaApp->gotoFileAndLine(filename, line, 0);
+ else
+ {
+--- quanta/components/debugger/pathmapperdialog.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/components/debugger/pathmapperdialog.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -78,7 +78,7 @@
+ // Indicate wether local file exists
+ if(m_direction == ServerToLocal)
+ {
+- if(QExtFileInfo::exists(translated, this))
++ if(QExtFileInfo::exists(translated, true, this))
+ ledTranslationExists->setColor(Qt::green);
+ else
+ ledTranslationExists->setColor(Qt::red);
+--- quanta/ChangeLog (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/ChangeLog (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -1,7 +1,12 @@
+ This files contains the changes since Quanta 2.0 until the current 3.5.x series.
+
+-Version 3.5.1 (Release date: xx-01-2006; Started 30-29-2005):
++Version 3.5.2 (Release date: xx-02-2006; Started 23-01-2005):
+ - bugfixes:
++ - allow opening of read-only remote files, like from http:// [#120632]
++ - fix insertion of files to the project [#120629]
++
++Version 3.5.1 (Release date: 23-01-2006; Started 30-11-2005):
++ - bugfixes:
+ - better handling of quotation marks when editing tags inside a script area [#118693]
+ - don't show the file changed dialog after using save as and save again
+ - crash fixes in VPL [#118686]
+--- quanta/src/quantadoc.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/src/quantadoc.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -173,7 +173,7 @@
+ }
+ if (!url.isEmpty())
+ {
+- if (QExtFileInfo::exists(url, quantaApp))
++ if (QExtFileInfo::exists(url, true, quantaApp))
+ {
+ if (encoding.isEmpty())
+ encoding = quantaApp->defaultEncoding();
+--- quanta/src/quanta.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/src/quanta.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -387,7 +387,7 @@
+
+ void QuantaApp::slotFileOpenRecent(const KURL &url)
+ {
+- if (!QExtFileInfo::exists(url, this))
++ if (!QExtFileInfo::exists(url, true, this))
+ {
+ if (KMessageBox::questionYesNo(this,
+ i18n("The file %1 does not exist.\n Do you want to remove it from the list?").arg(url.prettyURL(0, KURL::StripFileProtocol)), QString::null, KStdGuiItem::del(), i18n("Keep"))
+@@ -2072,7 +2072,7 @@
+
+ void QuantaApp::slotOpenFileUnderCursor()
+ {
+- if (QExtFileInfo::exists(urlUnderCursor, this))
++ if (QExtFileInfo::exists(urlUnderCursor, true, this))
+ {
+ if (QuantaCommon::checkMimeGroup(urlUnderCursor, "text" ))
+ {
+@@ -3186,7 +3186,7 @@
+ //first load the local version if it exists
+ fileName = locateLocal("data", resourceDir + "toolbars/"+newDtd->toolbars[i]);
+ QuantaCommon::setUrl(url, fileName);
+- if (QExtFileInfo::exists(url, this))
++ if (QExtFileInfo::exists(url, true, this))
+ {
+ //showToolbarFile(url);
+ newToolbars += url;
+@@ -3194,7 +3194,7 @@
+ {
+ fileName = qConfig.globalDataDir + resourceDir + "toolbars/"+newDtd->toolbars[i];
+ QuantaCommon::setUrl(url, fileName);
+- if (QExtFileInfo::exists(url, this))
++ if (QExtFileInfo::exists(url, true, this))
+ {
+ newToolbars += url;// showToolbarFile(url);
+ }
+--- quanta/utility/quantacommon.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/utility/quantacommon.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -677,7 +677,7 @@
+ {
+ bool result = true;
+
+- if (QExtFileInfo::exists(url, window))
++ if (QExtFileInfo::exists(url, false, window))
+ {
+ if (KMessageBox::warningContinueCancel(window,
+ i18n( "<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>" ).arg(url.prettyURL(0, KURL::StripFileProtocol)), QString::null, i18n("Overwrite")) == KMessageBox::Cancel)
+--- quanta/project/project.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/project/project.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -243,7 +243,7 @@
+ kdDebug(24000) << "Open recent project: " << url <<endl;
+ if ( !url.isEmpty() )
+ {
+- if ( !QExtFileInfo::exists(url, d->m_mainWindow) )
++ if ( !QExtFileInfo::exists(url, true, d->m_mainWindow) )
+ {
+ emit hideSplash();
+ if (KMessageBox::questionYesNo(d->m_mainWindow,
+--- quanta/project/projectupload.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/project/projectupload.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -369,7 +369,7 @@
+ buttonUpload->setEnabled(false);
+ KURL u = *baseUrl;
+ u.setPath(u.protocol() == "file" ? "/" : "");
+- if (QExtFileInfo::exists(u, this))
++ if (QExtFileInfo::exists(u, false, this))
+ {
+ upload();
+ return;
+--- quanta/project/projectprivate.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/project/projectprivate.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -1431,7 +1431,7 @@
+ CopyTo *dlg = new CopyTo( baseURL);
+ connect(dlg, SIGNAL(deleteDialog(CopyTo*)),
+ SLOT (slotDeleteCopytoDlg(CopyTo*)));
+- connect(dlg, SIGNAL(addFilesToProject(const KURL::List&)),
++ connect(dlg, SIGNAL(addFilesToProject(const KURL::List&)), parent,
+ SLOT (slotInsertFilesAfterCopying(const KURL::List&)));
+ list = dlg->copy( list, destination );
+ return;
+@@ -1441,17 +1441,17 @@
+ }
+ }
+
+- insertFiles( list );
+- //Take care also of the selected dirs
+- KURL dirURL;
+- for (uint i = 0; i < list.count(); i++)
+- {
+- dirURL = list[i];
+- if (dirURL.path().endsWith("/"))
++ insertFiles( list );
++ //Take care also of the selected dirs
++ KURL dirURL;
++ for (uint i = 0; i < list.count(); i++)
+ {
+- insertFiles( dirURL, "*" );
++ dirURL = list[i];
++ if (dirURL.path().endsWith("/"))
++ {
++ insertFiles( dirURL, "*" );
++ }
+ }
+- }
+
+ parent->reloadTree( &(m_projectFiles), false, QStringList());
+ }
+@@ -1467,10 +1467,10 @@
+
+ void ProjectPrivate::slotAddDirectory()
+ {
+-KURL url = KURL();
+-url = KFileDialog::getExistingURL(baseURL.prettyURL(), m_mainWindow,
+- i18n("Insert Folder in Project"));
+-parent->slotAddDirectory(url);
++ KURL url = KURL();
++ url = KFileDialog::getExistingURL(baseURL.prettyURL(), m_mainWindow,
++ i18n("Insert Folder in Project"));
++ parent->slotAddDirectory(url);
+ }
+
+
+--- quanta/project/projectnewlocal.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/project/projectnewlocal.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -112,7 +112,7 @@
+ {
+ KURL::List list;
+
+- if (!QExtFileInfo::exists(baseURL, this) ||
++ if (!QExtFileInfo::exists(baseURL, false, this) ||
+ !baseURL.path().endsWith("/") ||
+ !checkInsert->isChecked() ) return list;
+
+--- quanta/treeviews/structtreeview.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/treeviews/structtreeview.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -995,7 +995,7 @@
+ QuantaCommon::setUrl(url, text.stripWhiteSpace());
+ KURL baseUrl = QExtFileInfo::path(write->url());
+ url = QExtFileInfo::toAbsolute(url, baseUrl);
+- if (QExtFileInfo::exists(url, this))
++ if (QExtFileInfo::exists(url, true, this))
+ {
+ if (QuantaCommon::checkMimeGroup(url, "text" ))
+ {
+--- quanta/treeviews/templatestreeview.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/treeviews/templatestreeview.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -465,7 +465,7 @@
+ *(tempFile->textStream()) << content;
+ tempFile->close();
+ bool proceed = true;
+- if (QExtFileInfo::exists(url, this))
++ if (QExtFileInfo::exists(url, false, this))
+ {
+ proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(url.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue;
+ }
+--- quanta/treeviews/basetreeview.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/treeviews/basetreeview.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -1026,7 +1026,7 @@
+ if ( oldURL != newURL )
+ {
+ bool proceed = true;
+- if (QExtFileInfo::exists(newURL, this))
++ if (QExtFileInfo::exists(newURL, false, this))
+ {
+ proceed = KMessageBox::warningContinueCancel(this, i18n("<qt>The file <b>%1</b> already exists.<br>Do you want to overwrite it?</qt>").arg(newURL.prettyURL(0, KURL::StripFileProtocol)),i18n("Overwrite"), i18n("Overwrite")) == KMessageBox::Continue;
+ }
+@@ -1204,7 +1204,7 @@
+ url.setPath(url.path() + "/" + fileName);
+ else
+ url.setPath(url.directory() + "/" + fileName);
+- if (QExtFileInfo::exists(url, this))
++ if (QExtFileInfo::exists(url, false, this))
+ {
+ KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File"));
+ return;
+--- quanta/treeviews/projecttreeview.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ quanta/treeviews/projecttreeview.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -397,7 +397,7 @@
+ url.setPath(url.path() + "/" + fileName);
+ else
+ url.setPath(url.directory() + "/" + fileName);
+- if (QExtFileInfo::exists(url, this))
++ if (QExtFileInfo::exists(url, false, this))
+ {
+ KMessageBox::error(this, i18n("<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>").arg(fileName), i18n("Error Creating File"));
+ return;
+--- lib/qextfileinfo.h (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ lib/qextfileinfo.h (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -56,8 +56,9 @@
+ /** Returns the user's home directory as an url. */
+ static KURL home();
+ /** A slightly better working alternative of KIO::NetAccess::exists().
+- Checks for the existance of the url. */
+- static bool exists(const KURL& url, QWidget *window);
++ Checks for the existance of the url. readingOnly is true if we check if
++ the url is readable, and false if we check if it is writable.*/
++ static bool exists(const KURL& url, bool readingOnly, QWidget *window);
+ /** Synchronous copy, like NetAccess::file_copy in KDE 3.2, just that it doesn't show a progress dialog */
+ static bool copy( const KURL& src, const KURL& dest, int permissions=-1,
+ bool overwrite=false, bool resume=false, QWidget* window = 0L );
+@@ -67,7 +68,7 @@
+ private:
+ /** Internal methods called by the above ones. They start their own event loop and
+ exit when the even loop is exited */
+- bool internalExists(const KURL& url, QWidget *window);
++ bool internalExists(const KURL& url, bool readingOnly, QWidget *window);
+ bool internalCopy(const KURL& src, const KURL& target, int permissions,
+ bool overwrite, bool resume, QWidget* window);
+ KURL::List allFilesInternal(const KURL& startURL, const QString& mask, QWidget *window);
+--- lib/qextfileinfo.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ lib/qextfileinfo.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -140,17 +140,17 @@
+ KURL dir2;
+ KURL dir1 = path;
+ dir1.setPath("/");
+- if (!exists(dir1, window))
++ if (!exists(dir1, false, window))
+ {
+ return false; //the root is not accessible, possible wrong username/password supplied
+ }
+- while (!exists(path, window) && dir2.path() != path.path())
++ while (!exists(path, false, window) && dir2.path() != path.path())
+ {
+ dir1 = path;
+ dir2 = path;
+
+ dir1=cdUp(dir1);
+- while (!exists(dir1, window) && dir1.path() != "/")
++ while (!exists(dir1, false, window) && dir1.path() != "/")
+ {
+ dir1 = cdUp(dir1);
+ dir2 = cdUp(dir2);
+@@ -162,7 +162,7 @@
+ break;
+ i++;
+ }
+- result = exists(path, window);
++ result = exists(path, false, window);
+ return result;
+ }
+
+@@ -198,20 +198,20 @@
+ }
+
+
+-bool QExtFileInfo::exists(const KURL& a_url, QWidget *window)
++bool QExtFileInfo::exists(const KURL& a_url, bool readingOnly, QWidget *window)
+ {
+ // Andras: Don't use it now, as it brings up an extra dialog and need manual
+ // intervention when usign fish
+ // return KIO::NetAccess::exists(a_url, false);
+
+ // No dialog when stating.
+- if ( a_url.isLocalFile() )
++ if (a_url.isLocalFile())
+ {
+- return QFile::exists( a_url.path() );
++ return QFile::exists(a_url.path());
+ } else
+ {
+- QExtFileInfo internalFileInfo;
+- return internalFileInfo.internalExists(a_url, window);
++ QExtFileInfo internalFileInfo;
++ return internalFileInfo.internalExists(a_url, readingOnly, window);
+ }
+ }
+
+@@ -230,7 +230,7 @@
+ return allLocalFiles(startURL.path(-1), mask);
+
+ dirListItems.clear();
+- if (internalExists(startURL, window))
++ if (internalExists(startURL, true, window))
+ {
+ lstFilters.setAutoDelete(true);
+ lstFilters.clear();
+@@ -268,7 +268,7 @@
+ detailedDirListItems.setAutoDelete(true);
+ detailedDirListItems.clear();
+ detailedDirListItems.setAutoDelete(false);
+- if (internalExists(startURL, window))
++ if (internalExists(startURL, true, window))
+ {
+ lstFilters.setAutoDelete(true);
+ lstFilters.clear();
+@@ -322,7 +322,7 @@
+
+ //Some hackery from KIO::NetAccess as they do not do exactly what we want
+ /* return true if the url exists*/
+-bool QExtFileInfo::internalExists(const KURL& url, QWidget *window)
++bool QExtFileInfo::internalExists(const KURL& url, bool readingOnly, QWidget *window)
+ {
+ bJobOK = true;
+ KURL url2 = url;
+@@ -331,7 +331,7 @@
+ KIO::StatJob * job = KIO::stat(url2, false);
+ job->setWindow(window);
+ job->setDetails(0);
+- job->setSide(false); //check the url for writing
++ job->setSide(readingOnly);
+ connect( job, SIGNAL( result (KIO::Job *) ),
+ this, SLOT( slotResult (KIO::Job *) ) );
+
+--- klinkstatus/src/klinkstatus_part.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ klinkstatus/src/klinkstatus_part.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -343,6 +343,7 @@
+ KBugReport bugReportDlg(0, true, &aboutData);
+ bugReportDlg.exec();
+ }
++
+ /*
+ void KLinkStatusPart::slotShowToolbar()
+ {
+--- klinkstatus/src/parser/Makefile.am (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ klinkstatus/src/parser/Makefile.am (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -4,3 +4,4 @@
+ libparser_la_LDFLAGS = $(all_libraries)
+ noinst_LTLIBRARIES = libparser.la
+ libparser_la_SOURCES = htmlparser.cpp http.cpp mstring.cpp node.cpp url.cpp
++
+--- klinkstatus/src/klinkstatus_part.rc (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ klinkstatus/src/klinkstatus_part.rc (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -1,39 +1,39 @@
+ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
+ <kpartgui name="klinkstatus_part" version="2">
+-<MenuBar>
+-
+- <Menu name="file"><text>File</text>
+- <Action name="new_link_check"/>
+- <Action name="open_link"/>
+- <Action name="close_tab"/>
+- <Separator/>
+- </Menu>
+-
+- <Menu name="settings"><text>&Settings</text>
+- <Separator/>
+- <Action name="configure_klinkstatus"/>
+- </Menu>
+-
+- <Menu name="view"><text>&View</text>
+- <Action name="display_all_links"/>
+- <Separator/>
+- <Action name="display_good_links"/>
+- <Action name="display_bad_links"/>
+- <Action name="display_malformed_links"/>
+- <Action name="display_undetermined_links"/>
+- </Menu>
+-
+- <Menu name="help"><text>&Help</text>
+- <Separator/>
+- <Action name="about_klinkstatus"/>
+- <Action name="report_bug"/>
+- </Menu>
+-</MenuBar>
+-
+-<ToolBar name="linksToolBar">
+- <Action name="new_link_check"/>
+- <Action name="open_link"/>
+- <Action name="close_tab"/>
+- <Separator/>
+-</ToolBar>
++ <MenuBar>
++
++ <Menu name="file"><text>File</text>
++ <Action name="new_link_check"/>
++ <Action name="open_link"/>
++ <Action name="close_tab"/>
++ <Separator/>
++ </Menu>
++
++ <Menu name="settings"><text>&Settings</text>
++ <Separator/>
++ <Action name="configure_klinkstatus"/>
++ </Menu>
++
++ <Menu name="view"><text>&View</text>
++ <Action name="display_all_links"/>
++ <Separator/>
++ <Action name="display_good_links"/>
++ <Action name="display_bad_links"/>
++ <Action name="display_malformed_links"/>
++ <Action name="display_undetermined_links"/>
++ </Menu>
++
++ <Menu name="help"><text>&Help</text>
++ <Separator/>
++ <Action name="about_klinkstatus"/>
++ <Action name="report_bug"/>
++ </Menu>
++ </MenuBar>
++
++ <ToolBar name="linksToolBar">
++ <Action name="new_link_check"/>
++ <Action name="open_link"/>
++ <Action name="close_tab"/>
++ <Separator/>
++ </ToolBar>
+ </kpartgui>
+--- klinkstatus/src/Makefile.am (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ klinkstatus/src/Makefile.am (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -35,8 +35,9 @@
+ # the Part's source, library search path, and link libraries
+
+ libklinkstatuspart_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries)
+-libklinkstatuspart_la_LIBADD = ui/settings/libsettings.la ui/libui.la engine/libengine.la \
+- utils/libutils.la parser/libparser.la $(LIB_KPARTS) $(LIB_KFILE)
++libklinkstatuspart_la_LIBADD = ui/settings/libsettings.la \
++ ui/libui.la engine/libengine.la \
++ parser/libparser.la utils/libutils.la $(LIB_KPARTS) $(LIB_KFILE)
+
+ # this is where the desktop file will go
+ partdesktopdir = $(kde_servicesdir)
+--- kommander/widget/Makefile.am (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ kommander/widget/Makefile.am (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -4,8 +4,11 @@
+ INCLUDES = $(all_includes)
+
+ # the library search path.
+-libkommanderwidget_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++libkommanderwidget_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
+
++# the libraries to link against.
++libkommanderwidget_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT)
++
+ libkommanderwidget_la_SOURCES = kommanderwidget.cpp myprocess.cpp \
+ specialinformation.cpp kommanderfunctions.cpp specials.cpp \
+ kommanderwindow.cpp expression.cpp \
+--- kommander/widget/function.h (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ kommander/widget/function.h (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -44,7 +44,7 @@
+ Function(FunctionPointer fp, Parse::ValueType value, Parse::ValueType param1, Parse::ValueType param2,
+ Parse::ValueType param3, Parse::ValueType param4, uint min = 99999, uint max = 0);
+ Function(FunctionPointer fp, Parse::ValueType value, Parse::ValueType param1, Parse::ValueType param2,
+- Parse::ValueType param3, Parse::ValueType param4, Parse::ValueType param4,
++ Parse::ValueType param3, Parse::ValueType param4, Parse::ValueType param5,
+ uint min = 99999, uint max = 0);
+ /* if function returns value */
+ bool isVoid() const;
+--- kommander/editor/Makefile.am (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ kommander/editor/Makefile.am (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -10,9 +10,10 @@
+ kmdr_editor_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+
+ # the libraries to link against.
+-kmdr_editor_LDADD = $(top_builddir)/kommander/widget/libkommanderwidget.la \
+- $(top_builddir)/kommander/widgets/libkommanderwidgets.la $(top_builddir)/kommander/plugin/libkommanderplugin.la \
+- $(top_builddir)/kommander/factory/libkommanderfactory.la
++kmdr_editor_LDADD = $(top_builddir)/kommander/factory/libkommanderfactory.la \
++ $(top_builddir)/kommander/widget/libkommanderwidget.la \
++ $(top_builddir)/kommander/widgets/libkommanderwidgets.la \
++ $(top_builddir)/kommander/plugin/libkommanderplugin.la
+
+ # which sources should be compiled for kmdr_editor
+ kmdr_editor_SOURCES = actiondnd.cpp actioneditorimpl.cpp \
+--- kommander/pluginmanager/mainwindow.cpp (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ kommander/pluginmanager/mainwindow.cpp (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -67,7 +67,7 @@
+
+ void MainWindow::add()
+ {
+- QString libDir = KGlobal::dirs()->findResourceDir("lib", "libkommanderplugin.la");
++ QString libDir = KGlobal::dirs()->findResourceDir("lib", "libkommanderplugin");
+ QString plugin = KFileDialog::getOpenFileName(libDir, "lib*", this,
+ i18n("Add Kommander Plugin"));
+ add(plugin);
+--- kommander/plugin/Makefile.am (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ kommander/plugin/Makefile.am (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -4,8 +4,11 @@
+ INCLUDES = -I$(top_srcdir)/kommander/widget $(all_includes)
+
+ # the library search path.
+-libkommanderplugin_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++libkommanderplugin_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
+
++# the libraries to link against.
++libkommanderplugin_la_LIBADD = $(LIB_QT)
++
+ libkommanderplugin_la_SOURCES = kommanderplugin.cpp
+
+ include_HEADERS = kommanderplugin.h
+--- kommander/widgets/Makefile.am (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ kommander/widgets/Makefile.am (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -5,12 +5,13 @@
+
+ # the library search path.
+ #widgets_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+-libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++libkommanderwidgets_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
+
+ # the libraries to link against.
+-libkommanderwidgets_la_LIBADD = $(LIB_KIO) \
++libkommanderwidgets_la_LIBADD = $(LIB_KIO) $(LIB_QT) \
+ $(top_builddir)/kommander/widget/libkommanderwidget.la \
+- $(top_builddir)/kommander/plugin/libkommanderplugin.la
++ $(top_builddir)/kommander/plugin/libkommanderplugin.la \
++ $(top_builddir)/kommander/factory/libkommanderfactory.la
+
+ # which sources should be compiled for widgets
+ libkommanderwidgets_la_SOURCES = buttongroup.cpp subdialog.cpp checkbox.cpp \
+--- kommander/factory/Makefile.am (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ kommander/factory/Makefile.am (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -4,7 +4,7 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/kommander/widget -I$(top_srcdir)/kommander/plugin $(all_includes)
+
+ # the library search path.
+-libkommanderfactory_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
++libkommanderfactory_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -no-undefined
+ libkommanderfactory_la_LIBADD = $(top_builddir)/kommander/plugin/libkommanderplugin.la
+
+ # which sources should be compiled for factory
+--- kommander/examples/tutorial/strings.kmdr (.../tags/KDE/3.5.1/kdewebdev) (revision 504937)
++++ kommander/examples/tutorial/strings.kmdr (.../branches/KDE/3.5/kdewebdev) (revision 504937)
+@@ -100,7 +100,7 @@
+ <cstring>TextLabel1</cstring>
+ </property>
+ <property name="text">
+- <string>&Enter string here:</string>
++ <string>Enter str&ing here:</string>
+ </property>
+ <property name="buddy" stdset="0">
+ <cstring>LineEdit1</cstring>
More information about the pkg-kde-commits
mailing list