kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

It compiles fine with "-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS"

Browse source
This commit is contained in:
Montel Laurent 2011-05-22 13:04:04 +02:00
parent 8b7b9d61b9
commit e3e883c84a
7 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -17,7 +17,7 @@ configure_file (config-apps.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-apps.h )
include_directories (${CMAKE_CURRENT_BINARY_DIR})
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DDISABLE_NEPOMUK_LEGACY)
add_definitions (-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
include_directories (${CMAKE_CURRENT_SOURCE_DIR}/lib/konq ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
add_subdirectory( lib )

2
dolphin/src/settings/general/configurepreviewplugindialog.cpp
View file

@ -73,7 +73,7 @@ void ConfigurePreviewPluginDialog::slotOk()
// for a specific MIME-type should be regenerated. As this is not available yet we
// delete the whole thumbnails directory.
QApplication::changeOverrideCursor(Qt::BusyCursor);
KIO::NetAccess::del(QDir::homePath() + "/.thumbnails/", this);
KIO::NetAccess::del(QString(QDir::homePath() + "/.thumbnails/"), this);
QApplication::restoreOverrideCursor();
}

2
kdepasswd/kcm/chfacedlg.cpp
View file

@ -91,7 +91,7 @@ ChFaceDlg::ChFaceDlg(const QString& picsdir, QWidget *parent)
const QStringList picslist = facesDir.entryList( QDir::Files );
for ( QStringList::const_iterator it = picslist.constBegin(); it != picslist.constEnd(); ++it )
new QListWidgetItem( QIcon( KCFGUserAccount::userFaceDir() + *it ),
'/'+(*it) == KCFGUserAccount::customFaceFile() ?
QString('/'+(*it)) == KCFGUserAccount::customFaceFile() ?
i18n("(Custom)") : (*it).section('.',0,0),
ui.m_FacesWidget );
}

2
keditbookmarks/importers.cpp
View file

@ -195,7 +195,7 @@ QString IEImportCommand::requestFilename() const {
QString GaleonImportCommand::requestFilename() const {
return KFileDialog::getOpenFileName(
QDir::homePath() + "/.galeon",
QString(QDir::homePath() + "/.galeon"),
i18n("*.xbel|Galeon Bookmark Files (*.xbel)"),
KEBApp::self());
}

2
kfind/kfinddlg.cpp
View file

@ -294,7 +294,7 @@ QStringList KfindDlg::getAllSubdirs(QDir d)
if((*it==".")||(*it==".."))
continue;
subdirs.append(d.path()+'/'+*it);
subdirs+=getAllSubdirs(d.path()+'/'+*it);
subdirs+=getAllSubdirs(QString(d.path()+QLatin1Char('/')+*it));
}
return subdirs;
}

8
konq-plugins/kimgalleryplugin/imgallerydialog.cpp
View file

@ -79,13 +79,13 @@ void KIGPDialog::slotDefault()
m_foregroundColor->setColor( QColor( "#d0ffd0") );
m_backgroundColor->setColor( QColor("#333333") );
m_imageNameReq->setUrl(m_path + "images.html");
m_imageNameReq->setUrl(QString(m_path + "images.html"));
m_recurseSubDir->setChecked( false );
m_recursionLevel->setEnabled( false );
m_recursionLevel->setValue(0);
m_copyOriginalFiles->setChecked( false );
m_useCommentFile->setChecked( false );
m_commentFileReq->setUrl(m_path + "comments");
m_commentFileReq->setUrl(QString(m_path + "comments"));
m_commentFileReq->setEnabled( false );
m_imageFormat->setItemText(m_imageFormat->currentIndex(), "JPEG");
@ -212,7 +212,7 @@ void KIGPDialog::setupDirectoryPage(const QString& path) {
whatsThis = i18n("<p>The name of the HTML file this gallery will be saved to.</p>");
label->setWhatsThis( whatsThis );
m_imageNameReq = new KUrlRequester(path + "images.html", page);
m_imageNameReq = new KUrlRequester(QString(path + "images.html"), page);
label->setBuddy( m_imageNameReq );
dvlay->addWidget(m_imageNameReq);
connect( m_imageNameReq, SIGNAL(textChanged(const QString&)),
@ -281,7 +281,7 @@ void KIGPDialog::setupDirectoryPage(const QString& path) {
"<br />and so on</p>");
label->setWhatsThis( whatsThis );
m_commentFileReq = new KUrlRequester(path + "comments", page);
m_commentFileReq = new KUrlRequester(QString(path + "comments"), page);
m_commentFileReq->setEnabled(useCommentFile);
label->setBuddy( m_commentFileReq );
dvlay->addWidget(m_commentFileReq);

2
lib/konq/konq_operations.cpp
View file

@ -729,7 +729,7 @@ void KonqOperations::rename( QWidget * parent, const KUrl & oldurl, const KUrl&
const QString userDirsFile(KGlobal::dirs()->localxdgconfdir() + QLatin1String("user-dirs.dirs"));
KConfig xdgUserConf( userDirsFile, KConfig::SimpleConfig );
KConfigGroup g( &xdgUserConf, "" );
g.writeEntry( "XDG_DESKTOP_DIR", "\"" + translatePath( newurl.path() ) + "\"" );
g.writeEntry( "XDG_DESKTOP_DIR", QString("\"" + translatePath( newurl.path() ) + "\"") );
KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged, KGlobalSettings::SETTINGS_PATHS);
}
}