summaryrefslogtreecommitdiffstats
path: root/qt
diff options
context:
space:
mode:
Diffstat (limited to 'qt')
-rw-r--r--qt/PlatQt.cpp14
-rw-r--r--qt/SciListBox.cpp4
-rw-r--r--qt/ScintillaQt.cpp10
-rw-r--r--qt/qextscintilla.cpp10
-rw-r--r--qt/qextscintilla.h4
-rw-r--r--qt/qextscintillabase.cpp26
-rw-r--r--qt/qextscintillabase.h2
-rw-r--r--qt/qextscintillalexer.cpp8
-rw-r--r--qt/qextscintillalexercss.cpp6
-rw-r--r--qt/qextscintillalexerhtml.cpp2
-rw-r--r--qt/qextscintillalexeridl.cpp2
-rw-r--r--qt/qextscintillalexertex.cpp2
-rw-r--r--qt/qextscintillaprinter.h2
13 files changed, 46 insertions, 46 deletions
diff --git a/qt/PlatQt.cpp b/qt/PlatQt.cpp
index 3b563c6..db5e94a 100644
--- a/qt/PlatQt.cpp
+++ b/qt/PlatQt.cpp
@@ -194,7 +194,7 @@ public:
void SetClip(PRectangle rc);
void FlushCachedState() {painter -> flush();}
- void SetUnicodeMode(bool unicodeMode_) {unicodeMode = unicodeMode_;}
+ void SetUnicodeMode(bool tqunicodeMode_) {tqunicodeMode = tqunicodeMode_;}
void SetDBCSMode(int codePage) {}
void DrawXPM(PRectangle rc,const XPM *xpm);
@@ -207,7 +207,7 @@ private:
static TQColor convertTQColor(const ColourAllocated &col,
unsigned alpha = 0xff);
- bool unicodeMode;
+ bool tqunicodeMode;
bool mypainter;
TQPainter *painter;
};
@@ -217,7 +217,7 @@ Surface *Surface::Allocate()
return new SurfaceImpl;
}
-SurfaceImpl::SurfaceImpl() : unicodeMode(false), mypainter(false), painter(0)
+SurfaceImpl::SurfaceImpl() : tqunicodeMode(false), mypainter(false), painter(0)
{
}
@@ -448,7 +448,7 @@ void SurfaceImpl::MeasureWidths(Font &font_,const char *s,int len,
{
totalWidth += fm.width(qs[i]);
- int l = (unicodeMode ? TQString(qs[i]).utf8().length() : 1);
+ int l = (tqunicodeMode ? TQString(qs[i]).utf8().length() : 1);
while (l--)
positions[ui++] = totalWidth;
@@ -533,7 +533,7 @@ bool SurfaceImpl::setFont(Font &font_)
// Convert a Scintilla string to a TQt Unicode string.
TQString SurfaceImpl::convertText(const char *s,int len)
{
- if (unicodeMode)
+ if (tqunicodeMode)
return TQString::fromUtf8(s,len);
TQString qs;
@@ -594,7 +594,7 @@ PRectangle Window::GetPosition()
if (w)
{
- const TQRect &r = w -> geometry();
+ const TQRect &r = w -> tqgeometry();
rc.left = r.left();
rc.top = r.top();
@@ -661,7 +661,7 @@ void Window::SetFont(Font &font)
void Window::SetCursor(Cursor curs)
{
- TQt::CursorShape qc;
+ TQt::tqCursorShape qc;
switch (curs)
{
diff --git a/qt/SciListBox.cpp b/qt/SciListBox.cpp
index f873d7c..ef2475b 100644
--- a/qt/SciListBox.cpp
+++ b/qt/SciListBox.cpp
@@ -98,7 +98,7 @@ void ListBoxX::Create(Window &parent,int,Point,int,bool)
void ListBoxX::SetAverageCharWidth(int)
{
- // We rely on TQListBox::sizeHint() for the size of the list box rather
+ // We rely on TQListBox::tqsizeHint() for the size of the list box rather
// than make calculations based on the average character width and the
// number of visible rows.
}
@@ -121,7 +121,7 @@ PRectangle ListBoxX::GetDesiredRect()
if (slb)
{
- TQSize sh = slb -> sizeHint();
+ TQSize sh = slb -> tqsizeHint();
rc.right = sh.width();
rc.bottom = sh.height();
diff --git a/qt/ScintillaQt.cpp b/qt/ScintillaQt.cpp
index e626d17..322f300 100644
--- a/qt/ScintillaQt.cpp
+++ b/qt/ScintillaQt.cpp
@@ -25,7 +25,7 @@
#include <tqpopupmenu.h>
#include <tqstring.h>
#include <tqtimer.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqdragobject.h>
#include <tqpainter.h>
@@ -446,7 +446,7 @@ TQString ScintillaTQt::textRange(const SelectionText *text)
// Copy the selected text to the clipboard.
void ScintillaTQt::CopyToClipboard(const SelectionText &selectedText)
{
- TQApplication::clipboard() -> setText(textRange(&selectedText));
+ TQApplication::tqclipboard() -> setText(textRange(&selectedText));
}
@@ -466,7 +466,7 @@ void ScintillaTQt::Copy()
// Implement paste.
void ScintillaTQt::Paste()
{
- TQString str = TQApplication::clipboard() -> text();
+ TQString str = TQApplication::tqclipboard() -> text();
if (str.isEmpty())
return;
@@ -607,7 +607,7 @@ void ScintillaTQt::ClaimSelection()
if (isSel)
{
- TQClipboard *cb = TQApplication::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
// If we support X11 style selection then make it available
// now.
@@ -683,7 +683,7 @@ void ScintillaTQt::paintEvent(TQPaintEvent *pe)
delete sw;
// If the painting area was insufficient to cover the new style
- // or brace highlight positions then repaint the whole thing.
+ // or brace highlight positions then tqrepaint the whole thing.
if (paintState == paintAbandoned)
PWindow(wMain) -> update();
}
diff --git a/qt/qextscintilla.cpp b/qt/qextscintilla.cpp
index d586e21..4b33791 100644
--- a/qt/qextscintilla.cpp
+++ b/qt/qextscintilla.cpp
@@ -1036,7 +1036,7 @@ void QextScintilla::foldClick(int lineClick,int bstate)
{
if (bstate & ShiftButton)
{
- // Ensure all children are visible.
+ // Ensure all tqchildren are visible.
SendScintilla(SCI_SETFOLDEXPANDED,lineClick,1);
foldExpand(lineClick,TRUE,TRUE,100,levelClick);
}
@@ -1044,13 +1044,13 @@ void QextScintilla::foldClick(int lineClick,int bstate)
{
if (SendScintilla(SCI_GETFOLDEXPANDED,lineClick))
{
- // Contract this line and all its children.
+ // Contract this line and all its tqchildren.
SendScintilla(SCI_SETFOLDEXPANDED,lineClick,0L);
foldExpand(lineClick,FALSE,TRUE,0,levelClick);
}
else
{
- // Expand this line and all its children.
+ // Expand this line and all its tqchildren.
SendScintilla(SCI_SETFOLDEXPANDED,lineClick,1);
foldExpand(lineClick,TRUE,TRUE,100,levelClick);
}
@@ -1119,7 +1119,7 @@ void QextScintilla::foldExpand(int &line,bool doExpand,bool force,
// Fully expand (if there is any line currently folded) all text. Otherwise,
// fold all text. This is mostly taken from SciTE.
-void QextScintilla::foldAll(bool children)
+void QextScintilla::foldAll(bool tqchildren)
{
recolor();
@@ -1142,7 +1142,7 @@ void QextScintilla::foldAll(bool children)
if (!(level & SC_FOLDLEVELHEADERFLAG))
continue;
- if (children ||
+ if (tqchildren ||
(SC_FOLDLEVELBASE == (level & SC_FOLDLEVELNUMBERMASK)))
{
if (expanding)
diff --git a/qt/qextscintilla.h b/qt/qextscintilla.h
index 331ebad..c34c88d 100644
--- a/qt/qextscintilla.h
+++ b/qt/qextscintilla.h
@@ -920,10 +920,10 @@ public slots:
//! If any lines are currently folded then they are all unfolded.
//! Otherwise all lines are folded. This has the same effect as
//! clicking in the fold margin with the shift and control keys
- //! pressed. If \a children is not set (the default) then only the top
+ //! pressed. If \a tqchildren is not set (the default) then only the top
//! level fold points are affected, otherwise the state of all fold
//! points are changed.
- virtual void foldAll(bool children = FALSE);
+ virtual void foldAll(bool tqchildren = FALSE);
//! If the line \a line is folded then it is unfolded. Otherwise it is
//! folded. This has the same effect as clicking in the fold margin.
diff --git a/qt/qextscintillabase.cpp b/qt/qextscintillabase.cpp
index 4279094..aa58b9e 100644
--- a/qt/qextscintillabase.cpp
+++ b/qt/qextscintillabase.cpp
@@ -21,9 +21,9 @@
#include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqscrollbar.h>
-#include <layout.h>
+#include <tqlayout.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 *layout = new TQGridLayout(this,2,2);
+ TQGridLayout *tqlayout = new TQGridLayout(this,2,2);
txtarea = new TQWidget(this,0,WRepaintNoErase|WResizeNoErase);
- txtarea -> setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
+ txtarea -> tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Expanding));
txtarea -> setMouseTracking(TRUE);
txtarea -> setAcceptDrops(TRUE);
txtarea -> setFocusPolicy(WheelFocus);
txtarea -> setFocusProxy(this);
- layout -> addWidget(txtarea,0,0);
+ tqlayout -> addWidget(txtarea,0,0);
vsb = new TQScrollBar(Qt::Vertical,this);
- layout -> addWidget(vsb,0,1);
+ tqlayout -> addWidget(vsb,0,1);
connect(vsb,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(handleVSb(int)));
hsb = new TQScrollBar(Qt::Horizontal,this);
- layout -> addWidget(hsb,1,0);
+ tqlayout -> 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::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
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::clipboard();
+ TQClipboard *cb = TQApplication::tqclipboard();
if (cb -> supportsSelection())
{
@@ -488,7 +488,7 @@ void QextScintillaBase::keyPressEvent(TQKeyEvent *ke)
// key.
if (ke -> text().length() == 1)
{
- if ((key = ke -> text()[0].unicode()) >= 0x80)
+ if ((key = ke -> text()[0].tqunicode()) >= 0x80)
key = 0;
}
else
@@ -563,12 +563,12 @@ void QextScintillaBase::handleHSb(int val)
// Return the current prefered size.
-TQSize QextScintillaBase::sizeHint() const
+TQSize QextScintillaBase::tqsizeHint() const
{
int height = sci -> vs.lineHeight * sci -> pdoc -> LinesTotal();
if (sci -> horizontalScrollBarVisible)
- height += hsb -> sizeHint().height();
+ height += hsb -> tqsizeHint().height();
return TQSize(sci -> scrollWidth,height);
}
@@ -577,6 +577,6 @@ TQSize QextScintillaBase::sizeHint() const
// Handle the selection changing.
void QextScintillaBase::handleSelection()
{
- if (!TQApplication::clipboard() -> ownsSelection())
+ if (!TQApplication::tqclipboard() -> ownsSelection())
sci -> UnclaimSelection();
}
diff --git a/qt/qextscintillabase.h b/qt/qextscintillabase.h
index 1e5a792..d4e73ba 100644
--- a/qt/qextscintillabase.h
+++ b/qt/qextscintillabase.h
@@ -2243,7 +2243,7 @@ public:
}
//! Returns the recommended size of the widget.
- virtual TQSize sizeHint() const;
+ virtual TQSize tqsizeHint() const;
//! Returns the viewport widget. This is the widget that actually
//! contains the text.
diff --git a/qt/qextscintillalexer.cpp b/qt/qextscintillalexer.cpp
index 20a1c22..327206f 100644
--- a/qt/qextscintillalexer.cpp
+++ b/qt/qextscintillalexer.cpp
@@ -339,12 +339,12 @@ bool QextScintillaLexer::writeSettings(TQSettings &qs,const char *prefix) const
f = font(i);
fdesc += f.family();
- fdesc += fmt.arg(f.pointSize());
+ fdesc += fmt.tqarg(f.pointSize());
// The casts are for Borland.
- fdesc += fmt.arg((int)f.bold());
- fdesc += fmt.arg((int)f.italic());
- fdesc += fmt.arg((int)f.underline());
+ fdesc += fmt.tqarg((int)f.bold());
+ fdesc += fmt.tqarg((int)f.italic());
+ fdesc += fmt.tqarg((int)f.underline());
if (!qs.writeEntry(key + "font",fdesc,','))
rc = FALSE;
diff --git a/qt/qextscintillalexercss.cpp b/qt/qextscintillalexercss.cpp
index 6983202..ff15caa 100644
--- a/qt/qextscintillalexercss.cpp
+++ b/qt/qextscintillalexercss.cpp
@@ -199,16 +199,16 @@ const char *QextScintillaLexerCSS::keywords(int set) const
"border-top-style border-right-style "
"border-bottom-style border-left-style border-style "
"top right bottom left position z-index direction "
- "unicode-bidi min-width max-width min-height "
+ "tqunicode-bidi min-width max-width min-height "
"max-height overflow clip visibility content quotes "
"counter-reset counter-increment marker-offset size "
"marks page-break-before page-break-after "
"page-break-inside page orphans widows font-stretch "
- "font-size-adjust unicode-range units-per-em src "
+ "font-size-adjust tqunicode-range units-per-em src "
"panose-1 stemv stemh slope cap-height x-height "
"ascent descent widths bbox definition-src baseline "
"centerline mathline topline text-shadow "
- "caption-side table-layout border-collapse "
+ "caption-side table-tqlayout border-collapse "
"border-spacing empty-cells speak-header cursor "
"outline outline-width outline-style outline-color "
"volume speak pause-before pause-after pause "
diff --git a/qt/qextscintillalexerhtml.cpp b/qt/qextscintillalexerhtml.cpp
index 2da5f01..5013ff9 100644
--- a/qt/qextscintillalexerhtml.cpp
+++ b/qt/qextscintillalexerhtml.cpp
@@ -474,7 +474,7 @@ const char *QextScintillaLexerHTML::keywords(int set) const
"onselect onsubmit onunload "
"profile prompt "
"readonly rel rev rows rowspan rules "
- "scheme scope selected shape size span src standby "
+ "scheme scope selected tqshape size span src standby "
"start style summary "
"tabindex target text title topmargin type "
"usemap "
diff --git a/qt/qextscintillalexeridl.cpp b/qt/qextscintillalexeridl.cpp
index 51c8eb7..ceba60c 100644
--- a/qt/qextscintillalexeridl.cpp
+++ b/qt/qextscintillalexeridl.cpp
@@ -84,7 +84,7 @@ const char *QextScintillaLexerIDL::keywords(int set) const
"object odl oleautomation optimize optional out out_of_line "
"pipe pointer_default pragma properties propget propput "
"propputref ptr public range readonly ref represent_as "
- "requestedit restricted retval shape short signed size_is "
+ "requestedit restricted retval tqshape short signed size_is "
"small source strict_context_handle string struct switch "
"switch_is switch_type transmit_as typedef uidefault union "
"unique unsigned user_marshal usesgetlasterror uuid v1_enum "
diff --git a/qt/qextscintillalexertex.cpp b/qt/qextscintillalexertex.cpp
index 912b2a2..aa21e80 100644
--- a/qt/qextscintillalexertex.cpp
+++ b/qt/qextscintillalexertex.cpp
@@ -137,7 +137,7 @@ const char *QextScintillaLexerTeX::keywords(int set) const
"overwithdelims pagedepth pagefilllstretch "
"pagefillstretch pagefilstretch pagegoal pageshrink "
"pagestretch pagetotal par parfillskip parindent "
- "parshape parskip patterns pausing penalty "
+ "partqshape parskip patterns pausing penalty "
"postdisplaypenalty predisplaypenalty predisplaysize "
"pretolerance prevdepth prevgraf radical raise read "
"relax relpenalty right righthyphenmin rightskip "
diff --git a/qt/qextscintillaprinter.h b/qt/qextscintillaprinter.h
index a938c1a..3478b91 100644
--- a/qt/qextscintillaprinter.h
+++ b/qt/qextscintillaprinter.h
@@ -38,7 +38,7 @@ class QextScintillaBase;
//! \brief The QextScintillaPrinter class is a sub-class of the TQt TQPrinter
//! class that is able to print the text of a Scintilla document.
//!
-//! The class can be further sub-classed to alter to layout of the text, adding
+//! The class can be further sub-classed to alter to tqlayout of the text, adding
//! headers and footers for example.
class TQEXTSCINTILLA_EXPORT QextScintillaPrinter : public TQPrinter
{