office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-05 23:49:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile with "-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS"

Browse source
This commit is contained in:
Montel Laurent 2011-06-05 13:19:15 +02:00
parent 89e7b03a3b
commit 71cc9b131c
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -11,6 +11,7 @@ macro_optional_find_package(QImageBlitz)
macro_log_feature(QIMAGEBLITZ_FOUND "QImageBlitz" "An image effects library" "http://sourceforge.net/projects/qimageblitz" TRUE "kdesupport" "Required to build Okular.")
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${KDE4_INCLUDES}

4
generators/chm/generator_chm.cpp
View file

@ -181,7 +181,7 @@ bool CHMGenerator::doCloseDocument()
void CHMGenerator::preparePageForSyncOperation( int zoom , const QString & url)
{
KUrl pAddress= "ms-its:" + m_fileName + "::" + url;
KUrl pAddress= QString("ms-its:" + m_fileName + "::" + url);
m_chmUrl = url;
m_syncGen->setZoomFactor(zoom);
m_syncGen->openUrl(pAddress);
@ -278,7 +278,7 @@ void CHMGenerator::generatePixmap( Okular::PixmapRequest * request )
, static_cast<double>(requestHeight)/static_cast<double>(request->page()->height())
) ) * 100;
KUrl pAddress= "ms-its:" + m_fileName + "::" + url;
KUrl pAddress= QString("ms-its:" + m_fileName + "::" + url);
m_chmUrl = url;
m_syncGen->setZoomFactor(zoom);
m_syncGen->view()->resize(requestWidth,requestHeight);

2
generators/dvi/dviexport.cpp
View file

@ -205,7 +205,7 @@ bool find_exe(const QString& exe_)
const iterator end = path.end();
for (iterator it = path.begin(); it != end; ++it) {
const QString dir = it->endsWith("/") ? *it : *it + '/';
const QFileInfo abs_exe = dir + exe.filePath();
const QFileInfo abs_exe = QString(dir + exe.filePath());
if (abs_exe.exists())
return abs_exe.isReadable() && abs_exe.isExecutable();