[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdereview/wacomtablet/src/kcmodule
From:       Jörg Ehrichs <joerg.ehrichs () gmx ! de>
Date:       2010-09-30 16:59:49
Message-ID: 20100930165949.C6389AC88E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1181305 by jehrichs:

make it compile again (QLatin1String no cast to ascii fix)

 M  +13 -13    penwidget.cpp  


--- trunk/kdereview/wacomtablet/src/kcmodule/penwidget.cpp #1181304:1181305
@@ -69,9 +69,9 @@
         penConfig = m_profileManagement->configGroup(QLatin1String( "eraser" ));
     }
 
-    penConfig.writeEntry("Button1", \
m_profileManagement->transformButtonToConfig((ProfileManagement::PenButton) \
m_ui->button1ComboBox->itemData(m_ui->button1ComboBox->currentIndex()).toInt(), \
                m_buttonConfig.value("button1ActionLabel")));
-    penConfig.writeEntry("Button2", \
m_profileManagement->transformButtonToConfig((ProfileManagement::PenButton) \
m_ui->button2ComboBox->itemData(m_ui->button2ComboBox->currentIndex()).toInt(), \
                m_buttonConfig.value("button2ActionLabel")));
-    penConfig.writeEntry("Button3", \
m_profileManagement->transformButtonToConfig((ProfileManagement::PenButton) \
m_ui->button3ComboBox->itemData(m_ui->button3ComboBox->currentIndex()).toInt(), \
m_buttonConfig.value("button3ActionLabel"))); +    penConfig.writeEntry("Button1", \
m_profileManagement->transformButtonToConfig((ProfileManagement::PenButton) \
m_ui->button1ComboBox->itemData(m_ui->button1ComboBox->currentIndex()).toInt(), \
m_buttonConfig.value(QLatin1String("button1ActionLabel")))); +    \
penConfig.writeEntry("Button2", \
m_profileManagement->transformButtonToConfig((ProfileManagement::PenButton) \
m_ui->button2ComboBox->itemData(m_ui->button2ComboBox->currentIndex()).toInt(), \
m_buttonConfig.value(QLatin1String("button2ActionLabel")))); +    \
penConfig.writeEntry("Button3", \
m_profileManagement->transformButtonToConfig((ProfileManagement::PenButton) \
m_ui->button3ComboBox->itemData(m_ui->button3ComboBox->currentIndex()).toInt(), \
m_buttonConfig.value(QLatin1String("button3ActionLabel"))));  \
//penConfig.writeEntry("Accel", m_ui->speedSlider->value());  \
penConfig.writeEntry("ClickForce", m_ui->clickSlider->value());  \
//penConfig.writeEntry("CursorProx", "Button 6"); @@ -121,7 +121,7 @@
     m_ui->button1ComboBox->setCurrentIndex(modeSwitch);
     m_ui->button1ComboBox->blockSignals(false);
     m_ui->button1ActionLabel->setText(m_profileManagement->transformButtonFromConfig(modeSwitch, \
                readEntry));
-    m_buttonConfig.insert("button1ActionLabel", m_ui->button1ActionLabel->text());
+    m_buttonConfig.insert(QLatin1String("button1ActionLabel"), \
m_ui->button1ActionLabel->text());  
     readEntry = penConfig.readEntry("Button2");
     modeSwitch = m_profileManagement->getPenButtonFunction(readEntry);
@@ -129,7 +129,7 @@
     m_ui->button2ComboBox->setCurrentIndex(modeSwitch);
     m_ui->button2ComboBox->blockSignals(false);
     m_ui->button2ActionLabel->setText(m_profileManagement->transformButtonFromConfig(modeSwitch, \
                readEntry));
-    m_buttonConfig.insert("button2ActionLabel", m_ui->button2ActionLabel->text());
+    m_buttonConfig.insert(QLatin1String("button2ActionLabel"), \
m_ui->button2ActionLabel->text());  
     readEntry = penConfig.readEntry("Button3");
     modeSwitch = m_profileManagement->getPenButtonFunction(readEntry);
@@ -137,7 +137,7 @@
     m_ui->button3ComboBox->setCurrentIndex(modeSwitch);
     m_ui->button3ComboBox->blockSignals(false);
     m_ui->button3ActionLabel->setText(m_profileManagement->transformButtonFromConfig(modeSwitch, \
                readEntry));
-    m_buttonConfig.insert("button3ActionLabel", m_ui->button3ActionLabel->text());
+    m_buttonConfig.insert(QLatin1String("button3ActionLabel"), \
m_ui->button3ActionLabel->text());  
     //Double Click Distance
     m_ui->clickSlider->setValue(penConfig.readEntry("ClickForce").toInt());
@@ -177,22 +177,22 @@
     switch (selectionEnum) {
     case ProfileManagement::Pen_LeftClick:
         buttonActionLabel->setText( cb->currentText() );
-        m_buttonConfig.insert(senderName, QString("button 1"));
+        m_buttonConfig.insert(senderName, QLatin1String("button 1"));
         break;
 
     case ProfileManagement::Pen_RightClick:
         buttonActionLabel->setText( cb->currentText() );
-        m_buttonConfig.insert(senderName, QString("button 3"));
+        m_buttonConfig.insert(senderName, QLatin1String("button 3"));
         break;
 
     case ProfileManagement::Pen_MiddleClick:
         buttonActionLabel->setText( cb->currentText() );
-        m_buttonConfig.insert(senderName, QString("button 2"));
+        m_buttonConfig.insert(senderName, QLatin1String("button 2"));
         break;
 
     case ProfileManagement::Pen_DoubleClick:
         buttonActionLabel->setText( cb->currentText() );
-        m_buttonConfig.insert(senderName, QString("dblclick 1"));
+        m_buttonConfig.insert(senderName, QLatin1String("dblclick 1"));
         break;
 
     case ProfileManagement::Pen_Button:
@@ -223,17 +223,17 @@
 
     case ProfileManagement::Pen_ModeToggle:
         buttonActionLabel->setText( cb->currentText() );
-        m_buttonConfig.insert(senderName, QString("modetoggle"));
+        m_buttonConfig.insert(senderName, QLatin1String("modetoggle"));
         break;
 
     case ProfileManagement::Pen_ScreenToggle:
         buttonActionLabel->setText( cb->currentText() );
-        m_buttonConfig.insert(senderName, QString("screentoggle"));
+        m_buttonConfig.insert(senderName, QLatin1String("screentoggle"));
         break;
 
     case ProfileManagement::Pen_DisplayToggle:
         buttonActionLabel->setText( cb->currentText() );
-        m_buttonConfig.insert(senderName, QString("displaytoggle"));
+        m_buttonConfig.insert(senderName, QLatin1String("displaytoggle"));
         break;
 
     case ProfileManagement::Pen_Disable:


[prev in list] [next in list] [prev in thread] [next in thread]