diff options
Diffstat (limited to 'qt/qextscintillabase.cpp')
| -rw-r--r-- | qt/qextscintillabase.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/qt/qextscintillabase.cpp b/qt/qextscintillabase.cpp index aa58b9e..4279094 100644 --- a/qt/qextscintillabase.cpp +++ b/qt/qextscintillabase.cpp @@ -21,9 +21,9 @@ #include <tqapplication.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqscrollbar.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcolor.h> #include <tqevent.h> #include <tqdragobject.h> @@ -70,22 +70,22 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f) { sci = 0; - TQGridLayout *tqlayout = new TQGridLayout(this,2,2); + TQGridLayout *layout = new TQGridLayout(this,2,2); txtarea = new TQWidget(this,0,WRepaintNoErase|WResizeNoErase); - txtarea -> tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); + txtarea -> setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding)); txtarea -> setMouseTracking(TRUE); txtarea -> setAcceptDrops(TRUE); txtarea -> setFocusPolicy(WheelFocus); txtarea -> setFocusProxy(this); - tqlayout -> addWidget(txtarea,0,0); + layout -> addWidget(txtarea,0,0); vsb = new TQScrollBar(Qt::Vertical,this); - tqlayout -> addWidget(vsb,0,1); + layout -> addWidget(vsb,0,1); connect(vsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleVSb(int))); hsb = new TQScrollBar(Qt::Horizontal,this); - tqlayout -> addWidget(hsb,1,0); + layout -> addWidget(hsb,1,0); connect(hsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleHSb(int))); txtarea -> installEventFilter(this); @@ -104,7 +104,7 @@ QextScintillaBase::QextScintillaBase(TQWidget *parent,const char *name,WFlags f) lexersLinked = TRUE; } - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); if (cb -> supportsSelection()) connect(cb,TQT_SIGNAL(selectionChanged()),TQT_SLOT(handleSelection())); @@ -329,7 +329,7 @@ void QextScintillaBase::mousePress(TQMouseEvent *me) case MidButton: { - TQClipboard *cb = TQApplication::tqclipboard(); + TQClipboard *cb = TQApplication::clipboard(); if (cb -> supportsSelection()) { @@ -488,7 +488,7 @@ void QextScintillaBase::keyPressEvent(TQKeyEvent *ke) // key. if (ke -> text().length() == 1) { - if ((key = ke -> text()[0].tqunicode()) >= 0x80) + if ((key = ke -> text()[0].unicode()) >= 0x80) key = 0; } else @@ -563,12 +563,12 @@ void QextScintillaBase::handleHSb(int val) // Return the current prefered size. -TQSize QextScintillaBase::tqsizeHint() const +TQSize QextScintillaBase::sizeHint() const { int height = sci -> vs.lineHeight * sci -> pdoc -> LinesTotal(); if (sci -> horizontalScrollBarVisible) - height += hsb -> tqsizeHint().height(); + height += hsb -> sizeHint().height(); return TQSize(sci -> scrollWidth,height); } @@ -577,6 +577,6 @@ TQSize QextScintillaBase::tqsizeHint() const // Handle the selection changing. void QextScintillaBase::handleSelection() { - if (!TQApplication::tqclipboard() -> ownsSelection()) + if (!TQApplication::clipboard() -> ownsSelection()) sci -> UnclaimSelection(); } |