diff options
Diffstat (limited to 'tdehtml')
99 files changed, 889 insertions, 897 deletions
diff --git a/tdehtml/CMakeLists.txt b/tdehtml/CMakeLists.txt index 187eff352..624612d55 100644 --- a/tdehtml/CMakeLists.txt +++ b/tdehtml/CMakeLists.txt @@ -93,7 +93,7 @@ tde_add_library( ${target} SHARED AUTOMOC LINK ${VSCRIPT} kjava-static kjs_html-static tdehtmldom-static tdehtmlcss-static tdehtmlhtml-static tdehtmlxml-static tdehtmlrender-static tdehtmlmisc-static tdeutils-shared tdeprint-shared - LINK_PRIVATE kjs-shared ${JPEG_LIBRARIES} + LINK_PRIVATE kjs-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/tdehtml/css/css_valueimpl.cpp b/tdehtml/css/css_valueimpl.cpp index 94cca8840..31f0d6be2 100644 --- a/tdehtml/css/css_valueimpl.cpp +++ b/tdehtml/css/css_valueimpl.cpp @@ -505,7 +505,7 @@ CSSPrimitiveValueImpl::CSSPrimitiveValueImpl( RectImpl *r) m_type = CSSPrimitiveValue::CSS_RECT; } -CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(QRgb color) +CSSPrimitiveValueImpl::CSSPrimitiveValueImpl(TQRgb color) { m_value.rgbcolor = color; m_type = CSSPrimitiveValue::CSS_RGBCOLOR; diff --git a/tdehtml/css/css_valueimpl.h b/tdehtml/css/css_valueimpl.h index 9a6203c86..952c81f8c 100644 --- a/tdehtml/css/css_valueimpl.h +++ b/tdehtml/css/css_valueimpl.h @@ -163,7 +163,7 @@ public: CSSPrimitiveValueImpl(const DOMString &str, CSSPrimitiveValue::UnitTypes type); CSSPrimitiveValueImpl(CounterImpl *c); CSSPrimitiveValueImpl( RectImpl *r); - CSSPrimitiveValueImpl(QRgb color); + CSSPrimitiveValueImpl(TQRgb color); CSSPrimitiveValueImpl(PairImpl *p); virtual ~CSSPrimitiveValueImpl(); @@ -206,7 +206,7 @@ public: return ( m_type != CSSPrimitiveValue::CSS_RECT ? 0 : m_value.rect ); } - QRgb getRGBColorValue () const { + TQRgb getRGBColorValue () const { return ( m_type != CSSPrimitiveValue::CSS_RGBCOLOR ? 0 : m_value.rgbcolor ); } @@ -232,7 +232,7 @@ protected: DOM::DOMStringImpl *string; CounterImpl *counter; RectImpl *rect; - QRgb rgbcolor; + TQRgb rgbcolor; PairImpl* pair; } m_value; }; diff --git a/tdehtml/css/cssparser.cpp b/tdehtml/css/cssparser.cpp index 130fa8b61..b4b531df0 100644 --- a/tdehtml/css/cssparser.cpp +++ b/tdehtml/css/cssparser.cpp @@ -2053,7 +2053,7 @@ bool CSSParser::parseHSLParameters(Value* value, double* colorArray, bool parseA return true; } -static bool parseColor(int unit, const TQString &name, QRgb& rgb) +static bool parseColor(int unit, const TQString &name, TQRgb& rgb) { int len = name.length(); @@ -2101,7 +2101,7 @@ CSSPrimitiveValueImpl *CSSParser::parseColor() CSSPrimitiveValueImpl *CSSParser::parseColorFromValue(Value* value) { - QRgb c = tdehtml::transparentColor; + TQRgb c = tdehtml::transparentColor; if ( !strict && value->unit == CSSPrimitiveValue::CSS_NUMBER && value->fValue >= 0. && value->fValue < 1000000. ) { TQString str; diff --git a/tdehtml/css/cssparser.h b/tdehtml/css/cssparser.h index 0e00ebc16..de735fe3e 100644 --- a/tdehtml/css/cssparser.h +++ b/tdehtml/css/cssparser.h @@ -148,7 +148,7 @@ namespace DOM { CSSPrimitiveValueImpl *parseColorFromValue(Value* val); CSSValueImpl* parseCounterContent(ValueList *args, bool counters); - static bool parseColor(const TQString &name, QRgb& rgb); + static bool parseColor(const TQString &name, TQRgb& rgb); // CSS3 Parsing Routines (for properties specific to CSS3) bool parseShadow(int propId, bool important); diff --git a/tdehtml/css/cssstyleselector.cpp b/tdehtml/css/cssstyleselector.cpp index 40dbcb2ec..e9517584e 100644 --- a/tdehtml/css/cssstyleselector.cpp +++ b/tdehtml/css/cssstyleselector.cpp @@ -1953,7 +1953,7 @@ static Length convertToLength( CSSPrimitiveValueImpl *primitiveValue, RenderStyl // color mapping code struct colorMap { int css_value; - QRgb color; + TQRgb color; }; static const colorMap cmap[] = { diff --git a/tdehtml/css/parser.y b/tdehtml/css/parser.y index 6d8b18e9a..236b467dd 100644 --- a/tdehtml/css/parser.y +++ b/tdehtml/css/parser.y @@ -634,7 +634,7 @@ element_name: IDENT { CSSParser *p = static_cast<CSSParser *>(parser); DOM::DocumentImpl *doc = p->document(); - QString tag = qString($1); + TQString tag = qString($1); if ( doc ) { if (doc->isHTMLDocument()) tag = tag.lower(); @@ -699,7 +699,7 @@ attrib_id: CSSParser *p = static_cast<CSSParser *>(parser); DOM::DocumentImpl *doc = p->document(); - QString attr = qString($1); + TQString attr = qString($1); if ( doc ) { if (doc->isHTMLDocument()) attr = attr.lower(); @@ -798,7 +798,7 @@ pseudo: | ':' FUNCTION INTEGER ')' { $$ = new CSSSelector(); $$->match = CSSSelector::PseudoClass; - $$->string_arg = QString::number($3); + $$->string_arg = TQString::number($3); $$->value = domString($2); } // used by :nth-* and :lang @@ -892,7 +892,7 @@ declaration: property: IDENT maybe_space { - QString str = qString($1); + TQString str = qString($1); $$ = getPropertyID( str.lower().latin1(), str.length() ); } ; @@ -941,7 +941,7 @@ term: | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; } | STRING maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_STRING; } | IDENT maybe_space { - QString str = qString( $1 ); + TQString str = qString( $1 ); $$.id = getValueID( str.lower().latin1(), str.length() ); $$.unit = CSSPrimitiveValue::CSS_IDENT; $$.string = $1; diff --git a/tdehtml/dom/css_value.cpp b/tdehtml/dom/css_value.cpp index 4e365644a..edbf15075 100644 --- a/tdehtml/dom/css_value.cpp +++ b/tdehtml/dom/css_value.cpp @@ -483,7 +483,7 @@ RGBColor::RGBColor(const RGBColor &other) m_color = other.m_color; } -RGBColor::RGBColor(QRgb color) +RGBColor::RGBColor(TQRgb color) { m_color = color; } diff --git a/tdehtml/dom/css_value.h b/tdehtml/dom/css_value.h index e2028feac..6e3d89717 100644 --- a/tdehtml/dom/css_value.h +++ b/tdehtml/dom/css_value.h @@ -596,7 +596,7 @@ public: * @deprecated */ RGBColor(const TQColor& c) { m_color = c.rgb(); } - RGBColor(QRgb color); + RGBColor(TQRgb color); RGBColor(const RGBColor &other); RGBColor & operator = (const RGBColor &other); @@ -624,9 +624,9 @@ public: /** * @internal */ - QRgb color() const { return m_color; } + TQRgb color() const { return m_color; } protected: - QRgb m_color; + TQRgb m_color; }; class RectImpl; diff --git a/tdehtml/dom/dom2_events.h b/tdehtml/dom/dom2_events.h index 3b68eafaa..79bd26385 100644 --- a/tdehtml/dom/dom2_events.h +++ b/tdehtml/dom/dom2_events.h @@ -624,7 +624,7 @@ public: * keys below represents the allowable modifier parameters for this * method (note: this was not documented properly in earlier versions): * - * Qt::ShiftButton, Qt::AltButton, Qt::ControlButton, Qt::MetaButton + * TQt::ShiftButton, TQt::AltButton, TQt::ControlButton, TQt::MetaButton * * Parameters: * @@ -709,7 +709,7 @@ public: * return false. The list of keys below represents the allowable * modifier parameters for this method (warning: this was not documented * properly in earlier versions): - * Qt::ShiftButton, Qt::AltButton, Qt::ControlButton, Qt::MetaButton + * TQt::ShiftButton, TQt::AltButton, TQt::ControlButton, TQt::MetaButton * * Parameters: * diff --git a/tdehtml/domtreeview.cpp b/tdehtml/domtreeview.cpp index c68eb2007..88477fe03 100644 --- a/tdehtml/domtreeview.cpp +++ b/tdehtml/domtreeview.cpp @@ -28,8 +28,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char addColumn("Renderer"); setSorting(-1); part = currentpart; - connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, TQT_SLOT(showTree(const DOM::Node &))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, TQ_SLOT(showTree(const DOM::Node &))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotItemClicked(TQListViewItem *))); m_nodedict.setAutoDelete(true); } diff --git a/tdehtml/domtreeview.h b/tdehtml/domtreeview.h index 4156f083a..b79938b1a 100644 --- a/tdehtml/domtreeview.h +++ b/tdehtml/domtreeview.h @@ -26,7 +26,7 @@ class DOMTreeView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: DOMTreeView(TQWidget *parent, TDEHTMLPart *part, const char * name = 0); ~DOMTreeView(); diff --git a/tdehtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp index 82c11d308..0a0a2da47 100644 --- a/tdehtml/ecma/kjs_binding.cpp +++ b/tdehtml/ecma/kjs_binding.cpp @@ -50,7 +50,7 @@ Value DOMObject::get(ExecState *exec, const Identifier &p) const } catch (DOM::DOMException e) { // ### translate code into readable string ? - // ### oh, and s/QString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?) + // ### oh, and s/TQString/i18n or I18N_NOOP (the code in kjs uses I18N_NOOP... but where is it translated ?) // and where does it appear to the user ? Object err = Error::create(exec, GeneralError, TQString(TQString("DOM exception %1").arg(e.code)).local8Bit()); exec->setException( err ); diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp index 2e08f5ea8..27fb181bb 100644 --- a/tdehtml/ecma/kjs_debugwin.cpp +++ b/tdehtml/ecma/kjs_debugwin.cpp @@ -210,7 +210,7 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, p->fillRect(0,height*lineno,linenoWidth,height,palette().active().mid()); p->setPen(palette().active().text()); - p->drawText(0,height*lineno,linenoWidth,height,Qt::AlignRight,linenoStr); + p->drawText(0,height*lineno,linenoWidth,height,TQt::AlignRight,linenoStr); TQColor bgColor; TQColor textColor; @@ -232,7 +232,7 @@ void SourceDisplay::drawContents(TQPainter *p, int clipx, int clipy, int clipw, p->fillRect(linenoWidth,height*lineno,right-linenoWidth,height,bgColor); p->setPen(textColor); p->drawText(linenoWidth+4,height*lineno,contentsWidth()-linenoWidth-4,height, - Qt::AlignLeft,m_lines[lineno]); + TQt::AlignLeft,m_lines[lineno]); } int remainingTop = height*(lastLine+1); @@ -249,7 +249,7 @@ KJSDebugWin * KJSDebugWin::kjs_html_debugger = 0; TQString SourceFile::getCode() { if (interpreter) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart*>(static_cast<ScriptInterpreter*>(interpreter)->part()); if (part && url == part->url().url() && TDEHTMLPageCache::self()->isValid(part->cacheId())) { Decoder *decoder = part->createDecoder(); TQByteArray data; @@ -333,7 +333,7 @@ EvalMultiLineEdit::EvalMultiLineEdit(TQWidget *parent) void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e) { - if (e->key() == Qt::Key_Return) { + if (e->key() == TQt::Key_Return) { if (hasSelectedText()) { m_code = selectedText(); } else { @@ -374,7 +374,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) TQVBoxLayout *vl = new TQVBoxLayout(mainWidget,5); // frame list & code - TQSplitter *hsplitter = new TQSplitter(Qt::Vertical,mainWidget); + TQSplitter *hsplitter = new TQSplitter(TQt::Vertical,mainWidget); TQSplitter *vsplitter = new TQSplitter(hsplitter); TQFont font(TDEGlobalSettings::fixedFont()); @@ -384,7 +384,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) TQWidget *contextListContainer = new TQWidget(contextContainer); m_contextList = new TQListBox(contextListContainer); m_contextList->setMinimumSize(100,200); - connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int))); + connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int))); TQHBoxLayout *clistLayout = new TQHBoxLayout(contextListContainer); clistLayout->addWidget(m_contextList); @@ -400,11 +400,11 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) TQVBoxLayout *ssdvl = new TQVBoxLayout(sourceSelDisplay); m_sourceSel = new TQComboBox(toolBar()); - connect(m_sourceSel,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSourceSelected(int))); + connect(m_sourceSel,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSourceSelected(int))); m_sourceDisplay = new SourceDisplay(this,sourceSelDisplay); ssdvl->addWidget(m_sourceDisplay); - connect(m_sourceDisplay,TQT_SIGNAL(lineDoubleClicked(int)),TQT_SLOT(slotToggleBreakpoint(int))); + connect(m_sourceDisplay,TQ_SIGNAL(lineDoubleClicked(int)),TQ_SLOT(slotToggleBreakpoint(int))); TQValueList<int> vsplitSizes; vsplitSizes.insert(vsplitSizes.end(),120); @@ -419,7 +419,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) m_evalEdit = new EvalMultiLineEdit(evalContainer); m_evalEdit->setWordWrap(TQMultiLineEdit::NoWrap); m_evalEdit->setFont(font); - connect(m_evalEdit,TQT_SIGNAL(returnPressed()),TQT_SLOT(slotEval())); + connect(m_evalEdit,TQ_SIGNAL(returnPressed()),TQ_SLOT(slotEval())); m_evalDepth = 0; TQVBoxLayout *evalLayout = new TQVBoxLayout(evalContainer); @@ -443,20 +443,20 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) m_actionCollection->setInstance(this); // Venkman use F12, KDevelop F10 - TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(Qt::Key_F12))); - scNext.append(KKeySequence(KKey(Qt::Key_F10))); - m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()), + TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(TQt::Key_F12))); + scNext.append(KKeySequence(KKey(TQt::Key_F10))); + m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQ_SLOT(slotNext()), m_actionCollection,"next"); - m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()), + m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQ_SLOT(slotStep()), m_actionCollection,"step"); // Venkman use F5, Kdevelop F9 - TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(Qt::Key_F5))); - scCont.append(KKeySequence(KKey(Qt::Key_F9))); - m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()), + TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5))); + scCont.append(KKeySequence(KKey(TQt::Key_F9))); + m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQ_SLOT(slotContinue()), m_actionCollection,"cont"); - m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()), + m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQ_SLOT(slotStop()), m_actionCollection,"stop"); - m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()), + m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQ_SLOT(slotBreakNext()), m_actionCollection,"breaknext"); @@ -677,8 +677,8 @@ bool KJSDebugWin::eventFilter(TQObject *o, TQEvent *e) case TQEvent::Close: case TQEvent::Quit: while (o->parent()) - o = TQT_TQOBJECT(o->parent()); - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) + o = o->parent(); + if (o == this) return TQWidget::eventFilter(o,e); else return true; @@ -805,7 +805,7 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch return true; KParts::ReadOnlyPart *part = static_cast<ScriptInterpreter*>(exec->interpreter())->part(); - TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart*>(part); + TDEHTMLPart *tdehtmlpart = ::tqt_cast<TDEHTMLPart*>(part); if (tdehtmlpart && !tdehtmlpart->settings()->isJavaScriptErrorReportingEnabled()) return true; @@ -1048,7 +1048,7 @@ void KJSDebugWin::leaveSession() void KJSDebugWin::updateContextList() { - disconnect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int))); + disconnect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int))); m_contextList->clear(); for (int i = 0; i < m_execsCount; i++) @@ -1060,7 +1060,7 @@ void KJSDebugWin::updateContextList() setSourceLine(ctx.sourceId(),ctx.curStmtFirstLine()); } - connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int))); + connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int))); } TQString KJSDebugWin::contextStr(const Context &ctx) diff --git a/tdehtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h index be6b31dda..a40b20c2f 100644 --- a/tdehtml/ecma/kjs_debugwin.h +++ b/tdehtml/ecma/kjs_debugwin.h @@ -94,7 +94,7 @@ namespace KJS { }; class KJSErrorDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: KJSErrorDialog(TQWidget *parent, const TQString& errorMessage, bool showDebug); virtual ~KJSErrorDialog(); @@ -111,7 +111,7 @@ namespace KJS { }; class EvalMultiLineEdit : public TQMultiLineEdit { - Q_OBJECT + TQ_OBJECT public: EvalMultiLineEdit(TQWidget *parent); const TQString & code() const { return m_code; } @@ -122,7 +122,7 @@ namespace KJS { }; class SourceDisplay : public TQScrollView { - Q_OBJECT + TQ_OBJECT public: SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char *name = 0); ~SourceDisplay(); @@ -159,7 +159,7 @@ namespace KJS { */ class KJSDebugWin : public TDEMainWindow, public Debugger, public TDEInstance { - Q_OBJECT + TQ_OBJECT friend class SourceDisplay; public: KJSDebugWin(TQWidget *parent=0, const char *name=0); diff --git a/tdehtml/ecma/kjs_dom.cpp b/tdehtml/ecma/kjs_dom.cpp index 1834c5931..1f73dd9fe 100644 --- a/tdehtml/ecma/kjs_dom.cpp +++ b/tdehtml/ecma/kjs_dom.cpp @@ -1093,7 +1093,7 @@ Value DOMDocumentProtoFunc::tryCall(ExecState *exec, Object &thisObj, const List Window* active = Window::retrieveActive(exec); // Complete the URL using the "active part" (running interpreter). We do this for the security // check and to make sure we load exactly the same url as we have verified to be safe - TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart *>(active->part()); + TDEHTMLPart *tdehtmlpart = ::tqt_cast<TDEHTMLPart *>(active->part()); if (tdehtmlpart) { // Security: only allow documents to be loaded from the same host TQString dstUrl = tdehtmlpart->htmlDocument().completeURL(s).string(); @@ -1279,7 +1279,7 @@ Value DOMDOMImplementationProtoFunc::tryCall(ExecState *exec, Object &thisObj, c case DOMDOMImplementation::CreateDocument: { // DOM2 // Initially set the URL to document of the creator... this is so that it resides in the same // host/domain for security checks. The URL will be updated if Document.load() is called. - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart*>(static_cast<KJS::ScriptInterpreter*>(exec->interpreter())->part()); if (part) { Document doc = implementation.createDocument(args[0].toString(exec).string(),args[1].toString(exec).string(),toNode(args[2])); KURL url = static_cast<DocumentImpl*>(part->document().handle())->URL(); diff --git a/tdehtml/ecma/kjs_events.cpp b/tdehtml/ecma/kjs_events.cpp index 35016910f..825cd4107 100644 --- a/tdehtml/ecma/kjs_events.cpp +++ b/tdehtml/ecma/kjs_events.cpp @@ -62,7 +62,7 @@ void JSEventListener::handleEvent(DOM::Event &evt) if (KJSDebugWin::debugWindow() && KJSDebugWin::debugWindow()->inSession()) return; #endif - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); @@ -162,7 +162,7 @@ Object JSLazyEventListener::listenerObj() const void JSLazyEventListener::parseCode() const { if (!parsed) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(static_cast<Window*>(win.imp())->part()); KJSProxy *proxy = 0L; if (part) proxy = part->jScript(); diff --git a/tdehtml/ecma/kjs_proxy.cpp b/tdehtml/ecma/kjs_proxy.cpp index 92185d7f4..204fb46e2 100644 --- a/tdehtml/ecma/kjs_proxy.cpp +++ b/tdehtml/ecma/kjs_proxy.cpp @@ -387,8 +387,8 @@ void KJSCPUGuard::start(unsigned int ms, unsigned int i_ms) oldAlarmHandler = signal(SIGVTALRM, alarmHandler); itimerval tv = { - { i_ms / 1000, (i_ms % 1000) * 1000 }, - { ms / 1000, (ms % 1000) * 1000 } + { static_cast<time_t>( i_ms / 1000 ), static_cast<suseconds_t>( (i_ms % 1000) * 1000 ) }, + { static_cast<time_t>( ms / 1000 ), static_cast<suseconds_t>( (ms % 1000) * 1000 ) } }; setitimer(ITIMER_VIRTUAL, &tv, &oldtv); } diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp index b06cb970c..96d703833 100644 --- a/tdehtml/ecma/kjs_window.cpp +++ b/tdehtml/ecma/kjs_window.cpp @@ -42,7 +42,7 @@ #include <tdeparts/browserinterface.h> #include <twin.h> -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY #include <twinmodule.h> // schroder #endif @@ -111,7 +111,7 @@ namespace KJS { TQGuardedPtr<TDEHTMLPart> part; }; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS class KonquerorFunc : public DOMFunction { public: KonquerorFunc(ExecState *exec, const Konqueror* k, const char* name) @@ -160,7 +160,7 @@ Value Screen::get(ExecState *exec, const Identifier &p) const Value Screen::getValueProperty(ExecState *exec, int token) const { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY KWinModule info(0, KWinModule::INFO_DESKTOP); #endif TQWidget *thisWidget = Window::retrieveActive(exec)->part()->widget(); @@ -177,7 +177,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const return Number(m.depth()); } case AvailLeft: { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY TQRect clipped = info.workArea().intersect(sg); return Number(clipped.x()-sg.x()); #else @@ -185,7 +185,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const #endif } case AvailTop: { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY TQRect clipped = info.workArea().intersect(sg); return Number(clipped.y()-sg.y()); #else @@ -193,7 +193,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const #endif } case AvailHeight: { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY TQRect clipped = info.workArea().intersect(sg); return Number(clipped.height()); #else @@ -201,7 +201,7 @@ Value Screen::getValueProperty(ExecState *exec, int token) const #endif } case AvailWidth: { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY TQRect clipped = info.workArea().intersect(sg); return Number(clipped.width()); #else @@ -420,7 +420,7 @@ Window *Window::retrieveWindow(KParts::ReadOnlyPart *p) Object obj = Object::dynamicCast( retrieve( p ) ); #ifndef NDEBUG // obj should never be null, except when javascript has been disabled in that part. - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(p); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(p); if ( part && part->jScriptEnabled() ) { assert( obj.isValid() ); @@ -447,10 +447,10 @@ Window *Window::retrieveActive(ExecState *exec) Value Window::retrieve(KParts::ReadOnlyPart *p) { assert(p); - TDEHTMLPart * part = ::tqqt_cast<TDEHTMLPart *>(p); + TDEHTMLPart * part = ::tqt_cast<TDEHTMLPart *>(p); KJSProxy *proxy = 0L; if (!part) { - part = ::tqqt_cast<TDEHTMLPart *>(p->parent()); + part = ::tqt_cast<TDEHTMLPart *>(p->parent()); if (part) proxy = part->framejScript(p); } else @@ -477,7 +477,7 @@ Location *Window::location() const ObjectImp* Window::frames( ExecState* exec ) const { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (part) return m_frames ? m_frames : (const_cast<Window*>(this)->m_frames = new FrameArray(exec, part)); @@ -515,7 +515,7 @@ bool Window::hasProperty(ExecState *exec, const Identifier &p) const if (Lookup::findEntry(&WindowTable, p)) return true; - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) return false; @@ -584,7 +584,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const } const HashEntry* entry = Lookup::findEntry(&WindowTable, p); - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); // properties that work on all windows if (entry) { @@ -848,7 +848,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const const_cast<Window *>(this)->put(exec, "clientInformation", nav, DontDelete|ReadOnly|Internal); return nav; } -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS case _Konqueror: { Value k( new Konqueror(part) ); const_cast<Window *>(this)->put(exec, "konqueror", k, DontDelete|ReadOnly|Internal); @@ -860,7 +860,7 @@ Value Window::get(ExecState *exec, const Identifier &p) const case OuterHeight: case OuterWidth: { -#if defined Q_WS_X11 && ! defined K_WS_QTONLY +#if defined TQ_WS_X11 && ! defined K_WS_QTONLY if (!part->widget()) return Number(0); KWin::WindowInfo inf = KWin::windowInfo(part->widget()->topLevelWidget()->winId()); @@ -1084,7 +1084,7 @@ void Window::put(ExecState* exec, const Identifier &propertyName, const Value &v default: break; } - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (part) { switch( entry->value ) { case Status: { @@ -1221,7 +1221,7 @@ bool Window::toBoolean(ExecState *) const DOM::AbstractView Window::toAbstractView() const { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) return DOM::AbstractView(); return part->document().defaultView(); @@ -1231,7 +1231,7 @@ void Window::scheduleClose() { kdDebug(6070) << "Window::scheduleClose window.close() " << m_frame << endl; Q_ASSERT(winq); - TQTimer::singleShot( 0, winq, TQT_SLOT( timeoutClose() ) ); + TQTimer::singleShot( 0, winq, TQ_SLOT( timeoutClose() ) ); } void Window::closeNow() @@ -1239,7 +1239,7 @@ void Window::closeNow() if (m_frame.isNull() || m_frame->m_part.isNull()) { kdDebug(6070) << k_funcinfo << "part is deleted already" << endl; } else { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) { kdDebug(6070) << "closeNow on non TDEHTML part" << endl; } else { @@ -1287,7 +1287,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const if ( activePart == m_frame->m_part ) // Not calling from another frame, no problem. return true; - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) return true; // not a TDEHTMLPart @@ -1300,7 +1300,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const return false; } - TDEHTMLPart *activeTDEHTMLPart = ::tqqt_cast<TDEHTMLPart *>(activePart); + TDEHTMLPart *activeTDEHTMLPart = ::tqt_cast<TDEHTMLPart *>(activePart); if (!activeTDEHTMLPart) return true; // not a TDEHTMLPart @@ -1326,7 +1326,7 @@ bool Window::checkIsSafeScript(KParts::ReadOnlyPart *activePart) const void Window::setListener(ExecState *exec, int eventId, Value func) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part || !isSafeScript(exec)) return; DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle()); @@ -1338,7 +1338,7 @@ void Window::setListener(ExecState *exec, int eventId, Value func) Value Window::getListener(ExecState *exec, int eventId) const { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part || !isSafeScript(exec)) return Undefined(); DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl*>(part->htmlDocument().handle()); @@ -1356,7 +1356,7 @@ Value Window::getListener(ExecState *exec, int eventId) const JSEventListener *Window::getJSEventListener(const Value& val, bool html) { // This function is so hot that it's worth coding it directly with imps. - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part || val.type() != ObjectType) return 0; @@ -1432,8 +1432,8 @@ void Window::setCurrentEvent( DOM::Event *evt ) void Window::goURL(ExecState* exec, const TQString& url, bool lockHistory) { Window* active = Window::retrieveActive(exec); - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); - TDEHTMLPart *active_part = ::tqqt_cast<TDEHTMLPart *>(active->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *active_part = ::tqt_cast<TDEHTMLPart *>(active->part()); // Complete the URL using the "active part" (running interpreter) if (active_part && part) { if (url[0] == TQChar('#')) { @@ -1469,7 +1469,7 @@ void Window::delayedGoHistory( int steps ) void Window::goHistory( int steps ) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if(!part) // TODO history readonlypart return; @@ -1487,7 +1487,7 @@ void Window::goHistory( int steps ) void KJS::Window::resizeTo(TQWidget* tl, int width, int height) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if(!part) // TODO resizeTo readonlypart return; @@ -1530,7 +1530,7 @@ void KJS::Window::resizeTo(TQWidget* tl, int width, int height) Value Window::openWindow(ExecState *exec, const List& args) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); if (!part) return Undefined(); TDEHTMLView *widget = part->view(); @@ -1543,7 +1543,7 @@ Value Window::openWindow(ExecState *exec, const List& args) KURL url; if (!str.isEmpty()) { - TDEHTMLPart* p = ::tqqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part); + TDEHTMLPart* p = ::tqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->m_frame->m_part); if ( p ) url = p->htmlDocument().completeURL(str).string(); if ( !p || @@ -1601,7 +1601,7 @@ Value Window::openWindow(ExecState *exec, const List& args) Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString& frameName, const TQString& features) { - TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(m_frame->m_part); + TDEHTMLPart *p = ::tqt_cast<TDEHTMLPart *>(m_frame->m_part); TDEHTMLView *widget = p->view(); KParts::WindowArgs winargs; @@ -1702,7 +1702,7 @@ Value Window::executeOpenWindow(ExecState *exec, const KURL& url, const TQString // request window (new or existing if framename is set) KParts::ReadOnlyPart *newPart = 0L; emit p->browserExtension()->createNewWindow(KURL(), uargs,winargs,newPart); - if (newPart && ::tqqt_cast<TDEHTMLPart*>(newPart)) { + if (newPart && ::tqt_cast<TDEHTMLPart*>(newPart)) { TDEHTMLPart *tdehtmlpart = static_cast<TDEHTMLPart*>(newPart); //tqDebug("opener set to %p (this Window's part) in new Window %p (this Window=%p)",part,win,window); tdehtmlpart->setOpener(p); @@ -1734,7 +1734,7 @@ void Window::forgetSuppressedWindows() void Window::showSuppressedWindows() { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>( m_frame->m_part ); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>( m_frame->m_part ); KJS::Interpreter *interpreter = part->jScript()->interpreter(); ExecState *exec = interpreter->globalExec(); @@ -1759,7 +1759,7 @@ Value WindowFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) Window *window = static_cast<Window *>(thisObj.imp()); TQString str, str2; - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(window->m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(window->m_frame->m_part); if (!part) return Undefined(); @@ -2113,7 +2113,7 @@ ScheduledAction::ScheduledAction(TQString _code, DateTimeMS _nextTime, int _inte bool ScheduledAction::execute(Window *window) { - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(window->m_frame->m_part); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(window->m_frame->m_part); if (!part || !part->jScriptEnabled()) return false; ScriptInterpreter *interpreter = static_cast<ScriptInterpreter *>(part->jScript()->interpreter()); @@ -2169,8 +2169,8 @@ WindowQObject::WindowQObject(Window *w) if ( !parent->m_frame ) kdDebug(6070) << "WARNING: null part in " << k_funcinfo << endl; else - connect( parent->m_frame, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( parentDestroyed() ) ); + connect( parent->m_frame, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( parentDestroyed() ) ); pausedTime = 0; lastTimerId = 0; currentlyDispatching = false; @@ -2304,16 +2304,16 @@ void WindowQObject::timerEvent(TQTimerEvent *) DateTimeMS DateTimeMS::addMSecs(int s) const { DateTimeMS c = *this; - c.mTime = TQT_TQTIME_OBJECT(mTime.addMSecs(s)); + c.mTime = mTime.addMSecs(s); if (s > 0) { if (c.mTime < mTime) - c.mDate = TQT_TQDATE_OBJECT(mDate.addDays(1)); + c.mDate = mDate.addDays(1); } else { if (c.mTime > mTime) - c.mDate = TQT_TQDATE_OBJECT(mDate.addDays(-1)); + c.mDate = mDate.addDays(-1); } return c; } @@ -2589,7 +2589,7 @@ void Location::put(ExecState *exec, const Identifier &p, const Value &v, int att TQString str = v.toString(exec).qstring(); switch (entry->value) { case Href: { - TDEHTMLPart* p =::tqqt_cast<TDEHTMLPart*>(Window::retrieveActive(exec)->part()); + TDEHTMLPart* p =::tqt_cast<TDEHTMLPart*>(Window::retrieveActive(exec)->part()); if ( p ) url = p->htmlDocument().completeURL( str ).string(); else @@ -2680,7 +2680,7 @@ Value LocationFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) id == Location::Replace); break; case Location::Reload: { - TDEHTMLPart *tdehtmlpart = ::tqqt_cast<TDEHTMLPart *>(part); + TDEHTMLPart *tdehtmlpart = ::tqt_cast<TDEHTMLPart *>(part); if (tdehtmlpart) tdehtmlpart->scheduleRedirection(-1, part->url().url(), true/*lock history*/); else @@ -2865,7 +2865,7 @@ Value HistoryFunc::tryCall(ExecState *exec, Object &thisObj, const List &args) ///////////////////////////////////////////////////////////////////////////// -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS const ClassInfo Konqueror::info = { "Konqueror", 0, 0, 0 }; diff --git a/tdehtml/ecma/kjs_window.h b/tdehtml/ecma/kjs_window.h index 3af34d87b..539131fd5 100644 --- a/tdehtml/ecma/kjs_window.h +++ b/tdehtml/ecma/kjs_window.h @@ -246,7 +246,7 @@ namespace KJS { }; class KDE_EXPORT WindowQObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: WindowQObject(Window *w); ~WindowQObject(); @@ -288,7 +288,7 @@ namespace KJS { TQGuardedPtr<tdehtml::ChildFrame> m_frame; }; -#ifdef Q_WS_QWS +#ifdef TQ_WS_QWS class Konqueror : public ObjectImp { friend class KonquerorFunc; public: diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp index 410fd1992..d5937e9a0 100644 --- a/tdehtml/ecma/xmlhttprequest.cpp +++ b/tdehtml/ecma/xmlhttprequest.cpp @@ -420,17 +420,17 @@ void XMLHttpRequest::send(const TQString& _body) return; } - qObject->connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + qObject->connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); #ifdef APPLE_CHANGES - qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const char*, int ) ), - TQT_SLOT( slotData( TDEIO::Job*, const char*, int ) ) ); + qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const char*, int ) ), + TQ_SLOT( slotData( TDEIO::Job*, const char*, int ) ) ); #else - qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); #endif - qObject->connect( job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); + qObject->connect( job, TQ_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); #ifdef APPLE_CHANGES KWQServeRequest(tdehtml::Cache::loader(), doc->docLoader(), job); @@ -724,7 +724,7 @@ Value XMLHttpRequestProtoFunc::tryCall(ExecState *exec, Object &thisObj, const L } TQString method = args[0].toString(exec).qstring(); - TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->part()); + TDEHTMLPart *part = ::tqt_cast<TDEHTMLPart *>(Window::retrieveActive(exec)->part()); if (!part) return Undefined(); KURL url = KURL(part->document().completeURL(args[1].toString(exec).qstring()).string()); diff --git a/tdehtml/ecma/xmlhttprequest.h b/tdehtml/ecma/xmlhttprequest.h index d1b304f30..7d3934152 100644 --- a/tdehtml/ecma/xmlhttprequest.h +++ b/tdehtml/ecma/xmlhttprequest.h @@ -122,7 +122,7 @@ namespace KJS { class XMLHttpRequestQObject : public TQObject { - Q_OBJECT + TQ_OBJECT public: XMLHttpRequestQObject(XMLHttpRequest *_jsObject); diff --git a/tdehtml/html/Platform.h b/tdehtml/html/Platform.h index f47d28bb2..c587e0302 100644 --- a/tdehtml/html/Platform.h +++ b/tdehtml/html/Platform.h @@ -193,9 +193,7 @@ /* for Unicode, KDE uses Qt, everything else uses ICU */ #if PLATFORM(KDE) || PLATFORM(QT) -#define WTF_USE_QT4_UNICODE 1 -#elif PLATFORM(SYMBIAN) -#define WTF_USE_SYMBIAN_UNICODE 1 +#define WTF_USE_QT3_UNICODE 1 #else #define WTF_USE_ICU_UNICODE 1 #endif diff --git a/tdehtml/html/html_baseimpl.cpp b/tdehtml/html/html_baseimpl.cpp index 16ca7a23b..e8150a387 100644 --- a/tdehtml/html/html_baseimpl.cpp +++ b/tdehtml/html/html_baseimpl.cpp @@ -414,7 +414,7 @@ DocumentImpl* HTMLFrameElementImpl::contentDocument() const RenderPart* render = static_cast<RenderPart*>( m_render ); - if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) ) + if(render->widget() && ::tqt_cast<TDEHTMLView*>( render->widget()) ) return static_cast<TDEHTMLView*>( render->widget() )->part()->xmlDocImpl(); return 0; @@ -426,7 +426,7 @@ TDEHTMLPart* HTMLFrameElementImpl::contentPart() const RenderPart* render = static_cast<RenderPart*>( m_render ); - if(render->widget() && ::tqqt_cast<TDEHTMLView*>( render->widget()) ) + if(render->widget() && ::tqt_cast<TDEHTMLView*>( render->widget()) ) return static_cast<TDEHTMLView*>( render->widget() )->part(); return 0; diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp index 52ada7a7b..c27573844 100644 --- a/tdehtml/html/html_documentimpl.cpp +++ b/tdehtml/html/html_documentimpl.cpp @@ -78,13 +78,13 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHT m_doAutoFill = false; /* dynamic history stuff to be fixed later (pfeiffer) - connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )), - TQT_SLOT( slotHistoryChanged() )); + connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( removed( const TQString& )), + TQ_SLOT( slotHistoryChanged() )); */ - connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ), - TQT_SLOT( slotHistoryChanged() )); - connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( cleared()), - TQT_SLOT( slotHistoryChanged() )); + connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( inserted( const TQString& ) ), + TQ_SLOT( slotHistoryChanged() )); + connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( cleared()), + TQ_SLOT( slotHistoryChanged() )); } HTMLDocumentImpl::~HTMLDocumentImpl() diff --git a/tdehtml/html/html_documentimpl.h b/tdehtml/html/html_documentimpl.h index 92f163076..f7191f31a 100644 --- a/tdehtml/html/html_documentimpl.h +++ b/tdehtml/html/html_documentimpl.h @@ -43,7 +43,7 @@ namespace DOM { class HTMLDocumentImpl : public DOM::DocumentImpl { - Q_OBJECT + TQ_OBJECT public: HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v = 0); ~HTMLDocumentImpl(); diff --git a/tdehtml/html/html_formimpl.cpp b/tdehtml/html/html_formimpl.cpp index 5dc44ad04..f87260ffe 100644 --- a/tdehtml/html/html_formimpl.cpp +++ b/tdehtml/html/html_formimpl.cpp @@ -957,14 +957,14 @@ bool HTMLGenericFormElementImpl::isFocusable() const return false; TQWidget* widget = static_cast<RenderWidget*>(m_render)->widget(); - return widget && widget->focusPolicy() >= TQ_TabFocus; + return widget && widget->focusPolicy() >= TQWidget::TabFocus; } class FocusHandleWidget : public TQWidget { public: void focusNextPrev(bool n) { - if (!focusNextPrevChild(n) && inherits(TQTEXTEDIT_OBJECT_NAME_STRING)) + if (!focusNextPrevChild(n) && inherits("TQTextEdit")) TQWidget::focusNextPrevChild(n); } }; @@ -1018,19 +1018,13 @@ void HTMLGenericFormElementImpl::defaultEventHandler(EventImpl *evt) // handle tabbing out, either from a single or repeated key event. if ( evt->id() == EventImpl::KEYPRESS_EVENT && evt->isKeyRelatedEvent() ) { TQKeyEvent* const k = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); - if ( k && (k->key() == Qt::Key_Tab || k->key() == TQt::Key_BackTab) ) { + if ( k && (k->key() == TQt::Key_Tab || k->key() == TQt::Key_BackTab) ) { TQWidget* const widget = static_cast<RenderWidget*>(m_render)->widget(); -#ifdef USE_QT4 + TQFocusEvent::setReason( k->key() == TQt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab ); if (widget) static_cast<FocusHandleWidget *>(widget) - ->focusNextPrev(k->key() == Qt::Key_Tab); -#else // USE_QT4 - TQFocusEvent::setReason( k->key() == Qt::Key_Tab ? TQFocusEvent::Tab : TQFocusEvent::Backtab ); - if (widget) - static_cast<FocusHandleWidget *>(widget) - ->focusNextPrev(k->key() == Qt::Key_Tab); + ->focusNextPrev(k->key() == TQt::Key_Tab); TQFocusEvent::resetReason(); -#endif // USE_QT4 evt->setDefaultHandled(); } } @@ -1125,7 +1119,7 @@ void HTMLButtonElementImpl::defaultEventHandler(EventImpl *evt) bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT); if (!act && evt->id()==EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) { TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); - if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space)) + if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space)) act = true; } if (act) @@ -1149,7 +1143,7 @@ void HTMLButtonElementImpl::activate() void HTMLButtonElementImpl::click() { - TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0); + TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0); dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1); } @@ -1365,7 +1359,7 @@ void HTMLInputElementImpl::select( ) void HTMLInputElementImpl::click() { - TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0); + TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0); dispatchMouseEvent(&me,0, 1); dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1); } @@ -1807,7 +1801,7 @@ void HTMLInputElementImpl::defaultEventHandler(EventImpl *evt) bool act = (evt->id() == EventImpl::DOMACTIVATE_EVENT); if (!act && evt->id() == EventImpl::KEYUP_EVENT && evt->isKeyRelatedEvent()) { TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); - if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space)) + if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space)) act = true; } if (act) @@ -1923,7 +1917,7 @@ void HTMLLabelElementImpl::defaultEventHandler(EventImpl *evt) else if ( evt->isKeyRelatedEvent() && ( evt->id() == EventImpl::KEYUP_EVENT || evt->id() == EventImpl::KEYPRESS_EVENT ) ) { TQKeyEvent* const ke = static_cast<KeyEventBaseImpl *>(evt)->qKeyEvent(); - if (ke && active() && (ke->key() == Qt::Key_Return || ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Space)) + if (ke && active() && (ke->key() == TQt::Key_Return || ke->key() == TQt::Key_Enter || ke->key() == TQt::Key_Space)) act = true; } diff --git a/tdehtml/html/html_inlineimpl.cpp b/tdehtml/html/html_inlineimpl.cpp index f403a2385..1416ca3f4 100644 --- a/tdehtml/html/html_inlineimpl.cpp +++ b/tdehtml/html/html_inlineimpl.cpp @@ -132,11 +132,11 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt) state |= TQt::MetaButton; if ( e->button() == 0 ) - button = Qt::LeftButton; + button = TQt::LeftButton; else if ( e->button() == 1 ) - button = Qt::MidButton; + button = TQt::MidButton; else if ( e->button() == 2 ) - button = Qt::RightButton; + button = TQt::RightButton; } else if ( k ) { @@ -166,7 +166,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt) void HTMLAnchorElementImpl::click() { - TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),Qt::LeftButton, 0); + TQMouseEvent me(TQEvent::MouseButtonRelease, TQPoint(0,0),TQt::LeftButton, 0); dispatchMouseEvent(&me,EventImpl::CLICK_EVENT, 1); } diff --git a/tdehtml/html/html_miscimpl.cpp b/tdehtml/html/html_miscimpl.cpp index 58804bff5..5b8d4ef4b 100644 --- a/tdehtml/html/html_miscimpl.cpp +++ b/tdehtml/html/html_miscimpl.cpp @@ -64,7 +64,6 @@ struct CollectionCache: public NodeListImpl::Cache virtual void clear(DocumentImpl* doc) { Cache::clear(doc); - //qDeletaAll here in Qt4 nameCache.clear(); } }; diff --git a/tdehtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp index f2cf8c1db..8c530af61 100644 --- a/tdehtml/html/html_objectimpl.cpp +++ b/tdehtml/html/html_objectimpl.cpp @@ -136,7 +136,7 @@ void HTMLObjectBaseElementImpl::recalcStyle( StyleChange ch ) void HTMLObjectBaseElementImpl::renderAlternative() { if ( m_renderAlternative ) return; - TQTimer::singleShot( 0, this, TQT_SLOT( slotRenderAlternative() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRenderAlternative() ) ); } void HTMLObjectBaseElementImpl::slotRenderAlternative() @@ -267,7 +267,7 @@ void HTMLAppletElementImpl::attach() { TDEHTMLView* w = getDocument()->view(); -#ifndef Q_WS_QWS // FIXME? +#ifndef TQ_WS_QWS // FIXME? DOMString codeBase = getAttribute( ATTR_CODEBASE ); DOMString code = getAttribute( ATTR_CODE ); if ( !codeBase.isEmpty() ) @@ -422,7 +422,7 @@ DocumentImpl* HTMLObjectElementImpl::contentDocument() const if ( !m_render ) return 0; if ( !m_render->isWidget() ) return 0; TQWidget* widget = static_cast<RenderWidget*>( m_render )->widget(); - if( widget && ::tqqt_cast<TDEHTMLView*>( widget ) ) + if( widget && ::tqt_cast<TDEHTMLView*>( widget ) ) return static_cast<TDEHTMLView*>( widget )->part()->xmlDocImpl(); return 0; } diff --git a/tdehtml/html/html_objectimpl.h b/tdehtml/html/html_objectimpl.h index d10e66356..2818330e0 100644 --- a/tdehtml/html/html_objectimpl.h +++ b/tdehtml/html/html_objectimpl.h @@ -38,7 +38,7 @@ class DOMStringImpl; class HTMLObjectBaseElementImpl : public TQObject, public HTMLElementImpl { - Q_OBJECT + TQ_OBJECT public: HTMLObjectBaseElementImpl(DocumentImpl *doc); diff --git a/tdehtml/java/kjavaapplet.h b/tdehtml/java/kjavaapplet.h index bb4b20890..dd13100f7 100644 --- a/tdehtml/java/kjavaapplet.h +++ b/tdehtml/java/kjavaapplet.h @@ -48,7 +48,7 @@ class KJavaAppletPrivate; class KJavaApplet : public TQObject { -Q_OBJECT +TQ_OBJECT public: // states describing the life cycle of an applet. diff --git a/tdehtml/java/kjavaappletcontext.cpp b/tdehtml/java/kjavaappletcontext.cpp index b644b67ca..6d8af4667 100644 --- a/tdehtml/java/kjavaappletcontext.cpp +++ b/tdehtml/java/kjavaappletcontext.cpp @@ -54,7 +54,7 @@ KJavaAppletContext::KJavaAppletContext() { d = new KJavaAppletContextPrivate; server = KJavaAppletServer::allocateJavaServer(); - connect(server->javaProcess(), TQT_SIGNAL(exited(int)), this, TQT_SLOT(javaProcessExited(int))); + connect(server->javaProcess(), TQ_SIGNAL(exited(int)), this, TQ_SLOT(javaProcessExited(int))); id = contextCount; server->createContext( id, this ); diff --git a/tdehtml/java/kjavaappletcontext.h b/tdehtml/java/kjavaappletcontext.h index 166c00f15..2ce7585ee 100644 --- a/tdehtml/java/kjavaappletcontext.h +++ b/tdehtml/java/kjavaappletcontext.h @@ -42,7 +42,7 @@ class KJavaAppletContextPrivate; class KJavaAppletContext : public TQObject { -Q_OBJECT +TQ_OBJECT public: KJavaAppletContext(); diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp index 23e805577..640473489 100644 --- a/tdehtml/java/kjavaappletserver.cpp +++ b/tdehtml/java/kjavaappletserver.cpp @@ -136,8 +136,8 @@ KJavaAppletServer::KJavaAppletServer() d = new KJavaAppletServerPrivate; process = new KJavaProcess(); - connect( process, TQT_SIGNAL(received(const TQByteArray&)), - this, TQT_SLOT(slotJavaRequest(const TQByteArray&)) ); + connect( process, TQ_SIGNAL(received(const TQByteArray&)), + this, TQ_SLOT(slotJavaRequest(const TQByteArray&)) ); setupJava( process ); @@ -198,7 +198,7 @@ void KJavaAppletServer::freeJavaServer() if( config.readBoolEntry( "ShutdownAppletServer", true ) ) { const int value = config.readNumEntry( "AppletServerTimeout", 60 ); - TQTimer::singleShot( value*1000, self, TQT_SLOT( checkShutdown() ) ); + TQTimer::singleShot( value*1000, self, TQ_SLOT( checkShutdown() ) ); } } } @@ -680,7 +680,7 @@ void KJavaAppletServer::slotJavaRequest( const TQByteArray& qb ) KSSLCertChain chain; chain.setChain( certs ); if ( chain.isValid() ) - answer = PermissionDialog( TQT_TQWIDGET(tqApp->activeWindow()) ).exec( text, args[0] ); + answer = PermissionDialog( tqApp->activeWindow() ).exec( text, args[0] ); } } sl.push_front( TQString(answer) ); @@ -777,7 +777,7 @@ PermissionDialog::PermissionDialog( TQWidget* parent ) {} TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) { - TQGuardedPtr<TQDialog> dialog = new TQDialog( TQT_TQWIDGET(parent()), "PermissionDialog"); + TQGuardedPtr<TQDialog> dialog = new TQDialog( static_cast<TQWidget*>(parent()), "PermissionDialog"); dialog->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, dialog->sizePolicy().hasHeightForWidth() ) ); dialog->setModal( true ); @@ -810,10 +810,10 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) dialog->resize( dialog->minimumSizeHint() ); //clearWState( WState_Polished ); - connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); - connect( reject, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); - connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); - connect( grant, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); + connect( no, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); + connect( reject, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); + connect( yes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); + connect( grant, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); dialog->exec(); delete dialog; @@ -826,7 +826,7 @@ PermissionDialog::~PermissionDialog() void PermissionDialog::clicked() { - m_button = TQT_TQOBJECT_CONST(sender())->name(); + m_button = sender()->name(); static_cast<const TQWidget*>(sender())->parentWidget()->close(); } diff --git a/tdehtml/java/kjavaappletserver.h b/tdehtml/java/kjavaappletserver.h index 5b82e01a1..ec8a7ed01 100644 --- a/tdehtml/java/kjavaappletserver.h +++ b/tdehtml/java/kjavaappletserver.h @@ -39,7 +39,7 @@ class JSStackFrame; class KJavaAppletServer : public TQObject { -Q_OBJECT +TQ_OBJECT public: /** @@ -161,7 +161,7 @@ private: class PermissionDialog : public TQObject { - Q_OBJECT + TQ_OBJECT public: PermissionDialog( TQWidget* ); ~PermissionDialog(); diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp index f80690aa9..5a00e14eb 100644 --- a/tdehtml/java/kjavaappletviewer.cpp +++ b/tdehtml/java/kjavaappletviewer.cpp @@ -79,7 +79,7 @@ public: void setServer (KJavaAppletServer * s); TQGuardedPtr <KJavaAppletServer> server; private: - typedef TQMap <QPair <TQObject*, TQString>, QPair <KJavaAppletContext*, int> > + typedef TQMap <TQPair <TQObject*, TQString>, TQPair <KJavaAppletContext*, int> > ContextMap; ContextMap m_contextmap; }; @@ -347,10 +347,10 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, setInstance (KJavaAppletViewerFactory::instance ()); KParts::Part::setWidget (m_view); - connect (applet->getContext(), TQT_SIGNAL(appletLoaded()), this, TQT_SLOT(appletLoaded())); - connect (applet->getContext(), TQT_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQT_SLOT(showDocument(const TQString&, const TQString&))); - connect (applet->getContext(), TQT_SIGNAL(showStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &))); - connect (applet, TQT_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQT_SLOT(jsEvent (const TQStringList &))); + connect (applet->getContext(), TQ_SIGNAL(appletLoaded()), this, TQ_SLOT(appletLoaded())); + connect (applet->getContext(), TQ_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQ_SLOT(showDocument(const TQString&, const TQString&))); + connect (applet->getContext(), TQ_SIGNAL(showStatus(const TQString &)), this, TQ_SLOT(infoMessage(const TQString &))); + connect (applet, TQ_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQ_SLOT(jsEvent (const TQStringList &))); } bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) { @@ -369,7 +369,7 @@ bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) { KJavaAppletViewer::~KJavaAppletViewer () { m_view = 0L; - serverMaintainer->releaseContext (TQT_TQOBJECT(parent()), baseurl); + serverMaintainer->releaseContext (parent(), baseurl); if (m_statusbar_icon) { m_statusbar->removeStatusBarItem (m_statusbar_icon); delete m_statusbar_icon; @@ -404,7 +404,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) { if (applet->size().width() > 0 || m_view->isVisible()) w->showApplet (); else - TQTimer::singleShot (10, this, TQT_SLOT (delayedCreateTimeOut ())); + TQTimer::singleShot (10, this, TQ_SLOT (delayedCreateTimeOut ())); if (!applet->failed ()) emit started (0L); return url.isValid (); diff --git a/tdehtml/java/kjavaappletviewer.h b/tdehtml/java/kjavaappletviewer.h index bb1d6e921..e00839d49 100644 --- a/tdehtml/java/kjavaappletviewer.h +++ b/tdehtml/java/kjavaappletviewer.h @@ -43,7 +43,7 @@ class TDEConfig; class CoverWidget; class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: KJavaAppletViewerBrowserExtension (KJavaAppletViewer *parent); void urlChanged (const TQString & url); @@ -57,7 +57,7 @@ public slots: }; class KJavaAppletViewerLiveConnectExtension : public KParts::LiveConnectExtension { - Q_OBJECT + TQ_OBJECT public: KJavaAppletViewerLiveConnectExtension(KJavaAppletViewer * parent); @@ -78,7 +78,7 @@ private: }; class KJavaAppletViewer : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KJavaAppletViewer (TQWidget * wparent, const char * wname, TQObject * parent, const char * name, const TQStringList &args); @@ -116,7 +116,7 @@ private: }; class KJavaAppletViewerFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: KJavaAppletViewerFactory (); virtual ~KJavaAppletViewerFactory (); @@ -130,7 +130,7 @@ private: }; class AppletParameterDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AppletParameterDialog (KJavaAppletWidget * parent); protected slots: diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp index a1f5b8f11..83485019c 100644 --- a/tdehtml/java/kjavaappletwidget.cpp +++ b/tdehtml/java/kjavaappletwidget.cpp @@ -46,11 +46,11 @@ KJavaAppletWidget::KJavaAppletWidget( TQWidget* parent, const char* name ) m_applet = new KJavaApplet( this ); d = new KJavaAppletWidgetPrivate; - m_kwm = new KWinModule( TQT_TQOBJECT(this) ); + m_kwm = new KWinModule( this ); d->tmplabel = new TQLabel( this ); d->tmplabel->setText( KJavaAppletServer::getAppletLabel() ); - d->tmplabel->setAlignment( Qt::AlignCenter | TQt::WordBreak ); + d->tmplabel->setAlignment( TQt::AlignCenter | TQt::WordBreak ); d->tmplabel->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); d->tmplabel->show(); @@ -66,8 +66,8 @@ KJavaAppletWidget::~KJavaAppletWidget() void KJavaAppletWidget::showApplet() { - connect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ), - this, TQT_SLOT( setWindow( WId ) ) ); + connect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ), + this, TQ_SLOT( setWindow( WId ) ) ); m_kwm->doNotManage( m_swallowTitle ); @@ -89,8 +89,8 @@ void KJavaAppletWidget::setWindow( WId w ) d->tmplabel = 0; // disconnect from KWM events - disconnect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ), - this, TQT_SLOT( setWindow( WId ) ) ); + disconnect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ), + this, TQ_SLOT( setWindow( WId ) ) ); embed( w ); diff --git a/tdehtml/java/kjavaappletwidget.h b/tdehtml/java/kjavaappletwidget.h index 872188769..4912af125 100644 --- a/tdehtml/java/kjavaappletwidget.h +++ b/tdehtml/java/kjavaappletwidget.h @@ -23,7 +23,7 @@ #define KJAVAAPPLETWIDGET_H #include <tqwidget.h> -#ifndef Q_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded +#ifndef TQ_WS_QWS //FIXME(?) I don't think this is possible with Qt Embedded #include "java/kjavaappletcontext.h" #include "java/kjavaapplet.h" #include <qxembed.h> @@ -75,7 +75,7 @@ class KJavaAppletWidgetPrivate; class KJavaAppletWidget : public QXEmbed { - Q_OBJECT + TQ_OBJECT public: KJavaAppletWidget( TQWidget* parent=0, const char* name=0 ); diff --git a/tdehtml/java/kjavadownloader.cpp b/tdehtml/java/kjavadownloader.cpp index 5b1c55324..b58465d7f 100644 --- a/tdehtml/java/kjavadownloader.cpp +++ b/tdehtml/java/kjavadownloader.cpp @@ -81,14 +81,14 @@ KJavaDownloader::KJavaDownloader( int ID, const TQString& url ) d->job = TDEIO::get( *d->url, false, false ); d->job->addMetaData("PropagateHttpHeader", "true"); - connect( d->job, TQT_SIGNAL(data( TDEIO::Job*, const TQByteArray& )), - this, TQT_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) ); - connect( d->job, TQT_SIGNAL(connected(TDEIO::Job*)), - this, TQT_SLOT(slotConnected(TDEIO::Job*))); - connect( d->job, TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString&)), - this, TQT_SLOT(slotMimetype(TDEIO::Job*, const TQString&))); - connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( d->job, TQ_SIGNAL(data( TDEIO::Job*, const TQByteArray& )), + this, TQ_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) ); + connect( d->job, TQ_SIGNAL(connected(TDEIO::Job*)), + this, TQ_SLOT(slotConnected(TDEIO::Job*))); + connect( d->job, TQ_SIGNAL(mimetype(TDEIO::Job*, const TQString&)), + this, TQ_SLOT(slotMimetype(TDEIO::Job*, const TQString&))); + connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*)) ); } KJavaDownloader::~KJavaDownloader() @@ -215,10 +215,10 @@ void KJavaUploader::start() // create a suspended job d->job = TDEIO::put( *d->url, -1, false, false, false ); d->job->suspend(); - connect( d->job, TQT_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )), - this, TQT_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) ); - connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( d->job, TQ_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )), + this, TQ_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) ); + connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*)) ); server->sendURLData( d->loaderID, CONNECTED, d->file ); KJavaAppletServer::freeJavaServer(); } diff --git a/tdehtml/java/kjavadownloader.h b/tdehtml/java/kjavadownloader.h index 4e3b893e8..eb9765769 100644 --- a/tdehtml/java/kjavadownloader.h +++ b/tdehtml/java/kjavadownloader.h @@ -42,7 +42,7 @@ class KJavaUploaderPrivate; class KJavaTDEIOJob : public TQObject { -Q_OBJECT +TQ_OBJECT public: virtual ~KJavaTDEIOJob(); virtual void jobCommand( int cmd ) = 0; @@ -51,7 +51,7 @@ public: class KJavaDownloader : public KJavaTDEIOJob { -Q_OBJECT +TQ_OBJECT public: KJavaDownloader( int ID, const TQString& url ); @@ -71,7 +71,7 @@ private: class KJavaUploader : public KJavaTDEIOJob { -Q_OBJECT +TQ_OBJECT public: KJavaUploader( int ID, const TQString& url ); diff --git a/tdehtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp index 6b505c343..7f3a93e0a 100644 --- a/tdehtml/java/kjavaprocess.cpp +++ b/tdehtml/java/kjavaprocess.cpp @@ -54,12 +54,12 @@ KJavaProcess::KJavaProcess() : TDEProcess() javaProcess = this; //new TDEProcess(); - connect( javaProcess, TQT_SIGNAL( wroteStdin( TDEProcess * ) ), - this, TQT_SLOT( slotWroteData() ) ); - connect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ), - this, TQT_SLOT( slotReceivedData(int, int&) ) ); - connect( javaProcess, TQT_SIGNAL( processExited (TDEProcess *) ), - this, TQT_SLOT( slotExited (TDEProcess *) ) ); + connect( javaProcess, TQ_SIGNAL( wroteStdin( TDEProcess * ) ), + this, TQ_SLOT( slotWroteData() ) ); + connect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ), + this, TQ_SLOT( slotReceivedData(int, int&) ) ); + connect( javaProcess, TQ_SIGNAL( processExited (TDEProcess *) ), + this, TQ_SLOT( slotExited (TDEProcess *) ) ); d->jvmPath = "java"; d->mainClass = "-help"; @@ -319,8 +319,8 @@ bool KJavaProcess::invokeJVM() void KJavaProcess::killJVM() { d->processKilled = true; - disconnect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ), - this, TQT_SLOT( slotReceivedData(int, int&) ) ); + disconnect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ), + this, TQ_SLOT( slotReceivedData(int, int&) ) ); javaProcess->kill(); } diff --git a/tdehtml/java/kjavaprocess.h b/tdehtml/java/kjavaprocess.h index a479b8128..4e00d4080 100644 --- a/tdehtml/java/kjavaprocess.h +++ b/tdehtml/java/kjavaprocess.h @@ -37,9 +37,9 @@ */ class KJavaProcessPrivate; -class KJavaProcess : public TDEProcess //QObject +class KJavaProcess : public TDEProcess //TQObject { -Q_OBJECT +TQ_OBJECT public: /** @@ -110,7 +110,7 @@ public: /** * Sends a command to the KJAS Applet Server by building a QByteArray - * out of the data, and then writes it standard out. It adds each QString + * out of the data, and then writes it standard out. It adds each TQString * in the arg list, and then adds the data array. */ void send( char cmd_code, const TQStringList& args, const TQByteArray& data ); diff --git a/tdehtml/kjserrordlg.ui b/tdehtml/kjserrordlg.ui index 1c105d937..78d33aa8c 100644 --- a/tdehtml/kjserrordlg.ui +++ b/tdehtml/kjserrordlg.ui @@ -120,12 +120,12 @@ <include location="global" impldecl="in declaration">ksqueezedtextlabel.h</include> <include location="global" impldecl="in implementation">kactivelabel.h</include> </includes> -<Q_SLOTS> +<slots> <slot>init()</slot> <slot>addError( const TQString & error )</slot> <slot>setURL( const TQString & url )</slot> <slot>clear()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> </UI> diff --git a/tdehtml/misc/CMakeLists.txt b/tdehtml/misc/CMakeLists.txt index 0babd6567..fbef060b7 100644 --- a/tdehtml/misc/CMakeLists.txt +++ b/tdehtml/misc/CMakeLists.txt @@ -38,4 +38,5 @@ set( ${target}_SRCS tde_add_library( ${target} STATIC_PIC AUTOMOC SOURCES ${${target}_SRCS} + LINK ${JPEG_LIBRARIES} ) diff --git a/tdehtml/misc/helper.cpp b/tdehtml/misc/helper.cpp index b5191c7ca..6b9e06a14 100644 --- a/tdehtml/misc/helper.cpp +++ b/tdehtml/misc/helper.cpp @@ -66,7 +66,7 @@ double calcHue(double temp1, double temp2, double hueVal) // explanation available at http://en.wikipedia.org/wiki/HSL_color_space // all values are in the range of 0 to 1.0 -QRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a) +TQRgb tdehtml::tqRgbaFromHsla(double h, double s, double l, double a) { double temp2 = l < 0.5 ? l * (1.0 + s) : l + s - l * s; double temp1 = 2.0 * l - temp2; diff --git a/tdehtml/misc/helper.h b/tdehtml/misc/helper.h index 10ffb8035..2433c9284 100644 --- a/tdehtml/misc/helper.h +++ b/tdehtml/misc/helper.h @@ -32,15 +32,15 @@ class TQPainter; namespace tdehtml { class RenderObject; - const QRgb transparentColor = 0x00000000; - const QRgb invertedColor = 0x00000002; + const TQRgb transparentColor = 0x00000000; + const TQRgb invertedColor = 0x00000002; extern TQPainter *printpainter; void setPrintPainter( TQPainter *printer ); bool hasSufficientContrast(const TQColor &c1, const TQColor &c2); TQColor retrieveBackgroundColor(const RenderObject *obj); - QRgb tqRgbaFromHsla(double h, double s, double l, double a); + TQRgb tqRgbaFromHsla(double h, double s, double l, double a); //enumerator for findSelectionNode enum FindSelectionResult { SelectionPointBefore, diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp index b8b94cd6b..aefa73192 100644 --- a/tdehtml/misc/knsplugininstaller.cpp +++ b/tdehtml/misc/knsplugininstaller.cpp @@ -157,7 +157,11 @@ bool KNSPluginInstallEngine::findPlugin() // get system infos // TODO/FIX : correct this to work with x86-64 machines +#ifdef Q_OS_SOLARIS + struct utsname sysinfo; +#else /* default */ utsname sysinfo; +#endif /* default */ if(uname(&sysinfo)) return false; TQString sysname(sysinfo.sysname); @@ -234,8 +238,8 @@ void KNSPluginInstallEngine::startInstall(KNSPluginInfo info) // start the download job m_downloadJob = TDEIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false ); // connect signals - connect(m_downloadJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long))); - connect(m_downloadJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDownloadResult(TDEIO::Job *)) ); + connect(m_downloadJob, TQ_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQ_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long))); + connect(m_downloadJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotDownloadResult(TDEIO::Job *)) ); kdDebug(DEBUG_NUMBER) << "download plugin " << m_tmpPluginFileName << endl; } @@ -280,8 +284,8 @@ void KNSPluginInstallEngine::slotDownloadResult(TDEIO::Job *job) urlList.append( KURL("tar://"+m_tmpPluginFileName+"/"+(*it)) ); } m_installFileJob = TDEIO::copy(urlList , destURL, false ); - connect(m_installFileJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long))); - connect(m_installFileJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)) ); + connect(m_installFileJob, TQ_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQ_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long))); + connect(m_installFileJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotCopyResult(TDEIO::Job *)) ); } kdDebug(DEBUG_NUMBER) << "COPY FILE " << m_tmpPluginFileName << endl; @@ -308,10 +312,10 @@ void KNSPluginInstallEngine::slotCopyResult(TDEIO::Job *job) m_scanProc->addArgument( "nspluginscan" ); m_scanProc->addArgument( "--verbose" ); - connect( m_scanProc, TQT_SIGNAL(readyReadStdout()), - this, TQT_SLOT(readScanProcFromStdout()) ); - connect( m_scanProc, TQT_SIGNAL(processExited()), - this, TQT_SLOT(endScanProc()) ); + connect( m_scanProc, TQ_SIGNAL(readyReadStdout()), + this, TQ_SLOT(readScanProcFromStdout()) ); + connect( m_scanProc, TQ_SIGNAL(processExited()), + this, TQ_SLOT(endScanProc()) ); if ( !m_scanProc->start() ) { emit installFailed(); } @@ -422,7 +426,7 @@ void KNSPluginWizard::initLicencePage() addPage (m_licenceVBox, i18n("Plugin licence")); - connect(buttonGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotAgreementClicked(int))); + connect(buttonGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotAgreementClicked(int))); } void KNSPluginWizard::initInstallationProgressPage() { @@ -482,9 +486,9 @@ void KNSPluginWizard::initPagesButtonStates() void KNSPluginWizard::connectSignals() { - connect(&m_installEngine, TQT_SIGNAL(installProgress(int)), m_installationProgressBar, TQT_SLOT(setProgress(int)) ); - connect(&m_installEngine, TQT_SIGNAL(installCompleted()), this, TQT_SLOT(slotInstallationCompleted()) ); - connect(&m_installEngine, TQT_SIGNAL(installFailed()), this, TQT_SLOT(slotInstallationFailed()) ); + connect(&m_installEngine, TQ_SIGNAL(installProgress(int)), m_installationProgressBar, TQ_SLOT(setProgress(int)) ); + connect(&m_installEngine, TQ_SIGNAL(installCompleted()), this, TQ_SLOT(slotInstallationCompleted()) ); + connect(&m_installEngine, TQ_SIGNAL(installFailed()), this, TQ_SLOT(slotInstallationFailed()) ); } diff --git a/tdehtml/misc/knsplugininstaller.h b/tdehtml/misc/knsplugininstaller.h index f8caedf92..a77630c19 100644 --- a/tdehtml/misc/knsplugininstaller.h +++ b/tdehtml/misc/knsplugininstaller.h @@ -89,7 +89,7 @@ private: */ class KNSPluginInstallEngine : public TQObject { - Q_OBJECT + TQ_OBJECT public: /* @@ -171,7 +171,7 @@ private slots: */ class KNSPluginWizard : public KWizard { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp index 7621b5e4f..50525c342 100644 --- a/tdehtml/misc/loader.cpp +++ b/tdehtml/misc/loader.cpp @@ -786,10 +786,10 @@ void CachedImage::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnima imgSource->cleanBuffer(); delete p; p = new TQPixmap(m->framePixmap()); - m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); - m->disconnectStatus( this, TQT_SLOT( movieStatus( int ) )); - m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); - TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie())); + m->disconnectUpdate( this, TQ_SLOT( movieUpdated( const TQRect &) )); + m->disconnectStatus( this, TQ_SLOT( movieStatus( int ) )); + m->disconnectResize( this, TQ_SLOT( movieResize( const TQSize& ) ) ); + TQTimer::singleShot(0, this, TQ_SLOT( deleteMovie())); imgSource = 0; } } @@ -849,9 +849,9 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof ) { imgSource = new ImageSource( _buffer.buffer()); m = new TQMovie( imgSource, 8192 ); - m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); - m->connectStatus( this, TQT_SLOT( movieStatus(int))); - m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); + m->connectUpdate( this, TQ_SLOT( movieUpdated( const TQRect &) )); + m->connectStatus( this, TQ_SLOT( movieStatus(int))); + m->connectResize( this, TQ_SLOT( movieResize( const TQSize& ) ) ); } } @@ -1128,7 +1128,7 @@ Loader::Loader() : TQObject() { m_requestsPending.setAutoDelete( true ); m_requestsLoading.setAutoDelete( true ); - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( servePendingRequests() ) ); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( servePendingRequests() ) ); } void Loader::load(DocLoader* dl, CachedObject *object, bool incremental) @@ -1171,9 +1171,9 @@ void Loader::servePendingRequests() } } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); if ( req->object->schedule() ) TDEIO::Scheduler::scheduleJob( job ); diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h index c60c13a98..e340b3023 100644 --- a/tdehtml/misc/loader.h +++ b/tdehtml/misc/loader.h @@ -255,7 +255,7 @@ namespace tdehtml */ class CachedImage : public TQObject, public CachedObject { - Q_OBJECT + TQ_OBJECT public: CachedImage(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept); virtual ~CachedImage(); @@ -317,7 +317,7 @@ namespace tdehtml TQPixmap* p; TQPixmap* scaled; TQPixmap* bg; - QRgb bgColor; + TQRgb bgColor; TQSize bgSize; mutable TQPixmap* pixPart; @@ -407,7 +407,7 @@ namespace tdehtml */ class Loader : public TQObject { - Q_OBJECT + TQ_OBJECT public: Loader(); diff --git a/tdehtml/rendering/render_applet.cpp b/tdehtml/rendering/render_applet.cpp index eb9762897..6f60c90e6 100644 --- a/tdehtml/rendering/render_applet.cpp +++ b/tdehtml/rendering/render_applet.cpp @@ -32,7 +32,7 @@ #include <tqlabel.h> -#ifndef Q_WS_QWS // We don't have Java in Qt Embedded +#ifndef TQ_WS_QWS // We don't have Java in Qt Embedded #include "java/kjavaappletwidget.h" #include "misc/htmltags.h" diff --git a/tdehtml/rendering/render_block.cpp b/tdehtml/rendering/render_block.cpp index 053e51b95..414947e1e 100644 --- a/tdehtml/rendering/render_block.cpp +++ b/tdehtml/rendering/render_block.cpp @@ -695,9 +695,9 @@ void RenderBlock::layoutBlock(bool relayoutChildren) if (scrollsOverflow() && m_layer) { // For overflow:scroll blocks, ensure we have both scrollbars in place always. if (style()->overflowX() == OSCROLL) - m_layer->showScrollbar( Qt::Horizontal, true ); + m_layer->showScrollbar( TQt::Horizontal, true ); if (style()->overflowY() == OSCROLL) - m_layer->showScrollbar( Qt::Vertical, true ); + m_layer->showScrollbar( TQt::Vertical, true ); } setContainsPageBreak(false); diff --git a/tdehtml/rendering/render_box.cpp b/tdehtml/rendering/render_box.cpp index d804094ef..7dc07090d 100644 --- a/tdehtml/rendering/render_box.cpp +++ b/tdehtml/rendering/render_box.cpp @@ -644,8 +644,8 @@ void RenderBox::paintBackgroundExtended(TQPainter *p, const TQColor &c, const Ba void RenderBox::outlineBox(TQPainter *p, int _tx, int _ty, const char *color) { - p->setPen(TQPen(TQColor(color), 1, Qt::DotLine)); - p->setBrush( Qt::NoBrush ); + p->setPen(TQPen(TQColor(color), 1, TQt::DotLine)); + p->setBrush( TQt::NoBrush ); p->drawRect(_tx, _ty, m_width, m_height); } diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp index 9d302bfc8..f18ce9ae6 100644 --- a/tdehtml/rendering/render_form.cpp +++ b/tdehtml/rendering/render_form.cpp @@ -99,25 +99,25 @@ void RenderFormElement::layout() setNeedsLayout(false); } -TQ_Alignment RenderFormElement::textAlignment() const +TQt::AlignmentFlags RenderFormElement::textAlignment() const { switch (style()->textAlign()) { case LEFT: case TDEHTML_LEFT: - return Qt::AlignLeft; + return TQt::AlignLeft; case RIGHT: case TDEHTML_RIGHT: - return Qt::AlignRight; + return TQt::AlignRight; case CENTER: case TDEHTML_CENTER: - return Qt::AlignHCenter; + return TQt::AlignHCenter; case JUSTIFY: // Just fall into the auto code for justify. case TAAUTO: - return style()->direction() == RTL ? Qt::AlignRight : Qt::AlignLeft; + return style()->direction() == RTL ? TQt::AlignRight : TQt::AlignLeft; } assert(false); // Should never be reached. - return Qt::AlignLeft; + return TQt::AlignLeft; } // ------------------------------------------------------------------------- @@ -146,7 +146,7 @@ RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element) // prevent firing toggled() signals on initialization b->setChecked(element->checked()); - connect(b,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(slotStateChanged(int))); + connect(b,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(slotStateChanged(int))); } @@ -192,7 +192,7 @@ RenderRadioButton::RenderRadioButton(HTMLInputElementImpl *element) // prevent firing toggled() signals on initialization b->setChecked(element->checked()); - connect(b,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool))); } void RenderRadioButton::updateFromElement() @@ -263,7 +263,7 @@ void RenderSubmitButton::calcMinMaxWidth() raw = TQString::fromLatin1("X"); TQFontMetrics fm = pb->fontMetrics(); TQSize ts = fm.size( ShowPrefix, raw); - TQSize s(pb->style().tqsizeFromContents( TQStyle::CT_PushButton, pb, ts ) + TQSize s(pb->style().sizeFromContents( TQStyle::CT_PushButton, pb, ts ) .expandedTo(TQApplication::globalStrut())); int margin = pb->style().pixelMetric( TQStyle::PM_ButtonMargin, pb) + pb->style().pixelMetric( TQStyle::PM_DefaultFrameWidth, pb ) * 2; @@ -312,7 +312,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* vi { setMouseTracking(true); TDEActionCollection *ac = new TDEActionCollection(this); - m_spellAction = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotCheckSpelling() ), ac ); + m_spellAction = KStdAction::spelling( this, TQ_SLOT( slotCheckSpelling() ), ac ); } LineEditWidget::~LineEditWidget() @@ -328,11 +328,11 @@ void LineEditWidget::slotCheckSpelling() } delete m_spell; - m_spell = new KSpell( this, i18n( "Spell Checking" ), TQT_TQOBJECT(this), TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); + m_spell = new KSpell( this, i18n( "Spell Checking" ), this, TQ_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); - connect( m_spell, TQT_SIGNAL( death() ),this, TQT_SLOT( spellCheckerFinished() ) ); - connect( m_spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); - connect( m_spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); + connect( m_spell, TQ_SIGNAL( death() ),this, TQ_SLOT( spellCheckerFinished() ) ); + connect( m_spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQ_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); + connect( m_spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),this, TQ_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); } void LineEditWidget::spellCheckerMisspelling( const TQString &_text, const TQStringList &, unsigned int pos) @@ -362,7 +362,7 @@ void LineEditWidget::spellCheckerFinished() void LineEditWidget::slotSpellCheckReady( KSpell *s ) { s->check( text() ); - connect( s, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( slotSpellCheckDone( const TQString & ) ) ); + connect( s, TQ_SIGNAL( done( const TQString & ) ), this, TQ_SLOT( slotSpellCheckDone( const TQString & ) ) ); } void LineEditWidget::slotSpellCheckDone( const TQString &s ) @@ -380,8 +380,8 @@ TQPopupMenu *LineEditWidget::createPopupMenu() return 0L; } - connect( popup, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( extendedMenuActivated( int ) ) ); + connect( popup, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( extendedMenuActivated( int ) ) ); if (m_input->autoComplete()) { popup->insertSeparator(); @@ -414,7 +414,7 @@ void LineEditWidget::extendedMenuActivated( int id) case EditHistory: { KHistoryComboEditor dlg( compObj() ? compObj()->items() : TQStringList(), this ); - connect( &dlg, TQT_SIGNAL( removeFromHistory(const TQString&) ), TQT_SLOT( slotRemoveFromHistory(const TQString&)) ); + connect( &dlg, TQ_SIGNAL( removeFromHistory(const TQString&) ), TQ_SLOT( slotRemoveFromHistory(const TQString&)) ); dlg.exec(); } default: @@ -469,8 +469,8 @@ RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element) : RenderFormElement(element) { LineEditWidget *edit = new LineEditWidget(element, view(), view()->viewport()); - connect(edit,TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed())); - connect(edit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &))); + connect(edit,TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed())); + connect(edit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotTextChanged(const TQString &))); if(element->inputType() == HTMLInputElementImpl::PASSWORD) edit->setEchoMode( TQLineEdit::Password ); @@ -785,9 +785,9 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element) w->setMode(KFile::File | KFile::ExistingOnly); w->completionObject()->setDir(TDEGlobalSettings::documentPath()); - connect(w->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed())); - connect(w->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &))); - connect(w, TQT_SIGNAL(urlSelected(const TQString &)),this,TQT_SLOT(slotUrlSelected(const TQString &))); + connect(w->lineEdit(), TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed())); + connect(w->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotTextChanged(const TQString &))); + connect(w, TQ_SIGNAL(urlSelected(const TQString &)),this,TQ_SLOT(slotUrlSelected(const TQString &))); setQWidget(w); m_haveFocus = false; @@ -805,7 +805,7 @@ void RenderFileButton::calcMinMaxWidth() int h = fm.lineSpacing(); int w = fm.width( 'x' ) * (size > 0 ? size+1 : 17); // "some" KLineEdit* edit = static_cast<KURLRequester*>( m_widget )->lineEdit(); - TQSize s = edit->style().tqsizeFromContents(TQStyle::CT_LineEdit, + TQSize s = edit->style().sizeFromContents(TQStyle::CT_LineEdit, edit, TQSize(w + 2 + 2*edit->frameWidth(), kMax(h, 14) + 2 + 2*edit->frameWidth())) .expandedTo(TQApplication::globalStrut()); @@ -890,7 +890,7 @@ bool ComboBoxWidget::event(TQEvent *e) return true; if (e->type()==TQEvent::KeyPress) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); switch(ke->key()) { case Key_Return: @@ -907,9 +907,9 @@ bool ComboBoxWidget::event(TQEvent *e) bool ComboBoxWidget::eventFilter(TQObject *dest, TQEvent *e) { - if (TQT_BASE_OBJECT(dest)==TQT_BASE_OBJECT(listBox()) && e->type()==TQEvent::KeyPress) + if (dest==listBox() && e->type()==TQEvent::KeyPress) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); bool forward = false; switch(ke->key()) { @@ -1226,8 +1226,8 @@ TDEListBox* RenderSelect::createListBox() lb->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single); // ### looks broken //lb->setAutoMask(true); - connect( lb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotSelectionChanged() ) ); -// connect( lb, TQT_SIGNAL( clicked( TQListBoxItem * ) ), this, TQT_SLOT( slotClicked() ) ); + connect( lb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) ); +// connect( lb, TQ_SIGNAL( clicked( TQListBoxItem * ) ), this, TQ_SLOT( slotClicked() ) ); m_ignoreSelectEvents = false; lb->setMouseTracking(true); @@ -1237,7 +1237,7 @@ TDEListBox* RenderSelect::createListBox() ComboBoxWidget *RenderSelect::createComboBox() { ComboBoxWidget *cb = new ComboBoxWidget(view()->viewport()); - connect(cb, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelected(int))); + connect(cb, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelected(int))); return cb; } @@ -1295,9 +1295,9 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent) setMouseTracking(true); TDEActionCollection *ac = new TDEActionCollection(this); - m_findAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ), ac ); - m_findNextAction = KStdAction::findNext( TQT_TQOBJECT(this), TQT_SLOT( slotFindNext() ), ac ); - m_replaceAction = KStdAction::replace( TQT_TQOBJECT(this), TQT_SLOT( slotReplace() ), ac ); + m_findAction = KStdAction::find( this, TQ_SLOT( slotFind() ), ac ); + m_findNextAction = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), ac ); + m_replaceAction = KStdAction::replace( this, TQ_SLOT( slotReplace() ), ac ); } @@ -1387,11 +1387,11 @@ void TextAreaWidget::slotDoReplace() // Connect highlight signal to code which handles highlighting // of found text. - connect(m_replace, TQT_SIGNAL(highlight(const TQString &, int, int)), - this, TQT_SLOT(slotFindHighlight(const TQString &, int, int))); - connect(m_replace, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotReplaceNext())); - connect(m_replace, TQT_SIGNAL(replace(const TQString &, int, int, int)), - this, TQT_SLOT(slotReplaceText(const TQString &, int, int, int))); + connect(m_replace, TQ_SIGNAL(highlight(const TQString &, int, int)), + this, TQ_SLOT(slotFindHighlight(const TQString &, int, int))); + connect(m_replace, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotReplaceNext())); + connect(m_replace, TQ_SIGNAL(replace(const TQString &, int, int, int)), + this, TQ_SLOT(slotReplaceText(const TQString &, int, int, int))); m_repDlg->close(); slotReplaceNext(); @@ -1486,9 +1486,9 @@ void TextAreaWidget::slotDoFind() // Connect highlight signal to code which handles highlighting // of found text. - connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)), - this, TQT_SLOT(slotFindHighlight(const TQString &, int, int))); - connect(m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext())); + connect(m_find, TQ_SIGNAL(highlight(const TQString &, int, int)), + this, TQ_SLOT(slotFindHighlight(const TQString &, int, int))); + connect(m_find, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotFindNext())); m_findDlg->close(); m_find->closeFindNextDialog(); @@ -1562,7 +1562,7 @@ void TextAreaWidget::slotFind() KWin::activateWindow( m_findDlg->winId() ); } else { m_findDlg = new KFindDialog(false, this, "TDEHTML Text Area Find Dialog"); - connect( m_findDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) ); + connect( m_findDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoFind()) ); } m_findDlg->show(); } @@ -1578,7 +1578,7 @@ void TextAreaWidget::slotReplace() } else { m_repDlg = new KReplaceDialog(this, "TDEHTMLText Area Replace Dialog", 0, TQStringList(), TQStringList(), false); - connect( m_repDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoReplace()) ); + connect( m_repDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoReplace()) ); } m_repDlg->show(); } @@ -1618,7 +1618,7 @@ RenderTextArea::RenderTextArea(HTMLTextAreaElementImpl *element) edit->setCheckSpellingEnabled( settings->autoSpellCheck() ); edit->setTabChangesFocus( ! settings->allowTabulation() ); - connect(edit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged())); + connect(edit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged())); } RenderTextArea::~RenderTextArea() diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h index d6124528d..9c46346a7 100644 --- a/tdehtml/rendering/render_form.h +++ b/tdehtml/rendering/render_form.h @@ -95,7 +95,7 @@ public: protected: virtual bool isRenderButton() const { return false; } virtual bool isEditable() const { return false; } - TQ_Alignment textAlignment() const; + TQt::AlignmentFlags textAlignment() const; TQPoint m_mousePos; int m_state; @@ -106,7 +106,7 @@ protected: // generic class for all buttons class RenderButton : public RenderFormElement { - Q_OBJECT + TQ_OBJECT public: RenderButton(DOM::HTMLGenericFormElementImpl* node); @@ -126,7 +126,7 @@ protected: class RenderCheckBox : public RenderButton { - Q_OBJECT + TQ_OBJECT public: RenderCheckBox(DOM::HTMLInputElementImpl* node); @@ -146,7 +146,7 @@ public slots: class RenderRadioButton : public RenderButton { - Q_OBJECT + TQ_OBJECT public: RenderRadioButton(DOM::HTMLInputElementImpl* node); @@ -216,7 +216,7 @@ public: class RenderLineEdit : public RenderFormElement { - Q_OBJECT + TQ_OBJECT public: RenderLineEdit(DOM::HTMLInputElementImpl *element); @@ -253,7 +253,7 @@ private: class LineEditWidget : public KLineEdit { - Q_OBJECT + TQ_OBJECT public: LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* view, TQWidget* parent); @@ -307,7 +307,7 @@ protected: class RenderFileButton : public RenderFormElement { - Q_OBJECT + TQ_OBJECT public: RenderFileButton(DOM::HTMLInputElementImpl *element); @@ -378,7 +378,7 @@ protected: class RenderSelect : public RenderFormElement { - Q_OBJECT + TQ_OBJECT public: RenderSelect(DOM::HTMLSelectElementImpl *element); @@ -417,7 +417,7 @@ protected slots: // ------------------------------------------------------------------------- class TextAreaWidget : public KTextEdit { - Q_OBJECT + TQ_OBJECT public: TextAreaWidget(int wrap, TQWidget* parent); virtual ~TextAreaWidget(); @@ -452,7 +452,7 @@ private: class RenderTextArea : public RenderFormElement { - Q_OBJECT + TQ_OBJECT public: RenderTextArea(DOM::HTMLTextAreaElementImpl *element); ~RenderTextArea(); diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp index 68c66495a..1035f97a0 100644 --- a/tdehtml/rendering/render_frames.cpp +++ b/tdehtml/rendering/render_frames.cpp @@ -66,7 +66,7 @@ RenderFrameSet::RenderFrameSet( HTMLFrameSetElementImpl *frameSet) m_resizing = m_clientresizing= false; - m_cursor = Qt::ArrowCursor; + m_cursor = TQt::ArrowCursor; m_hSplit = -1; m_vSplit = -1; @@ -498,13 +498,13 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) } - m_cursor = Qt::ArrowCursor; + m_cursor = TQt::ArrowCursor; if(m_hSplit != -1 && m_vSplit != -1) - m_cursor = Qt::SizeAllCursor; + m_cursor = TQt::SizeAllCursor; else if( m_vSplit != -1 ) - m_cursor = Qt::SizeHorCursor; + m_cursor = TQt::SizeHorCursor; else if( m_hSplit != -1 ) - m_cursor = Qt::SizeVerCursor; + m_cursor = TQt::SizeVerCursor; if(!m_resizing && evt->id() == EventImpl::MOUSEDOWN_EVENT) { @@ -548,8 +548,8 @@ bool RenderFrameSet::userResize( MouseEventImpl *evt ) TDEHTMLView *view = canvas()->view(); if ((m_resizing || evt->id() == EventImpl::MOUSEUP_EVENT) && view) { TQPainter paint( view ); - paint.setPen( Qt::gray ); - paint.setBrush( Qt::gray ); + paint.setPen( TQt::gray ); + paint.setBrush( TQt::gray ); paint.setRasterOp( TQt::XorROP ); TQRect r(xPos(), yPos(), width(), height()); const int rBord = 3; @@ -634,9 +634,9 @@ void RenderPart::setWidget( TQWidget *widget ) #endif setQWidget( widget ); - widget->setFocusPolicy(TQ_WheelFocus); + widget->setFocusPolicy(TQWidget::WheelFocus); if(widget->inherits("TDEHTMLView")) - connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) ); + connect( widget, TQ_SIGNAL( cleared() ), this, TQ_SLOT( slotViewCleared() ) ); setNeedsLayoutAndMinMaxRecalc(); @@ -674,7 +674,7 @@ RenderFrame::RenderFrame( DOM::HTMLFrameElementImpl *frame ) void RenderFrame::slotViewCleared() { - if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING)) { + if(m_widget->inherits("TQScrollView")) { #ifdef DEBUG_LAYOUT kdDebug(6031) << "frame is a scrollview!" << endl; #endif @@ -888,7 +888,7 @@ bool RenderPartObject::partLoadingErrorNotify( tdehtml::ChildFrame *childFrame, } // Dissociate ourselves from the current event loop (to prevent crashes // due to the message box staying up) - TQTimer::singleShot( 0, this, TQT_SLOT( slotPartLoadingErrorNotify() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPartLoadingErrorNotify() ) ); #if 0 Tokenizer *tokenizer = static_cast<DOM::DocumentImpl *>(part->document().handle())->tokenizer(); if (tokenizer) tokenizer->setOnHold( true ); @@ -989,7 +989,7 @@ void RenderPartObject::layout( ) void RenderPartObject::slotViewCleared() { - if(m_widget->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) ) { + if(m_widget->inherits("TQScrollView") ) { #ifdef DEBUG_LAYOUT kdDebug(6031) << "iframe is a scrollview!" << endl; #endif diff --git a/tdehtml/rendering/render_frames.h b/tdehtml/rendering/render_frames.h index 49d1e8dc1..a6e0640f3 100644 --- a/tdehtml/rendering/render_frames.h +++ b/tdehtml/rendering/render_frames.h @@ -61,7 +61,7 @@ public: bool canResize( int _x, int _y); void setResizing(bool e); - Qt::CursorShape cursorShape() const { return m_cursor; } + TQt::CursorShape cursorShape() const { return m_cursor; } bool nodeAtPoint(NodeInfo& info, int x, int y, int tx, int ty, HitTestAction hitTestAction, bool inside); @@ -73,7 +73,7 @@ public: #endif private: - Qt::CursorShape m_cursor; + TQt::CursorShape m_cursor; int m_oldpos; int m_gridLen[2]; int* m_gridDelta[2]; @@ -93,7 +93,7 @@ private: class RenderPart : public tdehtml::RenderWidget { - Q_OBJECT + TQ_OBJECT public: RenderPart(DOM::HTMLElementImpl* node); @@ -123,7 +123,7 @@ public slots: class RenderFrame : public tdehtml::RenderPart { - Q_OBJECT + TQ_OBJECT public: RenderFrame( DOM::HTMLFrameElementImpl *frame ); @@ -146,7 +146,7 @@ public slots: // I can hardly call the class RenderObject ;-) class RenderPartObject : public tdehtml::RenderPart { - Q_OBJECT + TQ_OBJECT public: RenderPartObject( DOM::HTMLElementImpl * ); diff --git a/tdehtml/rendering/render_generated.cpp b/tdehtml/rendering/render_generated.cpp index 3f8d6e8f0..cf945145f 100644 --- a/tdehtml/rendering/render_generated.cpp +++ b/tdehtml/rendering/render_generated.cpp @@ -358,7 +358,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty) p->drawEllipse( marker ); return; case LCIRCLE: - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); p->drawEllipse( marker ); return; case LSQUARE: @@ -366,7 +366,7 @@ void RenderGlyph::paint(PaintInfo& paintInfo, int _tx, int _ty) p->drawRect( marker ); return; case LBOX: - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); p->drawRect( marker ); return; case LDIAMOND: { diff --git a/tdehtml/rendering/render_image.cpp b/tdehtml/rendering/render_image.cpp index ad8f18bb3..bfe5781ac 100644 --- a/tdehtml/rendering/render_image.cpp +++ b/tdehtml/rendering/render_image.cpp @@ -243,10 +243,10 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) if (bUnfinishedImageFrame && paintInfo.phase == PaintActionForeground && cWidth > 2 && cHeight > 2 && !complete()) { static TQPixmap *loadingIcon; TQColor bg = tdehtml::retrieveBackgroundColor(this); - TQColor fg = tdehtml::hasSufficientContrast(Qt::gray, bg) ? Qt::gray : - (hasSufficientContrast(Qt::white, bg) ? Qt::white : Qt::black); + TQColor fg = tdehtml::hasSufficientContrast(TQt::gray, bg) ? TQt::gray : + (hasSufficientContrast(TQt::white, bg) ? TQt::white : TQt::black); paintInfo.p->setPen(TQPen(fg, 1)); - paintInfo.p->setBrush( Qt::NoBrush ); + paintInfo.p->setBrush( TQt::NoBrush ); paintInfo.p->drawRect(_tx, _ty, m_width, m_height); if (!(m_width <= 5 || m_height <= 5)) { if (!loadingIcon) { @@ -289,7 +289,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) } else if (i && !i->isTransparent()) { - paintInfo.p->setPen( Qt::black ); // used for bitmaps + paintInfo.p->setPen( TQt::black ); // used for bitmaps const TQPixmap& pix = i->pixmap(); if ( (cWidth != intrinsicWidth() || cHeight != intrinsicHeight()) && pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid()) @@ -371,7 +371,7 @@ void RenderImage::paint(PaintInfo& paintInfo, int _tx, int _ty) paintInfo.p->setBrushOrigin(_tx, _ty - paintInfo.r.y()); paintInfo.p->fillRect(_tx, _ty, width(), height(), TQBrush(style()->palette().active().highlight(), - Qt::Dense4Pattern)); + TQt::Dense4Pattern)); } } } diff --git a/tdehtml/rendering/render_inline.cpp b/tdehtml/rendering/render_inline.cpp index 15bc1b0df..5439a5310 100644 --- a/tdehtml/rendering/render_inline.cpp +++ b/tdehtml/rendering/render_inline.cpp @@ -678,7 +678,7 @@ static void paintOutlineSegment(RenderObject *o, TQPainter *p, int tx, int ty, } // kdDebug(6040) << "segment(" << x1 << "," << y1 << ") - (" << x2 << "," << y2 << ")" << endl; -/* p->setPen(Qt::gray); +/* p->setPen(TQt::gray); p->drawLine(x1,y1,x2,y2);*/ switch (curBS) { case RenderObject::BSLeft: diff --git a/tdehtml/rendering/render_layer.cpp b/tdehtml/rendering/render_layer.cpp index 2b6bbf027..1da1e0b82 100644 --- a/tdehtml/rendering/render_layer.cpp +++ b/tdehtml/rendering/render_layer.cpp @@ -604,9 +604,9 @@ void RenderLayer::updateScrollPositionFromScrollbars() } void -RenderLayer::showScrollbar(Qt::Orientation o, bool show) +RenderLayer::showScrollbar(TQt::Orientation o, bool show) { - TQScrollBar *sb = (o == Qt::Horizontal) ? m_hBar : m_vBar; + TQScrollBar *sb = (o == TQt::Horizontal) ? m_hBar : m_vBar; if (show && !sb) { TQScrollView* scrollView = m_object->document()->view(); @@ -616,14 +616,14 @@ RenderLayer::showScrollbar(Qt::Orientation o, bool show) sb->show(); if (!m_scrollMediator) m_scrollMediator = new RenderScrollMediator(this); - m_scrollMediator->connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged())); + m_scrollMediator->connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged())); } else if (!show && sb) { delete sb; sb = 0; } - if (o == Qt::Horizontal) + if (o == TQt::Horizontal) m_hBar = sb; else m_vBar = sb; @@ -749,12 +749,12 @@ void RenderLayer::checkScrollbarsAfterLayout() || (hasOvf && m_object->style()->overflowY() == OAUTO && haveVerticalBar != needVerticalBar); if (scrollbarsChanged) { if (m_object->style()->overflowX() == OAUTO) { - showScrollbar(Qt::Horizontal, needHorizontalBar); + showScrollbar(TQt::Horizontal, needHorizontalBar); if (m_hBar) m_hBar->setEnabled(true); } if (m_object->style()->overflowY() == OAUTO) { - showScrollbar(Qt::Vertical, needVerticalBar); + showScrollbar(TQt::Vertical, needVerticalBar); if (m_vBar) m_vBar->setEnabled(true); } @@ -956,8 +956,8 @@ void RenderLayer::paintLayer(RenderLayer* rootLayer, TQPainter *p, int ax=0; int ay=0; renderer()->absolutePosition( ax, ay ); - p->setPen(TQPen(TQColor("yellow"), 1, Qt::DotLine)); - p->setBrush( Qt::NoBrush ); + p->setPen(TQPen(TQColor("yellow"), 1, TQt::DotLine)); + p->setBrush( TQt::NoBrush ); p->drawRect(ax, ay, width(), height()); } #endif diff --git a/tdehtml/rendering/render_layer.h b/tdehtml/rendering/render_layer.h index ae5ddff65..9c73eb0bb 100644 --- a/tdehtml/rendering/render_layer.h +++ b/tdehtml/rendering/render_layer.h @@ -65,7 +65,7 @@ namespace tdehtml { class RenderScrollMediator: public TQObject { - Q_OBJECT + TQ_OBJECT public: RenderScrollMediator(RenderLayer* layer) :m_layer(layer) {} @@ -80,7 +80,7 @@ private: // This class handles the auto-scrolling of layers with overflow: marquee. class Marquee: public TQObject { - Q_OBJECT + TQ_OBJECT public: Marquee(RenderLayer* l); @@ -193,7 +193,7 @@ public: void scrollToOffset(int x, int y, bool updateScrollbars = true, bool repaint = true); void scrollToXOffset(int x) { scrollToOffset(x, m_scrollY); } void scrollToYOffset(int y) { scrollToOffset(m_scrollX, y); } - void showScrollbar(Qt::Orientation, bool); + void showScrollbar(TQt::Orientation, bool); TQScrollBar* horizontalScrollbar() { return m_hBar; } TQScrollBar* verticalScrollbar() { return m_vBar; } int verticalScrollbarWidth(); diff --git a/tdehtml/rendering/render_list.cpp b/tdehtml/rendering/render_list.cpp index cc9ba4e5b..17caa26ae 100644 --- a/tdehtml/rendering/render_list.cpp +++ b/tdehtml/rendering/render_list.cpp @@ -299,7 +299,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) } #ifdef BOX_DEBUG - p->setPen( Qt::red ); + p->setPen( TQt::red ); p->drawRect( _tx + xoff, _ty + yoff, offset, offset ); #endif @@ -312,7 +312,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); return; case LCIRCLE: - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); p->drawEllipse( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); return; case LSQUARE: @@ -320,7 +320,7 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); return; case LBOX: - p->setBrush( Qt::NoBrush ); + p->setBrush( TQt::NoBrush ); p->drawRect( _tx + xoff, _ty + (3 * yoff)/2, (offset>>1)+1, (offset>>1)+1 ); return; case LDIAMOND: { @@ -342,25 +342,25 @@ void RenderListMarker::paint(PaintInfo& paintInfo, int _tx, int _ty) if (!m_item.isEmpty()) { if(listPositionInside()) { if( style()->direction() == LTR) { - p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); - p->drawText(_tx + fm.width(m_item), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, + p->drawText(_tx, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item); + p->drawText(_tx + fm.width(m_item), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, TQString::fromLatin1(". ")); } else { const TQString& punct(TQString::fromLatin1(" .")); - p->drawText(_tx, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct); - p->drawText(_tx + fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); + p->drawText(_tx, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, punct); + p->drawText(_tx + fm.width(punct), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item); } } else { if (style()->direction() == LTR) { const TQString& punct(TQString::fromLatin1(". ")); - p->drawText(_tx-offset/2, _ty, 0, 0, Qt::AlignRight|TQt::DontClip, punct); - p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, Qt::AlignRight|TQt::DontClip, m_item); + p->drawText(_tx-offset/2, _ty, 0, 0, TQt::AlignRight|TQt::DontClip, punct); + p->drawText(_tx-offset/2-fm.width(punct), _ty, 0, 0, TQt::AlignRight|TQt::DontClip, m_item); } else { const TQString& punct(TQString::fromLatin1(" .")); - p->drawText(_tx+offset/2, _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, punct); - p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, Qt::AlignLeft|TQt::DontClip, m_item); + p->drawText(_tx+offset/2, _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, punct); + p->drawText(_tx+offset/2+fm.width(punct), _ty, 0, 0, TQt::AlignLeft|TQt::DontClip, m_item); } } } diff --git a/tdehtml/rendering/render_object.cpp b/tdehtml/rendering/render_object.cpp index eacbb4d16..b1a9bdffc 100644 --- a/tdehtml/rendering/render_object.cpp +++ b/tdehtml/rendering/render_object.cpp @@ -722,7 +722,7 @@ static void calc3DColor(TQColor &color, bool darken) int g = gb - (f0 * gb / 100); int b = bb - (f0 * bb / 100); if ((r == rb) && (g == gb) && (b == bb)) - color = (color == Qt::black) ? DARK_GRAY : Qt::black; + color = (color == TQt::black) ? DARK_GRAY : TQt::black; else color.setRgb(r, g, b); } else { @@ -730,7 +730,7 @@ static void calc3DColor(TQColor &color, bool darken) int g = kMin(gb + (f1 * (MAX_COLOR - gb) / 100), 255); int b = kMin(bb + (f1 * (MAX_COLOR - bb) / 100), 255); if ((r == rb) && (g == gb) && (b == bb)) - color = (color == Qt::white) ? LIGHT_GRAY : Qt::white; + color = (color == TQt::white) ? LIGHT_GRAY : TQt::white; else color.setRgb(r, g, b); } @@ -749,12 +749,12 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2, if(invalidisInvert) { p->setRasterOp(TQt::XorROP); - c = Qt::white; + c = TQt::white; } else { if(style == INSET || style == OUTSET || style == RIDGE || style == GROOVE) - c = Qt::white; + c = TQt::white; else c = textcolor; } @@ -773,7 +773,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2, case DOTTED: if ( width == 1 ) { // workaround Qt brokenness - p->setPen(TQPen(c, width, Qt::SolidLine)); + p->setPen(TQPen(c, width, TQt::SolidLine)); switch(s) { case BSBottom: case BSTop: @@ -788,11 +788,11 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2, break; } - p->setPen(TQPen(c, width, Qt::DotLine)); + p->setPen(TQPen(c, width, TQt::DotLine)); /* nobreak; */ case DASHED: if(style == DASHED) - p->setPen(TQPen(c, width == 1 ? 0 : width, width == 1 ? Qt::DotLine : Qt::DashLine)); + p->setPen(TQPen(c, width == 1 ? 0 : width, width == 1 ? TQt::DotLine : TQt::DashLine)); if (width > 0) switch(s) { @@ -813,7 +813,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2, if (adjbw1 == 0 && adjbw2 == 0) { - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(c); switch(s) { @@ -921,7 +921,7 @@ void RenderObject::drawBorder(TQPainter *p, int x1, int y1, int x2, int y2, (style == INSET && ( s == BSTop || s == BSLeft ) ) ); /* nobreak; */ case SOLID: - p->setPen(Qt::NoPen); + p->setPen(TQt::NoPen); p->setBrush(c); Q_ASSERT(x2>=x1); Q_ASSERT(y2>=y1); diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp index 2d991c3a2..103cad9e8 100644 --- a/tdehtml/rendering/render_replaced.cpp +++ b/tdehtml/rendering/render_replaced.cpp @@ -186,7 +186,7 @@ bool RenderWidget::event( TQEvent *e ) repaint(); } // eat all events - except if this is a frame (in which case TDEHTMLView handles it all) - if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) ) + if ( ::tqt_cast<TDEHTMLView *>( m_widget ) ) return TQObject::event( e ); return true; } @@ -202,21 +202,21 @@ void RenderWidget::setQWidget(TQWidget *widget) { if (m_widget) { m_widget->removeEventFilter(this); - disconnect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed())); + disconnect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed())); m_widget->hide(); m_widget->deleteLater(); //Might happen due to event on the widget, so be careful m_widget = 0; } m_widget = widget; if (m_widget) { - connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed())); + connect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed())); m_widget->installEventFilter(this); - if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqqt_cast<TQFrame*>(m_widget)) + if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqt_cast<TQFrame*>(m_widget)) m_widget->setBackgroundMode( TQWidget::NoBackground ); - if (m_widget->focusPolicy() > TQ_StrongFocus) - m_widget->setFocusPolicy(TQ_StrongFocus); + if (m_widget->focusPolicy() > TQWidget::StrongFocus) + m_widget->setFocusPolicy(TQWidget::StrongFocus); // if we've already received a layout, apply the calculated space to the // widget immediately, but we have to have really been full constructed (with a non-null // style pointer). @@ -316,12 +316,12 @@ void RenderWidget::updateFromElement() if (v > 128) // dark bg, light fg - need a darker disabled fg disfg = disfg.dark(lowlightVal); - else if (disfg != Qt::black) + else if (disfg != TQt::black) // light bg, dark fg - need a lighter disabled fg - but only if !black disfg = disfg.light(highlightVal); else // black fg - use darkgray disabled fg - disfg = Qt::darkGray; + disfg = TQt::darkGray; pal.setColor(TQPalette::Disabled,TQColorGroup::Foreground,disfg); } @@ -330,7 +330,7 @@ void RenderWidget::updateFromElement() else m_widget->unsetPalette(); // Border: - TQFrame* frame = ::tqqt_cast<TQFrame*>(m_widget); + TQFrame* frame = ::tqt_cast<TQFrame*>(m_widget); if (frame) { if (shouldPaintBackgroundOrBorder()) { @@ -532,7 +532,7 @@ static void copyWidget(const TQRect& r, TQPainter *p, TQWidget *widget, int tx, TQObjectList childWidgets = widget->childrenListObject(); TQObjectListIterator it(childWidgets); for (; it.current(); ++it) { - TQWidget* const w = ::tqqt_cast<TQWidget *>(it.current()); + TQWidget* const w = ::tqt_cast<TQWidget *>(it.current()); if ( w && !w->isTopLevel() && !w->isHidden()) { TQRect r2 = w->geometry(); blit -= r2; @@ -613,7 +613,7 @@ void RenderWidget::paintWidget(PaintInfo& pI, TQWidget *widget, int tx, int ty) bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) { // no special event processing if this is a frame (in which case TDEHTMLView handles it all) - if ( ::tqqt_cast<TDEHTMLView *>( m_widget ) ) + if ( ::tqt_cast<TDEHTMLView *>( m_widget ) ) return false; if ( !element() ) return true; @@ -642,7 +642,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) // Don't count popup as a valid reason for losing the focus // (example: opening the options of a select combobox shouldn't emit onblur) - if ( TQT_TQFOCUSEVENT(e)->reason() != TQFocusEvent::Popup ) + if ( static_cast<TQFocusEvent*>(e)->reason() != TQFocusEvent::Popup ) handleFocusOut(); break; case TQEvent::FocusIn: @@ -663,7 +663,7 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) case TQEvent::KeyRelease: // TODO this seems wrong - Qt events are not correctly translated to DOM ones, // like in TDEHTMLView::dispatchKeyEvent() - if (element()->dispatchKeyEvent(TQT_TQKEYEVENT(e),false)) + if (element()->dispatchKeyEvent(static_cast<TQKeyEvent*>(e),false)) filtered = true; break; @@ -673,8 +673,8 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) // currently focused. this avoids accidentally changing a select box // or something while wheeling a webpage. if (tqApp->focusWidget() != widget() && - widget()->focusPolicy() <= TQ_StrongFocus) { - TQT_TQWHEELEVENT(e)->ignore(); + widget()->focusPolicy() <= TQWidget::StrongFocus) { + static_cast<TQWheelEvent*>(e)->ignore(); TQApplication::sendEvent(view(), e); filtered = true; } @@ -697,22 +697,22 @@ bool RenderWidget::eventFilter(TQObject* /*o*/, TQEvent* e) void RenderWidget::EventPropagator::sendEvent(TQEvent *e) { switch(e->type()) { case TQEvent::MouseButtonPress: - mousePressEvent(TQT_TQMOUSEEVENT(e)); + mousePressEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseButtonRelease: - mouseReleaseEvent(TQT_TQMOUSEEVENT(e)); + mouseReleaseEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseButtonDblClick: - mouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); + mouseDoubleClickEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseMove: - mouseMoveEvent(TQT_TQMOUSEEVENT(e)); + mouseMoveEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::KeyPress: - keyPressEvent(TQT_TQKEYEVENT(e)); + keyPressEvent(static_cast<TQKeyEvent*>(e)); break; case TQEvent::KeyRelease: - keyReleaseEvent(TQT_TQKEYEVENT(e)); + keyReleaseEvent(static_cast<TQKeyEvent*>(e)); break; default: break; @@ -722,22 +722,22 @@ void RenderWidget::EventPropagator::sendEvent(TQEvent *e) { void RenderWidget::ScrollViewEventPropagator::sendEvent(TQEvent *e) { switch(e->type()) { case TQEvent::MouseButtonPress: - viewportMousePressEvent(TQT_TQMOUSEEVENT(e)); + viewportMousePressEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseButtonRelease: - viewportMouseReleaseEvent(TQT_TQMOUSEEVENT(e)); + viewportMouseReleaseEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseButtonDblClick: - viewportMouseDoubleClickEvent(TQT_TQMOUSEEVENT(e)); + viewportMouseDoubleClickEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::MouseMove: - viewportMouseMoveEvent(TQT_TQMOUSEEVENT(e)); + viewportMouseMoveEvent(static_cast<TQMouseEvent*>(e)); break; case TQEvent::KeyPress: - keyPressEvent(TQT_TQKEYEVENT(e)); + keyPressEvent(static_cast<TQKeyEvent*>(e)); break; case TQEvent::KeyRelease: - keyReleaseEvent(TQT_TQKEYEVENT(e)); + keyReleaseEvent(static_cast<TQKeyEvent*>(e)); break; default: break; @@ -784,13 +784,13 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) } switch (me.button()) { case 0: - button = Qt::LeftButton; + button = TQt::LeftButton; break; case 1: - button = Qt::MidButton; + button = TQt::MidButton; break; case 2: - button = Qt::RightButton; + button = TQt::RightButton; break; default: break; @@ -809,11 +809,11 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) // << " pos=" << p << " type=" << type // << " button=" << button << " state=" << state << endl; TQMouseEvent e(type, p, button, state); - TQScrollView * sc = ::tqqt_cast<TQScrollView*>(m_widget); - if (sc && !::tqqt_cast<TQListBox*>(m_widget)) - static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(TQT_TQEVENT(&e)); + TQScrollView * sc = ::tqt_cast<TQScrollView*>(m_widget); + if (sc && !::tqt_cast<TQListBox*>(m_widget)) + static_cast<ScrollViewEventPropagator *>(sc)->sendEvent(static_cast<TQEvent*>(&e)); else - static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&e)); + static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(&e)); ret = e.isAccepted(); break; } @@ -827,7 +827,7 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) if (domKeyEv.isSynthetic() && !acceptsSyntheticEvents()) break; TQKeyEvent* const ke = domKeyEv.qKeyEvent(); - static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke)); + static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(ke)); ret = ke->isAccepted(); break; } @@ -847,16 +847,16 @@ bool RenderWidget::handleEvent(const DOM::EventImpl& ev) // DOM: Down Press | Press | Up // Qt: (nothing) Press | Release(autorepeat) + Press(autorepeat) | Release // - // Qt::KeyPress is sent for DOM keypress and not DOM keydown to allow + // TQt::KeyPress is sent for DOM keypress and not DOM keydown to allow // sites to block a key with onkeypress, #99749 TQKeyEvent* const ke = domKeyEv.qKeyEvent(); if (ke->isAutoRepeat()) { TQKeyEvent releaseEv( TQEvent::KeyRelease, ke->key(), ke->ascii(), ke->state(), ke->text(), ke->isAutoRepeat(), ke->count() ); - static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(&releaseEv)); + static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(&releaseEv)); } - static_cast<EventPropagator *>(m_widget)->sendEvent(TQT_TQEVENT(ke)); + static_cast<EventPropagator *>(m_widget)->sendEvent(static_cast<TQEvent*>(ke)); ret = ke->isAccepted(); break; } diff --git a/tdehtml/rendering/render_replaced.h b/tdehtml/rendering/render_replaced.h index 3d8a68f9c..7a5ec5353 100644 --- a/tdehtml/rendering/render_replaced.h +++ b/tdehtml/rendering/render_replaced.h @@ -83,7 +83,7 @@ protected: class RenderWidget : public TQObject, public RenderReplaced, public tdehtml::Shared<RenderWidget> { - Q_OBJECT + TQ_OBJECT public: RenderWidget(DOM::NodeImpl* node); virtual ~RenderWidget(); diff --git a/tdehtml/rendering/render_style.h b/tdehtml/rendering/render_style.h index 28b6b999d..90aef33df 100644 --- a/tdehtml/rendering/render_style.h +++ b/tdehtml/rendering/render_style.h @@ -1450,7 +1450,7 @@ public: static short initialBorderHorizontalSpacing() { return 0; } static short initialBorderVerticalSpacing() { return 0; } static ECursor initialCursor() { return CURSOR_AUTO; } - static TQColor initialColor() { return Qt::black; } + static TQColor initialColor() { return TQt::black; } static CachedImage* initialBackgroundImage() { return 0; } static CachedImage* initialListStyleImage() { return 0; } static unsigned short initialBorderWidth() { return 3; } diff --git a/tdehtml/rendering/render_table.cpp b/tdehtml/rendering/render_table.cpp index ab0573048..bd4002a37 100644 --- a/tdehtml/rendering/render_table.cpp +++ b/tdehtml/rendering/render_table.cpp @@ -2699,8 +2699,8 @@ int RenderTableCell::borderBottom() const static void outlineBox(TQPainter *p, int _tx, int _ty, int w, int h) { - p->setPen(TQPen(TQColor("yellow"), 3, Qt::DotLine)); - p->setBrush( Qt::NoBrush ); + p->setPen(TQPen(TQColor("yellow"), 3, TQt::DotLine)); + p->setBrush( TQt::NoBrush ); p->drawRect(_tx, _ty, w, h ); } #endif diff --git a/tdehtml/rendering/render_text.cpp b/tdehtml/rendering/render_text.cpp index 3a349844b..c2bf27af5 100644 --- a/tdehtml/rendering/render_text.cpp +++ b/tdehtml/rendering/render_text.cpp @@ -334,7 +334,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, m_reversed ? TQPainter::RTL : TQPainter::LTR); p.end(); - TQImage img = TQT_TQIMAGE_OBJECT(pixmap.convertToImage()).convertDepth(32); + TQImage img = pixmap.convertToImage().convertDepth(32); int md = thickness*thickness; // max-dist^2 @@ -398,7 +398,7 @@ void InlineTextBox::paintShadow(TQPainter *pt, const Font *f, int _tx, int _ty, } } - pt->drawImage(x-thickness, y-thickness, res, 0, 0, -1, -1, Qt::DiffuseAlphaDither | Qt::ColorOnly | Qt::PreferDither); + pt->drawImage(x-thickness, y-thickness, res, 0, 0, -1, -1, TQt::DiffuseAlphaDither | TQt::ColorOnly | TQt::PreferDither); } // Paint next shadow effect if (shadow->next) paintShadow(pt, f, _tx, _ty, shadow->next); diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp index e90f5db4f..6e2b6fa17 100644 --- a/tdehtml/tdehtml_ext.cpp +++ b/tdehtml/tdehtml_ext.cpp @@ -111,12 +111,12 @@ void TDEHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget ) if ( !m_connectedToClipboard && m_editableFormWidget ) { - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( updateEditActions() ) ); - if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) - connect( m_editableFormWidget, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + if ( m_editableFormWidget->inherits( "TQLineEdit" ) || m_editableFormWidget->inherits( "TQTextEdit" ) ) + connect( m_editableFormWidget, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( updateEditActions() ) ); m_connectedToClipboard = true; } @@ -134,14 +134,14 @@ void TDEHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ ) if ( m_connectedToClipboard ) { - disconnect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + disconnect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( updateEditActions() ) ); if ( oldWidget ) { - if ( oldWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) || oldWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) - disconnect( oldWidget, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + if ( oldWidget->inherits( "TQLineEdit" ) || oldWidget->inherits( "TQTextEdit" ) ) + disconnect( oldWidget, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( updateEditActions() ) ); } m_connectedToClipboard = false; @@ -153,14 +153,14 @@ void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *p { if ( m_extensionProxy ) { - disconnect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); + disconnect( m_extensionProxy, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) ) { - disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ), - this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) ); - disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetBlurred() ), - this, TQT_SLOT( extensionProxyEditableWidgetBlurred() ) ); + disconnect( m_extensionProxy, TQ_SIGNAL( editableWidgetFocused() ), + this, TQ_SLOT( extensionProxyEditableWidgetFocused() ) ); + disconnect( m_extensionProxy, TQ_SIGNAL( editableWidgetBlurred() ), + this, TQ_SLOT( extensionProxyEditableWidgetBlurred() ) ); } } @@ -168,14 +168,14 @@ void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *p if ( m_extensionProxy ) { - connect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); + connect( m_extensionProxy, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) ) { - connect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ), - this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) ); - connect( m_extensionProxy, TQT_SIGNAL( editableWidgetBlurred() ), - this, TQT_SLOT( extensionProxyEditableWidgetBlurred() ) ); + connect( m_extensionProxy, TQ_SIGNAL( editableWidgetFocused() ), + this, TQ_SLOT( extensionProxyEditableWidgetFocused() ) ); + connect( m_extensionProxy, TQ_SIGNAL( editableWidgetBlurred() ), + this, TQ_SLOT( extensionProxyEditableWidgetBlurred() ) ); } enableAction( "cut", m_extensionProxy->isActionEnabled( "cut" ) ); @@ -200,9 +200,9 @@ void TDEHTMLPartBrowserExtension::cut() if ( !m_editableFormWidget ) return; - if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) + if ( m_editableFormWidget->inherits( "TQLineEdit" ) ) static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->cut(); - else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) + else if ( m_editableFormWidget->inherits( "TQTextEdit" ) ) static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->cut(); } @@ -223,7 +223,7 @@ void TDEHTMLPartBrowserExtension::copy() TQClipboard *cb = TQApplication::clipboard(); - disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) ); + disconnect( cb, TQ_SIGNAL( selectionChanged() ), m_part, TQ_SLOT( slotClearSelection() ) ); #ifndef TQT_NO_MIMECLIPBOARD TQString htmltext; /* @@ -249,13 +249,13 @@ void TDEHTMLPartBrowserExtension::copy() cb->setText(text); #endif - connect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) ); + connect( cb, TQ_SIGNAL( selectionChanged() ), m_part, TQ_SLOT( slotClearSelection() ) ); } else { - if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) + if ( m_editableFormWidget->inherits( "TQLineEdit" ) ) static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->copy(); - else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) + else if ( m_editableFormWidget->inherits( "TQTextEdit" ) ) static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->copy(); } } @@ -263,7 +263,7 @@ void TDEHTMLPartBrowserExtension::copy() void TDEHTMLPartBrowserExtension::searchProvider() { // action name is of form "previewProvider[<searchproviderprefix>:]" - const TQString searchProviderPrefix = TQString( TQT_TQOBJECT_CONST(sender())->name() ).mid( 14 ); + const TQString searchProviderPrefix = TQString( sender()->name() ).mid( 14 ); KURIFilterData data; TQStringList list; @@ -303,9 +303,9 @@ void TDEHTMLPartBrowserExtension::paste() if ( !m_editableFormWidget ) return; - if ( m_editableFormWidget->inherits( TQLINEEDIT_OBJECT_NAME_STRING ) ) + if ( m_editableFormWidget->inherits( "TQLineEdit" ) ) static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->paste(); - else if ( m_editableFormWidget->inherits( TQTEXTEDIT_OBJECT_NAME_STRING ) ) + else if ( m_editableFormWidget->inherits( "TQTextEdit" ) ) static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->paste(); } @@ -343,9 +343,9 @@ void TDEHTMLPartBrowserExtension::updateEditActions() bool hasSelection = false; if( m_editableFormWidget) { - if ( ::tqqt_cast<TQLineEdit*>(m_editableFormWidget)) + if ( ::tqt_cast<TQLineEdit*>(m_editableFormWidget)) hasSelection = static_cast<TQLineEdit *>( &(*m_editableFormWidget) )->hasSelectedText(); - else if(::tqqt_cast<TQTextEdit*>(m_editableFormWidget)) + else if(::tqt_cast<TQTextEdit*>(m_editableFormWidget)) hasSelection = static_cast<TQTextEdit *>( &(*m_editableFormWidget) )->hasSelectedText(); } @@ -429,7 +429,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri if (hasSelection) { - TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" ); + TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQ_SLOT( copy() ), actionCollection(), "copy" ); copyAction->setText(i18n("&Copy Text")); copyAction->setEnabled(d->m_tdehtml->browserExtension()->isActionEnabled( "copy" )); actionCollection()->insert( tdehtml->actionCollection()->action( "selectAll" ) ); @@ -477,7 +477,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri // using .arg(foo, bar) instead of .arg(foo).arg(bar), as foo can contain %x new TDEAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_tdehtml->browserExtension(), - TQT_SLOT( searchProvider() ), actionCollection(), "searchProvider" ); + TQ_SLOT( searchProvider() ), actionCollection(), "searchProvider" ); // favorite search providers TQStringList favoriteEngines; @@ -507,7 +507,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri name = service->name(); providerList->insert( new TDEAction( name, icon, 0, d->m_tdehtml->browserExtension(), - TQT_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) ); + TQ_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) ); } } } @@ -515,13 +515,13 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri if ( selectedText.contains("://") && KURL(selectedText).isValid() ) new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window-new", 0, - d->m_tdehtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" ); + d->m_tdehtml->browserExtension(), TQ_SLOT( openSelection() ), actionCollection(), "openSelection" ); } else if ( url.isEmpty() && !isImage ) { actionCollection()->insert( tdehtml->actionCollection()->action( "security" ) ); actionCollection()->insert( tdehtml->actionCollection()->action( "setEncoding" ) ); - new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ), + new TDEAction( i18n( "Stop Animations" ), 0, this, TQ_SLOT( slotStopAnimations() ), actionCollection(), "stopanimations" ); } @@ -529,14 +529,14 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri { if (url.protocol() == "mailto") { - new TDEAction( i18n( "Copy Email Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ), + new TDEAction( i18n( "Copy Email Address" ), 0, this, TQ_SLOT( slotCopyLinkLocation() ), actionCollection(), "copylinklocation" ); } else { - new TDEAction( i18n( "&Save Link As..." ), 0, this, TQT_SLOT( slotSaveLinkAs() ), + new TDEAction( i18n( "&Save Link As..." ), 0, this, TQ_SLOT( slotSaveLinkAs() ), actionCollection(), "savelinkas" ); - new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ), + new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQ_SLOT( slotCopyLinkLocation() ), actionCollection(), "copylinklocation" ); } } @@ -546,28 +546,28 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri { if ( tdehtml->parentPart() ) { - new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQT_SLOT( slotFrameInWindow() ), + new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQ_SLOT( slotFrameInWindow() ), actionCollection(), "frameinwindow" ); - new TDEAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ), + new TDEAction( i18n( "Open in &This Window" ), 0, this, TQ_SLOT( slotFrameInTop() ), actionCollection(), "frameintop" ); - new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotFrameInTab() ), + new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQ_SLOT( slotFrameInTab() ), actionCollection(), "frameintab" ); - new TDEAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ), + new TDEAction( i18n( "Reload Frame" ), 0, this, TQ_SLOT( slotReloadFrame() ), actionCollection(), "reloadframe" ); if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) { if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame ) - new TDEAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" ); + new TDEAction( i18n( "Block IFrame..." ), 0, this, TQ_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" ); } - new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQT_SLOT( slotViewDocumentSource() ), + new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQ_SLOT( slotViewDocumentSource() ), actionCollection(), "viewFrameSource" ); - new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" ); + new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQ_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" ); // This one isn't in tdehtml_popupmenu.rc anymore, because Print isn't either, // and because print frame is already in the toolbar and the menu. // But leave this here, so that it's easy to read it. - new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" ); - new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); + new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQ_SLOT( print() ), actionCollection(), "printFrame" ); + new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQ_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewDocumentSource" ) ); actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewPageInfo" ) ); @@ -578,7 +578,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri } else if (isImage || !url.isEmpty()) { actionCollection()->insert( tdehtml->actionCollection()->action( "viewDocumentSource" ) ); actionCollection()->insert( tdehtml->actionCollection()->action( "viewPageInfo" ) ); - new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ), + new TDEAction( i18n( "Stop Animations" ), 0, this, TQ_SLOT( slotStopAnimations() ), actionCollection(), "stopanimations" ); } @@ -597,35 +597,35 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri } else d->m_imageURL = KURL( static_cast<DOM::HTMLInputElement>( e ).src().string() ); - new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveImageAs() ), + new TDEAction( i18n( "Save Image As..." ), 0, this, TQ_SLOT( slotSaveImageAs() ), actionCollection(), "saveimageas" ); - new TDEAction( i18n( "Send Image..." ), 0, this, TQT_SLOT( slotSendImage() ), + new TDEAction( i18n( "Send Image..." ), 0, this, TQ_SLOT( slotSendImage() ), actionCollection(), "sendimage" ); #ifndef TQT_NO_MIMECLIPBOARD - (new TDEAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ), + (new TDEAction( i18n( "Copy Image" ), 0, this, TQ_SLOT( slotCopyImage() ), actionCollection(), "copyimage" ))->setEnabled(!d->m_pixmap.isNull()); #endif if(d->m_pixmap.isNull()) { //fallback to image location if still loading the image. this will always be true if ifdef TQT_NO_MIMECLIPBOARD - new TDEAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ), + new TDEAction( i18n( "Copy Image Location" ), 0, this, TQ_SLOT( slotCopyImageLocation() ), actionCollection(), "copyimagelocation" ); } TQString name = KStringHandler::csqueeze(d->m_imageURL.fileName()+d->m_imageURL.query(), 25); - new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ), + new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQ_SLOT( slotViewImage() ), actionCollection(), "viewimage" ); if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()) { - new TDEAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ), + new TDEAction( i18n( "Block Image..." ), 0, this, TQ_SLOT( slotBlockImage() ), actionCollection(), "blockimage" ); if (!d->m_imageURL.host().isEmpty() && !d->m_imageURL.protocol().isEmpty()) { - new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQT_SLOT( slotBlockHost() ), + new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQ_SLOT( slotBlockHost() ), actionCollection(), "blockhost" ); } } @@ -995,7 +995,7 @@ void TDEHTMLZoomFactorAction::init(TDEHTMLPart *part, bool direction) m_popup->insertItem( i18n( "%1%" ).arg( fastZoomSizes[ofs + i] ) ); } - connect( m_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); + connect( m_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) ); } TDEHTMLZoomFactorAction::~TDEHTMLZoomFactorAction() diff --git a/tdehtml/tdehtml_ext.h b/tdehtml/tdehtml_ext.h index 7cea57956..ebdc886f9 100644 --- a/tdehtml/tdehtml_ext.h +++ b/tdehtml/tdehtml_ext.h @@ -40,7 +40,7 @@ */ class TDEHTMLPartBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT friend class TDEHTMLPart; friend class TDEHTMLView; public: @@ -114,7 +114,7 @@ private: */ class TDEHTMLPopupGUIClient : public TQObject, public KXMLGUIClient { - Q_OBJECT + TQ_OBJECT public: TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQString &doc, const KURL &url ); virtual ~TDEHTMLPopupGUIClient(); @@ -151,7 +151,7 @@ private: class TDEHTMLZoomFactorAction : public TDEAction { - Q_OBJECT + TQ_OBJECT public: //BCI: remove in KDE 4 TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name ); diff --git a/tdehtml/tdehtml_factory.h b/tdehtml/tdehtml_factory.h index 3ad2aff8c..5d424282c 100644 --- a/tdehtml/tdehtml_factory.h +++ b/tdehtml/tdehtml_factory.h @@ -38,7 +38,7 @@ namespace DOM class KDE_EXPORT TDEHTMLFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT friend class DOM::DocumentImpl; friend class TDEHTMLViewPrivate; public: diff --git a/tdehtml/tdehtml_iface.cpp b/tdehtml/tdehtml_iface.cpp index 4bb4afd89..197a1020e 100644 --- a/tdehtml/tdehtml_iface.cpp +++ b/tdehtml/tdehtml_iface.cpp @@ -150,7 +150,7 @@ void TDEHTMLPartIface::activateNode() { KParts::ReadOnlyPart* p = part->currentFrame(); if ( p && p->widget() ) { - TQKeyEvent ev( TQKeyEvent::KeyPress, Qt::Key_Return, '\n', 0, "\n" ); + TQKeyEvent ev( TQKeyEvent::KeyPress, TQt::Key_Return, '\n', 0, "\n" ); TQApplication::sendEvent( p->widget(), &ev ); } } diff --git a/tdehtml/tdehtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp index 319dd8162..df08f97d6 100644 --- a/tdehtml/tdehtml_pagecache.cpp +++ b/tdehtml/tdehtml_pagecache.cpp @@ -108,7 +108,7 @@ TDEHTMLPageCacheEntry::fetchData(TQObject *recvObj, const char *recvSlot) int fd = dup(m_file->handle()); lseek(fd, 0, SEEK_SET); TDEHTMLPageCacheDelivery *delivery = new TDEHTMLPageCacheDelivery(fd); - recvObj->connect(delivery, TQT_SIGNAL(emitData(const TQByteArray&)), recvSlot); + recvObj->connect(delivery, TQ_SIGNAL(emitData(const TQByteArray&)), recvSlot); delivery->recvObj = recvObj; return delivery; } @@ -210,7 +210,7 @@ TDEHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot) if (!d->deliveryActive) { d->deliveryActive = true; - TQTimer::singleShot(20, this, TQT_SLOT(sendData())); + TQTimer::singleShot(20, this, TQ_SLOT(sendData())); } } @@ -265,7 +265,7 @@ TDEHTMLPageCache::sendData() byteArray.resetRawData(buf, n); d->delivery.append( delivery ); } - TQTimer::singleShot(0, this, TQT_SLOT(sendData())); + TQTimer::singleShot(0, this, TQ_SLOT(sendData())); } void diff --git a/tdehtml/tdehtml_pagecache.h b/tdehtml/tdehtml_pagecache.h index f648bd548..e16164771 100644 --- a/tdehtml/tdehtml_pagecache.h +++ b/tdehtml/tdehtml_pagecache.h @@ -40,7 +40,7 @@ class TDEHTMLPageCachePrivate; */ class TDEHTMLPageCache : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * static "constructor". @@ -116,7 +116,7 @@ private: class TDEHTMLPageCacheDelivery : public TQObject { friend class TDEHTMLPageCache; -Q_OBJECT +TQ_OBJECT public: TDEHTMLPageCacheDelivery(int _fd) : fd(_fd) { } diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index b822212ac..81c228e90 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -177,7 +177,7 @@ void tdehtml::ChildFrame::liveConnectEvent(const unsigned long, const TQString & script += ")"; kdDebug(6050) << "tdehtml::ChildFrame::liveConnectEvent " << script << endl; - TDEHTMLPart * part = ::tqqt_cast<TDEHTMLPart *>(m_part->parent()); + TDEHTMLPart * part = ::tqt_cast<TDEHTMLPart *>(m_part->parent()); if (!part) return; if (!m_jscript) @@ -251,24 +251,24 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) d->m_bMousePressed = false; d->m_bRightMousePressed = false; d->m_bCleared = false; - d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQT_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" ); - d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQT_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" ); - d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" ); - d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQT_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" ); - d->m_paSaveDocument = KStdAction::saveAs( this, TQT_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" ); + d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQ_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" ); + d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQ_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" ); + d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQ_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" ); + d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQ_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" ); + d->m_paSaveDocument = KStdAction::saveAs( this, TQ_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" ); if ( parentPart() ) d->m_paSaveDocument->setShortcut( TDEShortcut() ); // avoid clashes - d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); - d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQT_SLOT( slotSecurity() ), actionCollection(), "security" ); + d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQ_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); + d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQ_SLOT( slotSecurity() ), actionCollection(), "security" ); d->m_paSecurity->setWhatsThis( i18n( "Security Settings<p>" "Shows the certificate of the displayed page. Only " "pages that have been transmitted using a secure, encrypted connection have a " "certificate.<p> " "Hint: If the image shows a closed lock, the page has been transmitted over a " "secure connection.") ); - d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQT_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" ); - d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQT_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" ); - d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQT_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" ); + d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQ_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" ); + d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQ_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" ); + d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQ_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" ); d->m_paSetEncoding = new TDEActionMenu( i18n( "Set &Encoding" ), "charset", actionCollection(), "setEncoding" ); d->m_paSetEncoding->setDelayed( false ); @@ -291,14 +291,14 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) //d->m_automaticDetection->insertItem( i18n( "Unicode" ), 13 ); d->m_automaticDetection->insertItem( i18n( "Western European" ), 14 ); - connect( d->m_automaticDetection, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotAutomaticDetectionLanguage( int ) ) ); + connect( d->m_automaticDetection, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAutomaticDetectionLanguage( int ) ) ); d->m_paSetEncoding->popupMenu()->insertItem( i18n( "Automatic Detection" ), d->m_automaticDetection, 0 ); d->m_paSetEncoding->insert( new TDEActionSeparator( actionCollection() ) ); - d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" ); + d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQ_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" ); TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); d->m_manualDetection->setItems( encodings ); d->m_manualDetection->setCurrentItem( -1 ); @@ -353,40 +353,40 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) } - d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" ); + d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQ_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" ); if ( prof == BrowserViewGUI ) { d->m_paIncZoomFactor = new TDEHTMLZoomFactorAction( this, true, i18n( "Enlarge Font" ), "zoom-in", "CTRL++;CTRL+=", this, - TQT_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" ); + TQ_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" ); d->m_paIncZoomFactor->setWhatsThis( i18n( "Enlarge Font<p>" "Make the font in this window bigger. " "Click and hold down the mouse button for a menu with all available font sizes." ) ); d->m_paDecZoomFactor = new TDEHTMLZoomFactorAction( this, false, i18n( "Shrink Font" ), "zoom-out", CTRL + Key_Minus, this, - TQT_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" ); + TQ_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" ); d->m_paDecZoomFactor->setWhatsThis( i18n( "Shrink Font<p>" "Make the font in this window smaller. " "Click and hold down the mouse button for a menu with all available font sizes." ) ); } - d->m_paFind = KStdAction::find( this, TQT_SLOT( slotFind() ), actionCollection(), "find" ); + d->m_paFind = KStdAction::find( this, TQ_SLOT( slotFind() ), actionCollection(), "find" ); d->m_paFind->setWhatsThis( i18n( "Find text<p>" "Shows a dialog that allows you to find text on the displayed page." ) ); - d->m_paFindNext = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection(), "findNext" ); + d->m_paFindNext = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), actionCollection(), "findNext" ); d->m_paFindNext->setWhatsThis( i18n( "Find next<p>" "Find the next occurrence of the text that you " "have found using the <b>Find Text</b> function" ) ); - d->m_paFindPrev = KStdAction::findPrev( this, TQT_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" ); + d->m_paFindPrev = KStdAction::findPrev( this, TQ_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" ); d->m_paFindPrev->setWhatsThis( i18n( "Find previous<p>" "Find the previous occurrence of the text that you " "have found using the <b>Find Text</b> function" ) ); - d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()), + d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQ_SLOT( slotFindAheadText()), actionCollection(), "findAheadText"); - d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()), + d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQ_SLOT( slotFindAheadLink()), actionCollection(), "findAheadLink"); d->m_paFindAheadText->setEnabled( false ); d->m_paFindAheadLinks->setEnabled( false ); @@ -400,17 +400,17 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) d->m_paFindAheadLinks->setShortcut( TDEShortcut()); } - d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQT_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" ); + d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQ_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" ); d->m_paPrintFrame->setWhatsThis( i18n( "Print Frame<p>" "Some pages have several frames. To print only a single frame, click " "on it and then use this function." ) ); - d->m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectAll" ); + d->m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectAll" ); if ( parentPart() ) d->m_paSelectAll->setShortcut( TDEShortcut() ); // avoid clashes d->m_paToggleCaretMode = new TDEToggleAction(i18n("Toggle Caret Mode"), - Key_F7, this, TQT_SLOT(slotToggleCaretMode()), + Key_F7, this, TQ_SLOT(slotToggleCaretMode()), actionCollection(), "caretMode"); d->m_paToggleCaretMode->setChecked(isCaretMode()); if (parentPart()) @@ -427,30 +427,30 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) // Set the meta-refresh flag... d->m_metaRefreshEnabled = d->m_settings->isAutoDelayedActionsEnabled (); - connect( view, TQT_SIGNAL( zoomView( int ) ), TQT_SLOT( slotZoomView( int ) ) ); + connect( view, TQ_SIGNAL( zoomView( int ) ), TQ_SLOT( slotZoomView( int ) ) ); - connect( this, TQT_SIGNAL( completed() ), - this, TQT_SLOT( updateActions() ) ); - connect( this, TQT_SIGNAL( completed( bool ) ), - this, TQT_SLOT( updateActions() ) ); - connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ), - this, TQT_SLOT( updateActions() ) ); + connect( this, TQ_SIGNAL( completed() ), + this, TQ_SLOT( updateActions() ) ); + connect( this, TQ_SIGNAL( completed( bool ) ), + this, TQ_SLOT( updateActions() ) ); + connect( this, TQ_SIGNAL( started( TDEIO::Job * ) ), + this, TQ_SLOT( updateActions() ) ); d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "tdehtml/tdehtml_popupmenu.rc", TDEHTMLFactory::instance() ) ); - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), - this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), + this, TQ_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); - connect ( &d->m_progressUpdateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressUpdate() ) ); + connect ( &d->m_progressUpdateTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgressUpdate() ) ); findTextBegin(); //reset find variables - connect( &d->m_redirectionTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRedirect() ) ); + connect( &d->m_redirectionTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRedirect() ) ); d->m_dcopobject = new TDEHTMLPartIface(this); @@ -495,12 +495,12 @@ TDEHTMLPart::~TDEHTMLPart() if (!d->m_bComplete) closeURL(); - disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), - this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); - disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); - disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), + this, TQ_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); + disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); clear(); @@ -551,10 +551,10 @@ bool TDEHTMLPart::restoreURL( const KURL &url ) m_url = url; d->m_restoreScrollPosition = true; - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); - connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); + connect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); - TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQT_SLOT(slotRestoreData(const TQByteArray &))); + TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQ_SLOT(slotRestoreData(const TQByteArray &))); emit started( 0L ); @@ -672,8 +672,8 @@ bool TDEHTMLPart::openURL( const KURL &url ) closeURL(); d->m_restoreScrollPosition = d->m_restored; - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); - connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); + connect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); // initializing m_url to the new url breaks relative links when opening such a link after this call and _before_ begin() is called (when the first // data arrives) (Simon) @@ -719,14 +719,14 @@ bool TDEHTMLPart::openURL( const KURL &url ) d->m_job->setWindow(widget()->topLevelWidget()); d->m_job->addMetaData(args.metaData()); - connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - connect( d->m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect ( d->m_job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); - connect( d->m_job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); + connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( d->m_job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect ( d->m_job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); + connect( d->m_job, TQ_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); d->m_bComplete = false; d->m_bLoadEventEmitted = false; @@ -742,14 +742,14 @@ bool TDEHTMLPart::openURL( const KURL &url ) d->m_bPluginsEnabled = TDEHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host()); - connect( d->m_job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - this, TQT_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( d->m_job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + this, TQ_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( d->m_job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - this, TQT_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) ); + connect( d->m_job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + this, TQ_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) ); - connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotJobDone( TDEIO::Job* ) ) ); + connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotJobDone( TDEIO::Job* ) ) ); d->m_jobspeed = 0; @@ -758,8 +758,8 @@ bool TDEHTMLPart::openURL( const KURL &url ) if ( args.reload && !settings()->userStyleSheet().isEmpty() ) { KURL url( settings()->userStyleSheet() ); TDEIO::StatJob *job = TDEIO::stat( url, false /* don't show progress */ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) ); } emit started( 0L ); @@ -790,7 +790,7 @@ bool TDEHTMLPart::closeURL() d->m_bLoadEventEmitted = true; // don't want that one either d->m_cachePolicy = KProtocolManager::cacheControl(); // reset cache policy - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); TDEHTMLPageCache::self()->cancelFetch(this); if ( d->m_doc && d->m_doc->parsing() ) @@ -1079,8 +1079,8 @@ KJSErrorDlg *TDEHTMLPart::jsErrorExtension() { d->m_statusBarExtension->addStatusBarItem(d->m_statusBarJSErrorLabel, 0, false); TQToolTip::add(d->m_statusBarJSErrorLabel, i18n("This web page contains coding errors.")); d->m_statusBarJSErrorLabel->setPixmap(SmallIcon("bug", instance())); - connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchJSErrorDialog())); - connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(jsErrorDialogContextMenu())); + connect(d->m_statusBarJSErrorLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(launchJSErrorDialog())); + connect(d->m_statusBarJSErrorLabel, TQ_SIGNAL(rightClickedURL()), TQ_SLOT(jsErrorDialogContextMenu())); } if (!d->m_jsedlg) { d->m_jsedlg = new KJSErrorDlg; @@ -1119,8 +1119,8 @@ void TDEHTMLPart::disableJSErrorExtension() { void TDEHTMLPart::jsErrorDialogContextMenu() { TDEPopupMenu *m = new TDEPopupMenu(0L); - m->insertItem(i18n("&Hide Errors"), this, TQT_SLOT(removeJSErrorExtension())); - m->insertItem(i18n("&Disable Error Reporting"), this, TQT_SLOT(disableJSErrorExtension())); + m->insertItem(i18n("&Hide Errors"), this, TQ_SLOT(removeJSErrorExtension())); + m->insertItem(i18n("&Disable Error Reporting"), this, TQ_SLOT(disableJSErrorExtension())); m->popup(TQCursor::pos()); } @@ -1251,7 +1251,7 @@ bool TDEHTMLPart::javaEnabled() const { if (onlyLocalReferences()) return false; -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS if( d->m_bJavaOverride ) return d->m_bJavaForce; return d->m_bJavaEnabled; @@ -1347,7 +1347,7 @@ void TDEHTMLPart::setAutoloadImages( bool enable ) d->m_paLoadImages = 0; } else if ( !d->m_paLoadImages ) - d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQT_SLOT( slotLoadImages() ), actionCollection(), "loadImages" ); + d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQ_SLOT( slotLoadImages() ), actionCollection(), "loadImages" ); if ( d->m_paLoadImages ) { TQPtrList<TDEAction> lst; @@ -1429,8 +1429,8 @@ void TDEHTMLPart::clear() // We don't want to change between parts if we are going to delete all of them anyway if (partManager()) { - disconnect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); + disconnect( partManager(), TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); } if (d->m_frames.count()) @@ -1464,8 +1464,8 @@ void TDEHTMLPart::clear() // Listen to part changes again if (partManager()) { - connect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); + connect( partManager(), TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); } d->m_delayRedirect = 0; @@ -1483,7 +1483,7 @@ void TDEHTMLPart::clear() d->m_startOffset = 0; d->m_endOffset = 0; #ifndef TQT_NO_CLIPBOARD - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); + connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection())); #endif d->m_jobPercent = 0; @@ -1531,7 +1531,7 @@ void TDEHTMLPart::setPageSecurity( PageSecurity sec ) d->m_statusBarIconLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); d->m_statusBarIconLabel->setUseCursor( false ); d->m_statusBarExtension->addStatusBarItem( d->m_statusBarIconLabel, 0, false ); - connect( d->m_statusBarIconLabel, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( slotSecurity() ) ); + connect( d->m_statusBarIconLabel, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( slotSecurity() ) ); } else if (d->m_statusBarIconLabel) { TQToolTip::remove(d->m_statusBarIconLabel); } @@ -1844,7 +1844,7 @@ void TDEHTMLPart::slotFinished( TDEIO::Job * job ) return; } - TDEIO::TransferJob *tjob = ::tqqt_cast<TDEIO::TransferJob*>(job); + TDEIO::TransferJob *tjob = ::tqt_cast<TDEIO::TransferJob*>(job); if (tjob && tjob->isErrorPage()) { tdehtml::RenderPart *renderPart = d->m_frame ? static_cast<tdehtml::RenderPart *>(d->m_frame->m_frame) : 0; if (renderPart) { @@ -1953,7 +1953,7 @@ void TDEHTMLPart::begin( const KURL &url, int xOffset, int yOffset ) d->m_doc->setRestoreState(args.docState); d->m_doc->open(); - connect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); + connect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); emit d->m_extension->enableAction( "print", true ); @@ -2071,8 +2071,8 @@ void TDEHTMLPart::resetFromScript() closeURL(); d->m_bComplete = false; d->m_bLoadEventEmitted = false; - disconnect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); - connect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); + disconnect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); + connect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); d->m_doc->setParsing(true); emit started( 0L ); @@ -2082,7 +2082,7 @@ void TDEHTMLPart::slotFinishedParsing() { d->m_doc->setParsing(false); checkEmitLoadEvent(); - disconnect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); + disconnect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); if (!d->m_view) return; // We are probably being destructed. @@ -3008,7 +3008,7 @@ void TDEHTMLPart::findText() // The lineedit of the dialog would make tdehtml lose its selection, otherwise #ifndef TQT_NO_CLIPBOARD - disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) ); + disconnect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotClearSelection()) ); #endif // Now show the dialog in which the user can choose options. @@ -3026,8 +3026,8 @@ void TDEHTMLPart::findText() d->m_lastFindState.last_dir = -1; d->m_findDialog->show(); - connect( d->m_findDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFindNext()) ); - connect( d->m_findDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFindDialogDestroyed()) ); + connect( d->m_findDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotFindNext()) ); + connect( d->m_findDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotFindDialogDestroyed()) ); findText( d->m_findDialog->pattern(), 0 /*options*/, widget(), d->m_findDialog ); } @@ -3039,17 +3039,17 @@ void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent, return; #ifndef TQT_NO_CLIPBOARD - connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) ); + connect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotClearSelection()) ); #endif // Create the KFind object delete d->m_find; d->m_find = new KFind( str, options, parent, findDialog ); d->m_find->closeFindNextDialog(); // we use KFindDialog non-modal, so we don't want other dlg popping up - connect( d->m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); - //connect(d->m_find, TQT_SIGNAL( findNext() ), - // this, TQT_SLOT( slotFindNext() ) ); + connect( d->m_find, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); + //connect(d->m_find, TQ_SIGNAL( findNext() ), + // this, TQ_SLOT( slotFindNext() ) ); if ( !findDialog ) { @@ -3933,7 +3933,7 @@ bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, return true; } - if ( button == Qt::LeftButton && ( state & ShiftButton ) ) + if ( button == TQt::LeftButton && ( state & ShiftButton ) ) { TDEIO::MetaData metaData; metaData["referrer"] = d->m_referrer; @@ -3972,7 +3972,7 @@ bool TDEHTMLPart::urlSelectedIntern( const TQString &url, int button, int state, args.metaData()["referrer"] = d->m_referrer; - if ( button == Qt::NoButton && (state & ShiftButton) && (state & ControlButton) ) + if ( button == TQt::NoButton && (state & ShiftButton) && (state & ControlButton) ) { emit d->m_extension->createNewWindow( cURL, args ); return true; @@ -4489,12 +4489,12 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL & //CRITICAL STUFF if ( child->m_part ) { - if (!::tqqt_cast<TDEHTMLPart*>(child->m_part) && child->m_jscript) + if (!::tqt_cast<TDEHTMLPart*>(child->m_part) && child->m_jscript) child->m_jscript->clear(); partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part ); delete (KParts::ReadOnlyPart *)child->m_part; if (child->m_liveconnect) { - disconnect(child->m_liveconnect, TQT_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQT_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); + disconnect(child->m_liveconnect, TQ_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQ_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); child->m_liveconnect = 0L; } } @@ -4510,70 +4510,70 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL & child->m_part = part; - if (::tqqt_cast<TDEHTMLPart*>(part)) { + if (::tqt_cast<TDEHTMLPart*>(part)) { static_cast<TDEHTMLPart*>(part)->d->m_frame = child; } else if (child->m_frame) { child->m_liveconnect = KParts::LiveConnectExtension::childObject(part); if (child->m_liveconnect) - connect(child->m_liveconnect, TQT_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQT_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); + connect(child->m_liveconnect, TQ_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQ_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); } KParts::StatusBarExtension *sb = KParts::StatusBarExtension::childObject(part); if (sb) sb->setStatusBar( d->m_statusBarExtension->statusBar() ); - connect( part, TQT_SIGNAL( started( TDEIO::Job *) ), - this, TQT_SLOT( slotChildStarted( TDEIO::Job *) ) ); - connect( part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotChildCompleted() ) ); - connect( part, TQT_SIGNAL( completed(bool) ), - this, TQT_SLOT( slotChildCompleted(bool) ) ); - connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SIGNAL( setStatusBarText( const TQString & ) ) ); + connect( part, TQ_SIGNAL( started( TDEIO::Job *) ), + this, TQ_SLOT( slotChildStarted( TDEIO::Job *) ) ); + connect( part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotChildCompleted() ) ); + connect( part, TQ_SIGNAL( completed(bool) ), + this, TQ_SLOT( slotChildCompleted(bool) ) ); + connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SIGNAL( setStatusBarText( const TQString & ) ) ); if ( part->inherits( "TDEHTMLPart" ) ) { - connect( this, TQT_SIGNAL( completed() ), - part, TQT_SLOT( slotParentCompleted() ) ); - connect( this, TQT_SIGNAL( completed(bool) ), - part, TQT_SLOT( slotParentCompleted() ) ); + connect( this, TQ_SIGNAL( completed() ), + part, TQ_SLOT( slotParentCompleted() ) ); + connect( this, TQ_SIGNAL( completed(bool) ), + part, TQ_SLOT( slotParentCompleted() ) ); // As soon as the child's document is created, we need to set its domain // (but we do so only once, so it can't be simply done in the child) - connect( part, TQT_SIGNAL( docCreated() ), - this, TQT_SLOT( slotChildDocCreated() ) ); + connect( part, TQ_SIGNAL( docCreated() ), + this, TQ_SLOT( slotChildDocCreated() ) ); } child->m_extension = KParts::BrowserExtension::childObject( part ); if ( child->m_extension ) { - connect( child->m_extension, TQT_SIGNAL( openURLNotify() ), - d->m_extension, TQT_SIGNAL( openURLNotify() ) ); - - connect( child->m_extension, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( slotChildURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - - connect( child->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), - d->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); - connect( child->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), - d->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); - - connect( child->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - d->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - d->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); - - connect( child->m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ), - d->m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ) ); - - connect( child->m_extension, TQT_SIGNAL( requestFocus( KParts::ReadOnlyPart * ) ), - this, TQT_SLOT( slotRequestFocus( KParts::ReadOnlyPart * ) ) ); + connect( child->m_extension, TQ_SIGNAL( openURLNotify() ), + d->m_extension, TQ_SIGNAL( openURLNotify() ) ); + + connect( child->m_extension, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( slotChildURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + + connect( child->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), + d->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( child->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), + d->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); + + connect( child->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + d->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + d->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); + + connect( child->m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ), + d->m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ) ); + + connect( child->m_extension, TQ_SIGNAL( requestFocus( KParts::ReadOnlyPart * ) ), + this, TQ_SLOT( slotRequestFocus( KParts::ReadOnlyPart * ) ) ); child->m_extension->setBrowserInterface( d->m_extension->browserInterface() ); } @@ -4684,7 +4684,7 @@ KParts::ReadOnlyPart *TDEHTMLPart::createPart( TQWidget *parentWidget, const cha if ( factory->inherits( "KParts::Factory" ) ) res = static_cast<KParts::ReadOnlyPart *>(static_cast<KParts::Factory *>( factory )->createPart( parentWidget, widgetName, parent, name, className, params )); else - res = static_cast<KParts::ReadOnlyPart *>(factory->create( TQT_TQOBJECT(parentWidget), widgetName, className )); + res = static_cast<KParts::ReadOnlyPart *>(factory->create( parentWidget, widgetName, className )); if ( res ) { serviceTypes = service->serviceTypes(); @@ -4706,10 +4706,10 @@ KParts::PartManager *TDEHTMLPart::partManager() { d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "tdehtml part manager" ); d->m_manager->setAllowNestedParts( true ); - connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); - connect( d->m_manager, TQT_SIGNAL( partRemoved( KParts::Part * ) ), - this, TQT_SLOT( slotPartRemoved( KParts::Part * ) ) ); + connect( d->m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); + connect( d->m_manager, TQ_SIGNAL( partRemoved( KParts::Part * ) ), + this, TQ_SLOT( slotPartRemoved( KParts::Part * ) ) ); } return d->m_manager; @@ -4717,7 +4717,7 @@ KParts::PartManager *TDEHTMLPart::partManager() void TDEHTMLPart::submitFormAgain() { - disconnect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain())); + disconnect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(submitFormAgain())); if( d->m_doc && !d->m_doc->parsing() && d->m_submitForm) TDEHTMLPart::submitForm( d->m_submitForm->submitAction, d->m_submitForm->submitUrl, d->m_submitForm->submitFormData, d->m_submitForm->target, d->m_submitForm->submitContentType, d->m_submitForm->submitBoundary ); @@ -4924,7 +4924,7 @@ void TDEHTMLPart::submitForm( const char *action, const TQString &url, const TQB d->m_submitForm->target = _target; d->m_submitForm->submitContentType = contentType; d->m_submitForm->submitBoundary = boundary; - connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain())); + connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(submitFormAgain())); } else { @@ -5033,7 +5033,7 @@ void TDEHTMLPart::slotParentCompleted() void TDEHTMLPart::slotChildStarted( TDEIO::Job *job ) { - tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) ); + tdehtml::ChildFrame *child = frame( sender() ); assert( child ); @@ -5060,7 +5060,7 @@ void TDEHTMLPart::slotChildCompleted() void TDEHTMLPart::slotChildCompleted( bool pendingAction ) { - tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender()) ); + tdehtml::ChildFrame *child = frame( sender() ); if ( child ) { kdDebug(6050) << this << " slotChildCompleted child=" << child << " m_frame=" << child->m_frame << endl; @@ -5088,12 +5088,12 @@ void TDEHTMLPart::slotChildDocCreated() } } // So it only happens once - disconnect( htmlFrame, TQT_SIGNAL( docCreated() ), this, TQT_SLOT( slotChildDocCreated() ) ); + disconnect( htmlFrame, TQ_SIGNAL( docCreated() ), this, TQ_SLOT( slotChildDocCreated() ) ); } void TDEHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ) { - tdehtml::ChildFrame *child = frame( TQT_TQOBJECT_CONST(sender())->parent() ); + tdehtml::ChildFrame *child = frame( sender()->parent() ); TDEHTMLPart *callingHtmlPart = const_cast<TDEHTMLPart *>(dynamic_cast<const TDEHTMLPart *>(sender()->parent())); // TODO: handle child target correctly! currently the script are always executed fur the parent @@ -5302,7 +5302,7 @@ bool TDEHTMLPart::frameExists( const TQString &frameName ) KJSProxy *TDEHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) { - TDEHTMLPart* const kp = ::tqqt_cast<TDEHTMLPart*>(framePart); + TDEHTMLPart* const kp = ::tqt_cast<TDEHTMLPart*>(framePart); if (kp) return kp->jScript(); @@ -5320,7 +5320,7 @@ KJSProxy *TDEHTMLPart::framejScript(KParts::ReadOnlyPart *framePart) TDEHTMLPart *TDEHTMLPart::parentPart() { - return ::tqqt_cast<TDEHTMLPart *>( parent() ); + return ::tqt_cast<TDEHTMLPart *>( parent() ); } tdehtml::ChildFrame *TDEHTMLPart::recursiveFrameRequest( TDEHTMLPart *callingHtmlPart, const KURL &url, @@ -5733,7 +5733,7 @@ void TDEHTMLPart::setZoomFactor (int percent) d->m_zoomFactor = percent; if(d->m_doc) { - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); if (d->m_doc->styleSelector()) d->m_doc->styleSelector()->computeFontSizes(d->m_doc->paintDeviceMetrics(), d->m_zoomFactor); d->m_doc->recalcStyle( NodeImpl::Force ); @@ -5839,7 +5839,7 @@ TQString TDEHTMLPart::lastModified() const // Done on demand to save time when this isn't needed - but can lead // to slightly wrong results if updating the file on disk w/o reloading. TQDateTime lastModif = TQFileInfo( m_url.path() ).lastModified(); - d->m_lastModified = lastModif.toString( Qt::LocalDate ); + d->m_lastModified = lastModif.toString( TQt::LocalDate ); } //kdDebug(6050) << "TDEHTMLPart::lastModified: " << d->m_lastModified << endl; return d->m_lastModified; @@ -5879,7 +5879,7 @@ void TDEHTMLPart::reparseConfiguration() delete d->m_settings; d->m_settings = new TDEHTMLSettings(*TDEHTMLFactory::defaultHTMLSettings()); - TQApplication::setOverrideCursor( tqwaitCursor ); + TQApplication::setOverrideCursor( TQt::waitCursor ); tdehtml::CSSStyleSelector::reparseConfiguration(); if(d->m_doc) d->m_doc->updateStyleSelector(); TQApplication::restoreOverrideCursor(); @@ -6062,13 +6062,13 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event ) else d->m_strSelectedURL = d->m_strSelectedURLTarget = TQString(); - if ( _mouse->button() == Qt::LeftButton || - _mouse->button() == Qt::MidButton ) + if ( _mouse->button() == TQt::LeftButton || + _mouse->button() == TQt::MidButton ) { d->m_bMousePressed = true; #ifndef TDEHTML_NO_SELECTION - if ( _mouse->button() == Qt::LeftButton ) + if ( _mouse->button() == TQt::LeftButton ) { if ( (!d->m_strSelectedURL.isNull() && !isEditable()) || (!d->m_mousePressNode.isNull() && d->m_mousePressNode.elementId() == ID_IMG) ) @@ -6116,10 +6116,10 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event ) #endif } - if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick ) + if ( _mouse->button() == TQt::RightButton && parentPart() != 0 && d->m_bBackRightClick ) { d->m_bRightMousePressed = true; - } else if ( _mouse->button() == Qt::RightButton ) + } else if ( _mouse->button() == TQt::RightButton ) { popupMenu( d->m_strSelectedURL ); // might be deleted, don't touch "this" @@ -6129,7 +6129,7 @@ void TDEHTMLPart::tdehtmlMousePressEvent( tdehtml::MousePressEvent *event ) void TDEHTMLPart::tdehtmlMouseDoubleClickEvent( tdehtml::MouseDoubleClickEvent *event ) { TQMouseEvent *_mouse = event->qmouseEvent(); - if ( _mouse->button() == Qt::LeftButton ) + if ( _mouse->button() == TQt::LeftButton ) { d->m_bMousePressed = true; DOM::Node innerNode = event->innerNode(); @@ -6498,7 +6498,7 @@ void TDEHTMLPart::tdehtmlMouseMoveEvent( tdehtml::MouseMoveEvent *event ) #ifndef TDEHTML_NO_SELECTION // selection stuff if( d->m_bMousePressed && innerNode.handle() && innerNode.handle()->renderer() && - ( (_mouse->state() & Qt::LeftButton) != 0 )) { + ( (_mouse->state() & TQt::LeftButton) != 0 )) { extendSelectionTo(event->x(), event->y(), event->absX(), event->absY(), innerNode); #else @@ -6530,7 +6530,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) d->m_bMousePressed = false; TQMouseEvent *_mouse = event->qmouseEvent(); - if ( _mouse->button() == Qt::RightButton && parentPart() != 0 && d->m_bBackRightClick ) + if ( _mouse->button() == TQt::RightButton && parentPart() != 0 && d->m_bBackRightClick ) { d->m_bRightMousePressed = false; KParts::BrowserInterface *tmp_iface = d->m_extension->browserInterface(); @@ -6539,7 +6539,7 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) } } #ifndef TQT_NO_CLIPBOARD - if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == Qt::MidButton) && (event->url().isNull())) { + if ((d->m_guiProfile == BrowserViewGUI) && (_mouse->button() == TQt::MidButton) && (event->url().isNull())) { kdDebug( 6050 ) << "TDEHTMLPart::tdehtmlMouseReleaseEvent() MMB shouldOpen=" << d->m_bOpenMiddleClick << endl; @@ -6615,9 +6615,9 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) #ifndef TQT_NO_CLIPBOARD TQString text = selectedText(); text.replace(TQChar(0xa0), ' '); - disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection())); + disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection())); kapp->clipboard()->setText(text,TQClipboard::Selection); - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); + connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection())); #endif //kdDebug( 6000 ) << "selectedText = " << text << endl; emitSelectionChanged(); @@ -6681,13 +6681,13 @@ void TDEHTMLPart::slotSelectAll() void TDEHTMLPart::startAutoScroll() { - connect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() )); + connect(&d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() )); d->m_scrollTimer.start(100, false); } void TDEHTMLPart::stopAutoScroll() { - disconnect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() )); + disconnect(&d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() )); if (d->m_scrollTimer.isActive()) d->m_scrollTimer.stop(); } @@ -6876,7 +6876,7 @@ void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part ) return; } // kdDebug(6050) << "TDEHTMLPart::slotActiveFrameChanged d->m_activeFrame=" << d->m_activeFrame << endl; - if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) ) + if ( d->m_activeFrame && d->m_activeFrame->widget() && d->m_activeFrame->widget()->inherits( "TQFrame" ) ) { TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() ); if (frame->frameStyle() != TQFrame::NoFrame) @@ -6904,7 +6904,7 @@ void TDEHTMLPart::slotActiveFrameChanged( KParts::Part *part ) d->m_activeFrame = part; - if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( TQFRAME_OBJECT_NAME_STRING ) ) + if ( d->m_activeFrame && d->m_activeFrame->widget()->inherits( "TQFrame" ) ) { TQFrame *frame = static_cast<TQFrame *>( d->m_activeFrame->widget() ); if (frame->frameStyle() != TQFrame::NoFrame) @@ -7114,7 +7114,7 @@ void TDEHTMLPart::restoreScrollPosition() if ( m_url.hasRef() && !d->m_restoreScrollPosition && !args.reload) { if ( !d->m_doc || !d->m_doc->parsing() ) - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); if ( !gotoAnchor(m_url.encodedHtmlRef()) ) gotoAnchor(m_url.htmlRef()); return; @@ -7127,7 +7127,7 @@ void TDEHTMLPart::restoreScrollPosition() if (d->m_view->contentsHeight() - d->m_view->visibleHeight() >= args.yOffset || d->m_bComplete) { d->m_view->setContentsPos(args.xOffset, args.yOffset); - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); } } @@ -7165,8 +7165,8 @@ void TDEHTMLPart::openWallet(DOM::HTMLFormElementImpl *form) TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous); d->m_wq = new TDEHTMLWalletQueue(this); d->m_wq->wallet = wallet; - connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); - connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*))); + connect(wallet, TQ_SIGNAL(walletOpened(bool)), d->m_wq, TQ_SLOT(walletOpened(bool))); + connect(d->m_wq, TQ_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQ_SLOT(walletOpened(TDEWallet::Wallet*))); } assert(form); d->m_wq->callers.append(TDEHTMLWalletQueue::Caller(form, form->getDocument())); @@ -7207,8 +7207,8 @@ void TDEHTMLPart::saveToWallet(const TQString& key, const TQMap<TQString,TQStrin TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous); d->m_wq = new TDEHTMLWalletQueue(this); d->m_wq->wallet = wallet; - connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); - connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*))); + connect(wallet, TQ_SIGNAL(walletOpened(bool)), d->m_wq, TQ_SLOT(walletOpened(bool))); + connect(d->m_wq, TQ_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQ_SLOT(walletOpened(TDEWallet::Wallet*))); } d->m_wq->savers.append(qMakePair(key, data)); #endif // TDEHTML_NO_WALLET @@ -7249,7 +7249,7 @@ void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) { d->m_wallet = wallet; d->m_bWalletOpened = true; - connect(d->m_wallet, TQT_SIGNAL(walletClosed()), TQT_SLOT(slotWalletClosed())); + connect(d->m_wallet, TQ_SIGNAL(walletClosed()), TQ_SLOT(slotWalletClosed())); if (!d->m_statusBarWalletLabel) { d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar()); @@ -7258,8 +7258,8 @@ void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) { d->m_statusBarWalletLabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarWalletLabel, 0, false); d->m_statusBarWalletLabel->setPixmap(SmallIcon("wallet_open", instance())); - connect(d->m_statusBarWalletLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchWalletManager())); - connect(d->m_statusBarWalletLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(walletMenu())); + connect(d->m_statusBarWalletLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(launchWalletManager())); + connect(d->m_statusBarWalletLabel, TQ_SIGNAL(rightClickedURL()), TQ_SLOT(walletMenu())); } else { TQToolTip::remove(d->m_statusBarWalletLabel); } @@ -7317,7 +7317,7 @@ void TDEHTMLPart::walletMenu() { #ifndef TDEHTML_NO_WALLET TDEPopupMenu *m = new TDEPopupMenu(0L); - m->insertItem(i18n("&Close Wallet"), this, TQT_SLOT(slotWalletClosed())); + m->insertItem(i18n("&Close Wallet"), this, TQ_SLOT(slotWalletClosed())); m->popup(TQCursor::pos()); #endif // TDEHTML_NO_WALLET } @@ -7360,7 +7360,7 @@ void TDEHTMLPart::setDebugScript( bool enable ) unplugActionList( "debugScriptList" ); if ( enable ) { if (!d->m_paDebugScript) { - d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQT_SLOT( slotDebugScript() ), actionCollection(), "debugScript" ); + d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQ_SLOT( slotDebugScript() ), actionCollection(), "debugScript" ); } d->m_paDebugScript->setEnabled( d->m_frame ? d->m_frame->m_jscript : 0L ); TQPtrList<TDEAction> lst; @@ -7397,7 +7397,7 @@ void TDEHTMLPart::setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originP d->m_statusBarPopupLabel->setPixmap( SmallIcon( "window_suppressed", instance() ) ); TQToolTip::add( d->m_statusBarPopupLabel, i18n("This page was prevented from opening a new window via JavaScript." ) ); - connect(d->m_statusBarPopupLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(suppressedPopupMenu())); + connect(d->m_statusBarPopupLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(suppressedPopupMenu())); if (d->m_settings->jsPopupBlockerPassivePopup()) { TQPixmap px; px = MainBarIcon( "window_suppressed" ); @@ -7415,10 +7415,10 @@ void TDEHTMLPart::suppressedPopupMenu() { TDEPopupMenu *m = new TDEPopupMenu(0L); m->setCheckable(true); if ( d->m_openableSuppressedPopups ) - m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQT_SLOT(showSuppressedPopups())); - m->insertItem(i18n("Show Blocked Window Passive Popup &Notification"), this, TQT_SLOT(togglePopupPassivePopup()),0,57); + m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQ_SLOT(showSuppressedPopups())); + m->insertItem(i18n("Show Blocked Window Passive Popup &Notification"), this, TQ_SLOT(togglePopupPassivePopup()),0,57); m->setItemChecked(57,d->m_settings->jsPopupBlockerPassivePopup()); - m->insertItem(i18n("&Configure JavaScript New Window Policies..."), this, TQT_SLOT(launchJSConfigDialog())); + m->insertItem(i18n("&Configure JavaScript New Window Policies..."), this, TQ_SLOT(launchJSConfigDialog())); m->popup(TQCursor::pos()); } diff --git a/tdehtml/tdehtml_part.h b/tdehtml/tdehtml_part.h index 20cdd68c8..7d3f01312 100644 --- a/tdehtml/tdehtml_part.h +++ b/tdehtml/tdehtml_part.h @@ -182,7 +182,7 @@ namespace TDEWallet */ class TDEHTML_EXPORT TDEHTMLPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT friend class TDEHTMLView; friend class DOM::HTMLTitleElementImpl; friend class DOM::HTMLFrameElementImpl; diff --git a/tdehtml/tdehtml_printsettings.h b/tdehtml/tdehtml_printsettings.h index 2a92d0e3c..1e1250824 100644 --- a/tdehtml/tdehtml_printsettings.h +++ b/tdehtml/tdehtml_printsettings.h @@ -26,7 +26,7 @@ class TQCheckBox; class TDEHTMLPrintSettings : public KPrintDialogPage { - Q_OBJECT + TQ_OBJECT public: TDEHTMLPrintSettings(TQWidget *parent = 0, const char *name = 0); ~TDEHTMLPrintSettings(); diff --git a/tdehtml/tdehtml_run.h b/tdehtml/tdehtml_run.h index 401bc7fd6..b4e11829a 100644 --- a/tdehtml/tdehtml_run.h +++ b/tdehtml/tdehtml_run.h @@ -37,7 +37,7 @@ namespace tdehtml class TDEHTMLRun : public KParts::BrowserRun { - Q_OBJECT + TQ_OBJECT public: TDEHTMLRun( TDEHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &args, bool hideErrorDialog ); diff --git a/tdehtml/tdehtml_settings.cpp b/tdehtml/tdehtml_settings.cpp index 7f799e311..2e4c5dcb6 100644 --- a/tdehtml/tdehtml_settings.cpp +++ b/tdehtml/tdehtml_settings.cpp @@ -442,7 +442,7 @@ void TDEHTMLSettings::init( TDEConfig * config, bool reset ) d->m_fallbackAccessKeysAssignments.clear(); for( TQStringList::ConstIterator it = accesskeys.begin(); it != accesskeys.end(); ++it ) if( (*it).length() > 2 && (*it)[ 1 ] == ':' ) - d->m_fallbackAccessKeysAssignments.append( tqMakePair( (*it).mid( 2 ), (*it)[ 0 ] )); + d->m_fallbackAccessKeysAssignments.append( qMakePair( (*it).mid( 2 ), (*it)[ 0 ] )); } // Colors diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp index dc2a51c66..726f6d6c1 100644 --- a/tdehtml/tdehtmlimage.cpp +++ b/tdehtml/tdehtmlimage.cpp @@ -62,7 +62,7 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof ) : KParts::ReadOnlyPart( parent, name ), m_image( 0 ) { - TDEHTMLPart* parentPart = ::tqqt_cast<TDEHTMLPart *>( parent ); + TDEHTMLPart* parentPart = ::tqt_cast<TDEHTMLPart *>( parent ); setInstance( TDEHTMLImageFactory::instance(), prof == TDEHTMLPart::BrowserViewGUI && !parentPart ); TQVBox *box = new TQVBox( parentWidget, widgetName ); @@ -70,7 +70,7 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, m_tdehtml = new TDEHTMLPart( box, widgetName, this, "htmlimagepart", prof ); m_tdehtml->setAutoloadImages( true ); m_tdehtml->widget()->installEventFilter(this); - connect( m_tdehtml->view(), TQT_SIGNAL( finishedLayout() ), this, TQT_SLOT( restoreScrollPosition() ) ); + connect( m_tdehtml->view(), TQ_SIGNAL( finishedLayout() ), this, TQ_SLOT( restoreScrollPosition() ) ); setWidget( box ); @@ -103,17 +103,17 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, // forward important signals from the tdehtml part // forward opening requests to parent frame (if existing) - TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(parent); + TDEHTMLPart *p = ::tqt_cast<TDEHTMLPart *>(parent); KParts::BrowserExtension *be = p ? p->browserExtension() : m_ext; - connect(m_tdehtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), - be, TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &))); + connect(m_tdehtml->browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), + be, TQ_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &))); - connect( m_tdehtml->browserExtension(), TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, - const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, + connect( m_tdehtml->browserExtension(), TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, + const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ) ); - connect( m_tdehtml->browserExtension(), TQT_SIGNAL( enableAction( const char *, bool ) ), - m_ext, TQT_SIGNAL( enableAction( const char *, bool ) ) ); + connect( m_tdehtml->browserExtension(), TQ_SIGNAL( enableAction( const char *, bool ) ), + m_ext, TQ_SIGNAL( enableAction( const char *, bool ) ) ); m_ext->setURLDropHandlingEnabled( true ); } @@ -169,8 +169,8 @@ bool TDEHTMLImage::openURL( const KURL &url ) m_tdehtml->end(); /* - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( updateWindowCaption() ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( updateWindowCaption() ) ); */ return true; } @@ -242,7 +242,7 @@ void TDEHTMLImage::slotImageJobFinished( TDEIO::Job *job ) else { emit completed(); - TQTimer::singleShot( 0, this, TQT_SLOT( updateWindowCaption() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateWindowCaption() ) ); } } @@ -304,7 +304,7 @@ bool TDEHTMLImage::eventFilter(TQObject *, TQEvent *e) { case TQEvent::Drop: { // find out if this part is embedded in a frame, and send the // event to its outside widget - TDEHTMLPart *p = ::tqqt_cast<TDEHTMLPart *>(parent()); + TDEHTMLPart *p = ::tqt_cast<TDEHTMLPart *>(parent()); if (p) return TQApplication::sendEvent(p->widget(), e); // otherwise simply forward all dnd events to the part widget, diff --git a/tdehtml/tdehtmlimage.h b/tdehtml/tdehtmlimage.h index 8b8b5893b..6fd3fd928 100644 --- a/tdehtml/tdehtmlimage.h +++ b/tdehtml/tdehtmlimage.h @@ -39,7 +39,7 @@ namespace tdehtml */ class TDEHTMLImageFactory : public KParts::Factory { - Q_OBJECT + TQ_OBJECT public: TDEHTMLImageFactory(); virtual ~TDEHTMLImageFactory(); @@ -59,7 +59,7 @@ private: */ class TDEHTMLImage : public KParts::ReadOnlyPart, public tdehtml::CachedObjectClient { - Q_OBJECT + TQ_OBJECT public: TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof ); @@ -100,7 +100,7 @@ private: */ class TDEHTMLImageBrowserExtension : public KParts::BrowserExtension { - Q_OBJECT + TQ_OBJECT public: TDEHTMLImageBrowserExtension( TDEHTMLImage *parent, const char *name = 0 ); diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h index 90be612b2..132624fdd 100644 --- a/tdehtml/tdehtmlpart_p.h +++ b/tdehtml/tdehtmlpart_p.h @@ -74,7 +74,7 @@ namespace tdehtml { class KDE_EXPORT ChildFrame : public TQObject { - Q_OBJECT + TQ_OBJECT public: enum Type { Frame, IFrame, Object }; @@ -129,7 +129,7 @@ static int tdehtml_part_dcop_counter = 0; class TDEHTMLWalletQueue : public TQObject { - Q_OBJECT + TQ_OBJECT public: TDEHTMLWalletQueue(TQObject *parent) : TQObject(parent) { #ifndef TDEHTML_NO_WALLET @@ -146,10 +146,10 @@ class TDEHTMLWalletQueue : public TQObject #ifndef TDEHTML_NO_WALLET TDEWallet::Wallet *wallet; #endif // TDEHTML_NO_WALLET - typedef QPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller; + typedef TQPair<DOM::HTMLFormElementImpl*, TQGuardedPtr<DOM::DocumentImpl> > Caller; typedef TQValueList<Caller> CallerList; CallerList callers; - TQValueList<QPair<TQString, TQMap<TQString, TQString> > > savers; + TQValueList<TQPair<TQString, TQMap<TQString, TQString> > > savers; signals: void walletOpened(TDEWallet::Wallet*); @@ -172,7 +172,7 @@ class TDEHTMLWalletQueue : public TQObject } } wallet->setFolder(TDEWallet::Wallet::FormDataFolder()); - for (TQValueList<QPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) { + for (TQValueList<TQPair<TQString, TQMap<TQString, TQString> > >::Iterator i = savers.begin(); i != savers.end(); ++i) { wallet->writeMap((*i).first, (*i).second); } } @@ -220,7 +220,7 @@ public: m_jsedlg = 0; m_formNotification = TDEHTMLPart::NoNotification; -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS m_javaContext = 0; #endif m_cacheId = 0; @@ -298,7 +298,7 @@ public: #ifndef TDEHTML_NO_WALLET delete m_wallet; #endif -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS //delete m_javaContext; #endif } @@ -350,7 +350,7 @@ public: int m_dcop_counter; DCOPObject *m_dcopobject; -#ifndef Q_WS_QWS +#ifndef TQ_WS_QWS KJavaAppletContext *m_javaContext; #endif diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 92119267e..bbc45da95 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -94,7 +94,7 @@ //#define DEBUG_PIXEL -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/Xlib.h> #include <fixx11h.h> #endif @@ -493,13 +493,13 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) d = new TDEHTMLViewPrivate; TQScrollView::setVScrollBarMode(d->vmode); TQScrollView::setHScrollBarMode(d->hmode); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteChanged())); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotScrollBarMoved())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteChanged())); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotScrollBarMoved())); // initialize QScrollView enableClipper(true); // hack to get unclipped painting on the viewport. - static_cast<TDEHTMLView *>(TQT_TQWIDGET(viewport()))->setWFlags(WPaintUnclipped); + static_cast<TDEHTMLView *>(viewport())->setWFlags(WPaintUnclipped); setResizePolicy(Manual); viewport()->setMouseTracking(true); @@ -512,7 +512,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) #endif #ifndef TDEHTML_NO_TYPE_AHEAD_FIND - connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(findTimeout())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(findTimeout())); #endif // TDEHTML_NO_TYPE_AHEAD_FIND init(); @@ -520,7 +520,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) viewport()->show(); #ifndef NO_SMOOTH_SCROLL_HACK #define timer timer2 - connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scrollTick())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scrollTick())); #undef timer #endif } @@ -546,7 +546,7 @@ void TDEHTMLView::init() d->vertPaintBuffer = new TQPixmap(10, PAINT_BUFFER_HEIGHT); if(!d->tp) d->tp = new TQPainter(); - setFocusPolicy(TQ_StrongFocus); + setFocusPolicy(TQWidget::StrongFocus); viewport()->setFocusProxy(this); _marginWidth = -1; // undefined @@ -579,7 +579,7 @@ void TDEHTMLView::clear() if ( d->cursor_icon_widget ) d->cursor_icon_widget->hide(); d->reset(); - TQT_TQOBJECT(this)->killTimers(); + this->killTimers(); emit cleared(); TQScrollView::setHScrollBarMode(d->hmode); @@ -897,7 +897,7 @@ void TDEHTMLView::layout() void TDEHTMLView::closeChildDialogs() { - TQObjectList *dlgs = queryList(TQDIALOG_OBJECT_NAME_STRING); + TQObjectList *dlgs = queryList("TQDialog"); for (TQObject *dlg = dlgs->first(); dlg; dlg = dlgs->next()) { KDialogBase* dlgbase = dynamic_cast<KDialogBase *>( dlg ); @@ -911,8 +911,8 @@ void TDEHTMLView::closeChildDialogs() } else { - kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << TQT_TQWIDGET(dlg) << endl; - TQT_TQWIDGET(dlg)->hide(); + kdWarning() << "closeChildDialogs: not a KDialogBase! Don't use QDialogs in KDE! " << static_cast<TQWidget*>(dlg) << endl; + static_cast<TQWidget*>(dlg)->hide(); } } delete dlgs; @@ -941,7 +941,7 @@ void TDEHTMLView::closeEvent( TQCloseEvent* ev ) void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) { if (!m_part->xmlDocImpl()) return; - if (d->possibleTripleClick && ( _mouse->button() & Qt::MouseButtonMask ) == Qt::LeftButton) + if (d->possibleTripleClick && ( _mouse->button() & TQt::MouseButtonMask ) == TQt::LeftButton) { viewportMouseDoubleClickEvent( _mouse ); // it handles triple clicks too return; @@ -958,7 +958,7 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) //kdDebug(6000) << "innerNode="<<mev.innerNode.nodeName().string()<<endl; - if ( (_mouse->button() == Qt::MidButton) && + if ( (_mouse->button() == TQt::MidButton) && !m_part->d->m_bOpenMiddleClick && !d->m_mouseScrollTimer && mev.url.isNull() && (mev.innerNode.elementId() != ID_INPUT) ) { TQPoint point = mapFromGlobal( _mouse->globalPos() ); @@ -967,7 +967,7 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) d->m_mouseScroll_byY = 0; d->m_mouseScrollTimer = new TQTimer( this ); - connect( d->m_mouseScrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotMouseScrollTimer()) ); + connect( d->m_mouseScrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotMouseScrollTimer()) ); if ( !d->m_mouseScrollIndicator ) { TQPixmap pixmap, icon; @@ -1095,7 +1095,7 @@ void TDEHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse ) } d->possibleTripleClick=true; - TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout())); + TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout())); } void TDEHTMLView::tripleClickTimeout() @@ -1112,11 +1112,11 @@ static inline void forwardPeripheralEvent(tdehtml::RenderWidget* r, TQMouseEvent TQPoint p(x-absx, y-absy); TQMouseEvent fw(me->type(), p, me->button(), me->state()); TQWidget* w = r->widget(); - TQScrollView* sc = ::tqqt_cast<TQScrollView*>(w); - if (sc && !::tqqt_cast<TQListBox*>(w)) - static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(TQT_TQEVENT(&fw)); + TQScrollView* sc = ::tqt_cast<TQScrollView*>(w); + if (sc && !::tqt_cast<TQListBox*>(w)) + static_cast<tdehtml::RenderWidget::ScrollViewEventPropagator*>(sc)->sendEvent(static_cast<TQEvent*>(&fw)); else if(w) - static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(TQT_TQEVENT(&fw)); + static_cast<tdehtml::RenderWidget::EventPropagator*>(w)->sendEvent(static_cast<TQEvent*>(&fw)); } @@ -1168,7 +1168,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) DOM::NodeImpl::MouseEvent mev( _mouse->stateAfter(), DOM::NodeImpl::MouseMove ); // Do not modify :hover/:active state while mouse is pressed. - m_part->xmlDocImpl()->prepareMouseEvent( _mouse->state() & Qt::MouseButtonMask /*readonly ?*/, xm, ym, &mev ); + m_part->xmlDocImpl()->prepareMouseEvent( _mouse->state() & TQt::MouseButtonMask /*readonly ?*/, xm, ym, &mev ); // kdDebug(6000) << "mouse move: " << _mouse->pos() // << " button " << _mouse->button() @@ -1268,7 +1268,7 @@ void TDEHTMLView::viewportMouseMoveEvent( TQMouseEvent * _mouse ) } if ( ( mailtoCursor || newWindowCursor ) && isVisible() && hasFocus() ) { -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( mailtoCursor ? "mail_generic" : "window-new", TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true ); if (d->cursor_icon_widget) { @@ -1341,7 +1341,7 @@ void TDEHTMLView::viewportMouseReleaseEvent( TQMouseEvent * _mouse ) DOM::NodeImpl* fn = m_part->xmlDocImpl()->focusNode(); if (fn && fn != mev.innerNode.handle() && fn->renderer() && fn->renderer()->isWidget() && - _mouse->button() != Qt::MidButton) { + _mouse->button() != TQt::MidButton) { forwardPeripheralEvent(static_cast<tdehtml::RenderWidget*>(fn->renderer()), _mouse, xm, ym); } @@ -1895,27 +1895,27 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) TQWidget *view = viewport(); - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(view)) { + if (o == view) { // we need to install an event filter on all children of the viewport to // be able to get correct stacking of children within the document. if(e->type() == TQEvent::ChildInserted) { - TQObject *c = TQT_TQOBJECT(TQT_TQCHILDEVENT(e)->child()); + TQObject *c = static_cast<TQChildEvent*>(e)->child(); if (c->isWidgetType()) { - TQWidget *w = TQT_TQWIDGET(c); + TQWidget *w = static_cast<TQWidget*>(c); // don't install the event filter on toplevels if (w->parentWidget(true) == view) { if (!strcmp(w->name(), "__tdehtml")) { w->installEventFilter(this); w->unsetCursor(); - if (!::tqqt_cast<TQFrame*>(w)) + if (!::tqt_cast<TQFrame*>(w)) w->setBackgroundMode( TQWidget::NoBackground ); static_cast<HackWidget *>(w)->setNoErase(); if (!w->childrenListObject().isEmpty()) { TQObjectListIterator it(w->childrenListObject()); for (; it.current(); ++it) { - TQWidget *widget = ::tqqt_cast<TQWidget *>(it.current()); + TQWidget *widget = ::tqt_cast<TQWidget *>(it.current()); if (widget && !widget->isTopLevel()) { - if (!::tqqt_cast<TQFrame*>(w)) + if (!::tqt_cast<TQFrame*>(w)) widget->setBackgroundMode( TQWidget::NoBackground ); static_cast<HackWidget *>(widget)->setNoErase(); widget->installEventFilter(this); @@ -1927,7 +1927,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) } } } else if (o->isWidgetType()) { - TQWidget *v = TQT_TQWIDGET(o); + TQWidget *v = static_cast<TQWidget*>(o); TQWidget *c = v; while (v && v != view) { c = v; @@ -1936,7 +1936,7 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) if (v && !strcmp(c->name(), "__tdehtml")) { bool block = false; - TQWidget *w = TQT_TQWIDGET(o); + TQWidget *w = static_cast<TQWidget*>(o); switch(e->type()) { case TQEvent::Paint: if (!allowWidgetPaintEvents) { @@ -1951,8 +1951,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) v = v->parentWidget(); } viewportToContents( x, y, x, y ); - TQPaintEvent *pe = TQT_TQPAINTEVENT(e); - bool asap = !d->contentsMoving && ::tqqt_cast<TQScrollView *>(c); + TQPaintEvent *pe = static_cast<TQPaintEvent*>(e); + bool asap = !d->contentsMoving && ::tqt_cast<TQScrollView *>(c); // TQScrollView needs fast repaints if ( asap && !d->painting && m_part->xmlDocImpl() && m_part->xmlDocImpl()->renderer() && @@ -1969,8 +1969,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) case TQEvent::MouseButtonPress: case TQEvent::MouseButtonRelease: case TQEvent::MouseButtonDblClick: { - if ( (w->parentWidget() == view || ::tqqt_cast<TQScrollView*>(c)) && !::tqqt_cast<TQScrollBar *>(w)) { - TQMouseEvent *me = TQT_TQMOUSEEVENT(e); + if ( (w->parentWidget() == view || ::tqt_cast<TQScrollView*>(c)) && !::tqt_cast<TQScrollBar *>(w)) { + TQMouseEvent *me = static_cast<TQMouseEvent*>(e); TQPoint pt = w->mapTo( view, me->pos()); TQMouseEvent me2(me->type(), pt, me->button(), me->state()); @@ -1988,8 +1988,8 @@ bool TDEHTMLView::eventFilter(TQObject *o, TQEvent *e) } case TQEvent::KeyPress: case TQEvent::KeyRelease: - if (w->parentWidget() == view && !::tqqt_cast<TQScrollBar *>(w)) { - TQKeyEvent *ke = TQT_TQKEYEVENT(e); + if (w->parentWidget() == view && !::tqt_cast<TQScrollBar *>(w)) { + TQKeyEvent *ke = static_cast<TQKeyEvent*>(e); if (e->type() == TQEvent::KeyPress) keyPressEvent(ke); else @@ -2283,8 +2283,8 @@ void TDEHTMLView::displayAccessKeys( TDEHTMLView* caller, TDEHTMLView* origview, if( !accesskey.isNull()) { TQRect rec=en->getRect(); TQLabel *lab=new TQLabel(accesskey,viewport(),0,(WFlags)WDestructiveClose); - connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) ); - connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint())); + connect( origview, TQ_SIGNAL(hideAccessKeys()), lab, TQ_SLOT(close()) ); + connect( this, TQ_SIGNAL(repaintAccessKeys()), lab, TQ_SLOT(repaint())); lab->setPalette(TQToolTip::palette()); lab->setLineWidth(2); lab->setFrameStyle(TQFrame::Box | TQFrame::Plain); @@ -2409,13 +2409,9 @@ bool TDEHTMLView::focusNodeWithAccessKey( TQChar c, TDEHTMLView* caller ) guard = node; } // Set focus node on the document -#ifdef USE_QT4 - m_part->xmlDocImpl()->setFocusNode(node); -#else // USE_QT4 TQFocusEvent::setReason( TQFocusEvent::Shortcut ); m_part->xmlDocImpl()->setFocusNode(node); TQFocusEvent::resetReason(); -#endif // USE_QT4 if( node != NULL && node->hasOneRef()) // deleted, only held by guard return true; emit m_part->nodeActivated(Node(node)); @@ -2785,7 +2781,7 @@ void TDEHTMLView::print(bool quick) if ( !docname.isEmpty() ) docname = KStringHandler::csqueeze(docname, 80); if(quick || printer->setup(this, i18n("Print %1").arg(docname))) { - viewport()->setCursor( tqwaitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs + viewport()->setCursor( TQt::waitCursor ); // only viewport(), no TQApplication::, otherwise we get the busy cursor in tdeprint's dialogs // set up KPrinter printer->setFullPage(false); printer->setCreator(TQString("TDE %1.%2.%3 HTML Library").arg(TDE_VERSION_MAJOR).arg(TDE_VERSION_MINOR).arg(TDE_VERSION_RELEASE)); @@ -2888,15 +2884,15 @@ void TDEHTMLView::print(bool quick) if (printHeader) { int available_width = metrics.width() - 10 - - 2 * kMax(p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerLeft).width(), - p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerRight).width()); + 2 * kMax(p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerLeft).width(), + p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerRight).width()); if (available_width < 150) available_width = 150; int mid_width; int squeeze = 120; do { headerMid = KStringHandler::csqueeze(docname, squeeze); - mid_width = p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), Qt::AlignLeft, headerMid).width(); + mid_width = p->boundingRect(0, 0, metrics.width(), p->fontMetrics().lineSpacing(), TQt::AlignLeft, headerMid).width(); squeeze -= 10; } while (mid_width > available_width); } @@ -2910,14 +2906,14 @@ void TDEHTMLView::print(bool quick) if (printHeader) { int dy = p->fontMetrics().lineSpacing(); - p->setPen(Qt::black); + p->setPen(TQt::black); p->setFont(headerFont); headerRight = TQString("#%1").arg(page); - p->drawText(0, 0, metrics.width(), dy, Qt::AlignLeft, headerLeft); - p->drawText(0, 0, metrics.width(), dy, Qt::AlignHCenter, headerMid); - p->drawText(0, 0, metrics.width(), dy, Qt::AlignRight, headerRight); + p->drawText(0, 0, metrics.width(), dy, TQt::AlignLeft, headerLeft); + p->drawText(0, 0, metrics.width(), dy, TQt::AlignHCenter, headerMid); + p->drawText(0, 0, metrics.width(), dy, TQt::AlignRight, headerRight); } @@ -2955,7 +2951,7 @@ void TDEHTMLView::print(bool quick) d->paged = false; tdehtml::setPrintPainter( 0 ); setMediaType( oldMediaType ); - m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) ); + m_part->xmlDocImpl()->setPaintDevice( this ); m_part->xmlDocImpl()->styleSelector()->computeFontSizes(m_part->xmlDocImpl()->paintDeviceMetrics(), m_part->zoomFactor()); m_part->xmlDocImpl()->updateStyleSelector(); viewport()->unsetCursor(); @@ -3006,7 +3002,7 @@ void TDEHTMLView::paint(TQPainter *p, const TQRect &rc, int yOff, bool *more) root->setPagedMode(false); root->setStaticMode(false); - m_part->xmlDocImpl()->setPaintDevice( TQT_TQPAINTDEVICE(this) ); + m_part->xmlDocImpl()->setPaintDevice( this ); } @@ -3160,13 +3156,13 @@ bool TDEHTMLView::dispatchMouseEvent(int eventId, DOM::NodeImpl *targetNode, int screenY = _mouse->globalY(); int button = -1; switch (_mouse->button()) { - case Qt::LeftButton: + case TQt::LeftButton: button = 0; break; - case Qt::MidButton: + case TQt::MidButton: button = 1; break; - case Qt::RightButton: + case TQt::RightButton: button = 2; break; default: @@ -3282,12 +3278,12 @@ void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e) { e->accept(); } - else if( ( (e->orientation() == Qt::Vertical && + else if( ( (e->orientation() == TQt::Vertical && ((d->ignoreWheelEvents && !verticalScrollBar()->isVisible()) || e->delta() > 0 && contentsY() <= 0 || e->delta() < 0 && contentsY() >= contentsHeight() - visibleHeight())) || - (e->orientation() == Qt::Horizontal && + (e->orientation() == TQt::Horizontal && ((d->ignoreWheelEvents && !horizontalScrollBar()->isVisible()) || e->delta() > 0 && contentsX() <=0 || e->delta() < 0 && contentsX() >= contentsWidth() - visibleWidth()))) @@ -3306,7 +3302,7 @@ void TDEHTMLView::viewportWheelEvent(TQWheelEvent* e) TQScrollView::viewportWheelEvent( e ); #endif - TQMouseEvent *tempEvent = new TQMouseEvent( TQEvent::MouseMove, TQPoint(-1,-1), TQPoint(-1,-1), Qt::NoButton, e->state() ); + TQMouseEvent *tempEvent = new TQMouseEvent( TQEvent::MouseMove, TQPoint(-1,-1), TQPoint(-1,-1), TQt::NoButton, e->state() ); emit viewportMouseMoveEvent ( tempEvent ); delete tempEvent; } @@ -4608,9 +4604,9 @@ void TDEHTMLView::scrollViewWheelEvent( TQWheelEvent *e ) if ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) step = pageStep; - if(e->orientation() == Qt::Horizontal) + if(e->orientation() == TQt::Horizontal) scrollBy(-((e->delta()*step)/120), 0); - else if(e->orientation() == Qt::Vertical) + else if(e->orientation() == TQt::Vertical) scrollBy(0,-((e->delta()*step)/120)); e->accept(); diff --git a/tdehtml/tdehtmlview.h b/tdehtml/tdehtmlview.h index 797db99fa..6f3ad6684 100644 --- a/tdehtml/tdehtmlview.h +++ b/tdehtml/tdehtmlview.h @@ -77,7 +77,7 @@ class TDEHTMLViewPrivate; **/ class TDEHTML_EXPORT TDEHTMLView : public TQScrollView { - Q_OBJECT + TQ_OBJECT friend class DOM::HTMLDocumentImpl; friend class DOM::HTMLTitleElementImpl; diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp index 15970bbaa..7afda5741 100644 --- a/tdehtml/tdemultipart/tdemultipart.cpp +++ b/tdehtml/tdemultipart/tdemultipart.cpp @@ -115,7 +115,7 @@ KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName, m_tempFile = 0L; m_timer = new TQTimer( this ); - connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressInfo() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgressInfo() ) ); } KMultiPart::~KMultiPart() @@ -167,10 +167,10 @@ bool KMultiPart::openURL( const KURL &url ) emit started( 0 /*m_job*/ ); // don't pass the job, it would interfer with our own infoMessage - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotJobFinished( TDEIO::Job * ) ) ); - connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotJobFinished( TDEIO::Job * ) ) ); + connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); m_numberOfFrames = 0; m_numberOfFramesSkipped = 0; @@ -324,8 +324,8 @@ void KMultiPart::setPart( const TQString& mimeType ) insertChildClient( m_part ); m_part->widget()->show(); - connect( m_part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotPartCompleted() ) ); + connect( m_part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotPartCompleted() ) ); m_isHTMLPart = ( mimeType == "text/html" ); KParts::BrowserExtension* childExtension = KParts::BrowserExtension::childObject( m_part ); @@ -336,62 +336,62 @@ void KMultiPart::setPart( const TQString& mimeType ) // Forward signals from the part's browser extension // this is very related (but not exactly like) TDEHTMLPart::processObjectRequest - connect( childExtension, TQT_SIGNAL( openURLNotify() ), - m_extension, TQT_SIGNAL( openURLNotify() ) ); + connect( childExtension, TQ_SIGNAL( openURLNotify() ), + m_extension, TQ_SIGNAL( openURLNotify() ) ); - connect( childExtension, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), - m_extension, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( childExtension, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), + m_extension, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), - m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); - connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), - m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); + connect( childExtension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), + m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( childExtension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), + m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); // Keep in sync with tdehtml_part.cpp - connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); if ( m_isHTMLPart ) - connect( childExtension, TQT_SIGNAL( infoMessage( const TQString & ) ), - m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ) ); + connect( childExtension, TQ_SIGNAL( infoMessage( const TQString & ) ), + m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ) ); // For non-HTML we prefer to show our infoMessage ourselves. childExtension->setBrowserInterface( m_extension->browserInterface() ); - connect( childExtension, TQT_SIGNAL( enableAction( const char *, bool ) ), - m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) ); - connect( childExtension, TQT_SIGNAL( setLocationBarURL( const TQString& ) ), - m_extension, TQT_SIGNAL( setLocationBarURL( const TQString& ) ) ); - connect( childExtension, TQT_SIGNAL( setIconURL( const KURL& ) ), - m_extension, TQT_SIGNAL( setIconURL( const KURL& ) ) ); - connect( childExtension, TQT_SIGNAL( loadingProgress( int ) ), - m_extension, TQT_SIGNAL( loadingProgress( int ) ) ); + connect( childExtension, TQ_SIGNAL( enableAction( const char *, bool ) ), + m_extension, TQ_SIGNAL( enableAction( const char *, bool ) ) ); + connect( childExtension, TQ_SIGNAL( setLocationBarURL( const TQString& ) ), + m_extension, TQ_SIGNAL( setLocationBarURL( const TQString& ) ) ); + connect( childExtension, TQ_SIGNAL( setIconURL( const KURL& ) ), + m_extension, TQ_SIGNAL( setIconURL( const KURL& ) ) ); + connect( childExtension, TQ_SIGNAL( loadingProgress( int ) ), + m_extension, TQ_SIGNAL( loadingProgress( int ) ) ); if ( m_isHTMLPart ) // for non-HTML we have our own - connect( childExtension, TQT_SIGNAL( speedProgress( int ) ), - m_extension, TQT_SIGNAL( speedProgress( int ) ) ); - connect( childExtension, TQT_SIGNAL( selectionInfo( const KFileItemList& ) ), - m_extension, TQT_SIGNAL( selectionInfo( const KFileItemList& ) ) ); - connect( childExtension, TQT_SIGNAL( selectionInfo( const TQString& ) ), - m_extension, TQT_SIGNAL( selectionInfo( const TQString& ) ) ); - connect( childExtension, TQT_SIGNAL( selectionInfo( const KURL::List& ) ), - m_extension, TQT_SIGNAL( selectionInfo( const KURL::List& ) ) ); - connect( childExtension, TQT_SIGNAL( mouseOverInfo( const KFileItem* ) ), - m_extension, TQT_SIGNAL( mouseOverInfo( const KFileItem* ) ) ); - connect( childExtension, TQT_SIGNAL( moveTopLevelWidget( int, int ) ), - m_extension, TQT_SIGNAL( moveTopLevelWidget( int, int ) ) ); - connect( childExtension, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ), - m_extension, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ) ); + connect( childExtension, TQ_SIGNAL( speedProgress( int ) ), + m_extension, TQ_SIGNAL( speedProgress( int ) ) ); + connect( childExtension, TQ_SIGNAL( selectionInfo( const KFileItemList& ) ), + m_extension, TQ_SIGNAL( selectionInfo( const KFileItemList& ) ) ); + connect( childExtension, TQ_SIGNAL( selectionInfo( const TQString& ) ), + m_extension, TQ_SIGNAL( selectionInfo( const TQString& ) ) ); + connect( childExtension, TQ_SIGNAL( selectionInfo( const KURL::List& ) ), + m_extension, TQ_SIGNAL( selectionInfo( const KURL::List& ) ) ); + connect( childExtension, TQ_SIGNAL( mouseOverInfo( const KFileItem* ) ), + m_extension, TQ_SIGNAL( mouseOverInfo( const KFileItem* ) ) ); + connect( childExtension, TQ_SIGNAL( moveTopLevelWidget( int, int ) ), + m_extension, TQ_SIGNAL( moveTopLevelWidget( int, int ) ) ); + connect( childExtension, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ), + m_extension, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ) ); } m_partIsLoading = false; @@ -414,7 +414,7 @@ void KMultiPart::startOfData() if ( m_gzip ) { m_filter = new HTTPFilterGZip; - connect( m_filter, TQT_SIGNAL( output( const TQByteArray& ) ), this, TQT_SLOT( reallySendData( const TQByteArray& ) ) ); + connect( m_filter, TQ_SIGNAL( output( const TQByteArray& ) ), this, TQ_SLOT( reallySendData( const TQByteArray& ) ) ); } if ( m_mimeType != m_nextMimeType ) @@ -551,7 +551,7 @@ void KMultiPart::slotJobFinished( TDEIO::Job *job ) emit completed(); - //TQTimer::singleShot( 0, this, TQT_SLOT( updateWindowCaption() ) ); + //TQTimer::singleShot( 0, this, TQ_SLOT( updateWindowCaption() ) ); } m_job = 0L; } diff --git a/tdehtml/tdemultipart/tdemultipart.h b/tdehtml/tdemultipart/tdemultipart.h index de309eef1..75b7c18a3 100644 --- a/tdehtml/tdemultipart/tdemultipart.h +++ b/tdehtml/tdemultipart/tdemultipart.h @@ -38,7 +38,7 @@ class KLineParser; */ class KMultiPart : public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KMultiPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ); @@ -99,7 +99,7 @@ private: #if 0 class KMultiPartBrowserExtension : public KParts::BrowserExtension { - //Q_OBJECT + //TQ_OBJECT public: KMultiPartBrowserExtension( KMultiPart *parent, const char *name = 0 ); diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp index 62842e086..81b0b9a4e 100644 --- a/tdehtml/test_regression.cpp +++ b/tdehtml/test_regression.cpp @@ -118,7 +118,7 @@ PartMonitor::PartMonitor(TDEHTMLPart *_part) { m_part = _part; m_completed = false; - connect(m_part,TQT_SIGNAL(completed()),this,TQT_SLOT(partCompleted())); + connect(m_part,TQ_SIGNAL(completed()),this,TQ_SLOT(partCompleted())); m_timer_waits = 200; m_timeout_timer = new TQTimer(this); } @@ -141,12 +141,12 @@ void PartMonitor::waitForCompletion() kapp->enter_loop(); - //connect(m_timeout_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( timeout() ) ); + //connect(m_timeout_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( timeout() ) ); //m_timeout_timer->stop(); //m_timeout_timer->start( visual ? 100 : 2, true ); } - TQTimer::singleShot( 0, this, TQT_SLOT( finishTimers() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( finishTimers() ) ); kapp->enter_loop(); } @@ -161,7 +161,7 @@ void PartMonitor::finishTimers() --m_timer_waits; if ( m_timer_waits && (w && w->winq->hasTimers()) || m_part->inProgress()) { // wait a bit - TQTimer::singleShot( 10, this, TQT_SLOT(finishTimers() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT(finishTimers() ) ); return; } kapp->exit_loop(); @@ -172,9 +172,9 @@ void PartMonitor::partCompleted() m_completed = true; RenderWidget::flushWidgetResizes(); m_timeout_timer->stop(); - connect(m_timeout_timer, TQT_SIGNAL(timeout()),this, TQT_SLOT( timeout() ) ); + connect(m_timeout_timer, TQ_SIGNAL(timeout()),this, TQ_SLOT( timeout() ) ); m_timeout_timer->start( visual ? 100 : 2, true ); - disconnect(m_part,TQT_SIGNAL(completed()),this,TQT_SLOT(partCompleted())); + disconnect(m_part,TQ_SIGNAL(completed()),this,TQ_SLOT(partCompleted())); } static void signal_handler( int ) @@ -350,7 +350,7 @@ Value TDEHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List char buf[1024]; int bytesread; while (!file.atEnd()) { - bytesread = file.tqreadBlock(buf,1024); + bytesread = file.readBlock(buf,1024); stream.writeRawBytes(buf,bytesread); } file.close(); @@ -593,10 +593,10 @@ int main(int argc, char *argv[]) args->isSet("genoutput"), !args->isSet( "html" ), !args->isSet( "js" )); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), - regressionTest, TQT_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(resizeTopLevelWidget( int, int )), - regressionTest, TQT_SLOT(resizeTopLevelWidget( int, int ))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), + regressionTest, TQ_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(resizeTopLevelWidget( int, int )), + regressionTest, TQ_SLOT(resizeTopLevelWidget( int, int ))); bool result = false; QCStringList tests = args->getOptionList("test"); @@ -642,7 +642,7 @@ int main(int argc, char *argv[]) link = TQString( "<hr>%1 failures. (%2 expected failures)" ) .arg(regressionTest->m_failures_work ) .arg( regressionTest->m_failures_fail ); - list.tqwriteBlock( link.latin1(), link.length() ); + list.writeBlock( link.latin1(), link.length() ); list.close(); } } @@ -697,12 +697,12 @@ RegressionTest::RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const TQString s; f.open( IO_WriteOnly | IO_Truncate ); s = "<html><body>Follow the white rabbit"; - f.tqwriteBlock( s.latin1(), s.length() ); + f.writeBlock( s.latin1(), s.length() ); f.close(); f.setName( m_outputDir + "/index.html" ); f.open( IO_WriteOnly | IO_Truncate ); s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>"; - f.tqwriteBlock( s.latin1(), s.length() ); + f.writeBlock( s.latin1(), s.length() ); f.close(); m_paintBuffer = 0; @@ -965,7 +965,7 @@ TQImage RegressionTest::renderToImage() TQPainter* tp = new TQPainter; tp->begin( m_paintBuffer ); tp->translate( -px, -py ); - tp->fillRect(px, py, 512, 128, Qt::magenta); + tp->fillRect(px, py, 512, 128, TQt::magenta); m_part->document().handle()->renderer()->layer()->paint( tp, TQRect( px, py, 512, 128 ) ); tp->end(); delete tp; @@ -994,12 +994,12 @@ bool RegressionTest::imageEqual( const TQImage &lhsi, const TQImage &rhsi ) for ( int y = 0; y < h; ++y ) { - QRgb* ls = ( QRgb* ) lhsi.scanLine( y ); - QRgb* rs = ( QRgb* ) rhsi.scanLine( y ); + TQRgb* ls = ( TQRgb* ) lhsi.scanLine( y ); + TQRgb* rs = ( TQRgb* ) rhsi.scanLine( y ); if ( memcmp( ls, rs, bytes ) ) { for ( int x = 0; x < w; ++x ) { - QRgb l = ls[x]; - QRgb r = rs[x]; + TQRgb l = ls[x]; + TQRgb r = rs[x]; if ( ( abs( tqRed( l ) - tqRed(r ) ) < 20 ) && ( abs( tqGreen( l ) - tqGreen(r ) ) < 20 ) && ( abs( tqBlue( l ) - tqBlue(r ) ) < 20 ) ) @@ -1032,7 +1032,7 @@ void RegressionTest::createLink( const TQString& test, int failures ) if ( failures & PaintFailure ) link += "P"; link += "]<br>\n"; - list.tqwriteBlock( link.latin1(), link.length() ); + list.writeBlock( link.latin1(), link.length() ); list.close(); } @@ -1056,7 +1056,7 @@ void RegressionTest::doJavascriptReport( const TQString &test ) text.replace( '\n', "<br>\n" ); cl += text; cl += "</tt></body></html>"; - compare.tqwriteBlock( cl.latin1(), cl.length() ); + compare.writeBlock( cl.latin1(), cl.length() ); compare.close(); } @@ -1248,7 +1248,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures ) cl += "<div id='dom' class='diff'>" + domDiff + "</div>"; cl += "</body></html>"; - compare.tqwriteBlock( cl.latin1(), cl.length() ); + compare.writeBlock( cl.latin1(), cl.length() ); compare.close(); } diff --git a/tdehtml/test_regression.h b/tdehtml/test_regression.h index b6791bd32..9092f22e2 100644 --- a/tdehtml/test_regression.h +++ b/tdehtml/test_regression.h @@ -38,7 +38,7 @@ class TQTimer; */ class PartMonitor : public TQObject { - Q_OBJECT + TQ_OBJECT public: PartMonitor(TDEHTMLPart *_part); ~PartMonitor(); @@ -124,7 +124,7 @@ class ScriptInterpreter; */ class RegressionTest : public TQObject { - Q_OBJECT + TQ_OBJECT public: RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const TQString &outputDir, diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp index bb8a948a7..6c3d1506e 100644 --- a/tdehtml/testtdehtml.cpp +++ b/tdehtml/testtdehtml.cpp @@ -56,10 +56,10 @@ int main(int argc, char *argv[]) TDEHTMLPart *doc = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI ); Dummy *dummy = new Dummy( doc ); - TQObject::connect( doc->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - dummy, TQT_SLOT( slotOpenURL( const KURL&, const KParts::URLArgs & ) ) ); + TQObject::connect( doc->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + dummy, TQ_SLOT( slotOpenURL( const KURL&, const KParts::URLArgs & ) ) ); - TQObject::connect( doc, TQT_SIGNAL(completed()), dummy, TQT_SLOT(handleDone()) ); + TQObject::connect( doc, TQ_SIGNAL(completed()), dummy, TQ_SLOT(handleDone()) ); if (args->url(0).url().right(4).find(".xml", 0, false) == 0) { KParts::URLArgs ags(doc->browserExtension()->urlArgs()); @@ -105,25 +105,25 @@ int main(int argc, char *argv[]) e.setAttribute( "name", "print" ); toolBar.insertBefore( e, toolBar.firstChild() ); - (void)new TDEAction( "Reload", "reload", Qt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" ); - (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" ); - TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" ); + (void)new TDEAction( "Reload", "reload", TQt::Key_F5, dummy, TQ_SLOT( reload() ), doc->actionCollection(), "reload" ); + (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQ_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" ); + TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQ_SLOT( print() ), doc->actionCollection(), "print" ); kprint->setEnabled(true); TDEToggleAction *ta = new TDEToggleAction( "Navigable", "edit-clear", 0, doc->actionCollection(), "navigable" ); ta->setChecked(doc->isCaretMode()); - TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) )); + TQWidget::connect(ta, TQ_SIGNAL(toggled(bool)), dummy, TQ_SLOT( toggleNavigable(bool) )); ta = new TDEToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" ); ta->setChecked(doc->isEditable()); - TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleEditable(bool) )); + TQWidget::connect(ta, TQ_SIGNAL(toggled(bool)), dummy, TQ_SLOT( toggleEditable(bool) )); toplevel->guiFactory()->addClient( doc ); doc->setJScriptEnabled(true); doc->setJavaEnabled(true); doc->setPluginsEnabled( true ); - doc->setURLCursor(TQCursor(Qt::PointingHandCursor)); + doc->setURLCursor(TQCursor(TQt::PointingHandCursor)); a.setTopWidget(doc->widget()); - TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)), - doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &))); + TQWidget::connect(doc, TQ_SIGNAL(setWindowCaption(const TQString &)), + doc->widget()->topLevelWidget(), TQ_SLOT(setCaption(const TQString &))); doc->widget()->show(); toplevel->show(); ((TQScrollView *)doc->widget())->viewport()->show(); diff --git a/tdehtml/testtdehtml.h b/tdehtml/testtdehtml.h index dcb4c1583..a6ce73675 100644 --- a/tdehtml/testtdehtml.h +++ b/tdehtml/testtdehtml.h @@ -10,7 +10,7 @@ */ class Dummy : public TQObject { - Q_OBJECT + TQ_OBJECT public: Dummy( TDEHTMLPart *part ) : TQObject( part ) { m_part = part; }; diff --git a/tdehtml/xml/dom2_eventsimpl.cpp b/tdehtml/xml/dom2_eventsimpl.cpp index e6af64184..1ee36c82d 100644 --- a/tdehtml/xml/dom2_eventsimpl.cpp +++ b/tdehtml/xml/dom2_eventsimpl.cpp @@ -526,52 +526,52 @@ private: /* Mapping between special Qt keycodes and virtual DOM codes */ IDTranslator<unsigned, unsigned, unsigned>::Info virtKeyToQtKeyTable[] = { - {KeyEventBaseImpl::DOM_VK_BACK_SPACE, Qt::Key_Backspace}, - {KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Enter}, - {KeyEventBaseImpl::DOM_VK_ENTER, Qt::Key_Return}, - {KeyEventBaseImpl::DOM_VK_NUM_LOCK, Qt::Key_NumLock}, - {KeyEventBaseImpl::DOM_VK_RIGHT_ALT, Qt::Key_Alt}, - {KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, Qt::Key_Control}, - {KeyEventBaseImpl::DOM_VK_LEFT_SHIFT, Qt::Key_Shift}, - {KeyEventBaseImpl::DOM_VK_META, Qt::Key_Meta}, - {KeyEventBaseImpl::DOM_VK_CAPS_LOCK, Qt::Key_CapsLock}, - {KeyEventBaseImpl::DOM_VK_DELETE, Qt::Key_Delete}, - {KeyEventBaseImpl::DOM_VK_END, Qt::Key_End}, - {KeyEventBaseImpl::DOM_VK_ESCAPE, Qt::Key_Escape}, - {KeyEventBaseImpl::DOM_VK_HOME, Qt::Key_Home}, - {KeyEventBaseImpl::DOM_VK_PAUSE, Qt::Key_Pause}, - {KeyEventBaseImpl::DOM_VK_PRINTSCREEN, Qt::Key_Print}, - {KeyEventBaseImpl::DOM_VK_SCROLL_LOCK, Qt::Key_ScrollLock}, - {KeyEventBaseImpl::DOM_VK_LEFT, Qt::Key_Left}, - {KeyEventBaseImpl::DOM_VK_RIGHT, Qt::Key_Right}, - {KeyEventBaseImpl::DOM_VK_UP, Qt::Key_Up}, - {KeyEventBaseImpl::DOM_VK_DOWN, Qt::Key_Down}, + {KeyEventBaseImpl::DOM_VK_BACK_SPACE, TQt::Key_Backspace}, + {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Enter}, + {KeyEventBaseImpl::DOM_VK_ENTER, TQt::Key_Return}, + {KeyEventBaseImpl::DOM_VK_NUM_LOCK, TQt::Key_NumLock}, + {KeyEventBaseImpl::DOM_VK_RIGHT_ALT, TQt::Key_Alt}, + {KeyEventBaseImpl::DOM_VK_LEFT_CONTROL, TQt::Key_Control}, + {KeyEventBaseImpl::DOM_VK_LEFT_SHIFT, TQt::Key_Shift}, + {KeyEventBaseImpl::DOM_VK_META, TQt::Key_Meta}, + {KeyEventBaseImpl::DOM_VK_CAPS_LOCK, TQt::Key_CapsLock}, + {KeyEventBaseImpl::DOM_VK_DELETE, TQt::Key_Delete}, + {KeyEventBaseImpl::DOM_VK_END, TQt::Key_End}, + {KeyEventBaseImpl::DOM_VK_ESCAPE, TQt::Key_Escape}, + {KeyEventBaseImpl::DOM_VK_HOME, TQt::Key_Home}, + {KeyEventBaseImpl::DOM_VK_PAUSE, TQt::Key_Pause}, + {KeyEventBaseImpl::DOM_VK_PRINTSCREEN, TQt::Key_Print}, + {KeyEventBaseImpl::DOM_VK_SCROLL_LOCK, TQt::Key_ScrollLock}, + {KeyEventBaseImpl::DOM_VK_LEFT, TQt::Key_Left}, + {KeyEventBaseImpl::DOM_VK_RIGHT, TQt::Key_Right}, + {KeyEventBaseImpl::DOM_VK_UP, TQt::Key_Up}, + {KeyEventBaseImpl::DOM_VK_DOWN, TQt::Key_Down}, {KeyEventBaseImpl::DOM_VK_PAGE_DOWN, TQt::Key_Next}, {KeyEventBaseImpl::DOM_VK_PAGE_UP, TQt::Key_Prior}, - {KeyEventBaseImpl::DOM_VK_F1, Qt::Key_F1}, - {KeyEventBaseImpl::DOM_VK_F2, Qt::Key_F2}, - {KeyEventBaseImpl::DOM_VK_F3, Qt::Key_F3}, - {KeyEventBaseImpl::DOM_VK_F4, Qt::Key_F4}, - {KeyEventBaseImpl::DOM_VK_F5, Qt::Key_F5}, - {KeyEventBaseImpl::DOM_VK_F6, Qt::Key_F6}, - {KeyEventBaseImpl::DOM_VK_F7, Qt::Key_F7}, - {KeyEventBaseImpl::DOM_VK_F8, Qt::Key_F8}, - {KeyEventBaseImpl::DOM_VK_F9, Qt::Key_F9}, - {KeyEventBaseImpl::DOM_VK_F10, Qt::Key_F10}, - {KeyEventBaseImpl::DOM_VK_F11, Qt::Key_F11}, - {KeyEventBaseImpl::DOM_VK_F12, Qt::Key_F12}, - {KeyEventBaseImpl::DOM_VK_F13, Qt::Key_F13}, - {KeyEventBaseImpl::DOM_VK_F14, Qt::Key_F14}, - {KeyEventBaseImpl::DOM_VK_F15, Qt::Key_F15}, - {KeyEventBaseImpl::DOM_VK_F16, Qt::Key_F16}, - {KeyEventBaseImpl::DOM_VK_F17, Qt::Key_F17}, - {KeyEventBaseImpl::DOM_VK_F18, Qt::Key_F18}, - {KeyEventBaseImpl::DOM_VK_F19, Qt::Key_F19}, - {KeyEventBaseImpl::DOM_VK_F20, Qt::Key_F20}, - {KeyEventBaseImpl::DOM_VK_F21, Qt::Key_F21}, - {KeyEventBaseImpl::DOM_VK_F22, Qt::Key_F22}, - {KeyEventBaseImpl::DOM_VK_F23, Qt::Key_F23}, - {KeyEventBaseImpl::DOM_VK_F24, Qt::Key_F24}, + {KeyEventBaseImpl::DOM_VK_F1, TQt::Key_F1}, + {KeyEventBaseImpl::DOM_VK_F2, TQt::Key_F2}, + {KeyEventBaseImpl::DOM_VK_F3, TQt::Key_F3}, + {KeyEventBaseImpl::DOM_VK_F4, TQt::Key_F4}, + {KeyEventBaseImpl::DOM_VK_F5, TQt::Key_F5}, + {KeyEventBaseImpl::DOM_VK_F6, TQt::Key_F6}, + {KeyEventBaseImpl::DOM_VK_F7, TQt::Key_F7}, + {KeyEventBaseImpl::DOM_VK_F8, TQt::Key_F8}, + {KeyEventBaseImpl::DOM_VK_F9, TQt::Key_F9}, + {KeyEventBaseImpl::DOM_VK_F10, TQt::Key_F10}, + {KeyEventBaseImpl::DOM_VK_F11, TQt::Key_F11}, + {KeyEventBaseImpl::DOM_VK_F12, TQt::Key_F12}, + {KeyEventBaseImpl::DOM_VK_F13, TQt::Key_F13}, + {KeyEventBaseImpl::DOM_VK_F14, TQt::Key_F14}, + {KeyEventBaseImpl::DOM_VK_F15, TQt::Key_F15}, + {KeyEventBaseImpl::DOM_VK_F16, TQt::Key_F16}, + {KeyEventBaseImpl::DOM_VK_F17, TQt::Key_F17}, + {KeyEventBaseImpl::DOM_VK_F18, TQt::Key_F18}, + {KeyEventBaseImpl::DOM_VK_F19, TQt::Key_F19}, + {KeyEventBaseImpl::DOM_VK_F20, TQt::Key_F20}, + {KeyEventBaseImpl::DOM_VK_F21, TQt::Key_F21}, + {KeyEventBaseImpl::DOM_VK_F22, TQt::Key_F22}, + {KeyEventBaseImpl::DOM_VK_F23, TQt::Key_F23}, + {KeyEventBaseImpl::DOM_VK_F24, TQt::Key_F24}, {0, 0} }; @@ -657,8 +657,8 @@ void KeyEventBaseImpl::buildQKeyEvent() const } //Neuter F keys as well. - if (key >= Qt::Key_F1 && key <= Qt::Key_F35) - key = Qt::Key_ScrollLock; + if (key >= TQt::Key_F1 && key <= TQt::Key_F35) + key = TQt::Key_ScrollLock; m_keyEvent = new TQKeyEvent(id() == KEYUP_EVENT ? TQEvent::KeyRelease : TQEvent::KeyPress, key, ascii, modifiers, text); diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp index b896d05a3..245585d74 100644 --- a/tdehtml/xml/dom_docimpl.cpp +++ b/tdehtml/xml/dom_docimpl.cpp @@ -299,7 +299,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView * m_paintDeviceMetrics = 0; m_paintDevice = 0; m_decoderMibEnum = 0; - m_textColor = Qt::black; + m_textColor = TQt::black; m_view = v; m_renderArena.reset(); @@ -308,7 +308,7 @@ DocumentImpl::DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView * if ( v ) { m_docLoader = new DocLoader(v->part(), this ); - setPaintDevice( TQT_TQPAINTDEVICE(m_view) ); + setPaintDevice( m_view ); } else m_docLoader = new DocLoader( 0, this ); @@ -1231,7 +1231,7 @@ void DocumentImpl::attach() assert(!attached()); if ( m_view ) - setPaintDevice( TQT_TQPAINTDEVICE(m_view) ); + setPaintDevice( m_view ); if (!m_renderArena) m_renderArena.reset(new RenderArena()); @@ -1334,7 +1334,7 @@ void DocumentImpl::open( bool clearEventListeners ) m_tokenizer = createTokenizer(); m_decoderMibEnum = 0; - connect(m_tokenizer,TQT_SIGNAL(finishedParsing()),this,TQT_SIGNAL(finishedParsing())); + connect(m_tokenizer,TQ_SIGNAL(finishedParsing()),this,TQ_SIGNAL(finishedParsing())); m_tokenizer->begin(); } diff --git a/tdehtml/xml/dom_docimpl.h b/tdehtml/xml/dom_docimpl.h index bcdc9500c..fc78a89b3 100644 --- a/tdehtml/xml/dom_docimpl.h +++ b/tdehtml/xml/dom_docimpl.h @@ -184,7 +184,7 @@ private: */ class DocumentImpl : public TQObject, private tdehtml::CachedObjectClient, public NodeBaseImpl { - Q_OBJECT + TQ_OBJECT public: DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v); ~DocumentImpl(); diff --git a/tdehtml/xml/dom_nodeimpl.cpp b/tdehtml/xml/dom_nodeimpl.cpp index 7e2e1bc5f..22b71051f 100644 --- a/tdehtml/xml/dom_nodeimpl.cpp +++ b/tdehtml/xml/dom_nodeimpl.cpp @@ -508,13 +508,13 @@ void NodeImpl::dispatchMouseEvent(TQMouseEvent *_mouse, int overrideId, int over int button = -1; switch (_mouse->button()) { - case Qt::LeftButton: + case TQt::LeftButton: button = 0; break; - case Qt::MidButton: + case TQt::MidButton: button = 1; break; - case Qt::RightButton: + case TQt::RightButton: button = 2; break; default: @@ -1659,7 +1659,7 @@ NodeImpl *NodeListImpl::item( unsigned long index ) const bool usedCache = false; if (m_cache->current.node) { //Compute distance from the requested index to the cache node - long cacheDist = QABS(long(index) - long(m_cache->position)); + long cacheDist = TQABS(long(index) - long(m_cache->position)); if (cacheDist < (long)index) { //Closer to the cached position usedCache = true; diff --git a/tdehtml/xml/dom_stringimpl.h b/tdehtml/xml/dom_stringimpl.h index c8f5ce7d8..09c746336 100644 --- a/tdehtml/xml/dom_stringimpl.h +++ b/tdehtml/xml/dom_stringimpl.h @@ -81,7 +81,7 @@ public: const TQChar &operator [] (int pos) { return s[pos]; } bool containsOnlyWhitespace() const; - // ignores trailing garbage, unlike QString + // ignores trailing garbage, unlike TQString int toInt(bool* ok = 0) const; tdehtml::Length* toLengthArray(int& len) const; diff --git a/tdehtml/xml/xml_tokenizer.h b/tdehtml/xml/xml_tokenizer.h index f89e5eb2f..d6b4dbe02 100644 --- a/tdehtml/xml/xml_tokenizer.h +++ b/tdehtml/xml/xml_tokenizer.h @@ -118,7 +118,7 @@ private: class Tokenizer : public TQObject { - Q_OBJECT + TQ_OBJECT public: virtual void begin() = 0; // script output must be prepended, while new data |