[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdesdk
From: Laurent Montel <montel () kde ! org>
Date: 2011-05-29 11:11:56
Message-ID: 20110529111157.03554AC73E () svn ! kde ! org
[Download RAW message or body]
SVN commit 1234100 by mlaurent:
Fix compile with "-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS"
M +2 -0 CMakeLists.txt
M +1 -1 cervisia/updateview_items.cpp
M +2 -2 lokalize/src/common/termlabel.cpp
M +2 -2 lokalize/src/phaseswindow.cpp
M +1 -1 umbrello/umbrello/codegenerators/d/dclassifiercodedocument.cpp
M +1 -1 umbrello/umbrello/codegenerators/java/javaclassifiercodedocument.cpp
M +1 -1 umbrello/umbrello/codegenerators/tcl/tclwriter.cpp
M +1 -1 umbrello/umbrello/dialogs/codeviewerdialog.cpp
--- trunk/KDE/kdesdk/CMakeLists.txt #1234099:1234100
@@ -40,6 +40,8 @@
macro_log_feature(LIBKONQ_FOUND "KDE-Base/LibKonq" "Provides high-level file \
management functions." "http://dolphin.kde.org/" FALSE "" "Required to build the \
Dolphin version control plugins.")
add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} \
${KDEPIMLIBS_INCLUDE_DIR})
if( UNIX )
--- trunk/KDE/kdesdk/cervisia/updateview_items.cpp #1234099:1234100
@@ -71,7 +71,7 @@
QString UpdateItem::filePath() const
{
// the filePath of the root item is '.'
- return parent() ? dirPath() + m_entry.m_name : QLatin1String(".");
+ return parent() ? QString(dirPath() + m_entry.m_name) : QLatin1String(".");
}
--- trunk/KDE/kdesdk/lokalize/src/common/termlabel.cpp #1234099:1234100
@@ -114,9 +114,9 @@
{
m_entryId=entryId;
m_capFirst=capFirst;
- QLabel::setText(term + QString(m_action?(" [" + \
m_action->shortcut().toString()+"] \n "):" \n ")//m_shortcut + \
QLabel::setText(QString(term + QString(m_action?QString(" [" + \
m_action->shortcut().toString()+"] \n "):" \n ")//m_shortcut
+ Project::instance()->glossary()->terms(m_entryId, \
Project::instance()->targetLangCode()).join(" \n ")
- + " \n ");
+ + " \n "));
}
--- trunk/KDE/kdesdk/lokalize/src/phaseswindow.cpp #1234099:1234100
@@ -130,9 +130,9 @@
case Date: return phase.date.toString();
case Process: return phase.process;
case Company: return phase.company;
- case Contact: return phase.contact
+ case Contact: return QString(phase.contact
+(phase.email.isEmpty()?"":QString(" <%1> \
").arg(phase.email))
- +(phase.phone.isEmpty()?"":QString(", \
%1").arg(phase.phone)); + \
+(phase.phone.isEmpty()?"":QString(", %1").arg(phase.phone))); case ToolName: \
return m_tools.value(phase.tool).name; }
return QVariant();
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/d/dclassifiercodedocument.cpp \
#1234099:1234100 @@ -339,7 +339,7 @@
//
QString pkgs = getPackage();
pkgs.replace(QRegExp("::"), ".");
- QString packageText = getPackage().isEmpty() ? "" : "package "+pkgs+';'+endLine;
+ QString packageText = getPackage().isEmpty() ? "" : QString("package \
"+pkgs+';'+endLine);
CodeBlockWithComments * pblock = \
addOrUpdateTaggedCodeBlockWithComments("packages", packageText, "", \
0, false);
if(packageText.isEmpty() && pblock->getContentType() == \
CodeBlock::AutoGenerated) pblock->setWriteOutText(false);
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/java/javaclassifiercodedocument.cpp \
#1234099:1234100 @@ -344,7 +344,7 @@
//
QString pkgs = getPackage();
pkgs.replace(QRegExp("::"), ".");
- QString packageText = getPackage().isEmpty() ? "" : "package "+pkgs+';'+endLine;
+ QString packageText = getPackage().isEmpty() ? "" : \
QString(QLatin1String("package ")+pkgs+QLatin1Char(';')+endLine);
CodeBlockWithComments * pblock = \
addOrUpdateTaggedCodeBlockWithComments("packages", packageText, "", \
0, false);
if(packageText.isEmpty() && pblock->getContentType() == \
CodeBlock::AutoGenerated) pblock->setWriteOutText(false);
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/tcl/tclwriter.cpp \
#1234099:1234100 @@ -409,7 +409,7 @@
myNs = "";
}
// if different package
- if (("::"+myNs) != mNamespace) {
+ if (QString("::"+myNs) != mNamespace) {
if (c->package().isEmpty()) {
writeCode("source " + findFileName(c, ".tcl"));
writeCode("namespace import ::" + cleanName(c->name()));
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/codeviewerdialog.cpp #1234099:1234100
@@ -104,7 +104,7 @@
void CodeViewerDialog::languageChange()
{
Uml::Programming_Language pl = UMLApp::app()->activeLanguage();
- setWindowTitle( tr2i18n( "Code Viewer - " ) + pl );
+ setWindowTitle( i18n( "Code Viewer - " ) + QString(pl) );
}
#include "codeviewerdialog.moc"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic