Some more code to base class

nyalldawson · Oct 24, 2022 · 24b777c · 24b777c
1 parent 06c20f9
commit 24b777c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 43 deletions.
diff --git a/src/app/rstats/qgsrstatsconsole.cpp b/src/app/rstats/qgsrstatsconsole.cpp
@@ -53,7 +53,7 @@ QgsRStatsConsole::QgsRStatsConsole( QWidget *parent, QgsRStatsRunner *runner )
 
   mOutput = new QgsCodeEditorR( nullptr, QgsCodeEditor::Mode::OutputDisplay );
   splitter->addWidget( mOutput );
-  mInputEdit = new QgsInteractiveRWidget();
+  mInputEdit = new QgsCodeEditorR( nullptr, QgsCodeEditor::Mode::CommandInput );
   mInputEdit->setInterpreter( mRunner );
   mInputEdit->setHistoryFilePath( QgsApplication::qgisSettingsDirPath() + QStringLiteral( "/r_console_history.txt" ) );
 
@@ -105,28 +105,3 @@ QgsRStatsConsole::~QgsRStatsConsole()
   delete mDockableWidgetHelper;
 }
 
-QgsInteractiveRWidget::QgsInteractiveRWidget( QWidget *parent )
-  : QgsCodeEditorR( parent, QgsCodeEditor::Mode::CommandInput )
-{
-  QgsInteractiveRWidget::initializeLexer();
-}
-
-void QgsInteractiveRWidget::initializeLexer()
-{
-  QgsCodeEditorR::initializeLexer();
-
-  setCaretLineVisible( false );
-  setLineNumbersVisible( false ); // NO linenumbers for the input line
-  // Margin 1 is used for the '>' prompt (console input)
-  setMarginLineNumbers( 1, true );
-  setMarginWidth( 1, "00" );
-  setMarginType( 1, QsciScintilla::MarginType::TextMarginRightJustified );
-  setMarginsBackgroundColor( color( QgsCodeEditorColorScheme::ColorRole::Background ) );
-  setEdgeMode( QsciScintilla::EdgeNone );
-}
-
-void QgsInteractiveRWidget::displayPrompt( bool more )
-{
-  const QString prompt = !more ? ">" : "+";
-  SendScintilla( QsciScintilla::SCI_MARGINSETTEXT, static_cast< uintptr_t >( 0 ), prompt.toUtf8().constData() );
-}
diff --git a/src/app/rstats/qgsrstatsconsole.h b/src/app/rstats/qgsrstatsconsole.h
@@ -26,22 +26,6 @@ class QLineEdit;
 class QTextBrowser;
 class QgsDockableWidgetHelper;
 
-class QgsInteractiveRWidget : public QgsCodeEditorR
-{
-    Q_OBJECT
-  public:
-
-    QgsInteractiveRWidget( QWidget *parent = nullptr );
-
-
-  protected:
-
-    void keyPressEvent( QKeyEvent *event ) override;
-
-    void initializeLexer() override;
-
-};
-
 class QgsRStatsConsole: public QWidget
 {
   public:
@@ -51,7 +35,7 @@ class QgsRStatsConsole: public QWidget
   private:
 
     QgsRStatsRunner *mRunner = nullptr;
-    QgsInteractiveRWidget *mInputEdit = nullptr;
+    QgsCodeEditorR *mInputEdit = nullptr;
     QgsCodeEditorR *mOutput = nullptr;
     QgsDockableWidgetHelper *mDockableWidgetHelper = nullptr;