[PATCH] Use of KURL instead of QString in kdevelop snapshot
Sandor Takacs
taki at cloud.matav.sulinet.hu
Thu Feb 24 18:41:34 GMT 2000
Hello!
I made this patch, which is replace getOpenFileName with getOpenURL in
current kdevelop code. I add a new include in dlgedit/dlgedit.h, 'cause
without this include QList<DialogWidget> dlgwidgets; line send an error.
Please apply this patch.
Oh, it is against kdevelop-20000224.tar.bz2 from
ftp.kde.org/pub/kde/snapshots/current.
--
Takika
-------------- next part --------------
--- kdevelop/dlgedit/dlgedit.h~ Mon Feb 7 04:15:10 2000
+++ kdevelop/dlgedit/dlgedit.h Wed Feb 23 20:09:26 2000
@@ -18,6 +18,7 @@
#ifndef DLGEDIT_H
#define DLGEDIT_H
+#include <qlist.h>
#include "../component.h"
#include "widgetsview.h"
#include "propertyview.h"
--- kdevelop/kwrite/kwview.cpp.orig Thu Feb 24 17:31:39 2000
+++ kdevelop/kwrite/kwview.cpp Thu Feb 24 17:42:25 2000
@@ -2105,28 +2105,38 @@
}
void KWrite::open() {
- QString url;
+ KURL url;
if (!canDiscard()) return;
// if (kWriteDoc->hasFileName()) s = QFileInfo(kWriteDoc->fileName()).dirPath();
// else s = QDir::currentDirPath();
- url = KFileDialog::getOpenFileName(kWriteDoc->fileName(),"*",this);
+ url = KFileDialog::getOpenURL(kWriteDoc->fileName(),"*",this);
+ if (!url.isLocalFile())
+ {
+ KMessageBox::sorry( 0L, i18n( "Only local files are supported yet." ));
+ return;
+ }
if (url.isEmpty()) return;
// kapp->processEvents();
- loadURL(url);
+ loadURL(url.path());
}
void KWrite::insertFile() {
if (isReadOnly())
return;
- QString url;
+ KURL url;
- url = KFileDialog::getOpenFileName(kWriteDoc->fileName(),"*",this);
+ url = KFileDialog::getOpenURL(kWriteDoc->fileName(),"*",this);
+ if (!url.isLocalFile())
+ {
+ KMessageBox::sorry( 0L, i18n( "Only local files are supported yet." ));
+ return;
+ }
if (url.isEmpty()) return;
// kapp->processEvents();
- loadURL(url,lfInsert);
+ loadURL(url.path(),lfInsert);
}
KWrite::fileResult KWrite::save() {
@@ -2139,15 +2149,15 @@
}
KWrite::fileResult KWrite::saveAs() {
- QString url;
+ KURL u;
int query;
do {
query = 0;
- url = KFileDialog::getSaveFileName(kWriteDoc->fileName(),"*",this);
- if (url.isEmpty()) return CANCEL;
+ u = KFileDialog::getSaveURL(kWriteDoc->fileName(),"*",this);
+ if (u.isEmpty()) return CANCEL;
- KURL u(url);
+// KURL u(url);
if (u.isLocalFile()) {
QFileInfo info;
QString name(u.path());
@@ -2164,7 +2174,7 @@
} while (query == 1);
// kapp->processEvents();
- writeURL(url);
+ writeURL(u.path());
return OK;
}
--- kdevelop/print/cprintdlg.cpp.orig Thu Feb 24 17:59:26 2000
+++ kdevelop/print/cprintdlg.cpp Thu Feb 24 17:59:51 2000
@@ -1106,7 +1106,7 @@
}
void CPrintDlg::slotPrintToFileDlgClicked() {
- printToFileLine->setText(KFileDialog::getOpenFileName());
+ printToFileLine->setText(KFileDialog::getOpenURL().path());
}
bool CPrintDlg::lookProgram(QString name) {
--- kdevelop/print/cfileprintdlg.cpp.orig Thu Feb 24 17:54:32 2000
+++ kdevelop/print/cfileprintdlg.cpp Thu Feb 24 17:55:45 2000
@@ -736,7 +736,7 @@
}
void CFilePrintDlg::slotSelfChoosenFileButtonClicked() {
- selfChoosenFileLine->setText(KFileDialog::getOpenFileName());
+ selfChoosenFileLine->setText(KFileDialog::getOpenURL().path());
}
void CFilePrintDlg::slotSelfChoosenFileAddClicked() {
--- kdevelop/ckdevelop.cpp.orig Thu Feb 24 18:25:16 2000
+++ kdevelop/ckdevelop.cpp Thu Feb 24 18:28:58 2000
@@ -118,17 +118,22 @@
void CKDevelop::slotFileOpen(){
+ KURL url;
slotStatusMsg(i18n("Opening file..."));
- QString str;
if(project){
- str = KFileDialog::getOpenFileName(prj->getProjectDir(),"*",this);
+ url = KFileDialog::getOpenURL(prj->getProjectDir(),"*",this);
}
else{
- str = KFileDialog::getOpenFileName(0,"*",this);
+ url = KFileDialog::getOpenURL(0,"*",this);
}
- if (!str.isEmpty()) // nocancel
+ if( !url.isLocalFile() )
+ {
+ KMessageBox::sorry( 0L, i18n( "Only local files supported yet" ) );
+ return;
+ }
+ if (!url.isEmpty()) // nocancel
{
- switchToFile(str);
+ switchToFile(url.path());
}
slotStatusMsg(i18n("Ready."));
}
--- kdevelop/ckdevelop_noslot.cpp.orig Thu Feb 24 18:41:59 2000
+++ kdevelop/ckdevelop_noslot.cpp Thu Feb 24 18:48:42 2000
@@ -123,7 +123,8 @@
*-----------------------------------------------------------------*/
bool CKDevelop::fileSaveAs(){
- QString name,oldName;
+ QString oldName;
+ KURL name;
int msg_result = KMessageBox::Ok;
if (bAutosave) saveTimer->stop();
@@ -131,17 +132,22 @@
oldName = editor_view->currentEditor()->getName();
do {
- name = KFileDialog::getSaveFileName(oldName,0,this,oldName);
- if (name.isNull()){
- if (bAutosave) {
- saveTimer->start(saveTimeout);
- }
+ name = KFileDialog::getSaveURL(oldName,0,this,oldName);
+ if( !name.isLocalFile() )
+ {
+ KMessageBox::sorry( 0L, i18n( "Only local files are supported" ) );
+ return false;
+ }
+ if (name.isEmpty()){
+ if (bAutosave) {
+ saveTimer->start(saveTimeout);
+ }
return false;
}
- if(QFile::exists(name)){
+ if(QFile::exists(name.path())){
msg_result=KMessageBox::warningYesNoCancel(this,
i18n("\nThe file\n\n%1\n\nalready exists.\n"
- "Do you want overwrite the old one?\n").arg(name));
+ "Do you want overwrite the old one?\n").arg(name.path()));
if (msg_result==KMessageBox::Cancel){
if (bAutosave)
@@ -152,8 +158,8 @@
}
while(msg_result == KMessageBox::No);
- editor_view->setMDICaption(QFileInfo(name).fileName());
- editor_view->currentEditor()->setName(name);
+ editor_view->setMDICaption(QFileInfo(name.path()).fileName());
+ editor_view->currentEditor()->setName(name.path());
editor_view->currentEditor()->doSave();
slotViewRefresh();
--- kdevelop/ckdevelop_project.cpp.orig Thu Feb 24 18:50:54 2000
+++ kdevelop/ckdevelop_project.cpp Thu Feb 24 18:52:38 2000
@@ -348,16 +348,21 @@
void CKDevelop::slotProjectOpen(){
slotStatusMsg(i18n("Opening project..."));
- QString filename = KFileDialog::getOpenFileName(0,"*.kdevprj",this);
+ KURL filename = KFileDialog::getOpenURL(0,"*.kdevprj",this);
+ if( !filename.isLocalFile() )
+ {
+ KMessageBox::sorry( 0L, i18n( "Only local files are supported" ) );
+ return;
+ }
if (filename.isEmpty())
return;
if (project && !slotProjectClose())
return;
- QFileInfo info(filename);
+ QFileInfo info(filename.path());
if (info.isFile()){
- if(!(readProjectFile(filename))){
+ if(!(readProjectFile(filename.path()))){
KMessageBox::sorry(0, i18n("This is a Project-File from KDevelop 0.1\nSorry,but it's incompatible with KDevelop >= 0.2.\n"
"Please use only new generated projects!"));
--- kdevelop/cprjoptionsdlg.cpp.orig Thu Feb 24 19:00:02 2000
+++ kdevelop/cprjoptionsdlg.cpp Thu Feb 24 19:00:56 2000
@@ -1406,10 +1406,11 @@
// connection to set_modify_dir
void CPrjOptionsDlg::slotFileDialogClicked() {
- QString file,dir;
+ QString dir;
+ KURL url;
dir = prj_info->getProjectDir();
- file = KFileDialog::getOpenFileName(dir,"*",this,"File");
- m_set_modify_line->setText(file);
+ url = KFileDialog::getOpenURL(dir,"*",this,"File");
+ m_set_modify_line->setText(url.path());
}
--- kdevelop/cfilepropdlg.h~ Sun Jan 16 16:05:18 2000
+++ kdevelop/cfilepropdlg.h Thu Feb 24 19:06:24 2000
@@ -29,6 +29,7 @@
#include <qpushbutton.h>
#include <qcheckbox.h>
#include <qlistview.h>
+#include <qlist.h>
class CProject;
class CLogFileView;
--- kdevelop/cdocbrowser.cpp.orig Thu Feb 24 19:08:23 2000
+++ kdevelop/cdocbrowser.cpp Thu Feb 24 19:09:40 2000
@@ -41,7 +41,7 @@
#include <kcolorbtn.h>
#include <kcursor.h>
#include <kprocess.h>
-#include <kio_netaccess.h>
+#include <kio/netaccess.h>
#include "resource.h"
@@ -119,7 +119,7 @@
if( (url_wo_ref != old_url) || reload){
QString str="";
- KIONetAccess::download(url,str);
+ KIO::NetAccess::download(url,str);
//cerr << endl << "STR:" << str;
@@ -145,7 +145,7 @@
// parse();
show();
- KIONetAccess::removeTempFile(str);
+ KIO::NetAccess::removeTempFile(str);
file.close();
}
else{
--- kdevelop/cdoctreepropdlg.cpp.orig Thu Feb 24 19:19:20 2000
+++ kdevelop/cdoctreepropdlg.cpp Thu Feb 24 19:19:59 2000
@@ -86,8 +86,8 @@
}
void CDocTreePropDlg::slotFileButtonClicked(){
- QString str= KFileDialog::getOpenFileName(0,"*.html *.htm",this,"test");
+ KURL str = KFileDialog::getOpenURL(0,"*.html *.htm",this,"test");
if(!str.isEmpty()){
- file_edit->setText(str);
+ file_edit->setText(str.path());
}
}
--- kdevelop/ctoolsconfigdlg.cpp.orig Thu Feb 24 19:27:00 2000
+++ kdevelop/ctoolsconfigdlg.cpp Thu Feb 24 19:28:01 2000
@@ -246,11 +246,11 @@
void CToolsConfigDlg::slotToolsExeSelect()
{
- QString exe_file_name;
- exe_file_name = KFileDialog::getOpenFileName();
+ KURL exe_file_name;
+ exe_file_name = KFileDialog::getOpenURL();
if (!exe_file_name.isEmpty()){
- QString exe_file=QFileInfo(exe_file_name).fileName();
- if(!QFileInfo(exe_file_name).isExecutable()){
+ QString exe_file=QFileInfo(exe_file_name.path()).fileName();
+ if(!QFileInfo(exe_file_name.path()).isExecutable()){
KMessageBox::error(this, i18n("The selected file is not an executable. Please choose an executable filename."));
return;
}
--- kdevelop/cmakemanualdlg.cpp.orig Thu Feb 24 19:31:46 2000
+++ kdevelop/cmakemanualdlg.cpp Thu Feb 24 19:32:22 2000
@@ -74,8 +74,8 @@
accept();
}
void CMakeManualDlg::slotFileButtonClicked(){
- QString str = KFileDialog::getOpenFileName(0,"*.sgml",this,"test");
+ KURL str = KFileDialog::getOpenURL(0,"*.sgml",this,"test");
if(!str.isEmpty()){
- file_edit->setText(str);
+ file_edit->setText(str.path());
}
}
More information about the KDevelop
mailing list