Commit 34e9b20e authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix compile with "-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS"

parent a009eba7
......@@ -356,6 +356,7 @@ IF(KIPIPLUGINS_CAN_BE_COMPILED)
ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=${AREA_CODE_GENERAL})
ADD_DEFINITIONS(-DAREA_CODE_GENERAL=${AREA_CODE_GENERAL})
ADD_DEFINITIONS(-DAREA_CODE_LOADING=${AREA_CODE_LOADING})
ADD_DEFINITIONS(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
# kipi host test program to check plugins
......
......@@ -91,7 +91,7 @@ GeneralPage::GeneralPage(QWidget* parent)
QGroupBox* box2 = new QGroupBox(i18n("Save Gallery To"), this);
QVBoxLayout* vlay2 = new QVBoxLayout(box2);
d->exportUrl = new KUrlRequester(KGlobalSettings::documentPath() + "/simpleviewer", this);
d->exportUrl = new KUrlRequester(QString(KGlobalSettings::documentPath() + QLatin1String("/simpleviewer")), this);
d->exportUrl->setMode(KFile::Directory | KFile::LocalOnly);
vlay2->setMargin(KDialog::spacingHint());
......
......@@ -614,7 +614,7 @@ bool SimpleViewer::copySimpleViewer()
entries = dir.entryList(QDir::Files);
for(QStringList::ConstIterator it = entries.constBegin(); it != entries.constEnd(); ++it)
{
files.append(dir.absolutePath() + '/' + *it);
files.append(QString(dir.absolutePath() + QLatin1Char('/') + *it));
}
// TODO: catch errors
/*KIO::CopyJob *copyJob = */KIO::copy(files, d->configDlg->settings().exportUrl, KIO::HideProgressInfo);
......
......@@ -424,7 +424,7 @@ void kmlExport::addTrack(QDomElement& kmlAlbum)
void kmlExport::generate()
{
//! @todo perform a test here before continuing.
createDir(m_tempDestDir + m_imageDir);
createDir(QString(m_tempDestDir + m_imageDir));
m_progressDialog->show();
KIPI::ImageCollection selection = m_interface->currentSelection();
......
......@@ -805,7 +805,7 @@ void PicasawebWindow::slotGetPhotoDone(int errCode, const QString& errMsg,
const QByteArray& photoData)
{
PicasaWebPhoto item = m_transferQueue.first().second;
KUrl tmpUrl = m_tmpDir + item.title;
KUrl tmpUrl = QString(m_tmpDir + item.title);
if (item.mimeType == "video/mpeg4")
{
tmpUrl.setFileName(item.title + ".mp4");
......@@ -874,7 +874,7 @@ void PicasawebWindow::slotGetPhotoDone(int errCode, const QString& errMsg,
}
}
KUrl newUrl = m_widget->getDestinationPath() + tmpUrl.fileName();
KUrl newUrl = QString(m_widget->getDestinationPath() + tmpUrl.fileName());
bool bSkip = false;
QFileInfo targetInfo(newUrl.toLocalFile());
......
......@@ -241,9 +241,9 @@ void RajceWidget::update()
m_userName->setText(QString("<b>%2</b> <small>%1</small>").arg(username, nickname));
QString link = loggedIn
? "<b><h2><a href='http://" + m_session->state().nickname() + ".rajce.net'>"
? QString("<b><h2><a href='http://" + m_session->state().nickname() + ".rajce.net'>"
"<font color=\"#9ACD32\">Rajce.net</font>"
"</a></h2></b>"
"</a></h2></b>")
: "<b><h2><a href='http://www.rajce.net'>"
"<font color=\"#9ACD32\">Rajce.net</font>"
"</a></h2></b>";
......
......@@ -244,7 +244,7 @@ void SwConnector::listAlbums()
QString length( "0" );
m_resultHandler = &SwConnector::listAlbumsResultHandler;
KIO::TransferJob* job = KIO::get(m_apiDomainURL + m_apiRestPath + requestPath, KIO::Reload, KIO::HideProgressInfo);
KIO::TransferJob* job = KIO::get(QString(m_apiDomainURL + m_apiRestPath + requestPath), KIO::Reload, KIO::HideProgressInfo);
setupRequest(job, m_apiRestPath + requestPath, method, md5, type, length);
m_job = job;
......@@ -267,7 +267,7 @@ void SwConnector::createAlbum(const SwAlbum& album)
QString length( "0" );
m_resultHandler = &SwConnector::createAlbumResultHandler;
KIO::TransferJob* job = KIO::http_post(m_apiDomainURL + m_apiRestPath + requestPath, QByteArray(), KIO::HideProgressInfo);
KIO::TransferJob* job = KIO::http_post(QString(m_apiDomainURL + m_apiRestPath + requestPath), QByteArray(), KIO::HideProgressInfo);
setupRequest(job, m_apiRestPath + requestPath, method, md5, type, length);
m_job = job;
......@@ -302,7 +302,7 @@ bool SwConnector::addPhoto(const QString& imgPath,
QString length = file_size;
m_resultHandler = &SwConnector::addPhotoResultHandler;
KIO::TransferJob* job = KIO::http_post(m_apiDomainURL + m_apiRestPath + requestPath, imageData, KIO::HideProgressInfo);
KIO::TransferJob* job = KIO::http_post(QString(m_apiDomainURL + m_apiRestPath + requestPath), imageData, KIO::HideProgressInfo);
setupRequest(job, m_apiRestPath + requestPath, method, md5, type, length);
m_job = job;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment