summaryrefslogtreecommitdiffstats
path: root/tdehtml
diff options
context:
space:
mode:
Diffstat (limited to 'tdehtml')
-rw-r--r--tdehtml/ChangeLog2
-rw-r--r--tdehtml/domtreeview.cpp2
-rw-r--r--tdehtml/domtreeview.h2
-rw-r--r--tdehtml/ecma/kjs_debugwin.cpp20
-rw-r--r--tdehtml/ecma/kjs_debugwin.h18
-rw-r--r--tdehtml/misc/knsplugininstaller.cpp2
-rw-r--r--tdehtml/misc/knsplugininstaller.h2
-rw-r--r--tdehtml/rendering/render_form.cpp24
-rw-r--r--tdehtml/rendering/render_form.h12
-rw-r--r--tdehtml/tdehtml_ext.cpp64
-rw-r--r--tdehtml/tdehtml_ext.h6
-rw-r--r--tdehtml/tdehtml_part.cpp68
-rw-r--r--tdehtml/tdehtmlimage.cpp6
-rw-r--r--tdehtml/tdehtmlpart_p.h52
-rw-r--r--tdehtml/test_regression.cpp2
-rw-r--r--tdehtml/testtdehtml.cpp12
16 files changed, 147 insertions, 147 deletions
diff --git a/tdehtml/ChangeLog b/tdehtml/ChangeLog
index cf19f1b06..302c414de 100644
--- a/tdehtml/ChangeLog
+++ b/tdehtml/ChangeLog
@@ -810,7 +810,7 @@
2005-04-06 Lubos Lunak <l.lunak@kde.org>
- * tdehtmlview.{h,cpp}: Use KActions for type ahead find.
+ * tdehtmlview.{h,cpp}: Use TDEActions for type ahead find.
* tdehtml_part.{h,cpp}: ditto.
* tdehtml_part.{h,cpp}: Add Find Previous action.
* tdehtml_part.cpp (findTextNext): Fix changing direction while searching text.
diff --git a/tdehtml/domtreeview.cpp b/tdehtml/domtreeview.cpp
index 5bff83e72..c68eb2007 100644
--- a/tdehtml/domtreeview.cpp
+++ b/tdehtml/domtreeview.cpp
@@ -19,7 +19,7 @@
#include "domtreeview.moc"
#include "xml/dom_nodeimpl.h"
-DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : KListView(parent, name)
+DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char * name) : TDEListView(parent, name)
{
setCaption(name);
setRootIsDecorated(true);
diff --git a/tdehtml/domtreeview.h b/tdehtml/domtreeview.h
index 93baa8f61..a0f5d942a 100644
--- a/tdehtml/domtreeview.h
+++ b/tdehtml/domtreeview.h
@@ -24,7 +24,7 @@
#include <tqptrdict.h>
#include "dom/dom_core.h"
-class DOMTreeView : public KListView
+class DOMTreeView : public TDEListView
{
Q_OBJECT
public:
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index ec794b8d2..ac78526ae 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -347,7 +347,7 @@ void EvalMultiLineEdit::keyPressEvent(TQKeyEvent * e)
}
//-------------------------------------------------------------------------
KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
- : KMainWindow(parent, name, (WFlags)WType_TopLevel), TDEInstance("kjs_debugger")
+ : TDEMainWindow(parent, name, (WFlags)WType_TopLevel), TDEInstance("kjs_debugger")
{
m_breakpoints = 0;
m_breakpointCount = 0;
@@ -436,27 +436,27 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name)
vl->addWidget(hsplitter);
// actions
- KPopupMenu *debugMenu = new KPopupMenu(this);
+ TDEPopupMenu *debugMenu = new TDEPopupMenu(this);
menuBar()->insertItem("&Debug",debugMenu);
- m_actionCollection = new KActionCollection(this);
+ m_actionCollection = new TDEActionCollection(this);
m_actionCollection->setInstance(this);
// Venkman use F12, KDevelop F10
- KShortcut scNext = KShortcut(KKeySequence(KKey(Qt::Key_F12)));
+ TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(Qt::Key_F12)));
scNext.append(KKeySequence(KKey(Qt::Key_F10)));
- m_nextAction = new KAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
+ m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,TQT_TQOBJECT(this),TQT_SLOT(slotNext()),
m_actionCollection,"next");
- m_stepAction = new KAction(i18n("&Step"),"dbgstep",KShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
+ m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(Qt::Key_F11),TQT_TQOBJECT(this),TQT_SLOT(slotStep()),
m_actionCollection,"step");
// Venkman use F5, Kdevelop F9
- KShortcut scCont = KShortcut(KKeySequence(KKey(Qt::Key_F5)));
+ TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(Qt::Key_F5)));
scCont.append(KKeySequence(KKey(Qt::Key_F9)));
- m_continueAction = new KAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
+ m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,TQT_TQOBJECT(this),TQT_SLOT(slotContinue()),
m_actionCollection,"cont");
- m_stopAction = new KAction(i18n("St&op"),"stop",KShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
+ m_stopAction = new TDEAction(i18n("St&op"),"stop",TDEShortcut(Qt::Key_F4),TQT_TQOBJECT(this),TQT_SLOT(slotStop()),
m_actionCollection,"stop");
- m_breakAction = new KAction(i18n("&Break at Next Statement"),"dbgrunto",KShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
+ m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(Qt::Key_F8),TQT_TQOBJECT(this),TQT_SLOT(slotBreakNext()),
m_actionCollection,"breaknext");
diff --git a/tdehtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h
index dc2368ac2..af205d654 100644
--- a/tdehtml/ecma/kjs_debugwin.h
+++ b/tdehtml/ecma/kjs_debugwin.h
@@ -43,8 +43,8 @@
class TQListBox;
class TQComboBox;
-class KActionCollection;
-class KAction;
+class TDEActionCollection;
+class TDEAction;
namespace KJS {
class FunctionImp;
@@ -157,7 +157,7 @@ namespace KJS {
*
* There is only one debug window per program. This can be obtained by calling #instance
*/
- class KJSDebugWin : public KMainWindow, public Debugger, public TDEInstance
+ class KJSDebugWin : public TDEMainWindow, public Debugger, public TDEInstance
{
Q_OBJECT
friend class SourceDisplay;
@@ -259,17 +259,17 @@ namespace KJS {
TQMap<int,SourceFragment*> m_sourceFragments; /* maps SourceId->SourceFragment */
TQPtrList<SourceFile> m_sourceSelFiles; /* maps combobox index->SourceFile */
- KActionCollection *m_actionCollection;
+ TDEActionCollection *m_actionCollection;
TQPixmap m_stopIcon;
TQPixmap m_emptyIcon;
SourceDisplay *m_sourceDisplay;
TQListBox *m_contextList;
- KAction *m_stepAction;
- KAction *m_nextAction;
- KAction *m_continueAction;
- KAction *m_stopAction;
- KAction *m_breakAction;
+ TDEAction *m_stepAction;
+ TDEAction *m_nextAction;
+ TDEAction *m_continueAction;
+ TDEAction *m_stopAction;
+ TDEAction *m_breakAction;
TQComboBox *m_sourceSel;
EvalMultiLineEdit *m_evalEdit;
diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index b953f34fb..3a0146547 100644
--- a/tdehtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -376,7 +376,7 @@ void KNSPluginWizard::initConfirmationPage()
m_confirmationVBox = new TQVBox(this);
new TQLabel(i18n("The following plugins are available."), m_confirmationVBox);
- m_pluginListView = new KListView(m_confirmationVBox);
+ m_pluginListView = new TDEListView(m_confirmationVBox);
m_pluginListView->addColumn(i18n("Name"));
m_pluginListView->setSelectionMode(TQListView::Single);
new TQLabel(i18n("Click on next to install the selected plugin."), m_confirmationVBox);
diff --git a/tdehtml/misc/knsplugininstaller.h b/tdehtml/misc/knsplugininstaller.h
index 240202468..f8caedf92 100644
--- a/tdehtml/misc/knsplugininstaller.h
+++ b/tdehtml/misc/knsplugininstaller.h
@@ -222,7 +222,7 @@ private:
TQWidget *m_finishWidget;
// plugin list
- KListView *m_pluginListView;
+ TDEListView *m_pluginListView;
// licence stuff
TQLabel *m_licencePageLabel;
diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp
index 5c8249b6b..ce6debcbc 100644
--- a/tdehtml/rendering/render_form.cpp
+++ b/tdehtml/rendering/render_form.cpp
@@ -311,7 +311,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* vi
: KLineEdit(parent, "__tdehtml"), m_input(input), m_view(view), m_spell(0)
{
setMouseTracking(true);
- KActionCollection *ac = new KActionCollection(this);
+ TDEActionCollection *ac = new TDEActionCollection(this);
m_spellAction = KStdAction::spelling( TQT_TQOBJECT(this), TQT_SLOT( slotCheckSpelling() ), ac );
}
@@ -971,7 +971,7 @@ void RenderSelect::updateFromElement()
}
if (m_useListBox && oldMultiple != m_multiple) {
- static_cast<KListBox*>(m_widget)->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
+ static_cast<TDEListBox*>(m_widget)->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
}
m_selectionChanged = true;
m_optionsChanged = true;
@@ -985,7 +985,7 @@ void RenderSelect::updateFromElement()
int listIndex;
if(m_useListBox) {
- static_cast<KListBox*>(m_widget)->clear();
+ static_cast<TDEListBox*>(m_widget)->clear();
}
else
@@ -999,7 +999,7 @@ void RenderSelect::updateFromElement()
if(m_useListBox) {
TQListBoxText *item = new TQListBoxText(TQString(text.implementation()->s, text.implementation()->l));
- static_cast<KListBox*>(m_widget)
+ static_cast<TDEListBox*>(m_widget)
->insertItem(item, listIndex);
item->setSelectable(false);
}
@@ -1022,7 +1022,7 @@ void RenderSelect::updateFromElement()
}
if(m_useListBox) {
- KListBox *l = static_cast<KListBox*>(m_widget);
+ TDEListBox *l = static_cast<TDEListBox*>(m_widget);
l->insertItem(text, listIndex);
DOMString disabled = optElem->getAttribute(ATTR_DISABLED);
if (!disabled.isNull() && l->item( listIndex )) {
@@ -1083,7 +1083,7 @@ void RenderSelect::layout( )
// calculate size
if(m_useListBox) {
- KListBox* w = static_cast<KListBox*>(m_widget);
+ TDEListBox* w = static_cast<TDEListBox*>(m_widget);
TQListBoxItem* p = w->firstItem();
int width = 0;
@@ -1105,7 +1105,7 @@ void RenderSelect::layout( )
// the average of that is IMHO kMin(number of elements, 10)
// so I did that ;-)
if(size < 1)
- size = kMin(static_cast<KListBox*>(m_widget)->count(), 10u);
+ size = kMin(static_cast<TDEListBox*>(m_widget)->count(), 10u);
width += 2*w->frameWidth() + w->verticalScrollBar()->sizeHint().width();
height = size*height + 2*w->frameWidth();
@@ -1208,7 +1208,7 @@ void RenderSelect::slotSelectionChanged() // emitted by the listbox only
// again with updateSelection.
if ( listItems[i]->id() == ID_OPTION )
static_cast<HTMLOptionElementImpl*>( listItems[i] )
- ->m_selected = static_cast<KListBox*>( m_widget )->isSelected( i );
+ ->m_selected = static_cast<TDEListBox*>( m_widget )->isSelected( i );
ref();
element()->onChange();
@@ -1220,9 +1220,9 @@ void RenderSelect::setOptionsChanged(bool _optionsChanged)
m_optionsChanged = _optionsChanged;
}
-KListBox* RenderSelect::createListBox()
+TDEListBox* RenderSelect::createListBox()
{
- KListBox *lb = new KListBox(view()->viewport(), "__tdehtml");
+ TDEListBox *lb = new TDEListBox(view()->viewport(), "__tdehtml");
lb->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single);
// ### looks broken
//lb->setAutoMask(true);
@@ -1247,7 +1247,7 @@ void RenderSelect::updateSelection()
int i;
if (m_useListBox) {
// if multi-select, we select only the new selected index
- KListBox *listBox = static_cast<KListBox*>(m_widget);
+ TDEListBox *listBox = static_cast<TDEListBox*>(m_widget);
for (i = 0; i < int(listItems.size()); i++)
listBox->setSelected(i,listItems[i]->id() == ID_OPTION &&
static_cast<HTMLOptionElementImpl*>(listItems[i])->selected());
@@ -1294,7 +1294,7 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent)
setAutoMask(true);
setMouseTracking(true);
- KActionCollection *ac = new KActionCollection(this);
+ 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 );
diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index d4508e6bc..7543b9e90 100644
--- a/tdehtml/rendering/render_form.h
+++ b/tdehtml/rendering/render_form.h
@@ -51,7 +51,7 @@ class KFindDialog;
class KReplaceDialog;
class KFind;
class KReplace;
-class KAction;
+class TDEAction;
class KURLRequester;
namespace DOM {
@@ -282,7 +282,7 @@ private:
DOM::HTMLInputElementImpl* m_input;
TDEHTMLView* m_view;
KSpell *m_spell;
- KAction *m_spellAction;
+ TDEAction *m_spellAction;
};
// -------------------------------------------------------------------------
@@ -399,7 +399,7 @@ public:
{ return static_cast<DOM::HTMLSelectElementImpl*>(RenderObject::element()); }
protected:
- KListBox *createListBox();
+ TDEListBox *createListBox();
ComboBoxWidget *createComboBox();
unsigned m_size;
@@ -440,9 +440,9 @@ private:
KFind *m_find;
KReplaceDialog *m_repDlg;
KReplace *m_replace;
- KAction *m_findAction;
- KAction *m_findNextAction;
- KAction *m_replaceAction;
+ TDEAction *m_findAction;
+ TDEAction *m_findNextAction;
+ TDEAction *m_replaceAction;
int m_findIndex, m_findPara;
int m_repIndex, m_repPara;
};
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 62c93079e..72576e91e 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -430,7 +430,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
if (hasSelection)
{
- KAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" );
+ TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQT_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 KAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_tdehtml->browserExtension(),
+ new TDEAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_tdehtml->browserExtension(),
TQT_SLOT( searchProvider() ), actionCollection(), "searchProvider" );
// favorite search providers
@@ -486,7 +486,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
favoriteEngines = config.readListEntry("FavoriteSearchEngines", favoriteEngines);
if ( !favoriteEngines.isEmpty()) {
- KActionMenu* providerList = new KActionMenu( i18n( "Search for '%1' with" ).arg( selectedText ), actionCollection(), "searchProviderList" );
+ TDEActionMenu* providerList = new TDEActionMenu( i18n( "Search for '%1' with" ).arg( selectedText ), actionCollection(), "searchProviderList" );
TQStringList::ConstIterator it = favoriteEngines.begin();
for ( ; it != favoriteEngines.end(); ++it ) {
@@ -507,7 +507,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
icon = TQPixmap( iconPath );
name = service->name();
- providerList->insert( new KAction( name, icon, 0, d->m_tdehtml->browserExtension(),
+ providerList->insert( new TDEAction( name, icon, 0, d->m_tdehtml->browserExtension(),
TQT_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) );
}
}
@@ -515,14 +515,14 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
if ( selectedText.contains("://") && KURL(selectedText).isValid() )
- new KAction( i18n( "Open '%1'" ).arg( selectedText ), "window_new", 0,
+ new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window_new", 0,
d->m_tdehtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" );
}
else if ( url.isEmpty() && !isImage )
{
actionCollection()->insert( tdehtml->actionCollection()->action( "security" ) );
actionCollection()->insert( tdehtml->actionCollection()->action( "setEncoding" ) );
- new KAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
+ new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
actionCollection(), "stopanimations" );
}
@@ -530,14 +530,14 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
{
if (url.protocol() == "mailto")
{
- new KAction( i18n( "Copy Email Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
+ new TDEAction( i18n( "Copy Email Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
actionCollection(), "copylinklocation" );
}
else
{
- new KAction( i18n( "&Save Link As..." ), 0, this, TQT_SLOT( slotSaveLinkAs() ),
+ new TDEAction( i18n( "&Save Link As..." ), 0, this, TQT_SLOT( slotSaveLinkAs() ),
actionCollection(), "savelinkas" );
- new KAction( i18n( "Copy &Link Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
+ new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ),
actionCollection(), "copylinklocation" );
}
}
@@ -547,28 +547,28 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
{
if ( tdehtml->parentPart() )
{
- new KAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotFrameInWindow() ),
+ new TDEAction( i18n( "Open in New &Window" ), "window_new", 0, this, TQT_SLOT( slotFrameInWindow() ),
actionCollection(), "frameinwindow" );
- new KAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ),
+ new TDEAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ),
actionCollection(), "frameintop" );
- new KAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotFrameInTab() ),
+ new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotFrameInTab() ),
actionCollection(), "frameintab" );
- new KAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ),
+ new TDEAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ),
actionCollection(), "reloadframe" );
if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) {
if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame )
- new KAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" );
+ new TDEAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" );
}
- new KAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQT_SLOT( slotViewDocumentSource() ),
+ new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQT_SLOT( slotViewDocumentSource() ),
actionCollection(), "viewFrameSource" );
- new KAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" );
+ new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQT_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 KAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" );
- new KAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
+ 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" );
actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewDocumentSource" ) );
actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewPageInfo" ) );
@@ -579,7 +579,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 KAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
+ new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ),
actionCollection(), "stopanimations" );
}
@@ -598,35 +598,35 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri
}
else
d->m_imageURL = KURL( static_cast<DOM::HTMLInputElement>( e ).src().string() );
- new KAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveImageAs() ),
+ new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveImageAs() ),
actionCollection(), "saveimageas" );
- new KAction( i18n( "Send Image..." ), 0, this, TQT_SLOT( slotSendImage() ),
+ new TDEAction( i18n( "Send Image..." ), 0, this, TQT_SLOT( slotSendImage() ),
actionCollection(), "sendimage" );
#ifndef QT_NO_MIMECLIPBOARD
- (new KAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ),
+ (new TDEAction( i18n( "Copy Image" ), 0, this, TQT_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 QT_NO_MIMECLIPBOARD
- new KAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ),
+ new TDEAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ),
actionCollection(), "copyimagelocation" );
}
TQString name = KStringHandler::csqueeze(d->m_imageURL.fileName()+d->m_imageURL.query(), 25);
- new KAction( 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, TQT_SLOT( slotViewImage() ),
actionCollection(), "viewimage" );
if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled())
{
- new KAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ),
+ new TDEAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ),
actionCollection(), "blockimage" );
if (!d->m_imageURL.host().isEmpty() &&
!d->m_imageURL.protocol().isEmpty())
{
- new KAction( 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, TQT_SLOT( slotBlockHost() ),
actionCollection(), "blockhost" );
}
}
@@ -962,13 +962,13 @@ extern const int KDE_NO_EXPORT fastZoomSizeCount;
// BCI: remove in KDE 4
TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
- : KAction( text, icon, 0, receiver, slot, parent, name )
+ : TDEAction( text, icon, 0, receiver, slot, parent, name )
{
init(part, direction);
}
-TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const KShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
- : KAction( text, icon, cut, receiver, slot, parent, name )
+TDEHTMLZoomFactorAction::TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
+ : TDEAction( text, icon, cut, receiver, slot, parent, name )
{
init(part, direction);
}
@@ -1006,11 +1006,11 @@ TDEHTMLZoomFactorAction::~TDEHTMLZoomFactorAction()
int TDEHTMLZoomFactorAction::plug( TQWidget *w, int index )
{
- int containerId = KAction::plug( w, index );
- if ( containerId == -1 || !w->inherits( "KToolBar" ) )
+ int containerId = TDEAction::plug( w, index );
+ if ( containerId == -1 || !w->inherits( "TDEToolBar" ) )
return containerId;
- KToolBarButton *button = static_cast<KToolBar *>( w )->getButton( itemId( containerId ) );
+ TDEToolBarButton *button = static_cast<TDEToolBar *>( w )->getButton( itemId( containerId ) );
if ( !button )
return containerId;
diff --git a/tdehtml/tdehtml_ext.h b/tdehtml/tdehtml_ext.h
index c6db763b9..165cedb0e 100644
--- a/tdehtml/tdehtml_ext.h
+++ b/tdehtml/tdehtml_ext.h
@@ -149,14 +149,14 @@ private:
TDEHTMLPopupGUIClientPrivate *d;
};
-class TDEHTMLZoomFactorAction : public KAction
+class TDEHTMLZoomFactorAction : public TDEAction
{
Q_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 );
TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text,
- const TQString &icon, const KShortcut& cut, const TQObject *receiver,
+ const TQString &icon, const TDEShortcut& cut, const TQObject *receiver,
const char *slot, TQObject *parent, const char *name );
virtual ~TDEHTMLZoomFactorAction();
@@ -165,7 +165,7 @@ public:
private slots:
void slotActivated( int );
protected slots:
- void slotActivated() { KAction::slotActivated(); }
+ void slotActivated() { TDEAction::slotActivated(); }
private:
void init(TDEHTMLPart *part, bool direction);
private:
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index 059763c6a..caa55ae61 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -252,29 +252,29 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
d->m_bMousePressed = false;
d->m_bRightMousePressed = false;
d->m_bCleared = false;
- d->m_paViewDocument = new KAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQT_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" );
- d->m_paViewFrame = new KAction( i18n( "View Frame Source" ), 0, this, TQT_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
- d->m_paViewInfo = new KAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
- d->m_paSaveBackground = new KAction( i18n( "Save &Background Image As..." ), 0, this, TQT_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
+ 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" );
if ( parentPart() )
- d->m_paSaveDocument->setShortcut( KShortcut() ); // avoid clashes
- d->m_paSaveFrame = new KAction( i18n( "Save &Frame As..." ), 0, this, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
- d->m_paSecurity = new KAction( i18n( "Security..." ), "decrypted", 0, this, TQT_SLOT( slotSecurity() ), actionCollection(), "security" );
+ 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_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 KAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQT_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" );
- d->m_paDebugDOMTree = new KAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQT_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" );
- d->m_paStopAnimations = new KAction( 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, 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_paSetEncoding = new KActionMenu( i18n( "Set &Encoding" ), "charset", actionCollection(), "setEncoding" );
+ d->m_paSetEncoding = new TDEActionMenu( i18n( "Set &Encoding" ), "charset", actionCollection(), "setEncoding" );
d->m_paSetEncoding->setDelayed( false );
- d->m_automaticDetection = new KPopupMenu( 0L );
+ d->m_automaticDetection = new TDEPopupMenu( 0L );
d->m_automaticDetection->insertItem( i18n( "Semi-Automatic" ), 0 );
d->m_automaticDetection->insertItem( i18n( "Arabic" ), 1 );
@@ -296,10 +296,10 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
d->m_paSetEncoding->popupMenu()->insertItem( i18n( "Automatic Detection" ), d->m_automaticDetection, 0 );
- d->m_paSetEncoding->insert( new KActionSeparator( actionCollection() ) );
+ d->m_paSetEncoding->insert( new TDEActionSeparator( actionCollection() ) );
- d->m_manualDetection = new KSelectAction( 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, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" );
TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
d->m_manualDetection->setItems( encodings );
d->m_manualDetection->setCurrentItem( -1 );
@@ -354,7 +354,7 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
}
- d->m_paUseStylesheet = new KSelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" );
+ d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" );
if ( prof == BrowserViewGUI ) {
d->m_paIncZoomFactor = new TDEHTMLZoomFactorAction( this, true, i18n(
@@ -385,37 +385,37 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof )
"Find the previous occurrence of the text that you "
"have found using the <b>Find Text</b> function" ) );
- d->m_paFindAheadText = new KAction( i18n("Find Text as You Type"), KShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()),
+ d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()),
actionCollection(), "findAheadText");
- d->m_paFindAheadLinks = new KAction( i18n("Find Links as You Type"), KShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()),
+ d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()),
actionCollection(), "findAheadLink");
d->m_paFindAheadText->setEnabled( false );
d->m_paFindAheadLinks->setEnabled( false );
if ( parentPart() )
{
- d->m_paFind->setShortcut( KShortcut() ); // avoid clashes
- d->m_paFindNext->setShortcut( KShortcut() ); // avoid clashes
- d->m_paFindPrev->setShortcut( KShortcut() ); // avoid clashes
- d->m_paFindAheadText->setShortcut( KShortcut());
- d->m_paFindAheadLinks->setShortcut( KShortcut());
+ d->m_paFind->setShortcut( TDEShortcut() ); // avoid clashes
+ d->m_paFindNext->setShortcut( TDEShortcut() ); // avoid clashes
+ d->m_paFindPrev->setShortcut( TDEShortcut() ); // avoid clashes
+ d->m_paFindAheadText->setShortcut( TDEShortcut());
+ d->m_paFindAheadLinks->setShortcut( TDEShortcut());
}
- d->m_paPrintFrame = new KAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQT_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
+ d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQT_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" );
if ( parentPart() )
- d->m_paSelectAll->setShortcut( KShortcut() ); // avoid clashes
+ d->m_paSelectAll->setShortcut( TDEShortcut() ); // avoid clashes
- d->m_paToggleCaretMode = new KToggleAction(i18n("Toggle Caret Mode"),
+ d->m_paToggleCaretMode = new TDEToggleAction(i18n("Toggle Caret Mode"),
Key_F7, this, TQT_SLOT(slotToggleCaretMode()),
actionCollection(), "caretMode");
d->m_paToggleCaretMode->setChecked(isCaretMode());
if (parentPart())
- d->m_paToggleCaretMode->setShortcut(KShortcut()); // avoid clashes
+ d->m_paToggleCaretMode->setShortcut(TDEShortcut()); // avoid clashes
// set the default java(script) flags according to the current host.
d->m_bOpenMiddleClick = d->m_settings->isOpenMiddleClickEnabled();
@@ -1119,7 +1119,7 @@ void TDEHTMLPart::disableJSErrorExtension() {
}
void TDEHTMLPart::jsErrorDialogContextMenu() {
- KPopupMenu *m = new KPopupMenu(0L);
+ 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->popup(TQCursor::pos());
@@ -1348,10 +1348,10 @@ void TDEHTMLPart::setAutoloadImages( bool enable )
d->m_paLoadImages = 0;
}
else if ( !d->m_paLoadImages )
- d->m_paLoadImages = new KAction( 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, TQT_SLOT( slotLoadImages() ), actionCollection(), "loadImages" );
if ( d->m_paLoadImages ) {
- TQPtrList<KAction> lst;
+ TQPtrList<TDEAction> lst;
lst.append( d->m_paLoadImages );
plugActionList( "loadImages", lst );
}
@@ -6637,7 +6637,7 @@ void TDEHTMLPart::guiActivateEvent( KParts::GUIActivateEvent *event )
if ( !d->m_settings->autoLoadImages() && d->m_paLoadImages )
{
- TQPtrList<KAction> lst;
+ TQPtrList<TDEAction> lst;
lst.append( d->m_paLoadImages );
plugActionList( "loadImages", lst );
}
@@ -7311,7 +7311,7 @@ void TDEHTMLPart::launchWalletManager()
void TDEHTMLPart::walletMenu()
{
#ifndef TDEHTML_NO_WALLET
- KPopupMenu *m = new KPopupMenu(0L);
+ TDEPopupMenu *m = new TDEPopupMenu(0L);
m->insertItem(i18n("&Close Wallet"), this, TQT_SLOT(slotWalletClosed()));
m->popup(TQCursor::pos());
#endif // TDEHTML_NO_WALLET
@@ -7355,10 +7355,10 @@ void TDEHTMLPart::setDebugScript( bool enable )
unplugActionList( "debugScriptList" );
if ( enable ) {
if (!d->m_paDebugScript) {
- d->m_paDebugScript = new KAction( i18n( "JavaScript &Debugger" ), 0, this, TQT_SLOT( slotDebugScript() ), actionCollection(), "debugScript" );
+ d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQT_SLOT( slotDebugScript() ), actionCollection(), "debugScript" );
}
d->m_paDebugScript->setEnabled( d->m_frame ? d->m_frame->m_jscript : 0L );
- TQPtrList<KAction> lst;
+ TQPtrList<TDEAction> lst;
lst.append( d->m_paDebugScript );
plugActionList( "debugScriptList", lst );
}
@@ -7407,7 +7407,7 @@ void TDEHTMLPart::setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originP
}
void TDEHTMLPart::suppressedPopupMenu() {
- KPopupMenu *m = new KPopupMenu(0L);
+ 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()));
diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp
index 021f95149..bf05d8495 100644
--- a/tdehtml/tdehtmlimage.cpp
+++ b/tdehtml/tdehtmlimage.cpp
@@ -80,20 +80,20 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
m_ext = new TDEHTMLImageBrowserExtension( this, "be" );
// Remove unnecessary actions.
- KAction *encodingAction = actionCollection()->action( "setEncoding" );
+ TDEAction *encodingAction = actionCollection()->action( "setEncoding" );
if ( encodingAction )
{
encodingAction->unplugAll();
delete encodingAction;
}
- KAction *viewSourceAction= actionCollection()->action( "viewDocumentSource" );
+ TDEAction *viewSourceAction= actionCollection()->action( "viewDocumentSource" );
if ( viewSourceAction )
{
viewSourceAction->unplugAll();
delete viewSourceAction;
}
- KAction *selectAllAction= actionCollection()->action( "selectAll" );
+ TDEAction *selectAllAction= actionCollection()->action( "selectAll" );
if ( selectAllAction )
{
selectAllAction->unplugAll();
diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index c1e641cb9..149483493 100644
--- a/tdehtml/tdehtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -54,8 +54,8 @@
class KFind;
class KFindDialog;
-class KPopupMenu;
-class KSelectAction;
+class TDEPopupMenu;
+class TDESelectAction;
class KURLLabel;
class KJavaAppletContext;
class KJSErrorDlg;
@@ -393,30 +393,30 @@ public:
int m_delayRedirect;
TQString m_redirectURL;
- KAction *m_paViewDocument;
- KAction *m_paViewFrame;
- KAction *m_paViewInfo;
- KAction *m_paSaveBackground;
- KAction *m_paSaveDocument;
- KAction *m_paSaveFrame;
- KAction *m_paSecurity;
- KActionMenu *m_paSetEncoding;
- KSelectAction *m_paUseStylesheet;
+ TDEAction *m_paViewDocument;
+ TDEAction *m_paViewFrame;
+ TDEAction *m_paViewInfo;
+ TDEAction *m_paSaveBackground;
+ TDEAction *m_paSaveDocument;
+ TDEAction *m_paSaveFrame;
+ TDEAction *m_paSecurity;
+ TDEActionMenu *m_paSetEncoding;
+ TDESelectAction *m_paUseStylesheet;
TDEHTMLZoomFactorAction *m_paIncZoomFactor;
TDEHTMLZoomFactorAction *m_paDecZoomFactor;
- KAction *m_paLoadImages;
- KAction *m_paFind;
- KAction *m_paFindNext;
- KAction *m_paFindPrev;
- KAction *m_paFindAheadText;
- KAction *m_paFindAheadLinks;
- KAction *m_paPrintFrame;
- KAction *m_paSelectAll;
- KAction *m_paDebugScript;
- KAction *m_paDebugDOMTree;
- KAction *m_paDebugRenderTree;
- KAction *m_paStopAnimations;
- KToggleAction *m_paToggleCaretMode;
+ TDEAction *m_paLoadImages;
+ TDEAction *m_paFind;
+ TDEAction *m_paFindNext;
+ TDEAction *m_paFindPrev;
+ TDEAction *m_paFindAheadText;
+ TDEAction *m_paFindAheadLinks;
+ TDEAction *m_paPrintFrame;
+ TDEAction *m_paSelectAll;
+ TDEAction *m_paDebugScript;
+ TDEAction *m_paDebugDOMTree;
+ TDEAction *m_paDebugRenderTree;
+ TDEAction *m_paStopAnimations;
+ TDEToggleAction *m_paToggleCaretMode;
KParts::PartManager *m_manager;
@@ -548,8 +548,8 @@ public:
bool m_newJSInterpreterExists; // set to 1 by setOpenedByJS, for window.open
tdehtml::Decoder::AutoDetectLanguage m_autoDetectLanguage;
- KPopupMenu *m_automaticDetection;
- KSelectAction *m_manualDetection;
+ TDEPopupMenu *m_automaticDetection;
+ TDESelectAction *m_manualDetection;
void setFlagRecursively(bool TDEHTMLPartPrivate::*flag, bool value);
/** returns the caret node */
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index d05591f48..88a662eb6 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -558,7 +558,7 @@ int main(int argc, char *argv[])
// create widgets
TDEHTMLFactory *fac = new TDEHTMLFactory();
- KMainWindow *toplevel = new KMainWindow();
+ TDEMainWindow *toplevel = new TDEMainWindow();
TDEHTMLPart *part = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI );
toplevel->setCentralWidget( part->widget() );
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index 001780dc2..e9d1cd4e1 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
TDEHTMLFactory *fac = new TDEHTMLFactory(true);
#endif
- KMainWindow *toplevel = new KMainWindow();
+ TDEMainWindow *toplevel = new TDEMainWindow();
TDEHTMLPart *doc = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI );
Dummy *dummy = new Dummy( doc );
@@ -105,14 +105,14 @@ int main(int argc, char *argv[])
e.setAttribute( "name", "print" );
toolBar.insertBefore( e, toolBar.firstChild() );
- (void)new KAction( "Reload", "reload", Qt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" );
- (void)new KAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" );
- KAction* kprint = new KAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" );
+ (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" );
kprint->setEnabled(true);
- KToggleAction *ta = new KToggleAction( "Navigable", "editclear", 0, doc->actionCollection(), "navigable" );
+ TDEToggleAction *ta = new TDEToggleAction( "Navigable", "editclear", 0, doc->actionCollection(), "navigable" );
ta->setChecked(doc->isCaretMode());
TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) ));
- ta = new KToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" );
+ 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) ));
toplevel->guiFactory()->addClient( doc );
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 07:32:34 +0000