[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeplasma-addons/applets
From: Laurent Montel <montel () kde ! org>
Date: 2010-09-13 16:56:39
Message-ID: 20100913170116.F1177AC887 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1174952 by mlaurent:
Fix compile with "-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII"
M +2 -2 bball/bball.cpp
M +8 -8 binary-clock/binaryclock.cpp
M +1 -1 blackboard/blackboard.cpp
M +1 -1 blackboard/blackboardwidget.cpp
M +14 -14 calculator/calculator.cpp
M +1 -1 charselect/charselect.cpp
M +5 -5 eyes/eyes.cpp
M +2 -2 magnifique/magnifique.cpp
M +3 -3 showdashboard/showdashboard.cpp
--- trunk/KDE/kdeplasma-addons/applets/bball/bball.cpp #1174951:1174952
@@ -282,7 +282,7 @@
KConfigGroup cg = config ();
// Appearance
- m_image_url = cg.readEntry("ImgURL", KStandardDirs::locate("data", \
"bball/bball.svgz")); + m_image_url = cg.readEntry("ImgURL", \
KStandardDirs::locate("data", QLatin1String( "bball/bball.svgz" ))); \
m_overlay_enabled = cg.readEntry("OverlayEnabled", false); m_overlay_colour = \
cg.readEntry("OverlayColour", QColor(Qt::white)); m_overlay_opacity = \
cg.readEntry("OverlayOpacity", 0); @@ -296,7 +296,7 @@
// Sound
m_sound_enabled = cg.readEntry("SoundEnabled", false);
- m_sound_url = cg.readEntry("SoundURL", KStandardDirs::locate ("data", \
"bball/bounce.ogg")); + m_sound_url = cg.readEntry("SoundURL", \
KStandardDirs::locate ("data", QLatin1String( "bball/bounce.ogg" ))); m_sound_volume \
= cg.readEntry("SoundVolume", 100);
// Misc
--- trunk/KDE/kdeplasma-addons/applets/binary-clock/binaryclock.cpp #1174951:1174952
@@ -34,8 +34,8 @@
m_showGrid(true),
m_time(0, 0)
{
- KGlobal::locale()->insertCatalog("libplasmaclock");
- KGlobal::locale()->insertCatalog("timezones4");
+ KGlobal::locale()->insertCatalog(QLatin1String("libplasmaclock"));
+ KGlobal::locale()->insertCatalog(QLatin1String("timezones4"));
setHasConfigurationInterface(true);
resize(getWidthFromHeight(128), 128);
@@ -96,7 +96,7 @@
void BinaryClock::connectToEngine()
{
- Plasma::DataEngine* timeEngine = dataEngine("time");
+ Plasma::DataEngine* timeEngine = dataEngine(QLatin1String("time"));
if (m_showSeconds) {
timeEngine->connectSource(currentTimezone(), this, 500);
@@ -109,7 +109,7 @@
{
Q_UNUSED(source);
- m_time = data["Time"].toTime();
+ m_time = data[QLatin1String("Time")].toTime();
if (m_time.minute() == m_lastTimeSeen.minute() &&
m_time.second() == m_lastTimeSeen.second()) {
@@ -131,7 +131,7 @@
{
QWidget *widget = new QWidget();
ui.setupUi(widget);
- parent->addPage(widget, i18n("Appearance"), "view-media-visualization");
+ parent->addPage(widget, i18n("Appearance"), \
QLatin1String("view-media-visualization"));
ui.showSecondHandCheckBox->setChecked(m_showSeconds);
ui.showGridCheckBox->setChecked(m_showGrid);
@@ -194,7 +194,7 @@
cg.writeEntry("offLedsColor", ui.offLedsCustomColorButton->color());
cg.writeEntry("gridColor", ui.gridCustomColorButton->color());
- dataEngine("time")->disconnectSource(currentTimezone(), this);
+ dataEngine(QLatin1String("time"))->disconnectSource(currentTimezone(), this);
connectToEngine();
update();
@@ -217,9 +217,9 @@
void BinaryClock::changeEngineTimezone(const QString &oldTimezone, const QString \
&newTimezone) {
- dataEngine("time")->disconnectSource(oldTimezone, this);
+ dataEngine(QLatin1String("time"))->disconnectSource(oldTimezone, this);
- Plasma::DataEngine* timeEngine = dataEngine("time");
+ Plasma::DataEngine* timeEngine = dataEngine(QLatin1String("time"));
if (m_showSeconds) {
timeEngine->connectSource(newTimezone, this, 500);
} else {
--- trunk/KDE/kdeplasma-addons/applets/blackboard/blackboard.cpp #1174951:1174952
@@ -59,7 +59,7 @@
addColorButton(Plasma::Theme::defaultTheme()->color(Plasma::Theme::TextColor));
Plasma::ToolButton *eraseB = new Plasma::ToolButton(this);
- eraseB->setIcon(KIcon("edit-delete"));
+ eraseB->setIcon(KIcon(QLatin1String("edit-delete")));
buttonsLayout->addItem(eraseB);
connect(eraseB, SIGNAL(clicked()), blackBoard, SLOT(erase()));
--- trunk/KDE/kdeplasma-addons/applets/blackboard/blackboardwidget.cpp \
#1174951:1174952 @@ -176,7 +176,7 @@
QString BlackBoardWidget::imagePath()
{
- return KStandardDirs::locateLocal("data", \
"plasma-desktop-datastorage/blackboard-" + QString::number(m_parentApplet->id()) + \
".png"); + return KStandardDirs::locateLocal("data", \
QLatin1String("plasma-desktop-datastorage/blackboard-") + \
QString::number(m_parentApplet->id()) + QLatin1String(".png")); }
#include "blackboardwidget.moc"
--- trunk/KDE/kdeplasma-addons/applets/calculator/calculator.cpp #1174951:1174952
@@ -46,7 +46,7 @@
{
setAspectRatioMode(Plasma::IgnoreAspectRatio);
resize(300,300);
- setPopupIcon("accessories-calculator");
+ setPopupIcon(QLatin1String( "accessories-calculator" ));
}
QGraphicsWidget *CalculatorApplet::graphicsWidget()
@@ -61,7 +61,7 @@
int buttonX,buttonY;
- inputText = QString('0');
+ inputText = QLatin1Char('0');
sum = 0;
factor = 0;
waitingForDigit = true;
@@ -85,7 +85,7 @@
mButtonDigit[0] = new Plasma::PushButton(m_widget);
QFontMetrics metric1(mButtonDigit[0]->font());
buttonY=metric1.height()*1.3;
- buttonX=metric1.width("00");
+ buttonX=metric1.width(QLatin1String( "00" ));
mButtonDigit[0]->setText( QString::number(0) );
connect( mButtonDigit[0], SIGNAL( clicked() ), this, SLOT( \
slotDigitClicked() ) ); mButtonDigit[0]->setMinimumSize(buttonX,buttonY);
@@ -150,7 +150,7 @@
mButtonMultiply->setVisible( true );
mButtonDivide = new Plasma::PushButton(m_widget);
- mButtonDivide->setText( i18nc("The ∕ button of the calculator", "∕") );
+ mButtonDivide->setText( i18nc("The ? button of the calculator", "?") );
mButtonDivide->setMinimumSize(buttonX,buttonY);
mButtonDivide->setSizePolicy(QSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored));
@@ -320,7 +320,7 @@
Plasma::PushButton *clickedButton = qobject_cast<Plasma::PushButton \
*>(sender()); int newDigit = clickedButton->text().toInt();
- if (inputText == "0" && newDigit == 0.0)
+ if (inputText == QLatin1String( "0" ) && newDigit == 0.0)
return;
if (inputText.length() >= MaxInputLength)
@@ -351,7 +351,7 @@
{
if (waitingForDigit) {
- inputText = '0';
+ inputText = QLatin1Char( '0' );
mOutputDisplay->setText(inputText);
}
@@ -382,7 +382,7 @@
sum = currentValue;
}
- inputText = '0'; //this is so if you click "1 + =" you'll get 1 instead of 2
+ inputText = QLatin1Char( '0' ); //this is so if you click "1 + =" you'll get 1 \
instead of 2 previousAddSubOperation=calcPlus;
waitingForDigit = true;
}
@@ -402,7 +402,7 @@
sum = currentValue;
}
- inputText = '0'; //this is so if you click "1 - =" you'll get 1 instead of 0
+ inputText = QLatin1Char( '0' ); //this is so if you click "1 - =" you'll get 1 \
instead of 0 previousAddSubOperation = calcMinus;
waitingForDigit = true;
}
@@ -417,7 +417,7 @@
factor = currentValue;
}
- inputText = '0'; //this is so if you click "6 * =" you'll get 6 instead of 36
+ inputText = QLatin1Char( '0' ); //this is so if you click "6 * =" you'll get 6 \
instead of 36 previousMulDivOperation=calcMult;
waitingForDigit = true;
}
@@ -432,7 +432,7 @@
factor = currentValue;
}
- inputText = '0'; //this is if you click "6 / =" you'll get 6 instead of 1
+ inputText = QLatin1Char( '0' ); //this is if you click "6 / =" you'll get 6 \
instead of 1 previousMulDivOperation = calcDiv;
waitingForDigit = true;
}
@@ -467,7 +467,7 @@
int decimalIndex = inputText.indexOf(KGlobal::locale()->decimalSymbol());
if (decimalIndex != -1) {
- while (inputText.size() > decimalIndex && inputText.endsWith('0')) {
+ while (inputText.size() > decimalIndex && inputText.endsWith(QLatin1Char( \
'0' ))) { inputText = inputText.left(inputText.size() - 1);
}
@@ -487,7 +487,7 @@
void CalculatorApplet::slotClearClicked()
{
- inputText = '0';
+ inputText = QLatin1Char( '0' );
waitingForDigit = true;
mOutputDisplay->setText(inputText);
}
@@ -498,7 +498,7 @@
factor = 0;
previousAddSubOperation=calcNone;
previousMulDivOperation=calcNone;
- inputText = '0';
+ inputText = QLatin1Char( '0' );
waitingForDigit = true;
mOutputDisplay->setText(inputText);
}
@@ -540,7 +540,7 @@
previousAddSubOperation=calcNone;
previousMulDivOperation=calcNone;
mOutputDisplay->setText(errorMessage);
- inputText = '0';
+ inputText = QLatin1Char( '0' );
waitingForDigit = true;
}
--- trunk/KDE/kdeplasma-addons/applets/charselect/charselect.cpp #1174951:1174952
@@ -31,7 +31,7 @@
: Plasma::PopupApplet(parent, args),
m_mainWidget(0)
{
- setPopupIcon("accessories-character-map");
+ setPopupIcon(QLatin1String("accessories-character-map"));
}
--- trunk/KDE/kdeplasma-addons/applets/eyes/eyes.cpp #1174951:1174952
@@ -33,16 +33,16 @@
resize(192, 128);
m_svg = new Plasma::Svg(this);
- m_svg->setImagePath("widgets/eyes");
+ m_svg->setImagePath(QLatin1String( "widgets/eyes" ));
m_svg->setContainsMultipleImages(true);
rightPupil = new Plasma::SvgWidget(this);
rightPupil->setSvg(m_svg);
- rightPupil->setElementID("rightPupil");
+ rightPupil->setElementID(QLatin1String( "rightPupil" ));
leftPupil = new Plasma::SvgWidget(this);
leftPupil->setSvg(m_svg);
- leftPupil->setElementID("leftPupil");
+ leftPupil->setElementID(QLatin1String( "leftPupil" ));
timerId = startTimer(50);
setAspectRatioMode(Plasma::IgnoreAspectRatio);
@@ -89,9 +89,9 @@
Q_UNUSED(option)
QRect rect = contentsRect;
rect.setWidth(rect.width()/2 - 2);
- m_svg->paint(p, rect, "leftEye");
+ m_svg->paint(p, rect, QLatin1String( "leftEye" ));
rect.translate(rect.width() + 2*2 , 0);
- m_svg->paint(p, rect, "rightEye");
+ m_svg->paint(p, rect, QLatin1String( "rightEye" ));
}
--- trunk/KDE/kdeplasma-addons/applets/magnifique/magnifique.cpp #1174951:1174952
@@ -57,7 +57,7 @@
layout->setContentsMargins(0, 0, 0, 0);
Plasma::IconWidget *icon = new Plasma::IconWidget(this);
- icon->setIcon("zoom-in");
+ icon->setIcon(QLatin1String("zoom-in"));
layout->addItem(icon);
setAspectRatioMode(Plasma::ConstrainedSquare);
@@ -66,7 +66,7 @@
Plasma::ToolTipContent data;
data.setMainText(i18n("Magnifying glass"));
data.setSubText(i18n("See the contents of your desktop through the windows"));
- data.setImage(KIcon("zoom-in"));
+ data.setImage(KIcon(QLatin1String("zoom-in")));
Plasma::ToolTipManager::self()->setContent(this, data);
}
--- trunk/KDE/kdeplasma-addons/applets/showdashboard/showdashboard.cpp \
#1174951:1174952 @@ -49,7 +49,7 @@
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
- Plasma::IconWidget *icon = new Plasma::IconWidget(KIcon("dashboard-show"), \
QString(), this); + Plasma::IconWidget *icon = new \
Plasma::IconWidget(KIcon(QLatin1String("dashboard-show")), QString(), this); \
registerAsDragHandle(icon); icon->setMinimumSize(16, 16);
setMinimumSize(16, 16);
@@ -79,8 +79,8 @@
void ShowDashboard::toggleShowDashboard()
{
m_timer.stop();
- QDBusInterface plasmaApp( "org.kde.plasma-desktop", "/App" );
- plasmaApp.call( "toggleDashboard" );
+ QDBusInterface plasmaApp( QLatin1String("org.kde.plasma-desktop"), \
QLatin1String("/App") ); + plasmaApp.call( QLatin1String("toggleDashboard") );
}
void ShowDashboard::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic