Replace Qt with TQt

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 7a3d3f43ea)

CMakeL10n.txt

@@ -9,7 +9,11 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 3.1 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
 
 
 ##### include our cmake modules #################

CMakeLists.txt

@@ -9,7 +9,12 @@
 #
 #################################################
 
-cmake_minimum_required( VERSION 3.1 )
+
+##### set project version ########################
+
+include( TDEVersion )
+cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} )
+tde_set_project_version( )
 
 
 ##### general package setup #####################
@@ -34,11 +39,6 @@ include( FindPkgConfig )
 include( TDEMacros )
 
 
-##### set version number ########################
-
-tde_set_project_version( )
-
-
 ##### setup install paths #######################
 
 include( TDESetupPaths )

doc/man/abakus.1

@@ -4,7 +4,7 @@
 abakus
 \- A simple keyboard-driven calculator
 .SH SYNOPSIS
-abakus [Qt\-options] [TDE\-options] 
+abakus [TQt\-options] [TDE\-options] 
 .SH DESCRIPTION
 A simple keyboard-driven calculator
 .SH OPTIONS
@@ -13,8 +13,8 @@ A simple keyboard-driven calculator
 .B  \-\-help  
 Show help about options
 .TP
-.B  \-\-help\-qt  
-Show Qt specific options
+.B  \-\-help\-tqt  
+Show TQt specific options
 .TP
 .B  \-\-help\-tde  
 Show TDE specific options
@@ -62,7 +62,7 @@ sets the application GUI style
 .TP
 .B  \-\-geometry  <geometry>
 sets the client geometry of the main widget - see man X for the argument format
-.SS Qt options:
+.SS TQt options:
 .TP
 .B  \-\-display  <displayname>
 Use the X-server display 'displayname'
@@ -81,7 +81,7 @@ using the QApplication::ManyColor color
 specification
 .TP
 .B  \-\-nograb  
-tells Qt to never grab the mouse or the keyboard
+tells TQt to never grab the mouse or the keyboard
 .TP
 .B  \-\-dograb  
 running under a debugger can cause an implicit

src/abakus.cpp

@@ -66,7 +66,7 @@ int main(int argc, char **argv)
     MainWindow *win = new MainWindow;
 
     app.setMainWidget(win);
-    app.connect(&app, TQT_SIGNAL(lastWindowClosed()), TQT_SLOT(quit()));
+    app.connect(&app, TQ_SIGNAL(lastWindowClosed()), TQ_SLOT(quit()));
     win->show();
     win->resize(500, 300);
     

src/abakuslistview.cpp

@@ -36,8 +36,8 @@ ListView::ListView(TQWidget *parent, const char *name) :
     setResizeMode(LastColumn);
     setDragEnabled(true);
 
-    connect(this, TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
-	          TQT_SLOT(rightClicked(TQListViewItem *, const TQPoint &)));
+    connect(this, TQ_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),
+	          TQ_SLOT(rightClicked(TQListViewItem *, const TQPoint &)));
 }
 
 TQDragObject *ListView::dragObject()
@@ -70,8 +70,8 @@ void ListView::enablePopupHandler(bool enable)
 
 	m_menu = new TDEPopupMenu(this);
 
-	m_removeSingleId = m_menu->insertItem(removeItemString(), this, TQT_SLOT(removeSelected()));
-	m_removeAllId = m_menu->insertItem("Placeholder", this, TQT_SLOT(removeAllItems()));
+	m_removeSingleId = m_menu->insertItem(removeItemString(), this, TQ_SLOT(removeSelected()));
+	m_removeAllId = m_menu->insertItem("Placeholder", this, TQ_SLOT(removeAllItems()));
     }
     else {
 	delete m_menu;

src/abakuslistview.h

@@ -27,7 +27,7 @@ class TDEPopupMenu;
 
 class ListView : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
@@ -110,7 +110,7 @@ class ValueListViewItem : public TDEListViewItem
  */
 class VariableListView : public ListView
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
 
@@ -131,7 +131,7 @@ class VariableListView : public ListView
  */
 class FunctionListView : public ListView
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
 

src/editor.cpp

@@ -47,7 +47,6 @@
 
 #include <algorithm>
 
-// XXX: QT 4: Replace this with qBinaryFind().
 using std::binary_search;
 
 class CalcResultLabel : public TQLabel
@@ -233,16 +232,16 @@ Editor::Editor( TQWidget* parent, const char* name ):
   setTabChangesFocus( true );
   setLinkUnderline( false );
 
-  connect( d->completion, TQT_SIGNAL( selectedCompletion( const TQString& ) ),
-    TQT_SLOT( autoComplete( const TQString& ) ) );
-  connect( this, TQT_SIGNAL( textChanged() ), TQT_SLOT( checkAutoComplete() ) );
-  connect( d->completionTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( triggerAutoComplete() ) );
+  connect( d->completion, TQ_SIGNAL( selectedCompletion( const TQString& ) ),
+    TQ_SLOT( autoComplete( const TQString& ) ) );
+  connect( this, TQ_SIGNAL( textChanged() ), TQ_SLOT( checkAutoComplete() ) );
+  connect( d->completionTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( triggerAutoComplete() ) );
 
-  connect( this, TQT_SIGNAL( textChanged() ), TQT_SLOT( checkMatching() ) );
-  connect( d->matchingTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doMatchingLeft() ) );
-  connect( d->matchingTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doMatchingRight() ) );
-  connect( this, TQT_SIGNAL( textChanged() ), TQT_SLOT( checkAutoCalc() ) );
-  connect( d->autoCalcTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( autoCalc() ) );
+  connect( this, TQ_SIGNAL( textChanged() ), TQ_SLOT( checkMatching() ) );
+  connect( d->matchingTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( doMatchingLeft() ) );
+  connect( d->matchingTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( doMatchingRight() ) );
+  connect( this, TQ_SIGNAL( textChanged() ), TQ_SLOT( checkAutoCalc() ) );
+  connect( d->autoCalcTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( autoCalc() ) );
   d->autoCalcLabel = new CalcResultLabel( 0, "autocalc", WStyle_StaysOnTop |
     WStyle_Customize | WStyle_NoBorder | WStyle_Tool |  WX11BypassWM );
   d->autoCalcLabel->setFrameStyle( TQFrame::Plain | TQFrame::Box );
@@ -268,7 +267,7 @@ TQSize Editor::sizeHint() const
   int h = TQMAX(fm.lineSpacing(), 14);
   int w = fm.width( 'x' ) * 20;
   int m = frameWidth() * 2;
-  return( style().tqsizeFromContents(TQStyle::CT_LineEdit, this,
+  return( style().sizeFromContents(TQStyle::CT_LineEdit, this,
              TQSize( w + m, h + m + 4 ).
              expandedTo(TQApplication::globalStrut())));
 }
@@ -639,7 +638,7 @@ void Editor::autoCalc()
     d->autoCalcLabel->raise();
 
     // do not show it forever
-    TQTimer::singleShot( 5000, d->autoCalcLabel, TQT_SLOT( hide()) );
+    TQTimer::singleShot( 5000, d->autoCalcLabel, TQ_SLOT( hide()) );
   }
   else
   {
@@ -778,7 +777,7 @@ EditorCompletion::~EditorCompletion()
 
 bool EditorCompletion::eventFilter( TQObject *obj, TQEvent *ev )
 {
-  if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->completionPopup) || TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(d->completionListBox) )
+  if ( obj == d->completionPopup || obj == d->completionListBox )
   {
 
     if ( ev->type() == TQEvent::KeyPress )
@@ -850,7 +849,7 @@ void EditorCompletion::showCompletion( const TQStringList &choices )
   if(!shown)
   {
     d->completionPopup->show();
-    TQTimer::singleShot ( 0, this, TQT_SLOT(moveCompletionPopup()) );
+    TQTimer::singleShot ( 0, this, TQ_SLOT(moveCompletionPopup()) );
   }
   else
   {

src/editor.h

@@ -36,7 +36,7 @@ class Evaluator;
 
 class Editor : public TQTextEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   
   public:
@@ -104,7 +104,7 @@ class Editor : public TQTextEdit
 
 class EditorCompletion : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   
   public:

src/function.h

@@ -63,7 +63,7 @@ Abakus::TrigMode trigMode();
 
 class FunctionManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
     typedef TQDict<Function> functionDict;

src/lexer.ll

@@ -140,7 +140,7 @@ public:
     YY_BUFFER_STATE buffer;
     int lastToken, thisToken;
     int lastPos, thisPos;
-    QString lastTokenData, thisTokenData;
+    TQString lastTokenData, thisTokenData;
 };
 
 /* Declared in function.h, implemented here in lexer.l since this is where
@@ -159,7 +159,7 @@ Lexer::Lexer(const TQString &expr) :
     m_private->lastPos = -1;
 
     m_private->thisToken = yylex();
-    m_private->thisTokenData = QString(yytext);
+    m_private->thisTokenData = TQString(yytext);
 
     if(yyCurTokenPos != 0)
     {
@@ -187,7 +187,7 @@ int Lexer::nextType()
     m_private->lastToken = m_private->thisToken;
 
     m_private->thisToken = yylex();
-    m_private->thisTokenData = QString(yytext);
+    m_private->thisTokenData = TQString(yytext);
     m_private->thisPos = yyCurTokenPos;
 
     return m_private->lastToken;

src/mainwindow.cpp

@@ -82,12 +82,12 @@ MainWindow::MainWindow() : TDEMainWindow(0, "abakus-mainwindow"), m_popup(0), m_
     buttonGroup->insert(m_degrees);
     buttonGroupLayout->addWidget(m_degrees);
     slotDegrees();
-    connect(m_degrees, TQT_SIGNAL(clicked()), TQT_SLOT(slotDegrees()));
+    connect(m_degrees, TQ_SIGNAL(clicked()), TQ_SLOT(slotDegrees()));
 
     m_radians = new TQRadioButton(i18n("&Radians"), buttonGroupBox);
     buttonGroup->insert(m_radians);
     buttonGroupLayout->addWidget(m_radians);
-    connect(m_radians, TQT_SIGNAL(clicked()), TQT_SLOT(slotRadians()));
+    connect(m_radians, TQ_SIGNAL(clicked()), TQ_SLOT(slotRadians()));
 
     m_history = new TQVBox(box);
     layout->addWidget(m_history);
@@ -97,10 +97,10 @@ MainWindow::MainWindow() : TDEMainWindow(0, "abakus-mainwindow"), m_popup(0), m_
     m_result = new ResultListView(m_history);
     m_result->setSelectionMode(TQListView::NoSelection);
     m_result->setHScrollBarMode(ResultListView::AlwaysOff);
-    connect(m_result, TQT_SIGNAL(signalEntrySelected(const TQString &)),
-                      TQT_SLOT(slotEntrySelected(const TQString &)));
-    connect(m_result, TQT_SIGNAL(signalResultSelected(const TQString &)),
-                      TQT_SLOT(slotResultSelected(const TQString &)));
+    connect(m_result, TQ_SIGNAL(signalEntrySelected(const TQString &)),
+                      TQ_SLOT(slotEntrySelected(const TQString &)));
+    connect(m_result, TQ_SIGNAL(signalResultSelected(const TQString &)),
+                      TQ_SLOT(slotResultSelected(const TQString &)));
 
     m_history->setStretchFactor(m_result, 1);
     layout->setStretchFactor(m_history, 1);
@@ -115,12 +115,12 @@ MainWindow::MainWindow() : TDEMainWindow(0, "abakus-mainwindow"), m_popup(0), m_
 
     KPushButton *evalButton = new KPushButton(i18n("&Evaluate"), editBox);
 
-    connect(evalButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEvaluate()));
+    connect(evalButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotEvaluate()));
 
-    connect(m_edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed()));
-    connect(m_edit, TQT_SIGNAL(textChanged()), TQT_SLOT(slotTextChanged()));
+    connect(m_edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed()));
+    connect(m_edit, TQ_SIGNAL(textChanged()), TQ_SLOT(slotTextChanged()));
 
-    m_listSplitter = new TQSplitter(Qt::Vertical, m_mainSplitter);
+    m_listSplitter = new TQSplitter(TQt::Vertical, m_mainSplitter);
     m_fnList = new FunctionListView(m_listSplitter);
     m_fnList->addColumn("Functions");
     m_fnList->addColumn("Value");
@@ -129,17 +129,17 @@ MainWindow::MainWindow() : TDEMainWindow(0, "abakus-mainwindow"), m_popup(0), m_
     m_varList->addColumn("Variables");
     m_varList->addColumn("Value");
 
-    connect(FunctionManager::instance(), TQT_SIGNAL(signalFunctionAdded(const TQString &)),
-            this, TQT_SLOT(slotNewFunction(const TQString &)));
-    connect(FunctionManager::instance(), TQT_SIGNAL(signalFunctionRemoved(const TQString &)),
-            this, TQT_SLOT(slotRemoveFunction(const TQString &)));
+    connect(FunctionManager::instance(), TQ_SIGNAL(signalFunctionAdded(const TQString &)),
+            this, TQ_SLOT(slotNewFunction(const TQString &)));
+    connect(FunctionManager::instance(), TQ_SIGNAL(signalFunctionRemoved(const TQString &)),
+            this, TQ_SLOT(slotRemoveFunction(const TQString &)));
 
-    connect(ValueManager::instance(), TQT_SIGNAL(signalValueAdded(const TQString &, Abakus::number_t)),
-            this, TQT_SLOT(slotNewValue(const TQString &, Abakus::number_t)));
-    connect(ValueManager::instance(), TQT_SIGNAL(signalValueChanged(const TQString &, Abakus::number_t)),
-            this, TQT_SLOT(slotChangeValue(const TQString &, Abakus::number_t)));
-    connect(ValueManager::instance(), TQT_SIGNAL(signalValueRemoved(const TQString &)),
-            this, TQT_SLOT(slotRemoveValue(const TQString &)));
+    connect(ValueManager::instance(), TQ_SIGNAL(signalValueAdded(const TQString &, Abakus::number_t)),
+            this, TQ_SLOT(slotNewValue(const TQString &, Abakus::number_t)));
+    connect(ValueManager::instance(), TQ_SIGNAL(signalValueChanged(const TQString &, Abakus::number_t)),
+            this, TQ_SLOT(slotChangeValue(const TQString &, Abakus::number_t)));
+    connect(ValueManager::instance(), TQ_SIGNAL(signalValueRemoved(const TQString &)),
+            this, TQ_SLOT(slotRemoveValue(const TQString &)));
 
     setupLayout();
 
@@ -228,7 +228,7 @@ void MainWindow::slotReturnPressed()
         // Skip creating list view items if in compact mode.
         if(!m_history->isShown()) {
             m_edit->setText(resultVal);
-            TQTimer::singleShot(0, m_edit, TQT_SLOT(selectAll()));
+            TQTimer::singleShot(0, m_edit, TQ_SLOT(selectAll()));
 
             return;
         }
@@ -276,7 +276,7 @@ void MainWindow::slotReturnPressed()
         // Skip creating list view items if in compact mode.
         if(compact) {
             m_edit->setText(resultVal);
-            TQTimer::singleShot(0, m_edit, TQT_SLOT(selectAll()));
+            TQTimer::singleShot(0, m_edit, TQ_SLOT(selectAll()));
 
             return;
         }
@@ -287,7 +287,7 @@ void MainWindow::slotReturnPressed()
     m_result->setCurrentItem(item);
     m_result->ensureItemVisible(item);
 
-    TQTimer::singleShot(0, m_edit, TQT_SLOT(selectAll()));
+    TQTimer::singleShot(0, m_edit, TQ_SLOT(selectAll()));
 }
 
 void MainWindow::slotTextChanged()
@@ -411,7 +411,7 @@ void MainWindow::loadConfig()
         action<TDEToggleAction>("toggleCompactMode")->setChecked(compactMode);
 
         if(compactMode)
-            TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCompactMode()));
+            TQTimer::singleShot(0, this, TQ_SLOT(slotToggleCompactMode()));
     }
 
     {
@@ -503,60 +503,60 @@ void MainWindow::setupLayout()
 {
     TDEActionCollection *ac = actionCollection();
 
-    KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), ac);
-    KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleMenuBar()), ac);
+    KStdAction::quit(kapp, TQ_SLOT(quit()), ac);
+    KStdAction::showMenubar(this, TQ_SLOT(slotToggleMenuBar()), ac);
 
-    TDEToggleAction *ta = new TDEToggleAction(i18n("&Degrees"), SHIFT + ALT + Key_D, TQT_TQOBJECT(this), TQT_SLOT(slotDegrees()), ac, "setDegreesMode");
+    TDEToggleAction *ta = new TDEToggleAction(i18n("&Degrees"), SHIFT + ALT + Key_D, this, TQ_SLOT(slotDegrees()), ac, "setDegreesMode");
     ta->setExclusiveGroup("TrigMode");
     ta->setChecked(trigMode() == Abakus::Degrees);
 
-    ta = new TDEToggleAction(i18n("&Radians"), SHIFT + ALT + Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotRadians()), ac, "setRadiansMode");
+    ta = new TDEToggleAction(i18n("&Radians"), SHIFT + ALT + Key_R, this, TQ_SLOT(slotRadians()), ac, "setRadiansMode");
     ta->setExclusiveGroup("TrigMode");
     ta->setChecked(trigMode() == Abakus::Radians);
 
-    ta = new TDEToggleAction(i18n("Show &History List"), SHIFT + ALT + Key_H, TQT_TQOBJECT(this), TQT_SLOT(slotToggleHistoryList()), ac, "toggleHistoryList");
+    ta = new TDEToggleAction(i18n("Show &History List"), SHIFT + ALT + Key_H, this, TQ_SLOT(slotToggleHistoryList()), ac, "toggleHistoryList");
     ta->setChecked(true);
 
-    ta = new TDEToggleAction(i18n("Show &Variables"), SHIFT + ALT + Key_V, TQT_TQOBJECT(this), TQT_SLOT(slotToggleVariableList()), ac, "toggleVariableList");
+    ta = new TDEToggleAction(i18n("Show &Variables"), SHIFT + ALT + Key_V, this, TQ_SLOT(slotToggleVariableList()), ac, "toggleVariableList");
     ta->setChecked(true);
 
-    ta = new TDEToggleAction(i18n("Show &Functions"), SHIFT + ALT + Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFunctionList()), ac, "toggleFunctionList");
+    ta = new TDEToggleAction(i18n("Show &Functions"), SHIFT + ALT + Key_F, this, TQ_SLOT(slotToggleFunctionList()), ac, "toggleFunctionList");
     ta->setChecked(true);
 
-    ta = new TDEToggleAction(i18n("Activate &Compact Mode"), SHIFT + ALT + Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotToggleCompactMode()), ac, "toggleCompactMode");
+    ta = new TDEToggleAction(i18n("Activate &Compact Mode"), SHIFT + ALT + Key_C, this, TQ_SLOT(slotToggleCompactMode()), ac, "toggleCompactMode");
     ta->setChecked(false);
 
-    ta = new TDEToggleAction(i18n("Use R&PN Mode"), SHIFT + ALT + Key_P, TQT_TQOBJECT(this), TQT_SLOT(slotToggleExpressionMode()), ac, "toggleExpressionMode");
+    ta = new TDEToggleAction(i18n("Use R&PN Mode"), SHIFT + ALT + Key_P, this, TQ_SLOT(slotToggleExpressionMode()), ac, "toggleExpressionMode");
     ta->setChecked(false);
 
     // Precision actions.
-    ta = new TDEToggleAction(i18n("&Automatic Precision"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrecisionAuto()), ac, "precisionAuto");
+    ta = new TDEToggleAction(i18n("&Automatic Precision"), 0, this, TQ_SLOT(slotPrecisionAuto()), ac, "precisionAuto");
     ta->setExclusiveGroup("Precision");
     ta->setChecked(true);
 
-    ta = new TDEToggleAction(i18n("&3 Decimal Digits"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrecision3()), ac, "precision3");
+    ta = new TDEToggleAction(i18n("&3 Decimal Digits"), 0, this, TQ_SLOT(slotPrecision3()), ac, "precision3");
     ta->setExclusiveGroup("Precision");
     ta->setChecked(false);
 
-    ta = new TDEToggleAction(i18n("&8 Decimal Digits"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrecision8()), ac, "precision8");
+    ta = new TDEToggleAction(i18n("&8 Decimal Digits"), 0, this, TQ_SLOT(slotPrecision8()), ac, "precision8");
     ta->setExclusiveGroup("Precision");
     ta->setChecked(false);
 
-    ta = new TDEToggleAction(i18n("&15 Decimal Digits"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrecision15()), ac, "precision15");
+    ta = new TDEToggleAction(i18n("&15 Decimal Digits"), 0, this, TQ_SLOT(slotPrecision15()), ac, "precision15");
     ta->setExclusiveGroup("Precision");
     ta->setChecked(false);
 
-    ta = new TDEToggleAction(i18n("&50 Decimal Digits"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrecision50()), ac, "precision50");
+    ta = new TDEToggleAction(i18n("&50 Decimal Digits"), 0, this, TQ_SLOT(slotPrecision50()), ac, "precision50");
     ta->setExclusiveGroup("Precision");
     ta->setChecked(false);
 
-    ta = new TDEToggleAction(i18n("C&ustom Precision..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotPrecisionCustom()), ac, "precisionCustom");
+    ta = new TDEToggleAction(i18n("C&ustom Precision..."), 0, this, TQ_SLOT(slotPrecisionCustom()), ac, "precisionCustom");
     ta->setExclusiveGroup("Precision");
     ta->setChecked(false);
 
-    new TDEAction(i18n("Clear &History"), "edit-clear", SHIFT + ALT + Key_L, TQT_TQOBJECT(m_result), TQT_SLOT(clear()), ac, "clearHistory");
+    new TDEAction(i18n("Clear &History"), "edit-clear", SHIFT + ALT + Key_L, m_result, TQ_SLOT(clear()), ac, "clearHistory");
 
-    new TDEAction(i18n("Select Editor"), "goto", Key_F6, TQT_TQOBJECT(m_edit), TQT_SLOT(setFocus()), ac, "select_edit");
+    new TDEAction(i18n("Select Editor"), "goto", Key_F6, m_edit, TQ_SLOT(setFocus()), ac, "select_edit");
 }
 
 void MainWindow::populateListViews()
@@ -682,7 +682,7 @@ void MainWindow::slotToggleCompactMode()
 
         m_oldSize = size();
         m_newSize = TQSize(0, 0);
-        TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateSize()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateSize()));
     }
     else {
         m_fnList->setShown(m_wasFnShown);
@@ -694,7 +694,7 @@ void MainWindow::slotToggleCompactMode()
         action<TDEToggleAction>("toggleHistoryList")->setChecked(m_wasHistoryShown);
 
         m_newSize = m_oldSize;
-        TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(slotUpdateSize()));
+        TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateSize()));
     }
 }
 

src/mainwindow.h

@@ -45,7 +45,7 @@ class AbakusIface;
 // Main window class, handles events and layout and stuff
 class MainWindow : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
     MainWindow();

src/parser.yy

@@ -316,7 +316,7 @@ VALUE: NUMBER { $$ = $1; }
 
 NUMBER: NUM {
     TDELocale *locale = TDEGlobal::locale();
-    QChar decimal = locale->decimalSymbol()[0];
+    TQChar decimal = locale->decimalSymbol()[0];
 
     // Replace current decimal separator with US Decimal separator to be
     // evil.

src/resultlistview.cpp

@@ -37,8 +37,8 @@ using namespace ResultList;
 ResultListView::ResultListView(TQWidget *parent, const char *name) :
     TDEListView(parent, name), m_itemRightClicked(0)
 {
-    connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
-                  TQT_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int)));
+    connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
+                  TQ_SLOT(slotDoubleClicked(TQListViewItem *, const TQPoint &, int)));
 
     addColumn(i18n("Expression"));
     addColumn(i18n("Result"));
@@ -115,9 +115,9 @@ TDEPopupMenu *ResultListView::constructPopupMenu(const ResultListViewText *item)
 {
     TDEPopupMenu *menu = new TDEPopupMenu(this, "list view context menu");
 
-    menu->insertItem(i18n("Clear &History"), this, TQT_SLOT(clear()), ALT+Key_R);
+    menu->insertItem(i18n("Clear &History"), this, TQ_SLOT(clear()), ALT+Key_R);
 
-    int id = menu->insertItem(i18n("Copy Result to Clipboard"), this, TQT_SLOT(slotCopyResult()));
+    int id = menu->insertItem(i18n("Copy Result to Clipboard"), this, TQ_SLOT(slotCopyResult()));
     if(!item || item->wasError())
 	menu->setItemEnabled(id, false);
 

src/resultlistview.h

@@ -33,7 +33,7 @@ namespace ResultList {
 
 class ResultListView : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:

src/valuemanager.h

@@ -28,7 +28,7 @@
 
 class ValueManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     public:
     typedef TQMap<TQString, Abakus::number_t> valueMap;

translations/desktop_files/abakus.desktop/bg.po

@@ -1,30 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # This file is put in the public domain.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
+# Tony Ivanov <cheery.bed9609@fastmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-03-18 04:00+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2023-05-07 15:15+0000\n"
+"Last-Translator: Tony Ivanov <cheery.bed9609@fastmail.com>\n"
+"Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/abakus-abakusdesktop/bg/>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.17\n"
 
 #. Comment
 #: abakus.desktop:7
 msgid "A simple keyboard-driven calculator"
-msgstr ""
+msgstr "Лесен калкулатор управляем с клавиатура"
 
 #. Name
 #: abakus.desktop:9
 msgid "Abakus"
-msgstr ""
+msgstr "Abakus"
 
 #. GenericName
 #: abakus.desktop:10

translations/messages/ru.po

@@ -0,0 +1,240 @@
+# SOME DESCRIPTIVE TITLE.
+# Andrei Stepanov <adem4ik@gmail.com>, 2023.
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2020-05-09 01:25+0200\n"
+"PO-Revision-Date: 2023-06-04 15:15+0000\n"
+"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n"
+"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/abakus/ru/>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 4.17\n"
+
+#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Андрей Степанов"
+
+#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "adem4ik@gmail.com"
+
+#: abakus.cpp:36
+msgid "abakus"
+msgstr "abakus"
+
+#: abakus.cpp:37
+msgid "A simple keyboard-driven calculator"
+msgstr "Простой калькулятор с клавиатурным управлением"
+
+#: abakus.cpp:42
+msgid "Developer"
+msgstr "Разработчик"
+
+#: abakus.cpp:46
+msgid ""
+"High precision math routines, and inspiration for the new design came from "
+"his C++ implementation (SpeedCrunch)"
+msgstr ""
+"Высокоточные математические процедуры, а вдохновением для нового дизайна "
+"послужила его реализация на C++ (SpeedCrunch)"
+
+#: abakus.cpp:50
+msgid "Came up with the initial idea, along with a Python implementation."
+msgstr "Придумал первоначальную идею, а также реализацию на Python."
+
+#: abakus.cpp:54
+msgid ""
+"Inspiration/code for the initial design came from his Ruby implementation."
+msgstr ""
+"Вдохновением/кодом для первоначального дизайна послужила его реализация на "
+"Ruby."
+
+#: abakuslistview.cpp:158
+msgid "Remove selected variable"
+msgstr "Удалить выбранную переменную"
+
+#: abakuslistview.cpp:173
+#, c-format
+msgid ""
+"_n: Remove all variables (1 variable)\n"
+"Remove all variables (%n variables)"
+msgstr ""
+"Удалить все переменные (1 переменная)\n"
+"Удалить все переменные (%n переменные)\n"
+"Удалить все переменные (%n переменных)"
+
+#: abakuslistview.cpp:200
+msgid "Remove selected function"
+msgstr "Удалить выбранную функцию"
+
+#: abakuslistview.cpp:206
+#, c-format
+msgid ""
+"_n: Remove all functions (1 function)\n"
+"Remove all functions (%n functions)"
+msgstr ""
+"Удалить все функции (1 функция)\n"
+"Удалить все функции (%n функции)\n"
+"Удалить все функции (%n функций)"
+
+#: mainwindow.cpp:69
+msgid "History: "
+msgstr "История: "
+
+#: mainwindow.cpp:81 mainwindow.cpp:509
+msgid "&Degrees"
+msgstr "&Градусы"
+
+#: mainwindow.cpp:87 mainwindow.cpp:513
+msgid "&Radians"
+msgstr "&Радианы"
+
+#: mainwindow.cpp:116
+msgid "&Evaluate"
+msgstr "&Вычислить"
+
+#: mainwindow.cpp:225
+#, c-format
+msgid "Error: %1"
+msgstr "Ошибка: %1"
+
+#: mainwindow.cpp:517
+msgid "Show &History List"
+msgstr "Показать список исто&рии"
+
+#: mainwindow.cpp:520
+msgid "Show &Variables"
+msgstr "Показать пере&менные"
+
+#: mainwindow.cpp:523
+msgid "Show &Functions"
+msgstr "Пок&азать функции"
+
+#: mainwindow.cpp:526
+msgid "Activate &Compact Mode"
+msgstr "Включить ко&мпактный режим"
+
+#: mainwindow.cpp:529
+msgid "Use R&PN Mode"
+msgstr "Использовать ре&жим ОПН"
+
+#: mainwindow.cpp:533
+msgid "&Automatic Precision"
+msgstr "Автоматическа&я точность"
+
+#: mainwindow.cpp:537
+msgid "&3 Decimal Digits"
+msgstr "&3 десятичных знака"
+
+#: mainwindow.cpp:541
+msgid "&8 Decimal Digits"
+msgstr "&8 десятичных знаков"
+
+#: mainwindow.cpp:545
+msgid "&15 Decimal Digits"
+msgstr "&15 десятичных знаков"
+
+#: mainwindow.cpp:549
+msgid "&50 Decimal Digits"
+msgstr "&50 десятичных знаков"
+
+#: mainwindow.cpp:553
+msgid "C&ustom Precision..."
+msgstr "Выб&ранная точность…"
+
+#: mainwindow.cpp:557 resultlistview.cpp:118
+msgid "Clear &History"
+msgstr "Очистить исто&рию"
+
+#: mainwindow.cpp:559
+msgid "Select Editor"
+msgstr "Выбрать редактор"
+
+#: mainwindow.cpp:717
+msgid "Marker %1 isn't set"
+msgstr "Метка %1 не задана"
+
+#: mainwindow.cpp:760
+msgid "Select number of decimal digits to display"
+msgstr "Выберите число десятичных цифр для показа"
+
+#: mainwindow.cpp:761
+msgid "Decimal precision:"
+msgstr "Знаков после запятой:"
+
+#: resultlistview.cpp:43
+msgid "Expression"
+msgstr "Выражение"
+
+#: resultlistview.cpp:44
+msgid "Result"
+msgstr "Результат"
+
+#: resultlistview.cpp:45
+msgid "Shortcut"
+msgstr "Сочетание клавиш"
+
+#: resultlistview.cpp:120
+msgid "Copy Result to Clipboard"
+msgstr "Копировать результат в буфер обмена"
+
+#: rpnmuncher.cpp:104
+msgid "Can't pop from an empty stack."
+msgstr "Невозможно открыть из пустого стека."
+
+#: rpnmuncher.cpp:118
+#, c-format
+msgid "Insufficient operands for function %1"
+msgstr "Недостаточно операндов для функции %1"
+
+#: rpnmuncher.cpp:135
+msgid "The set and remove commands can only be used in normal mode."
+msgstr "Команды set и remove можно использовать только в нормальном режиме."
+
+#: rpnmuncher.cpp:142
+msgid "Insufficient operands for exponentiation operator."
+msgstr "Недостаточно операндов для оператор экспоненции."
+
+#: rpnmuncher.cpp:153
+#, c-format
+msgid "Unknown token %1"
+msgstr "Неизвестный токен %1"
+
+#: rpnmuncher.cpp:168
+msgid "Insufficient operands for addition operator."
+msgstr "Недостаточно операндов для оператора сложения."
+
+#: rpnmuncher.cpp:180
+msgid "Insufficient operands for subtraction operator."
+msgstr "Недостаточно операндов для оператора вычитания."
+
+#: rpnmuncher.cpp:192
+msgid "Insufficient operands for multiplication operator."
+msgstr "Недостаточно операндов для оператора умножения."
+
+#: rpnmuncher.cpp:204
+msgid "Insufficient operands for division operator."
+msgstr "Недостаточно операндов для оператора деления."
+
+#: valuemanager.cpp:96
+msgid "Natural exponential base - 2.7182818"
+msgstr "Натуральное экспоненциальное основание - 2,7182818"
+
+#: valuemanager.cpp:98
+msgid "pi (π) - 3.1415926"
+msgstr "пи (π) - 3,1415926"
+
+#: abakusui.rc:26
+#, no-c-format
+msgid "&Mode"
+msgstr "&Режим"