File 2000-actions.patch of Package kcalc

Overview Repositories Revisions Requests Users Attributes Meta

File 2000-actions.patch of Package kcalc (Revision 9a66a5e1f9bdf2c2b67adfe5260fcf87)

Currently displaying revision 9a66a5e1f9bdf2c2b67adfe5260fcf87 , Show latest

diff --git a/kcalc.cpp b/kcalc.cpp
index 01083ecfe8e01f5db79dea5f7faa6fb2a7d2c43e..c51c843bcce6ee61acb7aedac42ec69fb30799a0 100644
--- a/kcalc.cpp
+++ b/kcalc.cpp
@@ -167,11 +167,10 @@ void KCalculator::setupMainActions()
     KStandardAction::quit(this, SLOT(close()), actionCollection());
 
     // edit menu
-    KStandardAction::undo(calc_display, SLOT(slotHistoryBack()), actionCollection());
-    KStandardAction::redo(calc_display, SLOT(slotHistoryForward()), actionCollection());
-    KStandardAction::cut(calc_display, SLOT(slotCut()), actionCollection());
-    KStandardAction::copy(calc_display, SLOT(slotCopy()), actionCollection());
-    KStandardAction::paste(this, SLOT(slotPaste()), actionCollection());
+    KStandardAction::undo(input_display, &KCalcInputDisplay::undo, actionCollection());
+    KStandardAction::redo(input_display, &KCalcInputDisplay::redo, actionCollection());
+    KStandardAction::copy(calc_display, &KCalcDisplay::slotCopy, actionCollection());
+    KStandardAction::paste(input_display, &KCalcInputDisplay::paste, actionCollection());
 
     // mode menu
     auto modeGroup = new QActionGroup(this);
@@ -833,7 +832,7 @@ void KCalculator::keyPressEvent(QKeyEvent *e)
     if (((e->modifiers() & Qt::NoModifier) == 0) || (e->modifiers() & Qt::ShiftModifier)) {
         switch (e->key()) {
         case Qt::Key_Backspace:
-            Q_EMIT(slotBackspaceclicked());
+            slotBackspaceclicked();
             break;
         }
     }
@@ -2792,15 +2791,6 @@ bool KCalculator::eventFilter(QObject *o, QEvent *e)
     }
 }
 
-//------------------------------------------------------------------------------
-// Name: slotPaste
-// Desc: paste a number from the clipboard
-//------------------------------------------------------------------------------
-void KCalculator::slotPaste()
-{
-    input_display->paste();
-}
-
 //------------------------------------------------------------------------------
 // Name: resizeEvent
 // Desc: resize window and make sure it's large enough for its content
diff --git a/kcalc.h b/kcalc.h
index c87b7ab6263c84bc59275918730863d7971ced69..81962b42d647950a9dab8f3da2fd9a2aaeda98fa 100644
--- a/kcalc.h
+++ b/kcalc.h
@@ -236,8 +236,6 @@ protected Q_SLOTS:
 
     void slotBaseModeAmountChanged(const KNumber &number);
 
-    void slotPaste();
-
 private:
     enum StatusField { ShiftField = 0, BaseField, AngleField, MemField };
 
diff --git a/kcalc_display.cpp b/kcalc_display.cpp
index 65fe66bdfae5170d6fe1d45cf80b04a564da75ee..b6e0f2321f98da5a5f1074c7b55f93bc6759d8d4 100644
--- a/kcalc_display.cpp
+++ b/kcalc_display.cpp
@@ -935,40 +935,6 @@ void KCalcDisplay::newCharacter(const QChar new_char)
     updateDisplay();
 }
 
-//------------------------------------------------------------------------------
-// Name: deleteLastDigit
-// Desc:
-//------------------------------------------------------------------------------
-void KCalcDisplay::deleteLastDigit()
-{
-    // Only partially implemented !!
-    if (eestate_) {
-        if (str_int_exp_.isNull()) {
-            eestate_ = false;
-        } else {
-            const int length = str_int_exp_.length();
-            if (length > 1) {
-                str_int_exp_.chop(1);
-            } else {
-                str_int_exp_ = QLatin1String((const char *)nullptr);
-            }
-        }
-    } else {
-        const int length = str_int_.length();
-        if (length > 1) {
-            if (str_int_[length - 1] == QLocale().decimalPoint()) {
-                period_ = false;
-            }
-            str_int_.chop(1);
-        } else {
-            Q_ASSERT(!period_);
-            str_int_[0] = QLatin1Char('0');
-        }
-    }
-
-    updateDisplay();
-}
-
 //------------------------------------------------------------------------------
 // Name: changeSign
 // Desc: change Sign of display. Problem: Only possible here, when in input
diff --git a/kcalc_display.h b/kcalc_display.h
index e79f1afcfd5d2f7f58000b0b36e7ebafead673ff..e696d88af46b8724958384aa5e10422547a88fff 100644
--- a/kcalc_display.h
+++ b/kcalc_display.h
@@ -51,7 +51,6 @@ public:
     };
 
     bool sendEvent(Event event);
-    void deleteLastDigit();
     const KNumber &getAmount() const;
     QString getAmountQString(bool addPreffix = true) const;
     void newCharacter(const QChar new_char);

Places

File 2000-actions.patch of Package kcalc (Revision 9a66a5e1f9bdf2c2b67adfe5260fcf87)

Places