summaryrefslogtreecommitdiffstats
path: root/tdehtml/ecma
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml/ecma')
-rw-r--r--tdehtml/ecma/kjs_binding.cpp20
-rw-r--r--tdehtml/ecma/kjs_binding.h2
-rw-r--r--tdehtml/ecma/kjs_debugwin.cpp50
-rw-r--r--tdehtml/ecma/kjs_debugwin.h8
-rw-r--r--tdehtml/ecma/kjs_dom.cpp4
-rw-r--r--tdehtml/ecma/kjs_dom.h2
-rw-r--r--tdehtml/ecma/kjs_events.cpp4
-rw-r--r--tdehtml/ecma/kjs_navigator.cpp2
-rw-r--r--tdehtml/ecma/kjs_proxy.cpp4
-rw-r--r--tdehtml/ecma/kjs_window.cpp86
-rw-r--r--tdehtml/ecma/kjs_window.h8
-rw-r--r--tdehtml/ecma/xmlhttprequest.cpp18
-rw-r--r--tdehtml/ecma/xmlhttprequest.h2
13 files changed, 105 insertions, 105 deletions
diff --git a/tdehtml/ecma/kjs_binding.cpp b/tdehtml/ecma/kjs_binding.cpp
index 82c11d308..c3dd39255 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 );
@@ -395,18 +395,18 @@ Value KJS::getLiveConnectValue(KParts::LiveConnectExtension *lc, const TQString
}
}
-/* only with gcc > 3.4 KDE_NO_EXPORT */
+/* only with gcc > 3.4 TDE_NO_EXPORT */
EmbedLiveConnect::EmbedLiveConnect(KParts::LiveConnectExtension *lc, UString n, KParts::LiveConnectExtension::Type t, int id)
: m_liveconnect (lc), name(n), objtype(t), objid(id)
{}
-/* only with gcc > 3.4 KDE_NO_EXPORT */
+/* only with gcc > 3.4 TDE_NO_EXPORT */
EmbedLiveConnect::~EmbedLiveConnect() {
if (m_liveconnect)
m_liveconnect->unregister(objid);
}
-KDE_NO_EXPORT
+TDE_NO_EXPORT
Value EmbedLiveConnect::get(ExecState *, const Identifier & prop) const
{
if (m_liveconnect) {
@@ -419,19 +419,19 @@ Value EmbedLiveConnect::get(ExecState *, const Identifier & prop) const
return Undefined();
}
-KDE_NO_EXPORT
+TDE_NO_EXPORT
void EmbedLiveConnect::put(ExecState * exec, const Identifier &prop, const Value & value, int)
{
if (m_liveconnect)
m_liveconnect->put(objid, prop.qstring(), value.toString(exec).qstring());
}
-KDE_NO_EXPORT
+TDE_NO_EXPORT
bool EmbedLiveConnect::implementsCall() const {
return objtype == KParts::LiveConnectExtension::TypeFunction;
}
-KDE_NO_EXPORT
+TDE_NO_EXPORT
Value EmbedLiveConnect::call(ExecState *exec, Object&, const List &args)
{
if (m_liveconnect) {
@@ -447,17 +447,17 @@ Value EmbedLiveConnect::call(ExecState *exec, Object&, const List &args)
return Undefined();
}
-KDE_NO_EXPORT
+TDE_NO_EXPORT
bool EmbedLiveConnect::toBoolean(ExecState *) const {
return true;
}
-KDE_NO_EXPORT
+TDE_NO_EXPORT
Value EmbedLiveConnect::toPrimitive(ExecState *exec, Type) const {
return String(toString(exec));
}
-KDE_NO_EXPORT
+TDE_NO_EXPORT
UString EmbedLiveConnect::toString(ExecState *) const {
TQString str;
const char *type = objtype == KParts::LiveConnectExtension::TypeFunction ? "Function" : "Object";
diff --git a/tdehtml/ecma/kjs_binding.h b/tdehtml/ecma/kjs_binding.h
index b6d60348e..f8276bcb8 100644
--- a/tdehtml/ecma/kjs_binding.h
+++ b/tdehtml/ecma/kjs_binding.h
@@ -89,7 +89,7 @@ namespace KJS {
* that the interpreter runs for.
* The interpreter also stores the DOM object - >KJS::DOMObject cache.
*/
- class KDE_EXPORT ScriptInterpreter : public Interpreter
+ class TDE_EXPORT ScriptInterpreter : public Interpreter
{
public:
ScriptInterpreter( const Object &global, tdehtml::ChildFrame* frame );
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index 2e08f5ea8..afeac6132 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;
@@ -860,12 +860,12 @@ bool KJSDebugWin::exception(ExecState *exec, const Value &value, bool inTryCatch
}
if (dontShowAgain) {
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
TDEConfigGroupSaver saver(config,TQString::fromLatin1("Java/JavaScript Settings"));
config->writeEntry("ReportJavaScriptErrors",TQVariant(false));
config->sync();
TQByteArray data;
- kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
+ tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", data );
}
return (m_mode != Stop);
@@ -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_dom.h b/tdehtml/ecma/kjs_dom.h
index e812745ea..57f8678f9 100644
--- a/tdehtml/ecma/kjs_dom.h
+++ b/tdehtml/ecma/kjs_dom.h
@@ -246,7 +246,7 @@ namespace KJS {
};
bool checkNodeSecurity(ExecState *exec, const DOM::Node& n);
- KDE_EXPORT Value getDOMNode(ExecState *exec, const DOM::Node& n);
+ TDE_EXPORT Value getDOMNode(ExecState *exec, const DOM::Node& n);
Value getDOMNamedNodeMap(ExecState *exec, const DOM::NamedNodeMap& m);
Value getDOMNodeList(ExecState *exec, const DOM::NodeList& l);
Value getDOMDOMImplementation(ExecState *exec, const DOM::DOMImplementation& i);
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_navigator.cpp b/tdehtml/ecma/kjs_navigator.cpp
index 90ce501db..c68121f0e 100644
--- a/tdehtml/ecma/kjs_navigator.cpp
+++ b/tdehtml/ecma/kjs_navigator.cpp
@@ -22,7 +22,7 @@
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <kdebug.h>
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..7badb3947 100644
--- a/tdehtml/ecma/kjs_window.h
+++ b/tdehtml/ecma/kjs_window.h
@@ -68,7 +68,7 @@ namespace KJS {
static const ClassInfo info;
};
- class KDE_EXPORT Window : public ObjectImp {
+ class TDE_EXPORT Window : public ObjectImp {
friend TQGuardedPtr<TDEHTMLPart> getInstance();
friend class Location;
friend class WindowFunc;
@@ -245,8 +245,8 @@ namespace KJS {
int timerId;
};
- class KDE_EXPORT WindowQObject : public TQObject {
- Q_OBJECT
+ class TDE_EXPORT WindowQObject : public TQObject {
+ 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);
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-18 03:42:25 +0000