kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-20 00:41:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

These are ambiguous overloads when Qt is compiled with STL support.

Browse source 
svn path=/trunk/kdebase/konqueror/; revision=311209
This commit is contained in:
Scott Wheeler 2004-05-13 22:16:15 +00:00
parent 2eaa5597fe
commit 02c53043ad
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
keditbookmarks/listview.cpp
View file

@ -754,7 +754,7 @@ QDragObject *KEBListView::dragObject() {
ListView::self()->itemsToBookmarks(ListView::self()->selectedItems());
KBookmarkDrag *drag = KBookmarkDrag::newDrag(bookmarks, viewport());
const QString iconname =
(bookmarks.size() == 1) ? bookmarks.first().icon() : "bookmark";
(bookmarks.size() == 1) ? bookmarks.first().icon() : QString("bookmark");
drag->setPixmap(SmallIcon(iconname)) ;
return drag;
}
@ -767,7 +767,7 @@ void KEBListViewItem::normalConstruct(const KBookmark &bk) {
#endif
setText(KEBListView::CommentColumn, NodeEditCommand::getNodeText(bk, "desc"));
bool shown = CmdGen::self()->shownInToolbar(bk);
setPixmap(0, SmallIcon(shown ? "bookmark_toolbar" : bk.icon()));
setPixmap(0, SmallIcon(shown ? QString("bookmark_toolbar") : bk.icon()));
// DESIGN - modUpdate badly needs a redesign
modUpdate();
}

4
keditbookmarks/main.cpp
View file

@ -176,7 +176,7 @@ extern "C" int kdemain(int argc, char **argv) {
QString address = args->isSet("address")
? QString::fromLocal8Bit(args->getOption("address"))
: "/0";
: QString("/0");
QString caption = args->isSet("customcaption")
? QString::fromLocal8Bit(args->getOption("customcaption"))
@ -186,7 +186,7 @@ extern "C" int kdemain(int argc, char **argv) {
bool readonly = false; // passed by ref
if (askUser(app, (gotArg ? filename : ""), readonly)) {
if (askUser(app, (gotArg ? filename : QString::null), readonly)) {
KEBApp *toplevel = new KEBApp(filename, readonly, address, browser, caption);
toplevel->show();
app.setMainWidget(toplevel);

4
keditbookmarks/testlink.cpp
View file

@ -279,8 +279,8 @@ static const QString updateNsInfoMod(const QString &_nsinfo, const QString &nm)
QString tmp;
tmp = "ADD_DATE=\"" + ((nCreate.isEmpty()) ? QString::number(time(0)) : nCreate) + "\"";
tmp += " LAST_VISIT=\"" + ((nAccess.isEmpty()) ? "0" : nAccess) + "\"";
tmp += " LAST_MODIFIED=\"" + ((numValid) ? nm : "1") + "\"";
tmp += " LAST_VISIT=\"" + ((nAccess.isEmpty()) ? QString("0") : nAccess) + "\"";
tmp += " LAST_MODIFIED=\"" + ((numValid) ? nm : QString("1")) + "\"";
return tmp;
}

2
keditbookmarks/toplevel.cpp
View file

@ -317,7 +317,7 @@ void KEBApp::updateActions() {
void KEBApp::setModifiedFlag(bool modified) {
m_modified = modified && !m_readOnly;
QString caption = m_caption.isNull() ? "" : (m_caption + " ");
QString caption = m_caption.isNull() ? QString::null : (m_caption + " ");
if (m_bookmarksFilename
!= KBookmarkManager::userBookmarksManager()->path())
caption += (caption.isEmpty()?"":" - ") + m_bookmarksFilename;

2
konqueror/konq_combo.cc
View file

@ -408,7 +408,7 @@ void KonqCombo::selectWord(QKeyEvent *e)
QString text = edit->text();
int pos_to_right = text.length() - pos - 1;
QString cut = text.left(pos_old) +
(pos_to_right > 0 ? text.right(pos_to_right) : "" );
(pos_to_right > 0 ? text.right(pos_to_right) : QString::null );
edit->setText(cut);
edit->setCursorPosition(pos_old);
}

2
konqueror/konq_mainwindow.cc
View file

@ -2293,7 +2293,7 @@ void KonqMainWindow::slotURLEntered( const QString &text, int state )
if (state & ControlButton)
{
m_combo->setURL( m_currentView ? m_currentView->url().prettyURL() : "" );
m_combo->setURL( m_currentView ? m_currentView->url().prettyURL() : QString::null );
openFilteredURL( text.stripWhiteSpace(), true );
}
else