Browse Source

Fix FTBFS

tags/r14.0.0
Timothy Pearson 7 years ago
parent
commit
2ca85d3360
5 changed files with 11 additions and 11 deletions
  1. 1
    1
      designer/designer.pro
  2. 2
    2
      designer/qscintillaplugin.cpp
  3. 1
    1
      qt/ScintillaQt.cpp
  4. 6
    6
      qt/qextscintillabase.cpp
  5. 1
    1
      src/Editor.h

+ 1
- 1
designer/designer.pro View File

@@ -4,7 +4,7 @@
TEMPLATE = lib
TARGET = qscintillaplugin
# DESTDIR = $(QTDIR)/plugins/designer
INCLUDEPATH = ../qt
INCLUDEPATH = ../qt /usr/include/tqt
LIBPATH += ../tmplib
CONFIG += qt warn_on release plugin


+ 2
- 2
designer/qscintillaplugin.cpp View File

@@ -1,9 +1,9 @@
// This implements the TQScintilla plugin for TQt Designer.


#include <tqwidgetplugin.h>
#include <qwidgetplugin.h>

#include "../tqt/qextscintilla.h"
#include "../qt/qextscintilla.h"


static const char *qscintilla_pixmap[]={

+ 1
- 1
qt/ScintillaQt.cpp View File

@@ -30,7 +30,7 @@
#include <tqpainter.h>

#include "qextscintillabase.h"
#include "ScintillaTQt.h"
#include "ScintillaQt.h"


// We want to use the Scintilla notification names as TQt signal names.

+ 6
- 6
qt/qextscintillabase.cpp View File

@@ -31,7 +31,7 @@
#include <tqptrlist.h>

#include "qextscintillabase.h"
#include "ScintillaTQt.h"
#include "ScintillaQt.h"


// The #defines in Scintilla.h and the enums in qextscintillabase.h conflict
@@ -80,11 +80,11 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f)
txtarea -> setFocusProxy(this);
tqlayout -> addWidget(txtarea,0,0);

vsb = new TQScrollBarQt::Vertical,this);
vsb = new TQScrollBar(Qt::Vertical,this);
tqlayout -> addWidget(vsb,0,1);
connect(vsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleVSb(int)));

hsb = new TQScrollBarQt::Horizontal,this);
hsb = new TQScrollBar(Qt::Horizontal,this);
tqlayout -> addWidget(hsb,1,0);
connect(hsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleHSb(int)));

@@ -386,9 +386,9 @@ void QextScintillaBase::mouseWheel(TQWheelEvent *we)
{
setFocus();

if (we -> orientation() ==Qt::Horizontal || we -> state() & ShiftButton)
if (we -> orientation() == Qt::Horizontal || we -> state() & ShiftButton)
TQApplication::sendEvent(hsb,we);
else if (we -> orientation() ==Qt::Vertical)
else if (we -> orientation() == Qt::Vertical)
TQApplication::sendEvent(vsb,we);
}

@@ -558,7 +558,7 @@ void QextScintillaBase::handleVSb(int val)
// Handle the horizontal scrollbar.
void QextScintillaBase::handleHSb(int val)
{
sci ->Qt::HorizontalScrollTo(val);
sci ->HorizontalScrollTo(val);
}



+ 1
- 1
src/Editor.h View File

@@ -368,7 +368,7 @@ protected: // ScintillaBase subclass needs access to much of Editor

void ScrollTo(int line, bool moveThumb=true);
virtual void ScrollText(int linesToMove);
voidQt::HorizontalScrollTo(int xPos);
void HorizontalScrollTo(int xPos);
void MoveCaretInsideView(bool ensureVisible=true);
int DisplayFromPosition(int pos);
void EnsureCaretVisible(bool useMargin=true, bool vert=true, bool horiz=true);

Loading…
Cancel
Save