Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Network
Konqueror
Commits
0a5f9848
Commit
0a5f9848
authored
Jan 24, 2006
by
Laurent Montel
Browse files
KURL -> KUrl
svn path=/trunk/KDE/kdebase/konqueror/; revision=501890
parent
0da23f54
Changes
127
Hide whitespace changes
Inline
Side-by-side
kdepasswd/kcm/chfacedlg.cpp
View file @
0a5f9848
...
...
@@ -141,7 +141,7 @@ void ChFaceDlg::addCustomPixmap( QString imPath, bool saveCopy )
userfaces
.
mkdir
(
userfaces
.
absolutePath
()
);
pix
.
save
(
userfaces
.
absolutePath
()
+
"/.userinfo-tmp"
,
"PNG"
);
KonqOperations
::
copy
(
this
,
KonqOperations
::
COPY
,
KU
RL
::
List
(
KURL
(
userfaces
.
absolutePath
()
+
"/.userinfo-tmp"
)
),
KURL
(
userfaces
.
absPath
()
+
"/"
+
QFileInfo
(
imPath
).
fileName
().
section
(
"."
,
0
,
0
)
)
);
KonqOperations
::
copy
(
this
,
KonqOperations
::
COPY
,
KU
rl
::
List
(
KURL
(
userfaces
.
absolutePath
()
+
"/.userinfo-tmp"
)
),
KURL
(
userfaces
.
absPath
()
+
"/"
+
QFileInfo
(
imPath
).
fileName
().
section
(
"."
,
0
,
0
)
)
);
#if 0
if ( !pix.save( userfaces.absolutePath() + "/" + imPath , "PNG" ) )
KMessageBox::sorry(this, i18n("There was an error saving the image:\n%1").arg( userfaces.absolutePath() ) );
...
...
kdepasswd/kcm/main.cpp
View file @
0a5f9848
...
...
@@ -305,7 +305,7 @@ bool KCMUserAccount::eventFilter(QObject *, QEvent *e)
return
true
;
}
KU
RL
*
url
=
decodeImgDrop
(
(
QDropEvent
*
)
e
,
this
);
KU
rl
*
url
=
decodeImgDrop
(
(
QDropEvent
*
)
e
,
this
);
if
(
url
)
{
QString
pixPath
;
...
...
@@ -319,13 +319,13 @@ bool KCMUserAccount::eventFilter(QObject *, QEvent *e)
return
false
;
}
inline
KU
RL
*
KCMUserAccount
::
decodeImgDrop
(
QDropEvent
*
e
,
QWidget
*
wdg
)
inline
KU
rl
*
KCMUserAccount
::
decodeImgDrop
(
QDropEvent
*
e
,
QWidget
*
wdg
)
{
KU
RL
::
List
uris
;
KU
rl
::
List
uris
;
if
(
K3URLDrag
::
decode
(
e
,
uris
)
&&
(
uris
.
count
()
>
0
))
{
KU
RL
*
url
=
new
KURL
(
uris
.
first
());
KU
rl
*
url
=
new
KURL
(
uris
.
first
());
if
(
KImageIO
::
types
(
KImageIO
::
Reading
).
contains
(
url
->
fileName
())
)
return
url
;
...
...
kdepasswd/kcm/main.h
View file @
0a5f9848
...
...
@@ -70,7 +70,7 @@ private Q_SLOTS:
private:
void
changeFace
(
const
QPixmap
&
pix
);
inline
KU
RL
*
decodeImgDrop
(
QDropEvent
*
e
,
QWidget
*
wdg
);
inline
KU
rl
*
decodeImgDrop
(
QDropEvent
*
e
,
QWidget
*
wdg
);
KEMailSettings
*
_kes
;
KUser
*
_ku
;
...
...
kdialog/kdialog.cpp
View file @
0a5f9848
...
...
@@ -507,7 +507,7 @@ static int directCommand(KCmdLineArgs *args)
dlg
.
exec
();
if
(
args
->
isSet
(
"getsaveurl"
)
)
{
KU
RL
result
=
dlg
.
selectedURL
();
KU
rl
result
=
dlg
.
selectedURL
();
if
(
result
.
isValid
())
{
cout
<<
result
.
url
().
local8Bit
().
data
()
<<
endl
;
...
...
@@ -533,7 +533,7 @@ static int directCommand(KCmdLineArgs *args)
result
=
QFileDialog
::
getExistingDirectory
(
startDir
,
0
,
"getExistingDirectory"
,
title
,
true
,
true
);
#else
KU
RL
url
;
KU
rl
url
;
KDirSelectDialog
myDialog
(
startDir
,
true
,
0
,
"kdirselect dialog"
,
true
);
...
...
@@ -578,13 +578,13 @@ static int directCommand(KCmdLineArgs *args)
dlg
.
exec
();
if
(
args
->
isSet
(
"multiple"
))
{
KU
RL
::
List
result
=
dlg
.
selectedURLs
();
KU
rl
::
List
result
=
dlg
.
selectedURLs
();
if
(
!
result
.
isEmpty
()
)
{
outputStringList
(
result
.
toStringList
(),
separateOutput
);
return
0
;
}
}
else
{
KU
RL
result
=
dlg
.
selectedURL
();
KU
rl
result
=
dlg
.
selectedURL
();
if
(
!
result
.
isEmpty
())
{
cout
<<
result
.
url
().
local8Bit
().
data
()
<<
endl
;
return
0
;
...
...
keditbookmarks/commands.cpp
View file @
0a5f9848
...
...
@@ -152,7 +152,7 @@ EditCommand::EditCommand(const QString & address, int col, const QString & newVa
{
if
(
mCol
==
1
)
{
KU
RL
u
=
KU
RL
::
fromPathOrURL
(
newValue
);
KU
rl
u
=
KU
rl
::
fromPathOrURL
(
newValue
);
mNewValue
=
u
.
url
(
0
,
106
);
}
else
...
...
@@ -235,7 +235,7 @@ void EditCommand::modify(QString newValue)
{
if
(
mCol
==
1
)
{
KU
RL
u
=
KU
RL
::
fromPathOrURL
(
newValue
);
KU
rl
u
=
KU
rl
::
fromPathOrURL
(
newValue
);
mNewValue
=
u
.
url
(
0
,
106
);
}
else
...
...
keditbookmarks/commands.h
View file @
0a5f9848
...
...
@@ -68,7 +68,7 @@ public:
// bookmark
CreateCommand
(
const
QString
&
address
,
const
QString
&
text
,
const
QString
&
iconPath
,
const
KU
RL
&
url
)
const
KU
rl
&
url
)
:
KCommand
(),
m_to
(
address
),
m_text
(
text
),
m_iconPath
(
iconPath
),
m_url
(
url
),
m_group
(
false
),
m_separator
(
false
),
m_originalBookmark
(
QDomElement
())
{
;
}
...
...
@@ -99,7 +99,7 @@ private:
QString
m_to
;
QString
m_text
;
QString
m_iconPath
;
KU
RL
m_url
;
KU
rl
m_url
;
bool
m_group
:
1
;
bool
m_separator
:
1
;
bool
m_open
:
1
;
...
...
keditbookmarks/updater.cpp
View file @
0a5f9848
...
...
@@ -97,8 +97,8 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
m_browserIface
=
new
FavIconBrowserInterface
(
this
);
ext
->
setBrowserInterface
(
m_browserIface
);
connect
(
ext
,
SIGNAL
(
setIconURL
(
const
KU
RL
&
)
),
this
,
SLOT
(
setIconURL
(
const
KU
RL
&
)
));
connect
(
ext
,
SIGNAL
(
setIconURL
(
const
KU
rl
&
)
),
this
,
SLOT
(
setIconURL
(
const
KU
rl
&
)
));
m_part
=
part
;
}
...
...
@@ -107,7 +107,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) {
}
// khtml callback
void
FavIconUpdater
::
setIconURL
(
const
KU
RL
&
iconURL
)
{
void
FavIconUpdater
::
setIconURL
(
const
KU
rl
&
iconURL
)
{
setIconForURL
(
m_bk
.
url
(),
iconURL
);
}
...
...
@@ -125,7 +125,7 @@ void FavIconUpdater::notifyChange(bool isHost, QString hostOrURL, QString iconNa
/* -------------------------- */
FavIconWebGrabber
::
FavIconWebGrabber
(
KParts
::
ReadOnlyPart
*
part
,
const
KU
RL
&
url
)
FavIconWebGrabber
::
FavIconWebGrabber
(
KParts
::
ReadOnlyPart
*
part
,
const
KU
rl
&
url
)
:
m_part
(
part
),
m_url
(
url
)
{
// kdDebug() << "FavIconWebGrabber::FavIconWebGrabber starting KIO::get()" << endl;
...
...
keditbookmarks/updater.h
View file @
0a5f9848
...
...
@@ -31,7 +31,7 @@ class FavIconWebGrabber : public QObject
{
Q_OBJECT
public:
FavIconWebGrabber
(
KParts
::
ReadOnlyPart
*
part
,
const
KU
RL
&
url
);
FavIconWebGrabber
(
KParts
::
ReadOnlyPart
*
part
,
const
KU
rl
&
url
);
~
FavIconWebGrabber
()
{}
protected
Q_SLOTS
:
...
...
@@ -40,7 +40,7 @@ protected Q_SLOTS:
private:
KParts
::
ReadOnlyPart
*
m_part
;
KU
RL
m_url
;
KU
rl
m_url
;
};
class
FavIconBrowserInterface
;
...
...
@@ -59,7 +59,7 @@ public:
QString
iconName
);
protected
Q_SLOTS
:
void
setIconURL
(
const
KU
RL
&
iconURL
);
void
setIconURL
(
const
KU
rl
&
iconURL
);
void
slotCompleted
();
Q_SIGNALS:
...
...
kfind/kfind.cpp
View file @
0a5f9848
...
...
@@ -98,7 +98,7 @@ Kfind::~Kfind()
kdDebug
()
<<
"Kfind::~Kfind"
<<
endl
;
}
void
Kfind
::
setURL
(
const
KU
RL
&
url
)
void
Kfind
::
setURL
(
const
KU
rl
&
url
)
{
tabWidget
->
setURL
(
url
);
}
...
...
kfind/kfind.h
View file @
0a5f9848
...
...
@@ -26,7 +26,7 @@ public:
Kfind
(
QWidget
*
parent
=
0
,
const
char
*
name
=
0
);
~
Kfind
();
void
setURL
(
const
KU
RL
&
url
);
void
setURL
(
const
KU
rl
&
url
);
void
setQuery
(
KQuery
*
q
)
{
query
=
q
;
}
void
searchFinished
();
...
...
kfind/kfinddlg.cpp
View file @
0a5f9848
...
...
@@ -23,7 +23,7 @@
#include
"kfinddlg.h"
#include
"kfinddlg.moc"
KfindDlg
::
KfindDlg
(
const
KU
RL
&
url
,
QWidget
*
parent
,
const
char
*
name
)
KfindDlg
::
KfindDlg
(
const
KU
rl
&
url
,
QWidget
*
parent
,
const
char
*
name
)
:
KDialogBase
(
Plain
,
QString
(),
User1
|
User2
|
Apply
|
Close
|
Help
,
Apply
,
parent
,
name
,
true
,
true
,
...
...
kfind/kfinddlg.h
View file @
0a5f9848
...
...
@@ -25,7 +25,7 @@ class KfindDlg: public KDialogBase
Q_OBJECT
public:
KfindDlg
(
const
KU
RL
&
url
,
QWidget
*
parent
=
0
,
const
char
*
name
=
0
);
KfindDlg
(
const
KU
rl
&
url
,
QWidget
*
parent
=
0
,
const
char
*
name
=
0
);
~
KfindDlg
();
void
copySelection
();
...
...
kfind/kfindpart.cpp
View file @
0a5f9848
...
...
@@ -81,7 +81,7 @@ KAboutData *KFindPart::createAboutData()
return
new
KAboutData
(
"kfindpart"
,
I18N_NOOP
(
"Find Component"
),
"1.0"
);
}
bool
KFindPart
::
doOpenURL
(
const
KU
RL
&
url
)
bool
KFindPart
::
doOpenURL
(
const
KU
rl
&
url
)
{
m_kfindWidget
->
setURL
(
url
);
return
true
;
...
...
@@ -189,7 +189,7 @@ void KFindPart::restoreState( QDataStream& stream )
{
KonqDirPart
::
restoreState
(
stream
);
int
nbitems
;
KU
RL
itemUrl
;
KU
rl
itemUrl
;
m_kfindWidget
->
restoreState
(
&
stream
);
...
...
kfind/kfindpart.h
View file @
0a5f9848
...
...
@@ -50,7 +50,7 @@ public:
static
KAboutData
*
createAboutData
();
virtual
bool
doOpenURL
(
const
KU
RL
&
url
);
virtual
bool
doOpenURL
(
const
KU
rl
&
url
);
virtual
bool
doCloseURL
()
{
return
true
;
}
virtual
bool
openFile
()
{
return
false
;
}
...
...
@@ -60,7 +60,7 @@ public:
virtual
void
restoreState
(
QDataStream
&
stream
);
// "Cut" icons : disable those whose URL is in lst, enable the rest //added for konqdirpart
virtual
void
disableIcons
(
const
KU
RL
::
List
&
){};
virtual
void
disableIcons
(
const
KU
rl
::
List
&
){};
virtual
const
KFileItem
*
currentItem
(){
return
0
;};
Q_SIGNALS:
...
...
@@ -89,7 +89,7 @@ protected Q_SLOTS:
virtual
void
slotDeleteItem
(
KFileItem
*
){};
virtual
void
slotRefreshItems
(
const
KFileItemList
&
){};
virtual
void
slotClear
(){};
virtual
void
slotRedirection
(
const
KU
RL
&
){};
virtual
void
slotRedirection
(
const
KU
rl
&
){};
private:
Kfind
*
m_kfindWidget
;
...
...
kfind/kftabdlg.cpp
View file @
0a5f9848
...
...
@@ -389,7 +389,7 @@ KfindTabWidget::~KfindTabWidget()
delete
pages
[
2
];
}
void
KfindTabWidget
::
setURL
(
const
KU
RL
&
url
)
void
KfindTabWidget
::
setURL
(
const
KU
rl
&
url
)
{
KConfig
*
conf
=
KGlobal
::
config
();
conf
->
setGroup
(
"History"
);
...
...
kfind/kftabdlg.h
View file @
0a5f9848
...
...
@@ -47,7 +47,7 @@ public:
void
saveHistory
();
bool
isSearchRecursive
();
void
setURL
(
const
KU
RL
&
url
);
void
setURL
(
const
KU
rl
&
url
);
public
Q_SLOTS
:
void
setFocus
();
...
...
@@ -109,7 +109,7 @@ private:
QCheckBox
*
regexpContentCb
;
QDialog
*
regExpDialog
;
KU
RL
m_url
;
KU
rl
m_url
;
KMimeType
::
List
m_types
;
QStringList
m_ImageTypes
;
...
...
kfind/kfwin.cpp
View file @
0a5f9848
...
...
@@ -156,7 +156,7 @@ QString KfindWindow::reducedDir(const QString& fullDir)
return
fullDir
;
}
void
KfindWindow
::
beginSearch
(
const
KU
RL
&
baseUrl
)
void
KfindWindow
::
beginSearch
(
const
KU
rl
&
baseUrl
)
{
kdDebug
()
<<
QString
(
"beginSearch in: %1"
).
arg
(
baseUrl
.
path
())
<<
endl
;
m_baseDir
=
baseUrl
.
path
(
+
1
);
...
...
@@ -205,7 +205,7 @@ void KfindWindow::saveResults()
dlg
->
exec
();
KU
RL
u
=
dlg
->
selectedURL
();
KU
rl
u
=
dlg
->
selectedURL
();
KMimeType
::
Ptr
mimeType
=
dlg
->
currentFilterMimeType
();
delete
dlg
;
...
...
@@ -314,7 +314,7 @@ void KfindWindow::fileProperties()
void
KfindWindow
::
openFolder
()
{
KFileItem
fileitem
=
((
KfFileLVI
*
)
currentItem
())
->
fileitem
;
KU
RL
url
=
fileitem
.
url
();
KU
rl
url
=
fileitem
.
url
();
url
.
setFileName
(
QString
());
(
void
)
new
KRun
(
url
,
this
);
...
...
@@ -342,7 +342,7 @@ void KfindWindow::resizeEvent(QResizeEvent *e)
Q3DragObject
*
KfindWindow
::
dragObject
()
{
KU
RL
::
List
uris
;
KU
rl
::
List
uris
;
QList
<
Q3ListViewItem
*>
selected
=
selectedItems
();
// create a list of URIs from selection
...
...
@@ -431,5 +431,5 @@ void KfindWindow::slotContextMenu(KListView *,Q3ListViewItem *item,const QPoint&
void
KfindWindow
::
slotOpenWith
()
{
KRun
::
displayOpenWithDialog
(
KU
RL
::
split
(((
KfFileLVI
*
)
currentItem
())
->
fileitem
.
url
())
);
KRun
::
displayOpenWithDialog
(
KU
rl
::
split
(((
KfFileLVI
*
)
currentItem
())
->
fileitem
.
url
())
);
}
kfind/kfwin.h
View file @
0a5f9848
...
...
@@ -35,7 +35,7 @@ class KfindWindow: public KListView
public:
KfindWindow
(
QWidget
*
parent
=
0
);
void
beginSearch
(
const
KU
RL
&
baseUrl
);
void
beginSearch
(
const
KU
rl
&
baseUrl
);
void
endSearch
();
void
insertItem
(
const
KFileItem
&
item
,
const
QString
&
matchingLine
);
...
...
kfind/kquery.cpp
View file @
0a5f9848
...
...
@@ -459,7 +459,7 @@ void KQuery::setRecursive(bool recursive)
m_recursive
=
recursive
;
}
void
KQuery
::
setPath
(
const
KU
RL
&
url
)
void
KQuery
::
setPath
(
const
KU
rl
&
url
)
{
m_url
=
url
;
}
...
...
kfind/kquery.h
View file @
0a5f9848
...
...
@@ -28,7 +28,7 @@ class KQuery : public QObject
void
setTimeRange
(
time_t
from
,
time_t
to
);
void
setRegExp
(
const
QString
&
regexp
,
bool
caseSensitive
);
void
setRecursive
(
bool
recursive
);
void
setPath
(
const
KU
RL
&
url
);
void
setPath
(
const
KU
rl
&
url
);
void
setFileType
(
int
filetype
);
void
setMimeType
(
const
QStringList
&
mimetype
);
void
setContext
(
const
QString
&
context
,
bool
casesensitive
,
...
...
@@ -40,7 +40,7 @@ class KQuery : public QObject
void
start
();
void
kill
();
const
KU
RL
&
url
()
{
return
m_url
;};
const
KU
rl
&
url
()
{
return
m_url
;};
private:
/* Check if file meets the find's requirements*/
...
...
@@ -68,7 +68,7 @@ class KQuery : public QObject
int
m_filetype
;
int
m_minsize
;
int
m_maxsize
;
KU
RL
m_url
;
KU
rl
m_url
;
time_t
m_timeFrom
;
time_t
m_timeTo
;
QRegExp
m_regexp
;
// regexp for file content
...
...
Prev
1
2
3
4
5
…
7
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment