Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 081670a127
commit 74a2067d28

@ -36,7 +36,7 @@
#include "designer.h" #include "designer.h"
AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name) AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
: KMainWindow(parent, name) : TDEMainWindow(parent, name)
{ {
firstBoard = true; firstBoard = true;
estates.setAutoDelete(true); estates.setAutoDelete(true);
@ -53,23 +53,23 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
(void) KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection()); (void) KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(openNew()), actionCollection());
(void) KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); (void) KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
(void) KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection()); (void) KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), actionCollection());
(void) new KAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(info()), actionCollection(), "boardinfo"); (void) new TDEAction(i18n("&Edit Gameboard Info..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(info()), actionCollection(), "boardinfo");
(void) new KAction(i18n("&Edit Groups..."), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(editGroups()), actionCollection(), "groupeditor"); (void) new TDEAction(i18n("&Edit Groups..."), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(editGroups()), actionCollection(), "groupeditor");
(void) new KAction(i18n("&Add 4 Squares"), "viewmag+", 0, TQT_TQOBJECT(this), TQT_SLOT(larger()), actionCollection(), "larger"); (void) new TDEAction(i18n("&Add 4 Squares"), "viewmag+", 0, TQT_TQOBJECT(this), TQT_SLOT(larger()), actionCollection(), "larger");
(void) new KAction(i18n("&Remove 4 Squares"), "viewmag-", 0, TQT_TQOBJECT(this), TQT_SLOT(smaller()), actionCollection(), "smaller"); (void) new TDEAction(i18n("&Remove 4 Squares"), "viewmag-", 0, TQT_TQOBJECT(this), TQT_SLOT(smaller()), actionCollection(), "smaller");
(void) KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection()); (void) KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copy()), actionCollection());
(void) KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection()); (void) KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), actionCollection());
(void) new KAction(i18n("&Up"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), actionCollection(), "up"); (void) new TDEAction(i18n("&Up"), Key_Up, TQT_TQOBJECT(this), TQT_SLOT(up()), actionCollection(), "up");
(void) new KAction(i18n("&Down"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), actionCollection(), "down"); (void) new TDEAction(i18n("&Down"), Key_Down, TQT_TQOBJECT(this), TQT_SLOT(down()), actionCollection(), "down");
(void) new KAction(i18n("&Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(left()), actionCollection(), "left"); (void) new TDEAction(i18n("&Left"), Key_Left, TQT_TQOBJECT(this), TQT_SLOT(left()), actionCollection(), "left");
(void) new KAction(i18n("&Right"), Key_Right, TQT_TQOBJECT(this), TQT_SLOT(right()), actionCollection(), "right"); (void) new TDEAction(i18n("&Right"), Key_Right, TQT_TQOBJECT(this), TQT_SLOT(right()), actionCollection(), "right");
recentAct = KStdAction::openRecent(0, 0, actionCollection()); recentAct = KStdAction::openRecent(0, 0, actionCollection());
connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL &))); connect(recentAct, TQT_SIGNAL(urlSelected(const KURL &)), TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL &)));
recentAct->loadEntries(TDEGlobal::config(), "Designer recent files"); recentAct->loadEntries(TDEGlobal::config(), "Designer recent files");
estateAct = new KListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num"); estateAct = new TDEListAction(i18n("Change Estate"), 0, 0, 0, actionCollection(), "estate_num");
connect(estateAct, TQT_SIGNAL(activated(int)), TQT_SLOT(changeEstate(int))); connect(estateAct, TQT_SIGNAL(activated(int)), TQT_SLOT(changeEstate(int)));
createGUI("atlantikdesignerui.rc"); createGUI("atlantikdesignerui.rc");

@ -15,14 +15,14 @@
class EstateEdit; class EstateEdit;
class TQCloseEvent; class TQCloseEvent;
class KListAction; class TDEListAction;
class KRecentFilesAction; class TDERecentFilesAction;
class Estate; class Estate;
class Player; class Player;
class ConfigEstate; class ConfigEstate;
class AtlantikBoard; class AtlantikBoard;
class AtlanticDesigner : public KMainWindow class AtlanticDesigner : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -80,8 +80,8 @@ class AtlanticDesigner : public KMainWindow
TQGuardedPtr<GroupEditor> groupEditor; TQGuardedPtr<GroupEditor> groupEditor;
TQGuardedPtr<BoardInfoDlg> boardInfoDlg; TQGuardedPtr<BoardInfoDlg> boardInfoDlg;
EstateList estates; EstateList estates;
KListAction *estateAct; TDEListAction *estateAct;
KRecentFilesAction *recentAct; TDERecentFilesAction *recentAct;
TQValueList<CardStack> cards; TQValueList<CardStack> cards;
BoardInfo boardInfo; BoardInfo boardInfo;

@ -664,7 +664,7 @@ CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char
connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del())); connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del()));
hlayout->addWidget(delButton); hlayout->addWidget(delButton);
List = new KListBox(this); List = new TDEListBox(this);
layout->addWidget(List); layout->addWidget(List);
connect(List, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(selected(int))); connect(List, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(selected(int)));

@ -17,7 +17,7 @@ class TQSpinBox;
class KColorButton; class KColorButton;
class KComboBox; class KComboBox;
class KListBox; class TDEListBox;
class KPushButton; class KPushButton;
enum EstateType { Street = 0, Cards, FreeParking, ToJail, Tax, Jail }; enum EstateType { Street = 0, Cards, FreeParking, ToJail, Tax, Jail };
@ -209,7 +209,7 @@ class CardView : public TQWidget
void updateButtonsEnabled(); void updateButtonsEnabled();
private: private:
KListBox *List; TDEListBox *List;
KPushButton *addButton; KPushButton *addButton;
KPushButton *renameButton; KPushButton *renameButton;
KPushButton *delButton; KPushButton *delButton;

@ -28,7 +28,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
TQFrame *page = plainPage(); TQFrame *page = plainPage();
TQHBoxLayout *hlayout = new TQHBoxLayout(page, marginHint(), spacingHint()); TQHBoxLayout *hlayout = new TQHBoxLayout(page, marginHint(), spacingHint());
groups = new KListBox(page); groups = new TDEListBox(page);
hlayout->addWidget(groups); hlayout->addWidget(groups);
connect(groups, TQT_SIGNAL(highlighted(TQListBoxItem *)), this, TQT_SLOT(updateSettings(TQListBoxItem *))); connect(groups, TQT_SIGNAL(highlighted(TQListBoxItem *)), this, TQT_SLOT(updateSettings(TQListBoxItem *)));
TQStringList newgroups; TQStringList newgroups;

@ -10,7 +10,7 @@
class KColorButton; class KColorButton;
class KLineEdit; class KLineEdit;
class KListBox; class TDEListBox;
class KPushButton; class KPushButton;
class TQComboBox; class TQComboBox;
@ -78,7 +78,7 @@ class GroupEditor : public KDialogBase
void selectionChanged(); void selectionChanged();
private: private:
KListBox *groups; TDEListBox *groups;
KLineEdit *rentMathEdit; KLineEdit *rentMathEdit;
KColorButton *fgButton; KColorButton *fgButton;
KColorButton *bgButton; KColorButton *bgButton;

@ -14,7 +14,7 @@
* Jun 19 2003 v.1.0 - Removed TQTimer (polling is Evil(tm)... ) * Jun 19 2003 v.1.0 - Removed TQTimer (polling is Evil(tm)... )
* - Captured documentChanged() event to refresh symbol list * - Captured documentChanged() event to refresh symbol list
* - Tooltips vanished into nowhere...sigh :( * - Tooltips vanished into nowhere...sigh :(
* May 04 2003 v 0.6 - Symbol List becomes a KListView object. Removed Tooltip class. * May 04 2003 v 0.6 - Symbol List becomes a TDEListView object. Removed Tooltip class.
* Added a TQTimer that every 200ms checks: * Added a TQTimer that every 200ms checks:
* * if the list width has changed * * if the list width has changed
* * if the document has changed * * if the document has changed
@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY( katecppsymbolviewerplugin, KGenericFactory<KatePlugi
KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w) KatePluginSymbolViewerView::KatePluginSymbolViewerView(Kate::MainWindow *w)
{ {
TDEGlobal::locale()->insertCatalogue("katecppsymbolviewer"); TDEGlobal::locale()->insertCatalogue("katecppsymbolviewer");
KToggleAction* act = new KToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" ); TDEToggleAction* act = new TDEToggleAction ( i18n("Hide Symbols"), 0, this, TQT_SLOT( slotInsertSymbol() ), actionCollection(), "view_insert_symbolviewer" );
act->setCheckedState(i18n("Show Symbols")); act->setCheckedState(i18n("Show Symbols"));
setInstance (new TDEInstance("kate")); setInstance (new TDEInstance("kate"));
@ -123,7 +123,7 @@ void KatePluginSymbolViewerView::slotInsertSymbol()
{ {
dock = win->toolViewManager()->createToolView("kate_plugin_cppsymbolviewer", Kate::ToolViewManager::Left, cls, i18n("Symbol List")); dock = win->toolViewManager()->createToolView("kate_plugin_cppsymbolviewer", Kate::ToolViewManager::Left, cls, i18n("Symbol List"));
symbols = new KListView(dock); symbols = new TDEListView(dock);
treeMode = 0; treeMode = 0;
connect(symbols, TQT_SIGNAL(executed(TQListViewItem *)), this, TQT_SLOT(goToSymbol(TQListViewItem *))); connect(symbols, TQT_SIGNAL(executed(TQListViewItem *)), this, TQT_SLOT(goToSymbol(TQListViewItem *)));

@ -69,7 +69,7 @@ class KatePluginSymbolViewerView : public TQObject, public KXMLGUIClient
void slotViewChanged(TQResizeEvent *e); void slotViewChanged(TQResizeEvent *e);
private: private:
TQPopupMenu *popup; TQPopupMenu *popup;
KListView *symbols; TDEListView *symbols;
TQWidget *dock; TQWidget *dock;
bool m_Active; bool m_Active;
int m_macro, m_struct, m_func, m_sort; int m_macro, m_struct, m_func, m_sort;

@ -39,7 +39,7 @@ class PluginView : public KXMLGUIClient
public: public:
Kate::MainWindow *win; Kate::MainWindow *win;
KRecentFilesAction *recentFiles; TDERecentFilesAction *recentFiles;
}; };
PluginKateFileListLoader::PluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList) PluginKateFileListLoader::PluginKateFileListLoader (TQObject * parent, const char *name, const TQStringList)
@ -74,20 +74,20 @@ void PluginKateFileListLoader::addView(Kate::MainWindow *win)
{ {
PluginView *view = new PluginView (); PluginView *view = new PluginView ();
(void) new KAction( i18n("Open File List..."), 0, (void) new TDEAction( i18n("Open File List..."), 0,
this, TQT_SLOT( slotOpenList() ), this, TQT_SLOT( slotOpenList() ),
view->actionCollection(), "file_kfllopen" ); view->actionCollection(), "file_kfllopen" );
view->recentFiles = new KRecentFilesAction( i18n("Open Recent"), KShortcut::null(), view->recentFiles = new TDERecentFilesAction( i18n("Open Recent"), TDEShortcut::null(),
this, TQT_SLOT(slotOpenList(const KURL&)), view->actionCollection(), this, TQT_SLOT(slotOpenList(const KURL&)), view->actionCollection(),
"file_kfllopenrecent"); "file_kfllopenrecent");
view->recentFiles->loadEntries(m_config, "Recent Files"); view->recentFiles->loadEntries(m_config, "Recent Files");
(void) new KAction( i18n("Save File List"), 0, (void) new TDEAction( i18n("Save File List"), 0,
this, TQT_SLOT( slotSaveList() ), this, TQT_SLOT( slotSaveList() ),
view->actionCollection(), "file_kfllsave" ); view->actionCollection(), "file_kfllsave" );
(void) new KAction( i18n("Save File List As..."), 0, (void) new TDEAction( i18n("Save File List As..."), 0,
this, TQT_SLOT( slotSaveListAs() ), this, TQT_SLOT( slotSaveListAs() ),
view->actionCollection(), "file_kfllsaveas" ); view->actionCollection(), "file_kfllsaveas" );

@ -58,7 +58,7 @@ class PluginKateFileListLoader : public Kate::Plugin, Kate::PluginViewInterface
private: private:
TQPtrList<class PluginView> m_views; TQPtrList<class PluginView> m_views;
KRecentFilesAction *m_recentFiles; TDERecentFilesAction *m_recentFiles;
TDEConfig* m_config; TDEConfig* m_config;
KURL m_oldInitURL; KURL m_oldInitURL;
KURL m_saveURL; KURL m_saveURL;

@ -127,16 +127,16 @@ class TemplateInfo
//BEGIN KateFileTemplates //BEGIN KateFileTemplates
KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name ) KateFileTemplates::KateFileTemplates( TQObject* parent, const char* name )
: Kate::Plugin ( (Kate::Application*)parent, name ), : Kate::Plugin ( (Kate::Application*)parent, name ),
m_actionCollection( new KActionCollection( this, "template_actions", new TDEInstance("kate") ) ) m_actionCollection( new TDEActionCollection( this, "template_actions", new TDEInstance("kate") ) )
{ {
// create actions, so that they are shared. // create actions, so that they are shared.
// We plug them into each view's menus, and update them centrally, so that // We plug them into each view's menus, and update them centrally, so that
// new plugins can automatically become visible in all windows. // new plugins can automatically become visible in all windows.
(void) new KAction ( i18n("Any File..."), 0, this, (void) new TDEAction ( i18n("Any File..."), 0, this,
TQT_SLOT( slotAny() ), m_actionCollection, TQT_SLOT( slotAny() ), m_actionCollection,
"file_template_any" ); "file_template_any" );
// recent templates // recent templates
m_acRecentTemplates = new KRecentFilesAction( i18n("&Use Recent"), 0, this, m_acRecentTemplates = new TDERecentFilesAction( i18n("&Use Recent"), 0, this,
TQT_SLOT(slotOpenTemplate(const KURL &)), TQT_SLOT(slotOpenTemplate(const KURL &)),
m_actionCollection, m_actionCollection,
"file_templates_recent" ); "file_templates_recent" );
@ -248,11 +248,11 @@ void KateFileTemplates::addView(Kate::MainWindow *win)
{ {
PluginView *view = new PluginView (); PluginView *view = new PluginView ();
(void) new KAction( i18n("&Manage Templates..."), 0, (void) new TDEAction( i18n("&Manage Templates..."), 0,
this, TQT_SLOT(slotEditTemplate()), this, TQT_SLOT(slotEditTemplate()),
view->actionCollection(), "settings_manage_templates" ); view->actionCollection(), "settings_manage_templates" );
(void)new KActionMenu( i18n("New From &Template"), "make", (void)new TDEActionMenu( i18n("New From &Template"), "make",
view->actionCollection(), "file_new_fromtemplate" ); view->actionCollection(), "file_new_fromtemplate" );
refreshMenu( view ); refreshMenu( view );
@ -293,7 +293,7 @@ TQStringList KateFileTemplates::groups()
void KateFileTemplates::refreshMenu( PluginView *v ) void KateFileTemplates::refreshMenu( PluginView *v )
{ {
TQPopupMenu *m = (TQPopupMenu*)(((KActionMenu*)(v->actionCollection()->action("file_new_fromtemplate")))->popupMenu()); TQPopupMenu *m = (TQPopupMenu*)(((TDEActionMenu*)(v->actionCollection()->action("file_new_fromtemplate")))->popupMenu());
// clear the menu for templates // clear the menu for templates
m->clear(); m->clear();
@ -1069,11 +1069,11 @@ void KateTemplateWizard::accept()
//END KateTemplateWizard //END KateTemplateWizard
//BEGIN KateTemplateItem //BEGIN KateTemplateItem
class KateTemplateItem : public KListViewItem class KateTemplateItem : public TDEListViewItem
{ {
public: public:
KateTemplateItem( KListViewItem *parent, TemplateInfo *templateinfo ) KateTemplateItem( TDEListViewItem *parent, TemplateInfo *templateinfo )
: KListViewItem( parent, templateinfo->tmplate ), templateinfo( templateinfo ) : TDEListViewItem( parent, templateinfo->tmplate ), templateinfo( templateinfo )
{ {
} }
TemplateInfo *templateinfo; TemplateInfo *templateinfo;
@ -1105,7 +1105,7 @@ KateTemplateManager::KateTemplateManager( KateFileTemplates *kft, TQWidget *pare
{ {
TQGridLayout *lo = new TQGridLayout( this, 2, 6 ); TQGridLayout *lo = new TQGridLayout( this, 2, 6 );
lo->setSpacing( KDialogBase::spacingHint() ); lo->setSpacing( KDialogBase::spacingHint() );
lvTemplates = new KListView( this ); lvTemplates = new TDEListView( this );
lvTemplates->addColumn( i18n("Template") ); lvTemplates->addColumn( i18n("Template") );
lo->addMultiCellWidget( lvTemplates, 1, 1, 1, 6 ); lo->addMultiCellWidget( lvTemplates, 1, 1, 1, 6 );
connect( lvTemplates, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateState()) ); connect( lvTemplates, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateState()) );
@ -1146,12 +1146,12 @@ void KateTemplateManager::reload()
{ {
lvTemplates->clear(); lvTemplates->clear();
TQDict<KListViewItem> groupitems; // FIXME TQMAP TQDict<TDEListViewItem> groupitems; // FIXME TQMAP
for ( uint i = 0; i < kft->templates().count(); i++ ) for ( uint i = 0; i < kft->templates().count(); i++ )
{ {
if ( ! groupitems[ kft->templates().at( i )->group ] ) if ( ! groupitems[ kft->templates().at( i )->group ] )
{ {
groupitems.insert( kft->templates().at( i )->group , new KListViewItem( lvTemplates, kft->templates().at( i )->group ) ); groupitems.insert( kft->templates().at( i )->group , new TDEListViewItem( lvTemplates, kft->templates().at( i )->group ) );
groupitems[ kft->templates().at( i )->group ]->setOpen( true ); groupitems[ kft->templates().at( i )->group ]->setOpen( true );
} }
new KateTemplateItem( groupitems[ kft->templates().at( i )->group ], kft->templates().at( i ) ); new KateTemplateItem( groupitems[ kft->templates().at( i )->group ], kft->templates().at( i ) );

@ -142,13 +142,13 @@ class KateFileTemplates : public Kate::Plugin, public Kate::PluginViewInterface
void refreshMenu( class PluginView */*class TQPopupMenu **/ ); void refreshMenu( class PluginView */*class TQPopupMenu **/ );
TQPtrList<class PluginView> m_views; TQPtrList<class PluginView> m_views;
class KActionCollection *m_actionCollection; class TDEActionCollection *m_actionCollection;
class KRecentFilesAction *m_acRecentTemplates; class TDERecentFilesAction *m_acRecentTemplates;
TQPtrList<class TemplateInfo> m_templates; TQPtrList<class TemplateInfo> m_templates;
class KDirWatch *m_dw; class KDirWatch *m_dw;
class KUser *m_user; class KUser *m_user;
class TDEConfig *m_emailstuff; class TDEConfig *m_emailstuff;
class KActionMenu *m_menu; class TDEActionMenu *m_menu;
}; };
class TemplateInfo; class TemplateInfo;
@ -252,7 +252,7 @@ class KateTemplateManager : public TQWidget
void slotRemoveTemplate(); void slotRemoveTemplate();
private: private:
class KListView *lvTemplates; class TDEListView *lvTemplates;
class TQPushButton *btnNew, *btnEdit, *btnRemove, *btnDownload, *btnUpload; class TQPushButton *btnNew, *btnEdit, *btnRemove, *btnDownload, *btnUpload;
KateFileTemplates *kft; KateFileTemplates *kft;
TQPtrList<class TemplateInfo> *remove; TQPtrList<class TemplateInfo> *remove;

@ -30,7 +30,7 @@ void KatePluginHelloWorld::addView(Kate::MainWindow *win)
// TODO: doesn't this have to be deleted? // TODO: doesn't this have to be deleted?
PluginView *view = new PluginView (); PluginView *view = new PluginView ();
(void) new KAction ( i18n("Insert Hello World"), 0, this, (void) new TDEAction ( i18n("Insert Hello World"), 0, this,
TQT_SLOT( slotInsertHello() ), view->actionCollection(), TQT_SLOT( slotInsertHello() ), view->actionCollection(),
"edit_insert_helloworld" ); "edit_insert_helloworld" );

@ -50,7 +50,7 @@ void PluginKateHtmlTools::addView(Kate::MainWindow *win)
// TODO: doesn't this have to be deleted? // TODO: doesn't this have to be deleted?
PluginView *view = new PluginView (); PluginView *view = new PluginView ();
(void) new KAction ( i18n("HT&ML Tag..."), /*"edit_HTML_tag",*/ ALT + Key_Minus, this, (void) new TDEAction ( i18n("HT&ML Tag..."), /*"edit_HTML_tag",*/ ALT + Key_Minus, this,
TQT_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" ); TQT_SLOT( slotEditHTMLtag() ), view->actionCollection(), "edit_HTML_tag" );
view->setInstance (new TDEInstance("kate")); view->setInstance (new TDEInstance("kate"));

@ -83,7 +83,7 @@ void PluginKateInsertCommand::addView(Kate::MainWindow *win)
// TODO: doesn't this have to be deleted? // TODO: doesn't this have to be deleted?
PluginView *view = new PluginView (); PluginView *view = new PluginView ();
(void) new KAction ( i18n("Insert Command..."), "", 0, this, (void) new TDEAction ( i18n("Insert Command..."), "", 0, this,
TQT_SLOT( slotInsertCommand() ), view->actionCollection(), TQT_SLOT( slotInsertCommand() ), view->actionCollection(),
"edit_insert_command" ); "edit_insert_command" );

@ -1,6 +1,6 @@
function newWindowCallBack(mainwindow) { function newWindowCallBack(mainwindow) {
var ac=mainwindow.actionCollection(); var ac=mainwindow.actionCollection();
action = new KAction( ac, 'kjsconsole_show_action' ); action = new TDEAction( ac, 'kjsconsole_show_action' );
action.text = 'Javascript Console Window'; action.text = 'Javascript Console Window';
action.icon = 'konsole'; action.icon = 'konsole';

@ -1,6 +1,6 @@
function newWindowCallBack(mainwindow) { function newWindowCallBack(mainwindow) {
var ac=mainwindow.actionCollection(); var ac=mainwindow.actionCollection();
action = new KAction( ac, 'kjsselect_select_action' ); action = new TDEAction( ac, 'kjsselect_select_action' );
action.text = 'Select enclosing block'; action.text = 'Select enclosing block';
//action.icon = 'konsole'; //action.icon = 'konsole';

@ -66,7 +66,7 @@ function MyToolView1 (mainwindow,parentwidget) {
parentwidget.caption="This is my first JS Toolview"; parentwidget.caption="This is my first JS Toolview";
parentwidget.icon=StdIcons.BarIcon("yes"); parentwidget.icon=StdIcons.BarIcon("yes");
this.lv = new KListView( parentwidget ); this.lv = new TDEListView( parentwidget );
this.lv.addColumn('Pix'); this.lv.addColumn('Pix');
this.lv.addColumn('One'); this.lv.addColumn('One');

@ -182,7 +182,7 @@ getOpenNodes (TQValueList < TQString > *open_nodes, PyBrowseNode * node)
KPyBrowser::KPyBrowser (TQWidget * parent, const char *name): KPyBrowser::KPyBrowser (TQWidget * parent, const char *name):
KListView (parent, name) TDEListView (parent, name)
{ {
addColumn(i18n("Name")); addColumn(i18n("Name"));

@ -32,7 +32,7 @@
/** KPyBrowser is the base class of the project */ /** KPyBrowser is the base class of the project */
class KPyBrowser : public KListView class KPyBrowser : public TDEListView
{ {
Q_OBJECT Q_OBJECT

@ -33,7 +33,7 @@ K_EXPORT_COMPONENT_FACTORY( katepybrowseplugin, KGenericFactory<KatePluginPyBrow
PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w) PluginViewPyBrowse::PluginViewPyBrowse (Kate::MainWindow *w)
: win (w) : win (w)
{ {
(void) new KAction ( i18n("Update Python Browser"), 0, this, (void) new TDEAction ( i18n("Update Python Browser"), 0, this,
TQT_SLOT( slotUpdatePyBrowser() ), actionCollection(), TQT_SLOT( slotUpdatePyBrowser() ), actionCollection(),
"python_update_pybrowse" ); "python_update_pybrowse" );

@ -333,19 +333,19 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent,
FUNCTIONSETUP; FUNCTIONSETUP;
m_proc=0; m_proc=0;
(void) new KAction ( i18n("Next Error"), KShortcut(ALT+CTRL+Key_Right), (void) new TDEAction ( i18n("Next Error"), TDEShortcut(ALT+CTRL+Key_Right),
TQT_TQOBJECT(this), TQT_SLOT( slotNext() ), TQT_TQOBJECT(this), TQT_SLOT( slotNext() ),
actionCollection(), "make_right" ); actionCollection(), "make_right" );
(void) new KAction ( i18n("Previous Error"), KShortcut(ALT+CTRL+Key_Left), (void) new TDEAction ( i18n("Previous Error"), TDEShortcut(ALT+CTRL+Key_Left),
TQT_TQOBJECT(this), TQT_SLOT( slotPrev() ), TQT_TQOBJECT(this), TQT_SLOT( slotPrev() ),
actionCollection(), "make_left" ); actionCollection(), "make_left" );
(void) new KAction ( i18n("Make"), KShortcut(ALT+Key_R), (void) new TDEAction ( i18n("Make"), TDEShortcut(ALT+Key_R),
TQT_TQOBJECT(this), TQT_SLOT( slotValidate() ), TQT_TQOBJECT(this), TQT_SLOT( slotValidate() ),
actionCollection(), "make_check" ); actionCollection(), "make_check" );
(void) new KAction ( i18n("Configure..."), KShortcut(), (void) new TDEAction ( i18n("Configure..."), TDEShortcut(),
TQT_TQOBJECT(this), TQT_SLOT( slotConfigure() ), TQT_TQOBJECT(this), TQT_SLOT( slotConfigure() ),
actionCollection(), "make_settings" ); actionCollection(), "make_settings" );

@ -55,7 +55,7 @@ void ModelinePlugin::addView(Kate::MainWindow *win)
// TODO: doesn't this have to be deleted? // TODO: doesn't this have to be deleted?
PluginView *view = new PluginView (); PluginView *view = new PluginView ();
new KAction( i18n("Apply Modeline"), 0, new TDEAction( i18n("Apply Modeline"), 0,
this, TQT_SLOT(applyModeline()), this, TQT_SLOT(applyModeline()),
view->actionCollection(), "edit_apply_modeline" ); view->actionCollection(), "edit_apply_modeline" );

@ -50,7 +50,7 @@ void PluginKateOpenHeader::addView(Kate::MainWindow *win)
// TODO: doesn't this have to be deleted? // TODO: doesn't this have to be deleted?
PluginView *view = new PluginView (); PluginView *view = new PluginView ();
(void) new KAction( i18n("Open .h/.cpp/.c"), Key_F12, (void) new TDEAction( i18n("Open .h/.cpp/.c"), Key_F12,
this, TQT_SLOT( slotOpenHeader() ), this, TQT_SLOT( slotOpenHeader() ),
view->actionCollection(), "file_openheader" ); view->actionCollection(), "file_openheader" );

@ -110,7 +110,7 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win)
win, bHoriz, sort, 0, "tabs_hbox"); win, bHoriz, sort, 0, "tabs_hbox");
new KWidgetAction(view->tabbar, "tab_bar_widget", new KWidgetAction(view->tabbar, "tab_bar_widget",
KShortcut::null(), 0, 0, view->actionCollection(), "tabbar_widget"); TDEShortcut::null(), 0, 0, view->actionCollection(), "tabbar_widget");
view->setInstance (new TDEInstance("kate")); view->setInstance (new TDEInstance("kate"));
view->setXMLFile("plugins/katetabbarextension/ui.rc"); view->setXMLFile("plugins/katetabbarextension/ui.rc");
@ -119,7 +119,7 @@ void KatePluginTabBarExtension::addView(Kate::MainWindow *win)
m_views.append (view); m_views.append (view);
KToolBar* toolbar = dynamic_cast<KToolBar*> TDEToolBar* toolbar = dynamic_cast<TDEToolBar*>
(win->guiFactory()->container("tabbarExtensionToolBar", view)); (win->guiFactory()->container("tabbarExtensionToolBar", view));
if (toolbar) { if (toolbar) {
connect(toolbar, TQT_SIGNAL( orientationChanged(Qt::Orientation) ), connect(toolbar, TQT_SIGNAL( orientationChanged(Qt::Orientation) ),

@ -63,7 +63,7 @@ void PluginKateTextFilter::addView(Kate::MainWindow *win)
// TODO: doesn't this have to be deleted? // TODO: doesn't this have to be deleted?
PluginView *view = new PluginView (); PluginView *view = new PluginView ();
(void) new KAction ( i18n("Filter Te&xt..."), /*"edit_filter",*/ CTRL + Key_Backslash, this, (void) new TDEAction ( i18n("Filter Te&xt..."), /*"edit_filter",*/ CTRL + Key_Backslash, this,
TQT_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" ); TQT_SLOT( slotEditFilter() ), view->actionCollection(), "edit_filter" );
view->setInstance (new TDEInstance("kate")); view->setInstance (new TDEInstance("kate"));

@ -99,10 +99,10 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow
{ {
m_tmp_file=0; m_tmp_file=0;
m_proc=0; m_proc=0;
(void) new KAction ( i18n("Validate XML"), 0, TQT_TQOBJECT(this), (void) new TDEAction ( i18n("Validate XML"), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotValidate() ), actionCollection(), "xml_check" ); TQT_SLOT( slotValidate() ), actionCollection(), "xml_check" );
// TODO?: // TODO?:
//(void) new KAction ( i18n("Indent XML"), 0, this, //(void) new TDEAction ( i18n("Indent XML"), 0, this,
// TQT_SLOT( slotIndent() ), actionCollection(), "xml_indent" ); // TQT_SLOT( slotIndent() ), actionCollection(), "xml_indent" );
setInstance(new TDEInstance("kate")); setInstance(new TDEInstance("kate"));

@ -149,11 +149,11 @@ void PluginKateXMLTools::addView( Kate::MainWindow *win )
{ {
// TODO: doesn't this have to be deleted? // TODO: doesn't this have to be deleted?
PluginView *view = new PluginView (); PluginView *view = new PluginView ();
( void) new KAction ( i18n("&Insert Element..."), CTRL+Key_Return, this, ( void) new TDEAction ( i18n("&Insert Element..."), CTRL+Key_Return, this,
TQT_SLOT( slotInsertElement()), view->actionCollection(), "xml_tool_insert_element" ); TQT_SLOT( slotInsertElement()), view->actionCollection(), "xml_tool_insert_element" );
( void) new KAction ( i18n("&Close Element"), CTRL+Key_Less, this, ( void) new TDEAction ( i18n("&Close Element"), CTRL+Key_Less, this,
TQT_SLOT( slotCloseElement()), view->actionCollection(), "xml_tool_close_element" ); TQT_SLOT( slotCloseElement()), view->actionCollection(), "xml_tool_close_element" );
( void) new KAction ( i18n("Assign Meta &DTD..." ), 0, this, ( void) new TDEAction ( i18n("Assign Meta &DTD..." ), 0, this,
TQT_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" ); TQT_SLOT( getDTD()), view->actionCollection(), "xml_tool_assign" );
view->setInstance( new TDEInstance("kate") ); view->setInstance( new TDEInstance("kate") );

@ -286,13 +286,13 @@ void KBinaryClock::updateClock(){
void KBinaryClock::openContextMenu() { void KBinaryClock::openContextMenu() {
bool bImmutable = config()->isImmutable(); bool bImmutable = config()->isImmutable();
KPopupMenu *menu = new KPopupMenu(); TDEPopupMenu *menu = new TDEPopupMenu();
menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) ); menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) );
TDELocale *loc = TDEGlobal::locale(); TDELocale *loc = TDEGlobal::locale();
TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime dt = TQDateTime::currentDateTime();
KPopupMenu *copyMenu = new KPopupMenu( menu ); TDEPopupMenu *copyMenu = new TDEPopupMenu( menu );
copyMenu->insertItem(loc->formatDateTime(dt), 201); copyMenu->insertItem(loc->formatDateTime(dt), 201);
copyMenu->insertItem(loc->formatDate(dt.date()), 202); copyMenu->insertItem(loc->formatDate(dt.date()), 202);
copyMenu->insertItem(loc->formatDate(dt.date(), true), 203); copyMenu->insertItem(loc->formatDate(dt.date(), true), 203);

@ -129,7 +129,7 @@ void KolourPicker::slotPick()
void KolourPicker::slotHistory() void KolourPicker::slotHistory()
{ {
KPopupMenu popup; TDEPopupMenu popup;
popup.insertTitle(SmallIcon("colorize"), i18n("History")); popup.insertTitle(SmallIcon("colorize"), i18n("History"));
TQPtrList<TQPopupMenu> subMenus; TQPtrList<TQPopupMenu> subMenus;
subMenus.setAutoDelete(true); subMenus.setAutoDelete(true);
@ -284,7 +284,7 @@ void KolourPicker::arrangeButtons()
TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const TQPopupMenu *KolourPicker::copyPopup(const TQColor &c, bool title) const
{ {
KPopupMenu *popup = new KPopupMenu; TDEPopupMenu *popup = new TDEPopupMenu;
if (title) if (title)
popup->insertTitle(colorPixmap(c), i18n("Copy Color Value")); popup->insertTitle(colorPixmap(c), i18n("Copy Color Value"));
TQString value; TQString value;

@ -241,7 +241,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions,
"Based on timemon by H. Maierhofer"); "Based on timemon by H. Maierhofer");
hmenu = new KHelpMenu(this, aboutmsg); hmenu = new KHelpMenu(this, aboutmsg);
menu = new KPopupMenu(this); menu = new TDEPopupMenu(this);
menu->insertTitle( SmallIcon( "ktimemon" ), i18n( "System Monitor" ) ) ; menu->insertTitle( SmallIcon( "ktimemon" ), i18n( "System Monitor" ) ) ;
menu->insertItem(i18n("Horizontal Bars"), 4); menu->insertItem(i18n("Horizontal Bars"), 4);

@ -32,7 +32,7 @@ class TQPainter;
class TDEProcess; class TDEProcess;
class KShellProcess; class KShellProcess;
class KHelpMenu; class KHelpMenu;
class KPopupMenu; class TDEPopupMenu;
// -- KTimeMon declaration ----------------------------------------------- // -- KTimeMon declaration -----------------------------------------------
@ -88,7 +88,7 @@ private:
unsigned interval; unsigned interval;
bool autoScale; bool autoScale;
unsigned pageScale, swapScale, ctxScale; unsigned pageScale, swapScale, ctxScale;
KPopupMenu* menu; TDEPopupMenu* menu;
KHelpMenu* hmenu; KHelpMenu* hmenu;
TQTimer* timer; TQTimer* timer;
KConfDialog *configDialog; KConfDialog *configDialog;

@ -110,7 +110,7 @@ MathApplet::MathApplet(const TQString& configFile, Type type, int actions,
void MathApplet::initContextMenu() void MathApplet::initContextMenu()
{ {
mContextMenu = new KPopupMenu(this); mContextMenu = new TDEPopupMenu(this);
mContextMenu->setCheckable(true); mContextMenu->setCheckable(true);
mContextMenu->insertItem(i18n("Use &Degrees"), this, TQT_SLOT(useDegrees()), 0, 0, 0); mContextMenu->insertItem(i18n("Use &Degrees"), this, TQT_SLOT(useDegrees()), 0, 0, 0);
mContextMenu->insertItem(i18n("Use &Radians"), this, TQT_SLOT(useRadians()), 0, 1, 1); mContextMenu->insertItem(i18n("Use &Radians"), this, TQT_SLOT(useRadians()), 0, 1, 1);

@ -33,7 +33,7 @@ class TQLabel;
class TQHBox; class TQHBox;
class TQPushButton; class TQPushButton;
class KHistoryCombo; class KHistoryCombo;
class KPopupMenu; class TDEPopupMenu;
class MathApplet : public KPanelApplet class MathApplet : public KPanelApplet
{ {
@ -68,7 +68,7 @@ private:
TQLabel *_label; TQLabel *_label;
TQPushButton *_btn; TQPushButton *_btn;
TQHBox *_hbox; TQHBox *_hbox;
KPopupMenu *mContextMenu; TDEPopupMenu *mContextMenu;
bool m_hasFocus; bool m_hasFocus;
}; };

@ -151,7 +151,7 @@ MediaControl::MediaControl(const TQString &configFile, Type t, int actions,
reparseConfig(); reparseConfig();
rmbMenu = new KPopupMenu(this, "RMBMenu"); rmbMenu = new TDEPopupMenu(this, "RMBMenu");
rmbMenu->insertTitle(i18n("MediaControl"), 0, 0); rmbMenu->insertTitle(i18n("MediaControl"), 0, 0);
rmbMenu->insertItem(SmallIcon("configure"), i18n("Configure MediaControl..."), rmbMenu->insertItem(SmallIcon("configure"), i18n("Configure MediaControl..."),
this, TQT_SLOT(preferences())); this, TQT_SLOT(preferences()));

@ -42,7 +42,7 @@
#define MEDIACONTROL_VERSION "0.4" #define MEDIACONTROL_VERSION "0.4"
class MCSlider; class MCSlider;
class KPopupMenu; class TDEPopupMenu;
class TDEInstance; class TDEInstance;
class MediaControlConfig; class MediaControlConfig;
class TDEAboutData; class TDEAboutData;
@ -96,7 +96,7 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface
TrayButton *next_button; // GoTo Next Playlist-Item TrayButton *next_button; // GoTo Next Playlist-Item
MCSlider *time_slider; MCSlider *time_slider;
int mLastLen, mLastTime, mLastStatus; int mLastLen, mLastTime, mLastStatus;
KPopupMenu *rmbMenu; TDEPopupMenu *rmbMenu;
virtual void mousePressEvent(TQMouseEvent* e); virtual void mousePressEvent(TQMouseEvent* e);
virtual void moveEvent(TQMoveEvent*); virtual void moveEvent(TQMoveEvent*);

@ -60,7 +60,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListBox" row="0" column="0"> <widget class="TDEListBox" row="0" column="0">
<property name="name"> <property name="name">
<cstring>playerListBox</cstring> <cstring>playerListBox</cstring>
</property> </property>
@ -120,7 +120,7 @@
<string>&amp;Use themes</string> <string>&amp;Use themes</string>
</property> </property>
</widget> </widget>
<widget class="KListBox"> <widget class="TDEListBox">
<item> <item>
<property name="text"> <property name="text">
<string>default</string> <string>default</string>

@ -63,7 +63,7 @@ AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) :
m_part = dynamic_cast<TDEHTMLPart *>(parent); m_part = dynamic_cast<TDEHTMLPart *>(parent);
if(!m_part) { kdDebug() << "couldn't get TDEHTMLPart" << endl; return; } if(!m_part) { kdDebug() << "couldn't get TDEHTMLPart" << endl; return; }
m_menu = new KPopupMenu(m_part->widget()); m_menu = new TDEPopupMenu(m_part->widget());
m_menu->insertTitle(i18n("Adblock")); m_menu->insertTitle(i18n("Adblock"));
m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showTDECModule())); m_menu->insertItem(i18n("Configure"), this, TQT_SLOT(showTDECModule()));
m_menu->insertItem(i18n("Show Elements"), this, TQT_SLOT(showDialogue())); m_menu->insertItem(i18n("Show Elements"), this, TQT_SLOT(showDialogue()));

@ -29,7 +29,7 @@ class TDEHTMLPart;
class KURLLabel; class KURLLabel;
class TDEHTMLSettings; class TDEHTMLSettings;
class AdElement; class AdElement;
class KPopupMenu; class TDEPopupMenu;
namespace KParts namespace KParts
{ {
@ -55,7 +55,7 @@ public:
private: private:
TQGuardedPtr<TDEHTMLPart> m_part; TQGuardedPtr<TDEHTMLPart> m_part;
KURLLabel *m_label; KURLLabel *m_label;
KPopupMenu *m_menu; TDEPopupMenu *m_menu;
void fillBlockableElements(AdElementList &elements); void fillBlockableElements(AdElementList &elements);
void fillWithImages(AdElementList &elements); void fillWithImages(AdElementList &elements);

@ -71,7 +71,7 @@ AdBlockDlg::AdBlockDlg(TQWidget *parent, AdElementList &elements) :
connect(this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( validateFilter() )); connect(this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( validateFilter() ));
connect(m_list, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(updateFilter(TQListViewItem *)) ); connect(m_list, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT(updateFilter(TQListViewItem *)) );
m_menu = new KPopupMenu(this); m_menu = new TDEPopupMenu(this);
m_menu->insertItem(i18n("Filter this item"), this, TQT_SLOT(filterItem())); m_menu->insertItem(i18n("Filter this item"), this, TQT_SLOT(filterItem()));
m_menu->insertItem(i18n("Filter all items at same path"), this, TQT_SLOT(filterPath())); m_menu->insertItem(i18n("Filter all items at same path"), this, TQT_SLOT(filterPath()));

@ -25,7 +25,7 @@
class TQLabel; class TQLabel;
class TQLineEdit; class TQLineEdit;
class KPopupMenu; class TDEPopupMenu;
class AdBlockDlg : public KDialogBase class AdBlockDlg : public KDialogBase
{ {
@ -37,7 +37,7 @@ private:
TQListView *m_list; TQListView *m_list;
TQLabel *m_label1; TQLabel *m_label1;
TQLabel *m_label2; TQLabel *m_label2;
KPopupMenu *m_menu; TDEPopupMenu *m_menu;
public: public:
AdBlockDlg(TQWidget *parent, AdElementList &elements); AdBlockDlg(TQWidget *parent, AdElementList &elements);

@ -84,7 +84,7 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const
if (isFeedUrl(it)) if (isFeedUrl(it))
{ {
kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl; kdDebug() << "AkregatorMenu: found feed URL " << it->url().prettyURL() << endl;
KAction *action = new KAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" ); TDEAction *action = new TDEAction( i18n( "Add Feed to Akregator" ), "akregator", 0, this, TQT_SLOT( slotAddFeed() ), actionCollection(), "akregatorkonqplugin_mnu" );
addAction( action ); addAction( action );
addSeparator(); addSeparator();
m_feedURL = it->url().url(); m_feedURL = it->url().url();

@ -27,7 +27,7 @@
#include "pluginbase.h" #include "pluginbase.h"
class KAction; class TDEAction;
class TDEHTMLPart; class TDEHTMLPart;
namespace Akregator namespace Akregator

@ -123,7 +123,7 @@ bool KonqFeedIcon::feedFound()
void KonqFeedIcon::contextMenu() void KonqFeedIcon::contextMenu()
{ {
delete m_menu; delete m_menu;
m_menu = new KPopupMenu(m_part->widget()); m_menu = new TDEPopupMenu(m_part->widget());
if(m_feedList.count() == 1) { if(m_feedList.count() == 1) {
m_menu->insertTitle(m_feedList.first().title()); m_menu->insertTitle(m_feedList.first().title());
m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, TQT_SLOT(addFeeds()) ); m_menu->insertItem(SmallIcon("bookmark_add"), i18n("Add Feed to Akregator"), this, TQT_SLOT(addFeeds()) );

@ -63,7 +63,7 @@ private:
KURLLabel *m_feedIcon; KURLLabel *m_feedIcon;
KParts::StatusBarExtension *m_statusBarEx; KParts::StatusBarExtension *m_statusBarEx;
FeedDetectorEntryList m_feedList; FeedDetectorEntryList m_feedList;
TQGuardedPtr<KPopupMenu> m_menu; TQGuardedPtr<TDEPopupMenu> m_menu;
private slots: private slots:
void waitPartToLoad(); void waitPartToLoad();

@ -87,33 +87,33 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
} }
TQString ext; TQString ext;
KActionMenu * actionMenu; TDEActionMenu * actionMenu;
KAction * action; TDEAction * action;
if ( hasOther && itemList.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() ) // don't try to compress if we right click on a folder without files selected if ( hasOther && itemList.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() ) // don't try to compress if we right click on a folder without files selected
{ {
compMimeTypes(); compMimeTypes();
actionMenu = new KActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu" ); actionMenu = new TDEActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu" );
m_ext = m_conf->readEntry( "LastExtension", ".tar.gz" ); m_ext = m_conf->readEntry( "LastExtension", ".tar.gz" );
if ( itemCount == 1 ) if ( itemCount == 1 )
{ {
item = itemList.first(); item = itemList.first();
m_name = itemList.first()->name(); m_name = itemList.first()->name();
action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this, action = new TDEAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); TQT_SLOT( slotCompressAsDefault() ), actionCollection() );
} }
else else
{ {
action = new KAction( KMimeType::mimeType( m_conf->readEntry( action = new TDEAction( KMimeType::mimeType( m_conf->readEntry(
"LastMimeType", "application/x-tgz" ) )->comment(), "LastMimeType", "application/x-tgz" ) )->comment(),
0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() ); 0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() );
} }
actionMenu->insert( action ); actionMenu->insert( action );
m_compAsMenu = new KActionMenu( i18n( "Compress As" ), actionCollection(), "arkcmpasmnu" ); m_compAsMenu = new TDEActionMenu( i18n( "Compress As" ), actionCollection(), "arkcmpasmnu" );
actionMenu->insert( m_compAsMenu ); actionMenu->insert( m_compAsMenu );
m_addToMenu = new KActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" ); m_addToMenu = new TDEActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" );
if ( itemList.first()->url().isLocalFile() ) if ( itemList.first()->url().isLocalFile() )
actionMenu->insert( m_addToMenu ); actionMenu->insert( m_addToMenu );
@ -123,7 +123,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
this, TQT_SLOT( slotPrepareAddToMenu() ) ); this, TQT_SLOT( slotPrepareAddToMenu() ) );
action = new KAction( i18n( "Add to Archive..." ), 0, this, action = new TDEAction( i18n( "Add to Archive..." ), 0, this,
TQT_SLOT( slotAdd() ), actionCollection() ); TQT_SLOT( slotAdd() ), actionCollection() );
actionMenu->insert( action ); actionMenu->insert( action );
addAction( actionMenu ); addAction( actionMenu );
@ -133,9 +133,9 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
{ {
if ( popupmenu->protocolInfo().supportsWriting() ) if ( popupmenu->protocolInfo().supportsWriting() )
{ {
actionMenu = new KActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu" ); actionMenu = new TDEActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu" );
action = new KAction( i18n( "Extract Here" ), 0, this, action = new TDEAction( i18n( "Extract Here" ), 0, this,
TQT_SLOT( slotExtractHere() ), actionCollection() ); TQT_SLOT( slotExtractHere() ), actionCollection() );
actionMenu->insert( action ); actionMenu->insert( action );
// stolen from arkwidget.cpp // stolen from arkwidget.cpp
@ -143,23 +143,23 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
{ {
TQString targetName = itemList.first()->name(); TQString targetName = itemList.first()->name();
stripExtension( targetName ); stripExtension( targetName );
action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this, action = new TDEAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); TQT_SLOT( slotExtractToSubfolders() ), actionCollection() );
} }
else else
{ {
action = new KAction( i18n( "Extract to Subfolders" ), 0, this, action = new TDEAction( i18n( "Extract to Subfolders" ), 0, this,
TQT_SLOT( slotExtractToSubfolders() ), actionCollection() ); TQT_SLOT( slotExtractToSubfolders() ), actionCollection() );
} }
actionMenu->insert( action ); actionMenu->insert( action );
action = new KAction( i18n( "Extract To..." ), 0 , this, action = new TDEAction( i18n( "Extract To..." ), 0 , this,
TQT_SLOT( slotExtractTo() ), actionCollection() ); TQT_SLOT( slotExtractTo() ), actionCollection() );
actionMenu->insert( action ); actionMenu->insert( action );
addAction( actionMenu ); addAction( actionMenu );
} }
else else
{ {
action = new KAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" ); action = new TDEAction( i18n( "Extract To..." ), "ark", 0, this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" );
addAction( action ); addAction( action );
} }
} }
@ -176,7 +176,7 @@ void ArkMenu::slotPrepareCompAsMenu()
disconnect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), disconnect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ),
this, TQT_SLOT( slotPrepareCompAsMenu() ) ); this, TQT_SLOT( slotPrepareCompAsMenu() ) );
KAction * action; TDEAction * action;
m_compAsMapper = new TQSignalMapper( this, "compAsMapper" ); m_compAsMapper = new TQSignalMapper( this, "compAsMapper" );
TQString ext; TQString ext;
TQStringList newExt; TQStringList newExt;
@ -194,13 +194,13 @@ void ArkMenu::slotPrepareCompAsMenu()
*eit = ".tar.bz2"; *eit = ".tar.bz2";
if ( m_urlList.count() == 1 ) if ( m_urlList.count() == 1 )
{ {
action = new KAction( m_name + (*eit), 0, m_compAsMapper, action = new TDEAction( m_name + (*eit), 0, m_compAsMapper,
TQT_SLOT( map() ), actionCollection() ); TQT_SLOT( map() ), actionCollection() );
} }
else else
{ {
ext = KMimeType::mimeType(*mit)->comment(); ext = KMimeType::mimeType(*mit)->comment();
action = new KAction( ext, 0, m_compAsMapper, action = new TDEAction( ext, 0, m_compAsMapper,
TQT_SLOT( map() ), actionCollection() ); TQT_SLOT( map() ), actionCollection() );
} }
@ -231,7 +231,7 @@ void ArkMenu::slotPrepareAddToMenu()
slotPrepareCompAsMenu(); slotPrepareCompAsMenu();
unsigned int counter = 0; unsigned int counter = 0;
KAction * action; TDEAction * action;
m_addToMapper = new TQSignalMapper( this, "addToMapper" ); m_addToMapper = new TQSignalMapper( this, "addToMapper" );
TQCString actionName; TQCString actionName;
TQStringList::Iterator mit; TQStringList::Iterator mit;
@ -244,7 +244,7 @@ void ArkMenu::slotPrepareAddToMenu()
for ( mit = m_extensionList.begin(); mit != m_extensionList.end(); ++mit ) for ( mit = m_extensionList.begin(); mit != m_extensionList.end(); ++mit )
if ( (*uit).endsWith(*mit) ) if ( (*uit).endsWith(*mit) )
{ {
action = new KAction( *uit, 0, m_addToMapper, action = new TDEAction( *uit, 0, m_addToMapper,
TQT_SLOT( map() ), actionCollection() ); TQT_SLOT( map() ), actionCollection() );
m_addToMenu->insert( action ); m_addToMenu->insert( action );
m_addToMapper->setMapping( action, counter ); m_addToMapper->setMapping( action, counter );

@ -25,7 +25,7 @@
#include <tdefileitem.h> #include <tdefileitem.h>
#include <tdeconfig.h> #include <tdeconfig.h>
class KAction; class TDEAction;
class TQSignalMapper; class TQSignalMapper;
class ArkMenu : public KonqPopupMenuPlugin { class ArkMenu : public KonqPopupMenuPlugin {
@ -61,8 +61,8 @@ private:
TQStringList m_archiveMimeTypes; TQStringList m_archiveMimeTypes;
TQStringList m_extractMimeTypes; TQStringList m_extractMimeTypes;
TQStringList m_extensionList; TQStringList m_extensionList;
KActionMenu * m_compAsMenu; TDEActionMenu * m_compAsMenu;
KActionMenu * m_addToMenu; TDEActionMenu * m_addToMenu;
TQSignalMapper * m_compAsMapper; TQSignalMapper * m_compAsMapper;
TQSignalMapper * m_addToMapper; TQSignalMapper * m_addToMapper;
TDEConfig * m_conf; TDEConfig * m_conf;

@ -22,7 +22,7 @@ AutoRefresh::AutoRefresh( TQObject* parent, const char* name, const TQStringList
timer = new TQTimer( this ); timer = new TQTimer( this );
connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) ); connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRefresh() ) );
refresher = new KSelectAction( i18n("&Auto Refresh"), refresher = new TDESelectAction( i18n("&Auto Refresh"),
"reload", 0, "reload", 0,
this, TQT_SLOT(slotIntervalChanged()), this, TQT_SLOT(slotIntervalChanged()),
actionCollection(), "autorefresh" ); actionCollection(), "autorefresh" );

@ -49,7 +49,7 @@ public slots:
void slotIntervalChanged(); void slotIntervalChanged();
private: private:
KSelectAction *refresher; TDESelectAction *refresher;
TQTimer *timer; TQTimer *timer;
}; };

@ -40,123 +40,123 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name,
{ {
setInstance(BabelFishFactory::instance()); setInstance(BabelFishFactory::instance());
m_menu = new KActionMenu( i18n("Translate Web &Page"), "babelfish", m_menu = new TDEActionMenu( i18n("Translate Web &Page"), "babelfish",
actionCollection(), "translatewebpage" ); actionCollection(), "translatewebpage" );
m_menu->setDelayed( false ); m_menu->setDelayed( false );
m_en = new KActionMenu( i18n("&English To"), "babelfish", m_en = new TDEActionMenu( i18n("&English To"), "babelfish",
actionCollection(), "translatewebpage_en" ); actionCollection(), "translatewebpage_en" );
m_fr = new KActionMenu( i18n("&French To"), "babelfish", m_fr = new TDEActionMenu( i18n("&French To"), "babelfish",
actionCollection(), "translatewebpage_fr" ); actionCollection(), "translatewebpage_fr" );
m_de = new KActionMenu( i18n("&German To"), "babelfish", m_de = new TDEActionMenu( i18n("&German To"), "babelfish",
actionCollection(), "translatewebpage_de" ); actionCollection(), "translatewebpage_de" );
m_es = new KActionMenu( i18n("&Spanish To"), "babelfish", m_es = new TDEActionMenu( i18n("&Spanish To"), "babelfish",
actionCollection(), "translatewebpage_es" ); actionCollection(), "translatewebpage_es" );
m_pt = new KActionMenu( i18n("&Portuguese To"), "babelfish", m_pt = new TDEActionMenu( i18n("&Portuguese To"), "babelfish",
actionCollection(), "translatewebpage_pt" ); actionCollection(), "translatewebpage_pt" );
m_it = new KActionMenu( i18n("&Italian To"), "babelfish", m_it = new TDEActionMenu( i18n("&Italian To"), "babelfish",
actionCollection(), "translatewebpage_it" ); actionCollection(), "translatewebpage_it" );
m_nl = new KActionMenu( i18n("&Dutch To"), "babelfish", m_nl = new TDEActionMenu( i18n("&Dutch To"), "babelfish",
actionCollection(), "translatewebpage_nl" ); actionCollection(), "translatewebpage_nl" );
m_en->insert( new KAction( i18n("&Chinese (Simplified)"), 0, m_en->insert( new TDEAction( i18n("&Chinese (Simplified)"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_zh") ); actionCollection(), "en_zh") );
m_en->insert( new KAction( i18n("Chinese (&Traditional)"), 0, m_en->insert( new TDEAction( i18n("Chinese (&Traditional)"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_zhTW") ); actionCollection(), "en_zhTW") );
m_en->insert( new KAction( i18n("&Dutch"), 0, m_en->insert( new TDEAction( i18n("&Dutch"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_nl") ); actionCollection(), "en_nl") );
m_en->insert( new KAction( i18n("&French"), 0, m_en->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_fr") ); actionCollection(), "en_fr") );
m_en->insert( new KAction( i18n("&German"), 0, m_en->insert( new TDEAction( i18n("&German"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_de") ); actionCollection(), "en_de") );
m_en->insert( new KAction( i18n("&Italian"), 0, m_en->insert( new TDEAction( i18n("&Italian"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_it") ); actionCollection(), "en_it") );
m_en->insert( new KAction( i18n("&Japanese"), 0, m_en->insert( new TDEAction( i18n("&Japanese"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_ja") ); actionCollection(), "en_ja") );
m_en->insert( new KAction( i18n("&Korean"), 0, m_en->insert( new TDEAction( i18n("&Korean"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_ko") ); actionCollection(), "en_ko") );
m_en->insert( new KAction( i18n("&Norwegian"), 0, m_en->insert( new TDEAction( i18n("&Norwegian"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_no") ); actionCollection(), "en_no") );
m_en->insert( new KAction( i18n("&Portuguese"), 0, m_en->insert( new TDEAction( i18n("&Portuguese"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_pt") ); actionCollection(), "en_pt") );
m_en->insert( new KAction( i18n("&Russian"), 0, m_en->insert( new TDEAction( i18n("&Russian"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_ru") ); actionCollection(), "en_ru") );
m_en->insert( new KAction( i18n("&Spanish"), 0, m_en->insert( new TDEAction( i18n("&Spanish"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_es") ); actionCollection(), "en_es") );
m_en->insert( new KAction( i18n("T&hai"), 0, m_en->insert( new TDEAction( i18n("T&hai"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "en_th") ); actionCollection(), "en_th") );
m_fr->insert( new KAction( i18n("&Dutch"), 0, m_fr->insert( new TDEAction( i18n("&Dutch"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "fr_nl") ); actionCollection(), "fr_nl") );
m_fr->insert( new KAction( i18n("&English"), 0, m_fr->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "fr_en") ); actionCollection(), "fr_en") );
m_fr->insert( new KAction( i18n("&German"), 0, m_fr->insert( new TDEAction( i18n("&German"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "fr_de") ); actionCollection(), "fr_de") );
m_fr->insert( new KAction( i18n("&Italian"), 0, m_fr->insert( new TDEAction( i18n("&Italian"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "fr_it") ); actionCollection(), "fr_it") );
m_fr->insert( new KAction( i18n("&Portuguese"), 0, m_fr->insert( new TDEAction( i18n("&Portuguese"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "fr_pt") ); actionCollection(), "fr_pt") );
m_fr->insert( new KAction( i18n("&Spanish"), 0, m_fr->insert( new TDEAction( i18n("&Spanish"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "fr_es") ); actionCollection(), "fr_es") );
m_de->insert( new KAction( i18n("&English"), 0, m_de->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "de_en") ); actionCollection(), "de_en") );
m_de->insert( new KAction( i18n("&French"), 0, m_de->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "de_fr") ); actionCollection(), "de_fr") );
m_es->insert( new KAction( i18n("&English"), 0, m_es->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "es_en") ); actionCollection(), "es_en") );
m_es->insert( new KAction( i18n("&French"), 0, m_es->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "es_fr") ); actionCollection(), "es_fr") );
m_pt->insert( new KAction( i18n("&English"), 0, m_pt->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "pt_en") ); actionCollection(), "pt_en") );
m_pt->insert( new KAction( i18n("&French"), 0, m_pt->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "pt_fr") ); actionCollection(), "pt_fr") );
m_it->insert( new KAction( i18n("&English"), 0, m_it->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "it_en") ); actionCollection(), "it_en") );
m_it->insert( new KAction( i18n("&French"), 0, m_it->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "it_fr") ); actionCollection(), "it_fr") );
m_nl->insert( new KAction( i18n("&English"), 0, m_nl->insert( new TDEAction( i18n("&English"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "nl_en") ); actionCollection(), "nl_en") );
m_nl->insert( new KAction( i18n("&French"), 0, m_nl->insert( new TDEAction( i18n("&French"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "nl_fr") ); actionCollection(), "nl_fr") );
m_menu->insert( new KAction( i18n("&Chinese (Simplified) to English"), 0, m_menu->insert( new TDEAction( i18n("&Chinese (Simplified) to English"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "zh_en") ); actionCollection(), "zh_en") );
m_menu->insert( new KAction( i18n("Chinese (&Traditional) to English"), 0, m_menu->insert( new TDEAction( i18n("Chinese (&Traditional) to English"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "zhTW_en") ); actionCollection(), "zhTW_en") );
m_menu->insert( m_nl ); m_menu->insert( m_nl );
@ -164,14 +164,14 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name,
m_menu->insert( m_fr ); m_menu->insert( m_fr );
m_menu->insert( m_de ); m_menu->insert( m_de );
m_menu->insert( m_it ); m_menu->insert( m_it );
m_menu->insert( new KAction( i18n("&Japanese to English"), 0, m_menu->insert( new TDEAction( i18n("&Japanese to English"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "ja_en") ); actionCollection(), "ja_en") );
m_menu->insert( new KAction( i18n("&Korean to English"), 0, m_menu->insert( new TDEAction( i18n("&Korean to English"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "ko_en") ); actionCollection(), "ko_en") );
m_menu->insert( m_pt ); m_menu->insert( m_pt );
m_menu->insert( new KAction( i18n("&Russian to English"), 0, m_menu->insert( new TDEAction( i18n("&Russian to English"), 0,
this, TQT_SLOT(translateURL()), this, TQT_SLOT(translateURL()),
actionCollection(), "ru_en") ); actionCollection(), "ru_en") );
m_menu->insert( m_es ); m_menu->insert( m_es );

@ -40,14 +40,14 @@ protected slots:
void slotStarted( TDEIO::Job* ); void slotStarted( TDEIO::Job* );
private: private:
KActionMenu* m_menu; TDEActionMenu* m_menu;
KActionMenu* m_de; TDEActionMenu* m_de;
KActionMenu* m_en; TDEActionMenu* m_en;
KActionMenu* m_es; TDEActionMenu* m_es;
KActionMenu* m_fr; TDEActionMenu* m_fr;
KActionMenu* m_it; TDEActionMenu* m_it;
KActionMenu* m_nl; TDEActionMenu* m_nl;
KActionMenu* m_pt; TDEActionMenu* m_pt;
}; };
#endif #endif

@ -42,7 +42,7 @@ CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQString
{ {
m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast<TDEHTMLPart*>(parent) : 0L; m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast<TDEHTMLPart*>(parent) : 0L;
m_pCrashesMenu = new KActionMenu( i18n("&Crashes"), "core", m_pCrashesMenu = new TDEActionMenu( i18n("&Crashes"), "core",
actionCollection(), "crashes" ); actionCollection(), "crashes" );
m_pCrashesMenu->setDelayed( false ); m_pCrashesMenu->setDelayed( false );

@ -30,7 +30,7 @@
#include <tdeparts/plugin.h> #include <tdeparts/plugin.h>
class TDEHTMLPart; class TDEHTMLPart;
class KActionMenu; class TDEActionMenu;
class CrashesPlugin : public KParts::Plugin class CrashesPlugin : public KParts::Plugin
{ {
@ -54,7 +54,7 @@ private:
int m_selectedItem; int m_selectedItem;
TDEHTMLPart* m_part; TDEHTMLPart* m_part;
KActionMenu* m_pCrashesMenu; TDEActionMenu* m_pCrashesMenu;
typedef TQPair<TQString,TQCString> Crash; typedef TQPair<TQString,TQCString> Crash;
typedef TQValueList<Crash> CrashesList; typedef TQValueList<Crash> CrashesList;

@ -153,7 +153,7 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name,
if ( !m_part || !m_part->scrollWidget() ) if ( !m_part || !m_part->scrollWidget() )
return; return;
m_pFilterMenu = new KActionMenu (i18n("View F&ilter"), "filter", m_pFilterMenu = new TDEActionMenu (i18n("View F&ilter"), "filter",
actionCollection(), "filterdir"); actionCollection(), "filterdir");
m_pFilterMenu->setDelayed (false); m_pFilterMenu->setDelayed (false);
m_pFilterMenu->setWhatsThis(i18n("Allow to filter the currently displayed items by filetype.")); m_pFilterMenu->setWhatsThis(i18n("Allow to filter the currently displayed items by filetype."));
@ -173,16 +173,16 @@ DirFilterPlugin::DirFilterPlugin (TQObject* parent, const char* name,
TQHBox *hbox = new TQHBox(m_part->widget()); TQHBox *hbox = new TQHBox(m_part->widget());
hbox->hide(); hbox->hide();
KAction *clear = new KAction(i18n("Clear Filter Field"), TDEAction *clear = new TDEAction(i18n("Clear Filter Field"),
TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
0, 0, 0, actionCollection(), "clear_filter"); 0, 0, 0, actionCollection(), "clear_filter");
clear->setWhatsThis(i18n("Clear filter field<p>Clears the content of the filter field.")); clear->setWhatsThis(i18n("Clear filter field<p>Clears the content of the filter field."));
if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) ) if ( ::tqqt_cast<TDEListView*>(m_part->scrollWidget()) )
{ {
m_searchWidget = new KListViewSearchLine(hbox); m_searchWidget = new TDEListViewSearchLine(hbox);
static_cast<KListViewSearchLine*>(m_searchWidget)->setListView(static_cast<KListView*>(m_part->scrollWidget())); static_cast<TDEListViewSearchLine*>(m_searchWidget)->setListView(static_cast<TDEListView*>(m_part->scrollWidget()));
} }
else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) )
{ {
@ -416,9 +416,9 @@ void DirFilterPlugin::slotItemsAdded (const KFileItemList& list)
m_pFilterMenu->setEnabled (m_part->nameFilter().isEmpty()); m_pFilterMenu->setEnabled (m_part->nameFilter().isEmpty());
return; return;
} }
if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) ) if ( ::tqqt_cast<TDEListView*>(m_part->scrollWidget()) )
{ {
static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch(); static_cast<TDEListViewSearchLine*>(m_searchWidget)->updateSearch();
} }
else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) )
{ {
@ -506,8 +506,8 @@ void DirFilterPlugin::activateSearch()
m_oldFilterString = m_searchWidget->text(); m_oldFilterString = m_searchWidget->text();
if ( ::tqqt_cast<KListView*>(m_part->scrollWidget()) ) { if ( ::tqqt_cast<TDEListView*>(m_part->scrollWidget()) ) {
static_cast<KListViewSearchLine*>(m_searchWidget)->updateSearch(); static_cast<TDEListViewSearchLine*>(m_searchWidget)->updateSearch();
} }
else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) { else if ( ::tqqt_cast<TQIconView*>(m_part->scrollWidget()) ) {
static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch(); static_cast<KIconViewSearchLine*>(m_searchWidget)->updateSearch();

@ -29,7 +29,7 @@
#include <klibloader.h> #include <klibloader.h>
#include <tdeparts/plugin.h> #include <tdeparts/plugin.h>
class KActionMenu; class TDEActionMenu;
class KonqDirPart; class KonqDirPart;
class KLineEdit; class KLineEdit;
@ -130,7 +130,7 @@ private:
KonqDirPart* m_part; KonqDirPart* m_part;
TQTimer *m_refreshTimer; TQTimer *m_refreshTimer;
TQTimer *m_reactivateRefreshTimer; TQTimer *m_reactivateRefreshTimer;
KActionMenu* m_pFilterMenu; TDEActionMenu* m_pFilterMenu;
TQString m_oldFilterString; TQString m_oldFilterString;
KLineEdit *m_searchWidget; KLineEdit *m_searchWidget;

@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
# Needed to catch DOM exceptions # Needed to catch DOM exceptions
KDE_CXXFLAGS = $(USE_EXCEPTIONS) KDE_CXXFLAGS = $(USE_EXCEPTIONS)
# -DKListView=DOMListView # -DTDEListView=DOMListView
# Install this plugin in the KDE modules directory # Install this plugin in the KDE modules directory
kde_module_LTLIBRARIES = libdomtreeviewerplugin.la kde_module_LTLIBRARIES = libdomtreeviewerplugin.la

@ -154,7 +154,7 @@ class DOMTreeView : public DOMTreeViewBase
TDEHTMLPart *part; TDEHTMLPart *part;
TQTextStream* m_textStream; TQTextStream* m_textStream;
const KListView* m_rootListView; const TDEListView* m_rootListView;
KPushButton* m_saveButton; KPushButton* m_saveButton;
TQObject *focused_child; TQObject *focused_child;

@ -141,7 +141,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>DOM Tree</string> <string>DOM Tree</string>
@ -326,7 +326,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>

@ -56,7 +56,7 @@
using domtreeviewer::ManipulationCommand; using domtreeviewer::ManipulationCommand;
DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
: KMainWindow( 0, "DOMTreeWindow" ), : TDEMainWindow( 0, "DOMTreeWindow" ),
m_plugin(plugin), m_view(new DOMTreeView(this, "DOMTreeView", false)) m_plugin(plugin), m_view(new DOMTreeView(this, "DOMTreeView", false))
{ {
part_manager = 0; part_manager = 0;
@ -67,7 +67,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
// accept dnd // accept dnd
setAcceptDrops(true); setAcceptDrops(true);
// tell the KMainWindow that this is indeed the main widget // tell the TDEMainWindow that this is indeed the main widget
setCentralWidget(m_view); setCentralWidget(m_view);
// message window dialog // message window dialog
@ -132,22 +132,22 @@ void DOMTreeWindow::setupActions()
KStdAction::redisplay(TQT_TQOBJECT(m_view), TQT_SLOT(refresh()), actionCollection()); KStdAction::redisplay(TQT_TQOBJECT(m_view), TQT_SLOT(refresh()), actionCollection());
// toggle manipulation dialog // toggle manipulation dialog
KAction *showMsgDlg = new KAction(i18n("Show Message Log"), TDEAction *showMsgDlg = new TDEAction(i18n("Show Message Log"),
CTRL+Key_E, actionCollection(), "show_msg_dlg"); CTRL+Key_E, actionCollection(), "show_msg_dlg");
connect(showMsgDlg, TQT_SIGNAL(activated()), TQT_SLOT(showMessageLog())); connect(showMsgDlg, TQT_SIGNAL(activated()), TQT_SLOT(showMessageLog()));
// KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0, // TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0,
// this, TQT_SLOT(optionsPreferences()), // this, TQT_SLOT(optionsPreferences()),
// actionCollection(), "custom_action"); // actionCollection(), "custom_action");
// actions for the dom tree list view toolbar // actions for the dom tree list view toolbar
KStdAction::up(TQT_TQOBJECT(view()), TQT_SLOT(moveToParent()), actionCollection(), "tree_up"); KStdAction::up(TQT_TQOBJECT(view()), TQT_SLOT(moveToParent()), actionCollection(), "tree_up");
KAction *tree_inc_level = new KAction(i18n("Expand"), TDEAction *tree_inc_level = new TDEAction(i18n("Expand"),
"1rightarrow", CTRL+Key_Greater, TQT_TQOBJECT(view()), "1rightarrow", CTRL+Key_Greater, TQT_TQOBJECT(view()),
TQT_SLOT(increaseExpansionDepth()), actionCollection(), TQT_SLOT(increaseExpansionDepth()), actionCollection(),
"tree_inc_level"); "tree_inc_level");
tree_inc_level->setToolTip(i18n("Increase expansion level")); tree_inc_level->setToolTip(i18n("Increase expansion level"));
KAction *tree_dec_level = new KAction(i18n("Collapse"), TDEAction *tree_dec_level = new TDEAction(i18n("Collapse"),
"1leftarrow", CTRL+Key_Less, TQT_TQOBJECT(view()), "1leftarrow", CTRL+Key_Less, TQT_TQOBJECT(view()),
TQT_SLOT(decreaseExpansionDepth()), actionCollection(), TQT_SLOT(decreaseExpansionDepth()), actionCollection(),
"tree_dec_level"); "tree_dec_level");
@ -155,20 +155,20 @@ void DOMTreeWindow::setupActions()
// actions for the dom tree list view context menu // actions for the dom tree list view context menu
del_tree = new KAction(i18n("&Delete"), "editdelete", del_tree = new TDEAction(i18n("&Delete"), "editdelete",
Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteNodes()), Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteNodes()),
actionCollection(), "tree_delete"); actionCollection(), "tree_delete");
del_tree->setToolTip(i18n("Delete nodes")); del_tree->setToolTip(i18n("Delete nodes"));
/*KAction *new_elem = */new KAction(i18n("New &Element ..."), /*TDEAction *new_elem = */new TDEAction(i18n("New &Element ..."),
"bookmark", KShortcut(), TQT_TQOBJECT(view()), "bookmark", TDEShortcut(), TQT_TQOBJECT(view()),
TQT_SLOT(slotAddElementDlg()), actionCollection(), TQT_SLOT(slotAddElementDlg()), actionCollection(),
"tree_add_element"); "tree_add_element");
/*KAction *new_text = */new KAction(i18n("New &Text Node ..."), /*TDEAction *new_text = */new TDEAction(i18n("New &Text Node ..."),
"text", KShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()), "text", TDEShortcut(), TQT_TQOBJECT(view()), TQT_SLOT(slotAddTextDlg()),
actionCollection(), "tree_add_text"); actionCollection(), "tree_add_text");
// actions for the info panel attribute list context menu // actions for the info panel attribute list context menu
del_attr = new KAction(i18n("&Delete"), "editdelete", del_attr = new TDEAction(i18n("&Delete"), "editdelete",
Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteAttributes()), Key_Delete, TQT_TQOBJECT(view()), TQT_SLOT(deleteAttributes()),
actionCollection(), "attr_delete"); actionCollection(), "attr_delete");
del_attr->setToolTip(i18n("Delete attributes")); del_attr->setToolTip(i18n("Delete attributes"));

@ -41,7 +41,7 @@ namespace KParts {
class DOMTreeView; class DOMTreeView;
class PluginDomtreeviewer; class PluginDomtreeviewer;
class KAction; class TDEAction;
class TDEConfig; class TDEConfig;
class KPrinter; class KPrinter;
class KURL; class KURL;
@ -58,7 +58,7 @@ class TQPopupMenu;
* @short Main window class * @short Main window class
* @author Leo Savernik * @author Leo Savernik
*/ */
class DOMTreeWindow : public KMainWindow class DOMTreeWindow : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -116,9 +116,9 @@ public:
TDEConfig *config() const { return _config; } TDEConfig *config() const { return _config; }
/** returns the attribute delete action */ /** returns the attribute delete action */
KAction *deleteAttributeAction() const { return del_attr; } TDEAction *deleteAttributeAction() const { return del_attr; }
/** returns the node delete action */ /** returns the node delete action */
KAction *deleteNodeAction() const { return del_tree; } TDEAction *deleteNodeAction() const { return del_tree; }
public slots: public slots:
/** /**
@ -187,7 +187,7 @@ private:
TQPopupMenu *domtree_ctx; TQPopupMenu *domtree_ctx;
TDEConfig *_config; TDEConfig *_config;
KAction *del_tree, *del_attr; TDEAction *del_tree, *del_attr;
TQGuardedPtr<KParts::PartManager> part_manager; TQGuardedPtr<KParts::PartManager> part_manager;
}; };

@ -19,7 +19,7 @@ PluginDomtreeviewer::PluginDomtreeviewer( TQObject* parent, const char* name,
const TQStringList & ) const TQStringList & )
: Plugin( parent, name ), m_dialog( 0 ) : Plugin( parent, name ), m_dialog( 0 )
{ {
(void) new KAction( i18n("Show &DOM Tree"), (void) new TDEAction( i18n("Show &DOM Tree"),
"domtreeviewer", 0, "domtreeviewer", 0,
this, TQT_SLOT(slotShowDOMTree()), this, TQT_SLOT(slotShowDOMTree()),
actionCollection(), "viewdomtree" ); actionCollection(), "viewdomtree" );

@ -118,18 +118,18 @@ FSViewPart::FSViewPart(TQWidget *parentWidget, const char *widgetName,
_ext = new FSViewBrowserExtension(this); _ext = new FSViewBrowserExtension(this);
_job = 0; _job = 0;
_areaMenu = new KActionMenu (i18n("Stop at Area"), _areaMenu = new TDEActionMenu (i18n("Stop at Area"),
actionCollection(), "treemap_areadir"); actionCollection(), "treemap_areadir");
_depthMenu = new KActionMenu (i18n("Stop at Depth"), _depthMenu = new TDEActionMenu (i18n("Stop at Depth"),
actionCollection(), "treemap_depthdir"); actionCollection(), "treemap_depthdir");
_visMenu = new KActionMenu (i18n("Visualization"), _visMenu = new TDEActionMenu (i18n("Visualization"),
actionCollection(), "treemap_visdir"); actionCollection(), "treemap_visdir");
_colorMenu = new KActionMenu (i18n("Color Mode"), _colorMenu = new TDEActionMenu (i18n("Color Mode"),
actionCollection(), "treemap_colordir"); actionCollection(), "treemap_colordir");
KAction* action; TDEAction* action;
action = new KAction( i18n( "&FSView Manual" ), "fsview", action = new TDEAction( i18n( "&FSView Manual" ), "fsview",
KShortcut(), this, TQT_SLOT(showHelp()), TDEShortcut(), this, TQT_SLOT(showHelp()),
actionCollection(), "help_fsview" ); actionCollection(), "help_fsview" );
action->setToolTip(i18n("Show FSView manual")); action->setToolTip(i18n("Show FSView manual"));
action->setWhatsThis(i18n("Opens the help browser with the " action->setWhatsThis(i18n("Opens the help browser with the "

@ -30,7 +30,7 @@
#include "fsview.h" #include "fsview.h"
class TDEAboutData; class TDEAboutData;
class KActionMenu; class TDEActionMenu;
class FSViewPart; class FSViewPart;
@ -119,7 +119,7 @@ private:
FSView* _view; FSView* _view;
FSJob* _job; FSJob* _job;
FSViewBrowserExtension* _ext; FSViewBrowserExtension* _ext;
KActionMenu *_visMenu, *_areaMenu, *_depthMenu, *_colorMenu; TDEActionMenu *_visMenu, *_areaMenu, *_depthMenu, *_colorMenu;
}; };
#endif // FSVIEW_PART_H #endif // FSVIEW_PART_H

@ -125,7 +125,7 @@ void KIGPDialog::setupLookPage(const TQString& path) {
m_fontName = new TQComboBox( false,page ); m_fontName = new TQComboBox( false,page );
TQStringList standardFonts; TQStringList standardFonts;
KFontChooser::getFontList(standardFonts, 0); TDEFontChooser::getFontList(standardFonts, 0);
m_fontName->insertStringList( standardFonts ); m_fontName->insertStringList( standardFonts );
m_fontName->setCurrentText( m_config->readEntry("FontName", TDEGlobalSettings::generalFont().family() ) ); m_fontName->setCurrentText( m_config->readEntry("FontName", TDEGlobalSettings::generalFont().family() ) );

@ -51,7 +51,7 @@ K_EXPORT_COMPONENT_FACTORY( libkimgallery, KImGalleryPluginFactory( "imgallerypl
KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & ) KImGalleryPlugin::KImGalleryPlugin( TQObject* parent, const char* name, const TQStringList & )
: KParts::Plugin( parent, name ), m_commentMap(0) : KParts::Plugin( parent, name ), m_commentMap(0)
{ {
new KAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this, new TDEAction( i18n( "&Create Image Gallery..." ), "imagegallery", CTRL+Key_I, this,
TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" ); TQT_SLOT( slotExecute() ), actionCollection(), "create_img_gallery" );
} }

@ -50,7 +50,7 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
TQFileInfo fileInfo(path); TQFileInfo fileInfo(path);
if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable()) if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable())
action = new KAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this)); action = new TDEAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this));
} }
KDirMenu::~KDirMenu( ) { KDirMenu::~KDirMenu( ) {
delete action; delete action;

@ -25,7 +25,7 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqmap.h> #include <tqmap.h>
class KAction; class TDEAction;
class KURL; class KURL;
class KDirMenu : public TQPopupMenu { class KDirMenu : public TQPopupMenu {
@ -47,7 +47,7 @@ private:
TQString path; TQString path;
TQString name; TQString name;
KURL src; KURL src;
KAction *action; TDEAction *action;
TQPtrList<KDirMenu> children; TQPtrList<KDirMenu> children;
void initIconMap( ); void initIconMap( );
public slots: public slots:

@ -111,7 +111,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
} }
m_browse = new KAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) ); m_browse = new TDEAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) );
m_browse->plug(this); m_browse->plug(this);
// read the last chosen dirs // read the last chosen dirs
// first set the group according to our parameter // first set the group according to our parameter
@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
continue; continue;
} }
TQString escapedDir = *it; TQString escapedDir = *it;
KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this)); TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this));
action->plug(this ); action->plug(this );
actions.append( action ); actions.append( action );
++it; ++it;
@ -158,8 +158,8 @@ void KMetaMenu::slotFileChosen(const TQString &path ){
} }
void KMetaMenu::slotFastPath( ) { void KMetaMenu::slotFastPath( ) {
KAction *action; TDEAction *action;
action = (KAction*) sender(); action = (TDEAction*) sender();
TQString text = action->plainText( ); TQString text = action->plainText( );
slotFileChosen( text ); slotFileChosen( text );
} }

@ -57,11 +57,11 @@ private:
KDirMenu *m_current; KDirMenu *m_current;
KIMContactMenu *m_contacts; KIMContactMenu *m_contacts;
KIMProxy *m_proxy; KIMProxy *m_proxy;
KAction *m_browse; TDEAction *m_browse;
TQStringList list; TQStringList list;
TDEConfig *conf; TDEConfig *conf;
TQString group; TQString group;
TQPtrList<KAction> actions; TQPtrList<TDEAction> actions;
}; };
#endif #endif

@ -42,7 +42,7 @@ KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQString
popup= popupmenu ; popup= popupmenu ;
meta_copy_mmu = 0L; meta_copy_mmu = 0L;
meta_move_mmu = 0L; meta_move_mmu = 0L;
my_action = new KAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" ); my_action = new TDEAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff" );
addAction( my_action ); addAction( my_action );
addSeparator(); addSeparator();
//popupmenu->addMerge(); //popupmenu->addMerge();

@ -24,7 +24,7 @@
#include "kmetamenu.h" #include "kmetamenu.h"
class KAction; class TDEAction;
class KURL; class KURL;
class KTestMenu : public KonqPopupMenuPlugin { class KTestMenu : public KonqPopupMenuPlugin {
Q_OBJECT Q_OBJECT
@ -37,7 +37,7 @@ public:
KonqPopupMenu *popup; KonqPopupMenu *popup;
private: private:
KAction *my_action; TDEAction *my_action;
KIMProxy *m_imProxy; KIMProxy *m_imProxy;
public slots: public slots:

@ -245,7 +245,7 @@ bool KonqMFIcon::mfFound() {
void KonqMFIcon::contextMenu() { void KonqMFIcon::contextMenu() {
delete m_menu; delete m_menu;
m_menu = new KPopupMenu(m_part->widget()); m_menu = new TDEPopupMenu(m_part->widget());
m_menu->insertTitle(i18n("Microformats")); m_menu->insertTitle(i18n("Microformats"));
connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addMF(int))); connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(addMF(int)));
int id = 0; int id = 0;

@ -56,7 +56,7 @@ class KonqMFIcon : public KParts::Plugin, PluginBase {
TQGuardedPtr<TDEHTMLPart> m_part; TQGuardedPtr<TDEHTMLPart> m_part;
KURLLabel *m_mfIcon; KURLLabel *m_mfIcon;
KParts::StatusBarExtension *m_statusBarEx; KParts::StatusBarExtension *m_statusBarEx;
TQGuardedPtr<KPopupMenu> m_menu; TQGuardedPtr<TDEPopupMenu> m_menu;
TQValueList<TQPair<TQString, TQString> > _events, _cards; TQValueList<TQPair<TQString, TQString> > _events, _cards;
private slots: private slots:

@ -46,7 +46,7 @@ MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStr
: KParts::Plugin(parent, name) { : KParts::Plugin(parent, name) {
m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast<TDEHTMLPart*>(parent) : 0L; m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast<TDEHTMLPart*>(parent) : 0L;
m_pMinitoolsMenu = new KActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools"); m_pMinitoolsMenu = new TDEActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools");
m_pMinitoolsMenu->setDelayed(false); m_pMinitoolsMenu->setDelayed(false);
m_pMinitoolsMenu->setEnabled(true); m_pMinitoolsMenu->setEnabled(true);

@ -30,7 +30,7 @@
#include <tdeparts/plugin.h> #include <tdeparts/plugin.h>
class TDEHTMLPart; class TDEHTMLPart;
class KActionMenu; class TDEActionMenu;
class MinitoolsPlugin : public KParts::Plugin { class MinitoolsPlugin : public KParts::Plugin {
Q_OBJECT Q_OBJECT
@ -56,7 +56,7 @@ private:
int m_selectedItem; int m_selectedItem;
TDEHTMLPart* m_part; TDEHTMLPart* m_part;
KActionMenu* m_pMinitoolsMenu; TDEActionMenu* m_pMinitoolsMenu;
typedef TQPair<TQString,TQCString> Minitool; typedef TQPair<TQString,TQCString> Minitool;
typedef TQValueList<Minitool> MinitoolsList; typedef TQValueList<Minitool> MinitoolsList;

@ -3,7 +3,7 @@ Rellinks :
* Support multiple same relations for all relations in a beautiful way * Support multiple same relations for all relations in a beautiful way
(as FireFox Link Toolbar Extension do) : (as FireFox Link Toolbar Extension do) :
by transfoming buttons (KAction) in menus (KActionMenu) if more than one item is found for a relation ? by transfoming buttons (TDEAction) in menus (TDEActionMenu) if more than one item is found for a relation ?
* Possibility to configure keyboard shortcuts * Possibility to configure keyboard shortcuts
* Manage "rel" and "rev" differently * Manage "rel" and "rev" differently
* Manage "media" * Manage "media"

@ -70,102 +70,102 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin
setInstance(RelLinksFactory::instance()); setInstance(RelLinksFactory::instance());
// ------------- Navigation links -------------- // ------------- Navigation links --------------
kaction_map["home"] = new KAction( i18n("&Top"), "2uparrow", KShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" ); kaction_map["home"] = new TDEAction( i18n("&Top"), "2uparrow", TDEShortcut("Ctrl+Alt+T"), this, TQT_SLOT(goHome()), actionCollection(), "rellinks_top" );
kaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") ); kaction_map["home"]->setWhatsThis( i18n("<p>This link references a home page or the top of some hierarchy.</p>") );
kaction_map["up"] = new KAction( i18n("&Up"), "1uparrow", KShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" ); kaction_map["up"] = new TDEAction( i18n("&Up"), "1uparrow", TDEShortcut("Ctrl+Alt+U"), this, TQT_SLOT(goUp()), actionCollection(), "rellinks_up" );
kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") ); kaction_map["up"]->setWhatsThis( i18n("<p>This link references the immediate parent of the current document.</p>") );
bool isRTL = TQApplication::reverseLayout(); bool isRTL = TQApplication::reverseLayout();
kaction_map["begin"] = new KAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", KShortcut("Ctrl+Alt+F"), this, TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" ); kaction_map["begin"] = new TDEAction( i18n("&First"), isRTL ? "2rightarrow" : "2leftarrow", TDEShortcut("Ctrl+Alt+F"), this, TQT_SLOT(goFirst()), actionCollection(), "rellinks_first" );
kaction_map["begin"]->setWhatsThis( i18n("<p>This link type tells search engines which document is considered by the author to be the starting point of the collection.</p>") ); kaction_map["begin"]->setWhatsThis( i18n("<p>This link type tells search engines which document is considered by the author to be the starting point of the collection.</p>") );
kaction_map["prev"] = new KAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", KShortcut("Ctrl+Alt+P"), this, TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" ); kaction_map["prev"] = new TDEAction( i18n("&Previous"), isRTL ? "1rightarrow" : "1leftarrow", TDEShortcut("Ctrl+Alt+P"), this, TQT_SLOT(goPrevious()), actionCollection(), "rellinks_previous" );
kaction_map["prev"]->setWhatsThis( i18n("<p>This link references the previous document in an ordered series of documents.</p>") ); kaction_map["prev"]->setWhatsThis( i18n("<p>This link references the previous document in an ordered series of documents.</p>") );
kaction_map["next"] = new KAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", KShortcut("Ctrl+Alt+N"), this, TQT_SLOT(goNext()), actionCollection(), "rellinks_next" ); kaction_map["next"] = new TDEAction( i18n("&Next"), isRTL ? "1leftarrow" : "1rightarrow", TDEShortcut("Ctrl+Alt+N"), this, TQT_SLOT(goNext()), actionCollection(), "rellinks_next" );
kaction_map["next"]->setWhatsThis( i18n("<p>This link references the next document in an ordered series of documents.</p>") ); kaction_map["next"]->setWhatsThis( i18n("<p>This link references the next document in an ordered series of documents.</p>") );
kaction_map["last"] = new KAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", KShortcut("Ctrl+Alt+L"), this, TQT_SLOT(goLast()), actionCollection(), "rellinks_last" ); kaction_map["last"] = new TDEAction( i18n("&Last"), isRTL ? "2leftarrow" : "2rightarrow", TDEShortcut("Ctrl+Alt+L"), this, TQT_SLOT(goLast()), actionCollection(), "rellinks_last" );
kaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") ); kaction_map["last"]->setWhatsThis( i18n("<p>This link references the end of a sequence of documents.</p>") );
// ------------ special items -------------------------- // ------------ special items --------------------------
kaction_map["search"] = new KAction( i18n("&Search"), "filefind", KShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" ); kaction_map["search"] = new TDEAction( i18n("&Search"), "filefind", TDEShortcut("Ctrl+Alt+S"), this, TQT_SLOT(goSearch()), actionCollection(), "rellinks_search" );
kaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") ); kaction_map["search"]->setWhatsThis( i18n("<p>This link references the search.</p>") );
// ------------ Document structure links --------------- // ------------ Document structure links ---------------
m_document = new KActionMenu( i18n("Document"), "contents", actionCollection(), "rellinks_document" ); m_document = new TDEActionMenu( i18n("Document"), "contents", actionCollection(), "rellinks_document" );
m_document->setWhatsThis( i18n("<p>This menu contains the links referring the document information.</p>") ); m_document->setWhatsThis( i18n("<p>This menu contains the links referring the document information.</p>") );
m_document->setDelayed(false); m_document->setDelayed(false);
kaction_map["contents"] = new KAction( i18n("Table of &Contents"), "contents", KShortcut("Ctrl+Alt+C"), this, TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" ); kaction_map["contents"] = new TDEAction( i18n("Table of &Contents"), "contents", TDEShortcut("Ctrl+Alt+C"), this, TQT_SLOT(goContents()), actionCollection(), "rellinks_toc" );
m_document->insert(kaction_map["contents"]); m_document->insert(kaction_map["contents"]);
kaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") ); kaction_map["contents"]->setWhatsThis( i18n("<p>This link references the table of contents.</p>") );
kactionmenu_map["chapter"] = new KActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" ); kactionmenu_map["chapter"] = new TDEActionMenu( i18n("Chapters"), "fileopen", actionCollection(), "rellinks_chapters" );
m_document->insert(kactionmenu_map["chapter"]); m_document->insert(kactionmenu_map["chapter"]);
connect( kactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int))); connect( kactionmenu_map["chapter"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT(goChapter(int)));
kactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") ); kactionmenu_map["chapter"]->setWhatsThis( i18n("<p>This menu references the chapters of the document.</p>") );
kactionmenu_map["chapter"]->setDelayed(false); kactionmenu_map["chapter"]->setDelayed(false);
kactionmenu_map["section"] = new KActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" ); kactionmenu_map["section"] = new TDEActionMenu( i18n("Sections"), "fileopen", actionCollection(), "rellinks_sections" );
m_document->insert(kactionmenu_map["section"]); m_document->insert(kactionmenu_map["section"]);
connect( kactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) ); connect( kactionmenu_map["section"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSection( int ) ) );
kactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") ); kactionmenu_map["section"]->setWhatsThis( i18n("<p>This menu references the sections of the document.</p>") );
kactionmenu_map["section"]->setDelayed(false); kactionmenu_map["section"]->setDelayed(false);
kactionmenu_map["subsection"] = new KActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" ); kactionmenu_map["subsection"] = new TDEActionMenu( i18n("Subsections"), "fileopen", actionCollection(), "rellinks_subsections" );
m_document->insert(kactionmenu_map["subsection"]); m_document->insert(kactionmenu_map["subsection"]);
connect( kactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) ); connect( kactionmenu_map["subsection"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goSubsection( int ) ) );
kactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") ); kactionmenu_map["subsection"]->setWhatsThis( i18n("<p>This menu references the subsections of the document.</p>") );
kactionmenu_map["subsection"]->setDelayed(false); kactionmenu_map["subsection"]->setDelayed(false);
kactionmenu_map["appendix"] = new KActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" ); kactionmenu_map["appendix"] = new TDEActionMenu( i18n("Appendix"), "edit", actionCollection(), "rellinks_appendix" );
m_document->insert(kactionmenu_map["appendix"]); m_document->insert(kactionmenu_map["appendix"]);
connect( kactionmenu_map["appendix"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAppendix( int ) ) ); connect( kactionmenu_map["appendix"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAppendix( int ) ) );
kactionmenu_map["appendix"]->setWhatsThis( i18n("<p>This link references the appendix.</p>") ); kactionmenu_map["appendix"]->setWhatsThis( i18n("<p>This link references the appendix.</p>") );
kactionmenu_map["appendix"]->setDelayed(false); kactionmenu_map["appendix"]->setDelayed(false);
kaction_map["glossary"] = new KAction( i18n("&Glossary"), "flag", KShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" ); kaction_map["glossary"] = new TDEAction( i18n("&Glossary"), "flag", TDEShortcut("Ctrl+Alt+G"), this, TQT_SLOT(goGlossary()), actionCollection(), "rellinks_glossary" );
m_document->insert(kaction_map["glossary"]); m_document->insert(kaction_map["glossary"]);
kaction_map["glossary"]->setWhatsThis( i18n("<p>This link references the glossary.</p>") ); kaction_map["glossary"]->setWhatsThis( i18n("<p>This link references the glossary.</p>") );
kaction_map["index"] = new KAction( i18n("&Index"), "info", KShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" ); kaction_map["index"] = new TDEAction( i18n("&Index"), "info", TDEShortcut("Ctrl+Alt+I"), this, TQT_SLOT(goIndex()), actionCollection(), "rellinks_index" );
m_document->insert(kaction_map["index"]); m_document->insert(kaction_map["index"]);
kaction_map["index"]->setWhatsThis( i18n("<p>This link references the index.</p>") ); kaction_map["index"]->setWhatsThis( i18n("<p>This link references the index.</p>") );
// Other links // Other links
m_more = new KActionMenu( i18n("More"), "misc", actionCollection(), "rellinks_more" ); m_more = new TDEActionMenu( i18n("More"), "misc", actionCollection(), "rellinks_more" );
m_more->setWhatsThis( i18n("<p>This menu contains other important links.</p>") ); m_more->setWhatsThis( i18n("<p>This menu contains other important links.</p>") );
m_more->setDelayed(false); m_more->setDelayed(false);
kaction_map["help"] = new KAction( i18n("&Help"), "help", KShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" ); kaction_map["help"] = new TDEAction( i18n("&Help"), "help", TDEShortcut("Ctrl+Alt+H"), this, TQT_SLOT(goHelp()), actionCollection(), "rellinks_help" );
m_more->insert(kaction_map["help"]); m_more->insert(kaction_map["help"]);
kaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") ); kaction_map["help"]->setWhatsThis( i18n("<p>This link references the help.</p>") );
kaction_map["author"] = new KAction( i18n("&Authors"), "mail_new", KShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" ); kaction_map["author"] = new TDEAction( i18n("&Authors"), "mail_new", TDEShortcut("Ctrl+Alt+A"), this, TQT_SLOT(goAuthor()), actionCollection(), "rellinks_authors" );
m_more->insert(kaction_map["author"]); m_more->insert(kaction_map["author"]);
kaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") ); kaction_map["author"]->setWhatsThis( i18n("<p>This link references the author.</p>") );
kaction_map["copyright"] = new KAction( i18n("Copy&right"), "signature", KShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" ); kaction_map["copyright"] = new TDEAction( i18n("Copy&right"), "signature", TDEShortcut("Ctrl+Alt+R"), this, TQT_SLOT(goCopyright()), actionCollection(), "rellinks_copyright" );
m_more->insert(kaction_map["copyright"]); m_more->insert(kaction_map["copyright"]);
kaction_map["copyright"]->setWhatsThis( i18n("<p>This link references the copyright.</p>") ); kaction_map["copyright"]->setWhatsThis( i18n("<p>This link references the copyright.</p>") );
kactionmenu_map["bookmark"] = new KActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" ); kactionmenu_map["bookmark"] = new TDEActionMenu( i18n("Bookmarks"), "bookmark_folder", actionCollection(), "rellinks_bookmarks" );
m_more->insert(kactionmenu_map["bookmark"]); m_more->insert(kactionmenu_map["bookmark"]);
kactionmenu_map["bookmark"]->setWhatsThis( i18n("<p>This menu references the bookmarks.</p>") ); kactionmenu_map["bookmark"]->setWhatsThis( i18n("<p>This menu references the bookmarks.</p>") );
connect( kactionmenu_map["bookmark"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goBookmark( int ) ) ); connect( kactionmenu_map["bookmark"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goBookmark( int ) ) );
kactionmenu_map["bookmark"]->setDelayed(false); kactionmenu_map["bookmark"]->setDelayed(false);
kactionmenu_map["alternate"] = new KActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" ); kactionmenu_map["alternate"] = new TDEActionMenu( i18n("Other Versions"), "attach", actionCollection(), "rellinks_other_versions" );
m_more->insert(kactionmenu_map["alternate"]); m_more->insert(kactionmenu_map["alternate"]);
kactionmenu_map["alternate"]->setWhatsThis( i18n("<p>This link references the alternate versions of this document.</p>") ); kactionmenu_map["alternate"]->setWhatsThis( i18n("<p>This link references the alternate versions of this document.</p>") );
connect( kactionmenu_map["alternate"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAlternate( int ) ) ); connect( kactionmenu_map["alternate"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAlternate( int ) ) );
kactionmenu_map["alternate"]->setDelayed(false); kactionmenu_map["alternate"]->setDelayed(false);
// Unclassified menu // Unclassified menu
m_links = new KActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" ); m_links = new TDEActionMenu( i18n("Miscellaneous"), "rellinks", actionCollection(), "rellinks_links" );
kactionmenu_map["unclassified"] = m_links; kactionmenu_map["unclassified"] = m_links;
kactionmenu_map["unclassified"]->setWhatsThis( i18n("<p>Miscellaneous links.</p>") ); kactionmenu_map["unclassified"]->setWhatsThis( i18n("<p>Miscellaneous links.</p>") );
connect( kactionmenu_map["unclassified"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAllElements( int ) ) ); connect( kactionmenu_map["unclassified"]->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( goAllElements( int ) ) );
@ -532,7 +532,7 @@ void RelLinksPlugin::disableAll() {
element_map.clear(); element_map.clear();
// Clear actions // Clear actions
KActionMap::Iterator it; TDEActionMap::Iterator it;
for ( it = kaction_map.begin(); it != kaction_map.end(); ++it ) { for ( it = kaction_map.begin(); it != kaction_map.end(); ++it ) {
// If I don't test it crash :( // If I don't test it crash :(
if (it.data()) { if (it.data()) {
@ -542,7 +542,7 @@ void RelLinksPlugin::disableAll() {
} }
// Clear actions // Clear actions
KActionMenuMap::Iterator itmenu; TDEActionMenuMap::Iterator itmenu;
for ( itmenu = kactionmenu_map.begin(); itmenu != kactionmenu_map.end(); ++itmenu ) { for ( itmenu = kactionmenu_map.begin(); itmenu != kactionmenu_map.end(); ++itmenu ) {
// If I don't test it crash :( // If I don't test it crash :(
if (itmenu.data()) { if (itmenu.data()) {

@ -39,14 +39,14 @@
// type definitions // type definitions
typedef TQMap<int,DOM::Element> DOMElementMap; typedef TQMap<int,DOM::Element> DOMElementMap;
typedef TQMap<TQString, KAction*> KActionMap; typedef TQMap<TQString, TDEAction*> TDEActionMap;
typedef TQMap<TQString, KActionMenu*> KActionMenuMap; typedef TQMap<TQString, TDEActionMenu*> TDEActionMenuMap;
// forward declarations // forward declarations
class KActionMenu; class TDEActionMenu;
class TDEHTMLPart; class TDEHTMLPart;
class TDEHTMLView; class TDEHTMLView;
class KToolBar; class TDEToolBar;
class KURL; class KURL;
class TQTimer; class TQTimer;
@ -153,14 +153,14 @@ private:
TDEHTMLView* m_view; TDEHTMLView* m_view;
bool m_viewVisible; bool m_viewVisible;
KActionMenu *m_document; TDEActionMenu *m_document;
KActionMenu *m_more; TDEActionMenu *m_more;
KActionMenu *m_links; TDEActionMenu *m_links;
/** Map of KAction */ /** Map of TDEAction */
KActionMap kaction_map; TDEActionMap kaction_map;
/** Map of KActionMenu */ /** Map of TDEActionMenu */
KActionMenuMap kactionmenu_map; TDEActionMenuMap kactionmenu_map;
/** Map of all the link element which can be managed by rellinks */ /** Map of all the link element which can be managed by rellinks */
TQMap<TQString,DOMElementMap> element_map; TQMap<TQString,DOMElementMap> element_map;

@ -118,9 +118,9 @@ RsyncPlugin::RsyncPlugin (TQObject* parent, const char* name,
if ( !m_part || !m_part->scrollWidget() ) if ( !m_part || !m_part->scrollWidget() )
return; return;
m_pSyncNow = new KAction(i18n("Synchronize F&older"), "syncnow", m_pSyncNow = new TDEAction(i18n("Synchronize F&older"), "syncnow",
actionCollection(), "syncnow"); actionCollection(), "syncnow");
m_pSyncSetup = new KAction (i18n("Setup Syn&chronization"), "setupsync", m_pSyncSetup = new TDEAction (i18n("Setup Syn&chronization"), "setupsync",
actionCollection(), "setupsync"); actionCollection(), "setupsync");
m_pSyncNow->setIcon("remotesync"); m_pSyncNow->setIcon("remotesync");
m_pSyncSetup->setIcon("remotesyncconfig"); m_pSyncSetup->setIcon("remotesyncconfig");

@ -36,7 +36,7 @@
// and in a manner identical to these declarations, the plugin will // and in a manner identical to these declarations, the plugin will
// mysteriously fail when launched with kshell but work fine under BASH // mysteriously fail when launched with kshell but work fine under BASH
class KActionMenu; class TDEActionMenu;
class KonqDirPart; class KonqDirPart;
class KLineEdit; class KLineEdit;
@ -65,8 +65,8 @@ private slots:
private: private:
KURL m_pURL; KURL m_pURL;
KonqDirPart* m_part; KonqDirPart* m_part;
KAction* m_pSyncNow; TDEAction* m_pSyncNow;
KAction* m_pSyncSetup; TDEAction* m_pSyncSetup;
KRsync* m_rSync; KRsync* m_rSync;
}; };
#endif #endif

@ -88,7 +88,7 @@ SearchBarPlugin::SearchBarPlugin(TQObject *parent, const char *name,
TQWhatsThis::add(m_searchCombo, i18n("Search Bar<p>" TQWhatsThis::add(m_searchCombo, i18n("Search Bar<p>"
"Enter a search term. Click on the icon to change search mode or provider.")); "Enter a search term. Click on the icon to change search mode or provider."));
new KAction( i18n( "Focus Searchbar" ), CTRL+Key_S, new TDEAction( i18n( "Focus Searchbar" ), CTRL+Key_S,
this, TQT_SLOT(focusSearchbar()), this, TQT_SLOT(focusSearchbar()),
actionCollection(), "focus_search_bar"); actionCollection(), "focus_search_bar");
@ -413,7 +413,7 @@ void SearchBarPlugin::showSelectionMenu()
} }
m_popupMenu->insertSeparator(); m_popupMenu->insertSeparator();
m_googleMenu = new KSelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectGoogleSuggestMode()), TQT_TQOBJECT(m_popupMenu)); m_googleMenu = new TDESelectAction(i18n("Use Google Suggest"), SmallIconSet("ktip"), 0, TQT_TQOBJECT(this), TQT_SLOT(selectGoogleSuggestMode()), TQT_TQOBJECT(m_popupMenu));
TQStringList google_modes; TQStringList google_modes;
google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never"); google_modes << i18n("For Google Only") << i18n("For All Searches") << i18n("Never");
m_googleMenu->setItems(google_modes); m_googleMenu->setItems(google_modes);

@ -178,7 +178,7 @@ class SearchBarPlugin : public KParts::Plugin
SearchBarCombo *m_searchCombo; SearchBarCombo *m_searchCombo;
KWidgetAction *m_searchComboAction; KWidgetAction *m_searchComboAction;
TQPopupMenu *m_popupMenu; TQPopupMenu *m_popupMenu;
KSelectAction *m_googleMenu; TDESelectAction *m_googleMenu;
TQPixmap m_searchIcon; TQPixmap m_searchIcon;
SearchModes m_searchMode; SearchModes m_searchMode;
TQString m_providerName; TQString m_providerName;

@ -25,7 +25,7 @@
#include <klocale.h> #include <klocale.h>
BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ) BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time )
: KListViewItem( parent ), m_desc( desc ) : TDEListViewItem( parent ), m_desc( desc )
{ {
m_url = KURL::fromPathOrURL( url ); m_url = KURL::fromPathOrURL( url );
m_dateTime.setTime_t( time ); m_dateTime.setTime_t( time );

@ -31,7 +31,7 @@
class TQString; class TQString;
class BookmarkListItem: public KListViewItem class BookmarkListItem: public TDEListViewItem
{ {
public: public:
BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time ); BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time );

@ -114,7 +114,7 @@
<string>Post a new bookmark</string> <string>Post a new bookmark</string>
</property> </property>
</widget> </widget>
<widget class="KListView" row="0" column="0" rowspan="1" colspan="2"> <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="2">
<column> <column>
<property name="text"> <property name="text">
<string>Description</string> <string>Description</string>

@ -77,7 +77,7 @@ void L33tSlider::wheelEvent(TQWheelEvent *e)
SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver, SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver,
const char *member, TQObject* parent, const char* name ) const char *member, TQObject* parent, const char* name )
: KAction( text, accel, parent, name ) : TDEAction( text, accel, parent, name )
{ {
m_receiver = receiver; m_receiver = receiver;
m_member = member; m_member = member;
@ -85,10 +85,10 @@ SliderAction::SliderAction(const TQString& text, int accel, const TQObject *rece
int SliderAction::plug( TQWidget *w, int index ) int SliderAction::plug( TQWidget *w, int index )
{ {
if (!w->inherits("KToolBar")) return -1; if (!w->inherits("TDEToolBar")) return -1;
KToolBar *toolBar = (KToolBar *)w; TDEToolBar *toolBar = (TDEToolBar *)w;
int id = KAction::getToolButtonID(); int id = TDEAction::getToolButtonID();
//Create it. //Create it.
m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar); m_slider=new L33tSlider(0, 1000, 100, 0,Qt::Horizontal, toolBar);
@ -100,20 +100,20 @@ int SliderAction::plug( TQWidget *w, int index )
connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
toolBar->setItemAutoSized( id, true ); toolBar->setItemAutoSized( id, true );
if (w->inherits( "KToolBar" )) if (w->inherits( "TDEToolBar" ))
connect(toolBar, TQT_SIGNAL(moved(KToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(KToolBar::BarPosition))); connect(toolBar, TQT_SIGNAL(moved(TDEToolBar::BarPosition)), this, TQT_SLOT(toolbarMoved(TDEToolBar::BarPosition)));
emit plugged(); emit plugged();
return containerCount() - 1; return containerCount() - 1;
} }
void SliderAction::toolbarMoved(KToolBar::BarPosition) void SliderAction::toolbarMoved(TDEToolBar::BarPosition)
{ {
// I wish this worked :) // I wish this worked :)
return; return;
/* /*
if (pos == KToolBar::Left || pos == KToolBar::Right) if (pos == TDEToolBar::Left || pos == TDEToolBar::Right)
{ {
m_slider->setOrientationQt::Vertical); m_slider->setOrientationQt::Vertical);
m_slider->setFixedWidth(m_slider->height()); m_slider->setFixedWidth(m_slider->height());
@ -128,7 +128,7 @@ return;
void SliderAction::unplug( TQWidget *w ) void SliderAction::unplug( TQWidget *w )
{ {
KToolBar *toolBar = (KToolBar *)w; TDEToolBar *toolBar = (TDEToolBar *)w;
int idx = findContainer( w ); int idx = findContainer( w );
toolBar->removeItem( itemId( idx ) ); toolBar->removeItem( itemId( idx ) );

@ -69,7 +69,7 @@ private:
/** /**
* A slider for your toolbar * A slider for your toolbar
**/ **/
class SliderAction : public KAction class SliderAction : public TDEAction
{ {
Q_OBJECT Q_OBJECT
@ -84,7 +84,7 @@ signals:
void plugged(); void plugged();
public slots: public slots:
void toolbarMoved(KToolBar::BarPosition pos); void toolbarMoved(TDEToolBar::BarPosition pos);
private: private:
TQGuardedPtr<TQSlider> m_slider; TQGuardedPtr<TQSlider> m_slider;
TQStringList m_items; TQStringList m_items;

@ -143,7 +143,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
link_down->setEnabled(false); link_down->setEnabled(false);
connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown())); connect(link_down, TQT_SIGNAL(clicked()), this, TQT_SLOT(moveLinkDown()));
link_list = new KListView(links); link_list = new TDEListView(links);
link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); link_list->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
link_list->setSorting(-1); link_list->setSorting(-1);
link_list->setItemsMovable(TRUE); link_list->setItemsMovable(TRUE);
@ -154,7 +154,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
TQWidget *actionPage = new TQWidget; TQWidget *actionPage = new TQWidget;
actionSelector = new KActionSelector(actionPage); actionSelector = new TDEActionSelector(actionPage);
loadAvailableActions(); loadAvailableActions();
tab->addTab(general, i18n("General")); tab->addTab(general, i18n("General"));

@ -70,13 +70,13 @@ class ConfigDialog : public TQDialog
TQCheckBox *servicemenus; TQCheckBox *servicemenus;
TQCheckBox *showframe; TQCheckBox *showframe;
KListView *link_list; TDEListView *link_list;
KComboBox *themes; KComboBox *themes;
TQCString topWidgetName; TQCString topWidgetName;
KActionSelector *actionSelector; TDEActionSelector *actionSelector;
TQPtrDict<LinkEntry> linkList; TQPtrDict<LinkEntry> linkList;

@ -117,11 +117,11 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
TQVBoxLayout *layout = new TQVBoxLayout(this); TQVBoxLayout *layout = new TQVBoxLayout(this);
layout->addWidget(html->view()); layout->addWidget(html->view());
popup = new KPopupMenu(0); popup = new TDEPopupMenu(0);
KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure"); TDEAction *configAction = new TDEAction(i18n("Configure %1...").arg("Metabar"), "configure", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
configAction->plug(popup); configAction->plug(popup);
KAction *reloadAction = new KAction(i18n("Reload Theme"), "reload", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload"); TDEAction *reloadAction = new TDEAction(i18n("Reload Theme"), "reload", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(setTheme()), html->actionCollection(), "reload");
reloadAction->plug(popup); reloadAction->plug(popup);
setTheme(); setTheme();

@ -61,7 +61,7 @@ class MetabarWidget : public TQWidget
MetabarFunctions *functions; MetabarFunctions *functions;
KDirWatch *dir_watch; KDirWatch *dir_watch;
KPopupMenu *popup; TDEPopupMenu *popup;
TQDict<ProtocolPlugin> plugins; TQDict<ProtocolPlugin> plugins;

@ -145,7 +145,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
const TQString priority = cfg.readEntry("X-TDE-Priority"); const TQString priority = cfg.readEntry("X-TDE-Priority");
const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" ); const TQString submenuName = cfg.readEntry( "X-TDE-Submenu" );
bool usePopup = false; bool usePopup = false;
KPopupMenu *popup; TDEPopupMenu *popup;
if(!submenuName.isEmpty()){ if(!submenuName.isEmpty()){
usePopup = true; usePopup = true;
@ -156,7 +156,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
else{ else{
MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString() : TQString("hiddenaction"), count >= maxActions); MetabarWidget::addEntry(html, submenuName, "servicepopup://" + idString, "1rightarrow", "popup" + idString, count < maxActions ? TQString() : TQString("hiddenaction"), count >= maxActions);
popup = new KPopupMenu(); popup = new TDEPopupMenu();
popups.insert(idString, popup); popups.insert(idString, popup);
count++; count++;
@ -168,7 +168,7 @@ void ServiceLoader::loadServices(const KFileItem item, DOM::DOMString &html, int
for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){ for (TQValueList<KDEDesktopMimeType::Service>::iterator it = list.begin(); it != list.end(); ++it){
if(usePopup){ if(usePopup){
KAction *action = new KAction((*it).m_strName, (*it).m_strIcon, KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8()); TDEAction *action = new TDEAction((*it).m_strName, (*it).m_strIcon, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(runAction()), TQT_TQOBJECT(popup), idString.utf8());
action->plug(popup); action->plug(popup);
} }
else{ else{
@ -204,7 +204,7 @@ void ServiceLoader::runAction(const TQString& name)
void ServiceLoader::showPopup(const TQString &popup, const TQPoint &point) void ServiceLoader::showPopup(const TQString &popup, const TQPoint &point)
{ {
KPopupMenu *p = popups[popup]; TDEPopupMenu *p = popups[popup];
if(p){ if(p){
p->exec(point); p->exec(point);
} }

@ -49,7 +49,7 @@ class ServiceLoader : public TQObject
void showPopup(const TQString &popup, const TQPoint &point); void showPopup(const TQString &popup, const TQPoint &point);
private: private:
TQDict<KPopupMenu> popups; TQDict<TDEPopupMenu> popups;
TQMap<TQString,KDEDesktopMimeType::Service> services; TQMap<TQString,KDEDesktopMimeType::Service> services;
KURL::List urlList; KURL::List urlList;

@ -36,12 +36,12 @@ namespace KSB_News {
// ListBox including ToolTip for item // ListBox including ToolTip for item
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f) TTListBox::TTListBox(TQWidget *parent, const char *name, WFlags f)
: KListBox(parent, name, f), : TDEListBox(parent, name, f),
TQToolTip(this) { TQToolTip(this) {
} }
void TTListBox::clear() { void TTListBox::clear() {
KListBox::clear(); TDEListBox::clear();
} }
void TTListBox::maybeTip(const TQPoint &point) { void TTListBox::maybeTip(const TQPoint &point) {

@ -42,7 +42,7 @@ namespace KSB_News {
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
// ListBox including ToolTip for item // ListBox including ToolTip for item
//////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////
class TTListBox : public KListBox, TQToolTip { class TTListBox : public TDEListBox, TQToolTip {
public: public:
TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0); TTListBox (TQWidget *parent = 0, const char *name = 0, WFlags f = 0);
void clear(); void clear();

@ -83,7 +83,7 @@ namespace KSB_News {
// popup menu // popup menu
popup = new KPopupMenu(this); popup = new TDEPopupMenu(this);
popup->insertItem(KStdGuiItem::configure().iconSet(), popup->insertItem(KStdGuiItem::configure().iconSet(),
i18n("&Configure Newsticker..."), this, i18n("&Configure Newsticker..."), this,
TQT_SLOT(slotConfigure())); TQT_SLOT(slotConfigure()));
@ -94,7 +94,7 @@ namespace KSB_News {
popup->insertSeparator(); popup->insertSeparator();
// help menu // help menu
helpmenu = new KPopupMenu(this); helpmenu = new TDEPopupMenu(this);
helpmenu->insertItem(appIcon, i18n("&About Newsticker"), this, helpmenu->insertItem(appIcon, i18n("&About Newsticker"), this,
TQT_SLOT(slotShowAbout())); TQT_SLOT(slotShowAbout()));
helpmenu->insertItem(i18n("&Report Bug..."), this, helpmenu->insertItem(i18n("&Report Bug..."), this,

@ -35,7 +35,7 @@
class TQVBoxLayout; class TQVBoxLayout;
class TQPushButton; class TQPushButton;
class TQStringList; class TQStringList;
class KPopupMenu; class TDEPopupMenu;
class TDEAboutData; class TDEAboutData;
class KAboutApplication; class KAboutApplication;
class KBugReport; class KBugReport;
@ -76,7 +76,7 @@ namespace KSB_News {
TQPtrDict<TQWidget> pagesheader; TQPtrDict<TQWidget> pagesheader;
TQVBoxLayout *layout; TQVBoxLayout *layout;
TQWidget *currentPage; TQWidget *currentPage;
KPopupMenu *popup, *helpmenu; TDEPopupMenu *popup, *helpmenu;
TDEAboutData *m_aboutdata; TDEAboutData *m_aboutdata;
KAboutApplication *m_about; KAboutApplication *m_about;
KBugReport *m_bugreport; KBugReport *m_bugreport;

@ -49,54 +49,54 @@ SettingsPlugin::SettingsPlugin( TQObject* parent, const char* name,
if ( !kapp->dcopClient()->isAttached() ) if ( !kapp->dcopClient()->isAttached() )
kapp->dcopClient()->attach(); kapp->dcopClient()->attach();
KActionMenu *menu = new KActionMenu( i18n("HTML Settings"), "configure", TDEActionMenu *menu = new TDEActionMenu( i18n("HTML Settings"), "configure",
actionCollection(), "action menu" ); actionCollection(), "action menu" );
menu->setDelayed( false ); menu->setDelayed( false );
KToggleAction *action; TDEToggleAction *action;
action = new KToggleAction( i18n("Java&Script"), 0, action = new TDEToggleAction( i18n("Java&Script"), 0,
this, TQT_SLOT(toggleJavascript()), this, TQT_SLOT(toggleJavascript()),
actionCollection(), "javascript" ); actionCollection(), "javascript" );
menu->insert( action ); menu->insert( action );
action = new KToggleAction( i18n("&Java"), 0, action = new TDEToggleAction( i18n("&Java"), 0,
this, TQT_SLOT(toggleJava()), this, TQT_SLOT(toggleJava()),
actionCollection(), "java" ); actionCollection(), "java" );
menu->insert( action ); menu->insert( action );
action = new KToggleAction( i18n("&Cookies"), 0, action = new TDEToggleAction( i18n("&Cookies"), 0,
this, TQT_SLOT(toggleCookies()), this, TQT_SLOT(toggleCookies()),
actionCollection(), "cookies" ); actionCollection(), "cookies" );
menu->insert( action ); menu->insert( action );
action = new KToggleAction( i18n("&Plugins"), 0, action = new TDEToggleAction( i18n("&Plugins"), 0,
this, TQT_SLOT(togglePlugins()), this, TQT_SLOT(togglePlugins()),
actionCollection(), "plugins" ); actionCollection(), "plugins" );
menu->insert( action ); menu->insert( action );
action = new KToggleAction( i18n("Autoload &Images"), 0, action = new TDEToggleAction( i18n("Autoload &Images"), 0,
this, TQT_SLOT(toggleImageLoading()), this, TQT_SLOT(toggleImageLoading()),
actionCollection(), "imageloading" ); actionCollection(), "imageloading" );
menu->insert( action ); menu->insert( action );
menu->insert( new KActionSeparator(actionCollection()) ); menu->insert( new TDEActionSeparator(actionCollection()) );
action = new KToggleAction( i18n("Enable Pro&xy"), 0, action = new TDEToggleAction( i18n("Enable Pro&xy"), 0,
this, TQT_SLOT(toggleProxy()), this, TQT_SLOT(toggleProxy()),
actionCollection(), "useproxy" ); actionCollection(), "useproxy" );
action->setCheckedState(i18n("Disable Pro&xy")); action->setCheckedState(i18n("Disable Pro&xy"));
menu->insert( action ); menu->insert( action );
action = new KToggleAction( i18n("Enable Cac&he"), 0, action = new TDEToggleAction( i18n("Enable Cac&he"), 0,
this, TQT_SLOT(toggleCache()), this, TQT_SLOT(toggleCache()),
actionCollection(), "usecache" ); actionCollection(), "usecache" );
action->setCheckedState(i18n("Disable Cac&he")); action->setCheckedState(i18n("Disable Cac&he"));
menu->insert( action ); menu->insert( action );
KSelectAction *sAction = new KSelectAction( i18n("Cache Po&licy"), 0, TDESelectAction *sAction = new TDESelectAction( i18n("Cache Po&licy"), 0,
0, 0, actionCollection(), 0, 0, actionCollection(),
"cachepolicy" ); "cachepolicy" );
TQStringList policies; TQStringList policies;
@ -129,25 +129,25 @@ void SettingsPlugin::showPopup()
KProtocolManager::reparseConfiguration(); KProtocolManager::reparseConfiguration();
bool cookies = cookiesEnabled( part->url().url() ); bool cookies = cookiesEnabled( part->url().url() );
((KToggleAction*)actionCollection()->action("useproxy"))->setChecked(KProtocolManager::useProxy()); ((TDEToggleAction*)actionCollection()->action("useproxy"))->setChecked(KProtocolManager::useProxy());
((KToggleAction*)actionCollection()->action("java"))->setChecked( part->javaEnabled() ); ((TDEToggleAction*)actionCollection()->action("java"))->setChecked( part->javaEnabled() );
((KToggleAction*)actionCollection()->action("javascript"))->setChecked( part->jScriptEnabled() ); ((TDEToggleAction*)actionCollection()->action("javascript"))->setChecked( part->jScriptEnabled() );
((KToggleAction*)actionCollection()->action("cookies"))->setChecked( cookies ); ((TDEToggleAction*)actionCollection()->action("cookies"))->setChecked( cookies );
((KToggleAction*)actionCollection()->action("plugins"))->setChecked( part->pluginsEnabled() ); ((TDEToggleAction*)actionCollection()->action("plugins"))->setChecked( part->pluginsEnabled() );
((KToggleAction*)actionCollection()->action("imageloading"))->setChecked( part->autoloadImages() ); ((TDEToggleAction*)actionCollection()->action("imageloading"))->setChecked( part->autoloadImages() );
((KToggleAction*)actionCollection()->action("usecache"))->setChecked(KProtocolManager::useCache()); ((TDEToggleAction*)actionCollection()->action("usecache"))->setChecked(KProtocolManager::useCache());
TDEIO::CacheControl cc = KProtocolManager::cacheControl(); TDEIO::CacheControl cc = KProtocolManager::cacheControl();
switch ( cc ) switch ( cc )
{ {
case TDEIO::CC_Verify: case TDEIO::CC_Verify:
((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 0 ); ((TDESelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 0 );
break; break;
case TDEIO::CC_CacheOnly: case TDEIO::CC_CacheOnly:
((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 2 ); ((TDESelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 2 );
break; break;
case TDEIO::CC_Cache: case TDEIO::CC_Cache:
((KSelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 1 ); ((TDESelectAction*)actionCollection()->action("cachepolicy"))->setCurrentItem( 1 );
break; break;
case TDEIO::CC_Reload: // nothing for now case TDEIO::CC_Reload: // nothing for now
case TDEIO::CC_Refresh: case TDEIO::CC_Refresh:
@ -162,7 +162,7 @@ void SettingsPlugin::toggleJava()
if( parent() && parent()->inherits("TDEHTMLPart")) if( parent() && parent()->inherits("TDEHTMLPart"))
{ {
TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent());
part->setJavaEnabled( ((KToggleAction*)actionCollection()->action("java"))->isChecked() ); part->setJavaEnabled( ((TDEToggleAction*)actionCollection()->action("java"))->isChecked() );
} }
} }
@ -171,7 +171,7 @@ void SettingsPlugin::toggleJavascript()
if( parent() && parent()->inherits("TDEHTMLPart")) if( parent() && parent()->inherits("TDEHTMLPart"))
{ {
TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent());
part->setJScriptEnabled( ((KToggleAction*)actionCollection()->action("javascript"))->isChecked() ); part->setJScriptEnabled( ((TDEToggleAction*)actionCollection()->action("javascript"))->isChecked() );
} }
} }
@ -183,7 +183,7 @@ void SettingsPlugin::toggleCookies()
TDEHTMLPart *part = static_cast<TDEHTMLPart *>( parent() ); TDEHTMLPart *part = static_cast<TDEHTMLPart *>( parent() );
TQString advice; TQString advice;
bool enable = ((KToggleAction*)actionCollection()->action("cookies"))->isChecked(); bool enable = ((TDEToggleAction*)actionCollection()->action("cookies"))->isChecked();
advice = enable ? "Accept" : "Reject"; advice = enable ? "Accept" : "Reject";
TQCString replyType; TQCString replyType;
@ -206,7 +206,7 @@ void SettingsPlugin::togglePlugins()
if( parent() && parent()->inherits("TDEHTMLPart")) if( parent() && parent()->inherits("TDEHTMLPart"))
{ {
TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent());
part->setPluginsEnabled( ((KToggleAction*)actionCollection()->action("plugins"))->isChecked() ); part->setPluginsEnabled( ((TDEToggleAction*)actionCollection()->action("plugins"))->isChecked() );
} }
} }
@ -215,7 +215,7 @@ void SettingsPlugin::toggleImageLoading()
if( parent() && parent()->inherits("TDEHTMLPart")) if( parent() && parent()->inherits("TDEHTMLPart"))
{ {
TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent());
part->setAutoloadImages( ((KToggleAction*)actionCollection()->action("imageloading"))->isChecked() ); part->setAutoloadImages( ((TDEToggleAction*)actionCollection()->action("imageloading"))->isChecked() );
} }
} }
@ -254,7 +254,7 @@ bool SettingsPlugin::cookiesEnabled( const TQString& url )
void SettingsPlugin::toggleProxy() void SettingsPlugin::toggleProxy()
{ {
bool enable = ((KToggleAction*)actionCollection()->action("useproxy"))->isChecked(); bool enable = ((TDEToggleAction*)actionCollection()->action("useproxy"))->isChecked();
int type; int type;
@ -270,7 +270,7 @@ void SettingsPlugin::toggleProxy()
config.setGroup( "Proxy Settings" ); config.setGroup( "Proxy Settings" );
config.writeEntry( "ProxyType", type ); config.writeEntry( "ProxyType", type );
((KToggleAction*)actionCollection()->action("useproxy"))->setChecked(enable); ((TDEToggleAction*)actionCollection()->action("useproxy"))->setChecked(enable);
updateIOSlaves(); updateIOSlaves();
} }
@ -281,7 +281,7 @@ void SettingsPlugin::toggleCache()
TDEConfig config( "tdeio_httprc", false, false ); TDEConfig config( "tdeio_httprc", false, false );
config.writeEntry( "UseCache", !usesCache ); config.writeEntry( "UseCache", !usesCache );
((KToggleAction*)actionCollection()->action("usecache"))->setChecked( !usesCache ); ((TDEToggleAction*)actionCollection()->action("usecache"))->setChecked( !usesCache );
updateIOSlaves(); updateIOSlaves();
} }

@ -57,7 +57,7 @@ UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name,
{ {
setInstance(UAChangerPlugin::instance()); setInstance(UAChangerPlugin::instance());
m_pUAMenu = new KActionMenu( i18n("Change Browser &Identification"), "agent", m_pUAMenu = new TDEActionMenu( i18n("Change Browser &Identification"), "agent",
actionCollection(), "changeuseragent" ); actionCollection(), "changeuseragent" );
m_pUAMenu->setDelayed( false ); m_pUAMenu->setDelayed( false );
connect( m_pUAMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), connect( m_pUAMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ),
@ -226,7 +226,7 @@ void UAChangerPlugin::slotAboutToShow()
AliasConstIterator map = m_mapAlias.begin(); AliasConstIterator map = m_mapAlias.begin();
for( ; map != m_mapAlias.end(); ++map ) for( ; map != m_mapAlias.end(); ++map )
{ {
KPopupMenu *browserMenu = new KPopupMenu; TDEPopupMenu *browserMenu = new TDEPopupMenu;
BrowserGroup::ConstIterator e = map.data().begin(); BrowserGroup::ConstIterator e = map.data().begin();
for( ; e != map.data().end(); ++e ) for( ; e != map.data().end(); ++e )
{ {

@ -30,7 +30,7 @@
#include <tdeparts/plugin.h> #include <tdeparts/plugin.h>
class TDEHTMLPart; class TDEHTMLPart;
class KActionMenu; class TDEActionMenu;
class TDEConfig; class TDEConfig;
namespace TDEIO namespace TDEIO
@ -73,7 +73,7 @@ private:
bool m_bSettingsLoaded; bool m_bSettingsLoaded;
TDEHTMLPart* m_part; TDEHTMLPart* m_part;
KActionMenu* m_pUAMenu; TDEActionMenu* m_pUAMenu;
TDEConfig* m_config; TDEConfig* m_config;
KURL m_currentURL; KURL m_currentURL;

@ -50,21 +50,21 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
{ {
setInstance(PluginValidatorsFactory::instance()); setInstance(PluginValidatorsFactory::instance());
m_menu = new KActionMenu ( i18n( "&Validate Web Page" ), "validators", m_menu = new TDEActionMenu ( i18n( "&Validate Web Page" ), "validators",
actionCollection(), "validateWebpage" ); actionCollection(), "validateWebpage" );
m_menu->setDelayed( false ); m_menu->setDelayed( false );
m_menu->insert( new KAction( i18n( "Validate &HTML" ), m_menu->insert( new TDEAction( i18n( "Validate &HTML" ),
"htmlvalidator", 0, "htmlvalidator", 0,
this, TQT_SLOT(slotValidateHTML()), this, TQT_SLOT(slotValidateHTML()),
actionCollection(), "validateHTML") ); actionCollection(), "validateHTML") );
m_menu->insert( new KAction( i18n( "Validate &CSS" ), m_menu->insert( new TDEAction( i18n( "Validate &CSS" ),
"cssvalidator", 0, "cssvalidator", 0,
this, TQT_SLOT(slotValidateCSS()), this, TQT_SLOT(slotValidateCSS()),
actionCollection(), "validateCSS") ); actionCollection(), "validateCSS") );
m_menu->insert( new KAction( i18n( "Validate &Links" ), m_menu->insert( new TDEAction( i18n( "Validate &Links" ),
0, 0,
this, TQT_SLOT(slotValidateLinks()), this, TQT_SLOT(slotValidateLinks()),
actionCollection(), "validateLinks") ); actionCollection(), "validateLinks") );
@ -73,7 +73,7 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
if ( parent && parent->inherits( "TDEHTMLPart" )) if ( parent && parent->inherits( "TDEHTMLPart" ))
{ {
m_menu->insert( new KAction( i18n( "C&onfigure Validator..." ), m_menu->insert( new TDEAction( i18n( "C&onfigure Validator..." ),
"configure", 0, "configure", 0,
this, TQT_SLOT(slotConfigure()), this, TQT_SLOT(slotConfigure()),
actionCollection(), "configure") ); actionCollection(), "configure") );
@ -90,7 +90,7 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name,
PluginValidators::~PluginValidators() PluginValidators::~PluginValidators()
{ {
delete m_configDialog; delete m_configDialog;
// Dont' delete the action. KActionCollection as parent does the job already // Dont' delete the action. TDEActionCollection as parent does the job already
// and not deleting it at this point also ensures that in case we are not unplugged // and not deleting it at this point also ensures that in case we are not unplugged
// from the GUI yet and the ~KXMLGUIClient destructor will do so it won't hit a // from the GUI yet and the ~KXMLGUIClient destructor will do so it won't hit a
// dead pointer. The kxmlgui factory keeps references to the actions, but it does not // dead pointer. The kxmlgui factory keeps references to the actions, but it does not

@ -35,7 +35,7 @@
#include "validatorsdialog.h" #include "validatorsdialog.h"
#include <tqguardedptr.h> #include <tqguardedptr.h>
class KAction; class TDEAction;
class KURL; class KURL;
class PluginValidators : public KParts::Plugin class PluginValidators : public KParts::Plugin
@ -57,7 +57,7 @@ private slots:
void slotStarted( TDEIO::Job* ); void slotStarted( TDEIO::Job* );
private: private:
KActionMenu *m_menu; TDEActionMenu *m_menu;
TQGuardedPtr<ValidatorsDialog> m_configDialog; // | TQGuardedPtr<ValidatorsDialog> m_configDialog; // |
// +-> Order dependency. // +-> Order dependency.
TDEHTMLPart* m_part; // | TDEHTMLPart* m_part; // |

@ -82,7 +82,7 @@
<cstring>progressBar</cstring> <cstring>progressBar</cstring>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>URL</string> <string>URL</string>

@ -54,7 +54,7 @@ PluginWebArchiver::PluginWebArchiver( TQObject* parent, const char* name,
const TQStringList & ) const TQStringList & )
: Plugin( parent, name ) : Plugin( parent, name )
{ {
(void) new KAction( i18n("Archive &Web Page..."), (void) new TDEAction( i18n("Archive &Web Page..."),
"webarchiver", 0, "webarchiver", 0,
this, TQT_SLOT(slotSaveToArchive()), this, TQT_SLOT(slotSaveToArchive()),
actionCollection(), "archivepage" ); actionCollection(), "archivepage" );

@ -36,7 +36,7 @@
// public methods // public methods
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
KSig::KSig(TQWidget *parent, const char *name) : KMainWindow(parent, name), KSig::KSig(TQWidget *parent, const char *name) : TDEMainWindow(parent, name),
changed(false) changed(false)
{ {
setupActions(); setupActions();
@ -64,17 +64,17 @@ KSig::~KSig()
void KSig::setupActions() void KSig::setupActions()
{ {
KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection()); KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(add()), actionCollection());
new KAction(i18n("Remove"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(remove()), actionCollection(), "remove"); new TDEAction(i18n("Remove"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(remove()), actionCollection(), "remove");
KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection()); KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(save()), actionCollection());
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection());
KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), actionCollection()); KStdAction::cut(TQT_TQOBJECT(kapp), TQT_SLOT(cut()), actionCollection());
KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), actionCollection()); KStdAction::copy(TQT_TQOBJECT(kapp), TQT_SLOT(copy()), actionCollection());
KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), actionCollection()); KStdAction::paste(TQT_TQOBJECT(kapp), TQT_SLOT(paste()), actionCollection());
new KAction(i18n("C&lear"), "editclear", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), actionCollection(), "clear"); new TDEAction(i18n("C&lear"), "editclear", 0, TQT_TQOBJECT(kapp), TQT_SLOT(clear()), actionCollection(), "clear");
new KAction(i18n("Edit Standard Header"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editHeader()), actionCollection(), "editHeader"); new TDEAction(i18n("Edit Standard Header"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editHeader()), actionCollection(), "editHeader");
new KAction(i18n("Edit Standard Footer"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editFooter()), actionCollection(), "editFooter"); new TDEAction(i18n("Edit Standard Footer"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(editFooter()), actionCollection(), "editFooter");
} }
void KSig::setupLayout() void KSig::setupLayout()
@ -103,8 +103,8 @@ void KSig::setupLayout()
void KSig::setupSearchLine() void KSig::setupSearchLine()
{ {
KListViewSearchLineWidget *searchWidget = new KListViewSearchLineWidget(sigList, this); TDEListViewSearchLineWidget *searchWidget = new TDEListViewSearchLineWidget(sigList, this);
new KWidgetAction(searchWidget, i18n("Search"), KShortcut(), 0, 0, actionCollection(), "search"); new KWidgetAction(searchWidget, i18n("Search"), TDEShortcut(), 0, 0, actionCollection(), "search");
} }
void KSig::loadData() void KSig::loadData()

@ -25,7 +25,7 @@
class KTextEdit; class KTextEdit;
class TQSplitter; class TQSplitter;
class KSig : public KMainWindow class KSig : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT

@ -96,19 +96,19 @@ SigListViewItem *SigListView::createItem()
SigListViewItem *SigListView::currentItem() SigListViewItem *SigListView::currentItem()
{ {
return(dynamic_cast<SigListViewItem *>(KListView::currentItem())); return(dynamic_cast<SigListViewItem *>(TDEListView::currentItem()));
} }
const SigListViewItem *SigListView::currentItem() const const SigListViewItem *SigListView::currentItem() const
{ {
return(dynamic_cast<SigListViewItem *>(KListView::currentItem())); return(dynamic_cast<SigListViewItem *>(TDEListView::currentItem()));
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// protected members // protected members
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
SigListView::SigListView(TQWidget *parent, const char *name) : KListView(parent, name) SigListView::SigListView(TQWidget *parent, const char *name) : TDEListView(parent, name)
{ {
addColumn(i18n("Signatures")); addColumn(i18n("Signatures"));

@ -34,7 +34,7 @@ class SigListViewItem;
* be two instances of this widget created. * be two instances of this widget created.
*/ */
class SigListView : public KListView class SigListView : public TDEListView
{ {
Q_OBJECT Q_OBJECT

@ -49,9 +49,9 @@ void SigListViewItem::setText(const TQString &t)
void SigListViewItem::refreshText() void SigListViewItem::refreshText()
{ {
if(!text().isEmpty()) if(!text().isEmpty())
KListViewItem::setText(0, text().simplifyWhiteSpace()); TDEListViewItem::setText(0, text().simplifyWhiteSpace());
else else
KListViewItem::setText(0, emptySigString); TDEListViewItem::setText(0, emptySigString);
} }
void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s) void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s)
@ -74,7 +74,7 @@ void SigListViewItem::nodeToText(const TQDomNode &n, TQString &s)
// private members // private members
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
SigListViewItem::SigListViewItem(TQListView *parent, TQDomDocument document, TQDomElement signatureElement) : KListViewItem(parent) SigListViewItem::SigListViewItem(TQListView *parent, TQDomDocument document, TQDomElement signatureElement) : TDEListViewItem(parent)
{ {
emptySigString = i18n("<empty signature>"); emptySigString = i18n("<empty signature>");

@ -22,7 +22,7 @@
#include <tqdom.h> #include <tqdom.h>
class SigListViewItem : public KListViewItem class SigListViewItem : public TDEListViewItem
{ {
friend class SigListView; friend class SigListView;
public: public:

@ -35,7 +35,7 @@
#define ID_STATUS_MSG 1 #define ID_STATUS_MSG 1
DubApp::DubApp(TQWidget* parent, const char* name) DubApp::DubApp(TQWidget* parent, const char* name)
: KMainWindow(parent, name) : TDEMainWindow(parent, name)
{ {
kdDebug(90010) << "cons dubapp" << endl; kdDebug(90010) << "cons dubapp" << endl;
config=kapp->config(); config=kapp->config();

@ -28,7 +28,7 @@
class DubView; class DubView;
// Application stuff // Application stuff
class DubApp : public KMainWindow class DubApp : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -66,9 +66,9 @@ private:
* changing the view class. * changing the view class.
*/ */
// KAction pointers to enable/disable actions // TDEAction pointers to enable/disable actions
//KAction* fileQuit; //TDEAction* fileQuit;
KAction* fileClose; TDEAction* fileClose;
// signals and slots // signals and slots

@ -54,7 +54,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
// Search box // Search box
TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() ); TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() );
boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) ); boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
providersBox = new KListBox( this, "providersBox" ); providersBox = new TDEListBox( this, "providersBox" );
boxlayout->addWidget(providersBox); boxlayout->addWidget(providersBox);
boxButtons = new KButtonBox( this,Qt::Vertical ); boxButtons = new KButtonBox( this,Qt::Vertical );

@ -6,7 +6,7 @@
#include <klocale.h> #include <klocale.h>
class KLineEdit; class KLineEdit;
class KListBox; class TDEListBox;
class KButtonBox; class KButtonBox;
struct SearchProvider { struct SearchProvider {
@ -30,7 +30,7 @@ class LyricsCModule : public CModule {
void nameChanged( const TQString &name ); void nameChanged( const TQString &name );
void queryChanged( const TQString &query ); void queryChanged( const TQString &query );
protected: protected:
KListBox *providersBox; TDEListBox *providersBox;
KButtonBox *boxButtons; KButtonBox *boxButtons;
KLineEdit *nameEdit; KLineEdit *nameEdit;
KLineEdit *queryEdit; KLineEdit *queryEdit;

@ -23,7 +23,7 @@ extern "C"
Lyrics *lyrics; Lyrics *lyrics;
Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false)
{ {
lyrics = this; lyrics = this;
/* Create default actions */ /* Create default actions */
@ -33,16 +33,16 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
//(void)KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(printPreview()), actionCollection()); //(void)KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(printPreview()), actionCollection());
//(void)KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection()); //(void)KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection());
//(void)KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection()); //(void)KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection());
follow_act = new KToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow"); follow_act = new TDEToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow");
KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection()); KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection());
attach_act = new KToggleAction(i18n("&Link URL to File"), "attach", KShortcut("CTRL+ALT+A"), actionCollection(), "attach_url"); attach_act = new TDEToggleAction(i18n("&Link URL to File"), "attach", TDEShortcut("CTRL+ALT+A"), actionCollection(), "attach_url");
connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool))); connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool)));
back_act = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection()); back_act = KStdAction::back(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection());
back_act->setEnabled(false); back_act->setEnabled(false);
forward_act = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection()); forward_act = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection());
forward_act->setEnabled(false); forward_act->setEnabled(false);
new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "kde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label"); new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "kde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label");
site_act = new KSelectAction(i18n("&Search Provider"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection(), "search_provider"); site_act = new TDESelectAction(i18n("&Search Provider"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection(), "search_provider");
/* Add entry to menu */ /* Add entry to menu */
menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), TQT_TQOBJECT(this), TQT_SLOT(viewLyrics())); menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()));

@ -12,7 +12,7 @@
class HistoryManager; class HistoryManager;
class Lyrics : public KMainWindow, public Plugin { class Lyrics : public TDEMainWindow, public Plugin {
Q_OBJECT Q_OBJECT
@ -41,10 +41,10 @@ protected slots:
private: private:
int menuID; int menuID;
KAction *back_act, *forward_act; TDEAction *back_act, *forward_act;
KToggleAction *follow_act; TDEToggleAction *follow_act;
KToggleAction *attach_act; TDEToggleAction *attach_act;
KSelectAction *site_act; TDESelectAction *site_act;
TDEHTMLPart *htmlpart; TDEHTMLPart *htmlpart;
TQValueVector<SearchProvider> mSites; TQValueVector<SearchProvider> mSites;
HistoryManager *history; HistoryManager *history;

@ -71,7 +71,7 @@ private:
Control::Control() : mConfigurator(0) Control::Control() : mConfigurator(0)
{ {
{ {
KToolBar *tools=toolBar(); TDEToolBar *tools=toolBar();
KStdAction::save(this, TQT_SLOT(save()), actionCollection())->plug(tools); KStdAction::save(this, TQT_SLOT(save()), actionCollection())->plug(tools);
KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection())->plug(tools); KStdAction::saveAs(this, TQT_SLOT(saveAs()), actionCollection())->plug(tools);
KStdAction::open(this, TQT_SLOT(open()), actionCollection())->plug(tools); KStdAction::open(this, TQT_SLOT(open()), actionCollection())->plug(tools);
@ -173,7 +173,7 @@ void Control::currentChanged(TQListViewItem *item)
} }
RendererListView::RendererListView(TQWidget *p) : KListView(p) RendererListView::RendererListView(TQWidget *p) : TDEListView(p)
{ {
addColumn(i18n("Name")); addColumn(i18n("Name"));
header()->hide(); header()->hide();

@ -10,7 +10,7 @@
class Renderer; class Renderer;
class Control : public KMainWindow class Control : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -34,13 +34,13 @@ protected slots:
private: private:
TQWidget *mRight; TQWidget *mRight;
KListView *mTree, *mCreatorsList; TDEListView *mTree, *mCreatorsList;
TQWidget *mConfigurator; TQWidget *mConfigurator;
KURL mCurrentURL; KURL mCurrentURL;
}; };
class RendererListView : public KListView class RendererListView : public TDEListView
{ {
Q_OBJECT Q_OBJECT

@ -72,7 +72,7 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
TQHBox *middle = new TQHBox(this); TQHBox *middle = new TQHBox(this);
middle->setSpacing(7); middle->setSpacing(7);
mSchemaTree = new KListView(middle); mSchemaTree = new TDEListView(middle);
connect( connect(
mSchemaTree, TQT_SIGNAL(currentChanged(TQListViewItem*)), mSchemaTree, TQT_SIGNAL(currentChanged(TQListViewItem*)),
TQT_SLOT(setCurrent(TQListViewItem*)) TQT_SLOT(setCurrent(TQListViewItem*))
@ -171,19 +171,19 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
} }
class QueryGroupItem : public KListViewItem class QueryGroupItem : public TDEListViewItem
{ {
QueryGroup *mItem; QueryGroup *mItem;
public: public:
QueryGroupItem(QueryGroupItem *parent, QueryGroup *group, QueryGroupItem *after=0) QueryGroupItem(QueryGroupItem *parent, QueryGroup *group, QueryGroupItem *after=0)
: KListViewItem(parent, after) : TDEListViewItem(parent, after)
{ {
init(group); init(group);
} }
QueryGroupItem(KListView *parent, QueryGroup *group, QueryGroupItem *after=0) QueryGroupItem(TDEListView *parent, QueryGroup *group, QueryGroupItem *after=0)
: KListViewItem(parent, after) : TDEListViewItem(parent, after)
{ {
init(group); init(group);
} }
@ -199,10 +199,10 @@ public:
} }
QueryGroupItem *parent() QueryGroupItem *parent()
{ return static_cast<QueryGroupItem*>(KListViewItem::parent()); } { return static_cast<QueryGroupItem*>(TDEListViewItem::parent()); }
KListView *listView() TDEListView *listView()
{ return static_cast<KListView*>(KListViewItem::listView()); } { return static_cast<TDEListView*>(TDEListViewItem::listView()); }
private: private:
void init(QueryGroup *group) void init(QueryGroup *group)
@ -510,7 +510,7 @@ SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique)
TQHBox *middle = new TQHBox(this); TQHBox *middle = new TQHBox(this);
middle->setSpacing(7); middle->setSpacing(7);
mSliceList = new KListView(middle); mSliceList = new TDEListView(middle);
TQWhatsThis::add(mSliceList, i18n("The list of slices. A Slice is part of the full collection. This allows you to categorize your playlist. You can add an item to the list by right clicking on it and selecting the Slice you want it in.")); TQWhatsThis::add(mSliceList, i18n("The list of slices. A Slice is part of the full collection. This allows you to categorize your playlist. You can add an item to the list by right clicking on it and selecting the Slice you want it in."));
mSliceList->addColumn(""); mSliceList->addColumn("");
mSliceList->header()->hide(); mSliceList->header()->hide();
@ -535,20 +535,20 @@ SliceConfig::SliceConfig(TQWidget *parent, Oblique *oblique)
} }
class SliceListItem : public KListViewItem class SliceListItem : public TDEListViewItem
{ {
Slice *mSlice; Slice *mSlice;
public: public:
SliceListItem(KListView *parent, Slice *slice) SliceListItem(TDEListView *parent, Slice *slice)
: KListViewItem(parent, slice->name()), mSlice(slice) : TDEListViewItem(parent, slice->name()), mSlice(slice)
{ {
} }
/** /**
* new item * new item
**/ **/
SliceListItem(KListView *parent) SliceListItem(TDEListView *parent)
: KListViewItem(parent, i18n("New Slice")), mSlice(0) : TDEListViewItem(parent, i18n("New Slice")), mSlice(0)
{ {
} }

@ -7,7 +7,7 @@
#include <noatun/pref.h> #include <noatun/pref.h>
#include "query.h" #include "query.h"
class KListView; class TDEListView;
class KLineEdit; class KLineEdit;
class TQDialog; class TQDialog;
class Oblique; class Oblique;
@ -22,7 +22,7 @@ Q_OBJECT
Oblique *mOblique; Oblique *mOblique;
KListView *mSchemaTree; TDEListView *mSchemaTree;
KLineEdit *mPropertyEdit, *mValueEdit, *mPresentationEdit; KLineEdit *mPropertyEdit, *mValueEdit, *mPresentationEdit;
TQComboBox *mSchemaList; TQComboBox *mSchemaList;
@ -87,7 +87,7 @@ class SliceConfig : public TQWidget
Q_OBJECT Q_OBJECT
Oblique *mOblique; Oblique *mOblique;
KListView *mSliceList; TDEListView *mSliceList;
TQPushButton *mAdd, *mRemove; TQPushButton *mAdd, *mRemove;
TQValueList<SliceListItem*> mAddedItems; TQValueList<SliceListItem*> mAddedItems;
TQValueList<Slice*> mRemovedItems; TQValueList<Slice*> mRemovedItems;

@ -8,7 +8,7 @@
#include "tree.h" #include "tree.h"
FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file) FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, File file)
: KPopupMenu(parent) : TDEPopupMenu(parent)
{ {
if (file) if (file)
mFiles.append(file); mFiles.append(file);
@ -40,7 +40,7 @@ static void addTo(TQValueList<File> &files, TreeItem *item)
} }
FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items) FileMenu::FileMenu(TQWidget *parent, Oblique *oblique, TreeItem *items)
: KPopupMenu(parent) : TDEPopupMenu(parent)
{ {
addTo(mFiles, items); addTo(mFiles, items);
@ -93,7 +93,7 @@ SliceListAction::SliceListAction(
const TQString &text, Oblique *oblique, const TQString &text, Oblique *oblique,
TQObject *reciever, const char *slot, TQObject *reciever, const char *slot,
const TQValueList<File> &files, TQObject *parent, const char *name const TQValueList<File> &files, TQObject *parent, const char *name
) : KActionMenu(text, parent, name) ) : TDEActionMenu(text, parent, name)
{ {
mFiles = files; mFiles = files;
mOblique = oblique; mOblique = oblique;
@ -107,7 +107,7 @@ SliceListAction::SliceListAction(
void SliceListAction::slicesModified() void SliceListAction::slicesModified()
{ {
mIndexToSlices.clear(); mIndexToSlices.clear();
KPopupMenu *menu = popupMenu(); TDEPopupMenu *menu = popupMenu();
menu->clear(); menu->clear();
TQPtrList<Slice> slices = mOblique->base()->slices(); TQPtrList<Slice> slices = mOblique->base()->slices();
@ -154,7 +154,7 @@ SchemaListAction::SchemaListAction(
const TQString &text, const TQString &text,
TQObject *reciever, const char *slot, TQObject *reciever, const char *slot,
TQObject *parent, const char *name TQObject *parent, const char *name
) : KActionMenu(text, parent, name) ) : TDEActionMenu(text, parent, name)
{ {
mTree = 0; mTree = 0;
if (reciever) if (reciever)
@ -167,7 +167,7 @@ void SchemaListAction::prepare()
{ {
assert(mTree); assert(mTree);
mIndexToSchemas.clear(); mIndexToSchemas.clear();
KPopupMenu *menu = popupMenu(); TDEPopupMenu *menu = popupMenu();
menu->clear(); menu->clear();
if (!mTree) return; if (!mTree) return;

@ -14,7 +14,7 @@
/** /**
* a context menu for a item in the list * a context menu for a item in the list
**/ **/
class FileMenu : public KPopupMenu class FileMenu : public TDEPopupMenu
{ {
Q_OBJECT Q_OBJECT
@ -33,7 +33,7 @@ private slots:
void toggleInSlice(Slice *slice); void toggleInSlice(Slice *slice);
}; };
class SliceListAction : public KActionMenu class SliceListAction : public TDEActionMenu
{ {
Q_OBJECT Q_OBJECT
@ -57,7 +57,7 @@ private slots:
}; };
class SchemaListAction : public KActionMenu class SchemaListAction : public TDEActionMenu
{ {
Q_OBJECT Q_OBJECT

@ -150,7 +150,7 @@ inline static void sortify(T *item)
TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p) TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQString &p)
: KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) : TDEListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false)
{ {
if (group->option(QueryGroup::Playable)) if (group->option(QueryGroup::Playable))
{ {
@ -162,7 +162,7 @@ TreeItem::TreeItem(Tree *parent, QueryGroup *group, const File &file, const TQSt
} }
TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p) TreeItem::TreeItem(TreeItem *parent, QueryGroup *group, const File &file, const TQString &p)
: KListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false) : TDEListViewItem(parent, p), mGroup(group), mUserOpened(false), mHidden(false)
{ {
if (group->option(QueryGroup::Playable)) if (group->option(QueryGroup::Playable))
{ {
@ -250,7 +250,7 @@ int TreeItem::compare(TQListViewItem *i, int col, bool) const
Tree *TreeItem::tree() Tree *TreeItem::tree()
{ {
return static_cast<Tree*>(KListViewItem::listView()); return static_cast<Tree*>(TDEListViewItem::listView());
} }
TQString TreeItem::presentation() const TQString TreeItem::presentation() const
@ -309,7 +309,7 @@ void TreeItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int w
text.setRgb(r/2,g/2,b/2); text.setRgb(r/2,g/2,b/2);
newcg.setColor(TQColorGroup::Text, text); newcg.setColor(TQColorGroup::Text, text);
} }
KListViewItem::paintCell(p, newcg, column, width, align); TDEListViewItem::paintCell(p, newcg, column, width, align);
font.setUnderline(false); font.setUnderline(false);
p->setFont(font); p->setFont(font);
@ -322,7 +322,7 @@ void TreeItem::setOpen(bool o)
mUserOpened = o; mUserOpened = o;
tree()->removeAutoExpanded(this); tree()->removeAutoExpanded(this);
} }
KListViewItem::setOpen(o); TDEListViewItem::setOpen(o);
} }
void TreeItem::autoExpand() void TreeItem::autoExpand()
@ -432,7 +432,7 @@ TreeItem *TreeItem::next()
Tree::Tree(Oblique *oblique, TQWidget *parent) Tree::Tree(Oblique *oblique, TQWidget *parent)
: KListView(parent), mOblique(oblique), mAutoExpanding(0) : TDEListView(parent), mOblique(oblique), mAutoExpanding(0)
{ {
mCurrent = 0; mCurrent = 0;
lastMenu =0; lastMenu =0;
@ -458,8 +458,8 @@ Tree::Tree(Oblique *oblique, TQWidget *parent)
); );
connect( connect(
this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
TQT_SLOT(contextMenu(KListView*, TQListViewItem*, const TQPoint&)) TQT_SLOT(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&))
); );
connect( connect(
this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SIGNAL(executed(TQListViewItem*)),
@ -500,7 +500,7 @@ void Tree::clear()
napp->player()->stop(); napp->player()->stop();
setCurrent(0); setCurrent(0);
} }
KListView::clear(); TDEListView::clear();
} }
void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme) void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme)
@ -512,7 +512,7 @@ void Tree::movableDropEvent (TQListViewItem* parent, TQListViewItem* afterme)
return; return;
} }
KListView::movableDropEvent(parent, afterme); TDEListView::movableDropEvent(parent, afterme);
} }
@ -533,7 +533,7 @@ void Tree::dropped(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> &
TreeItem *Tree::firstChild() TreeItem *Tree::firstChild()
{ return static_cast<TreeItem*>(KListView::firstChild()); } { return static_cast<TreeItem*>(TDEListView::firstChild()); }
TreeItem *Tree::find(File item) TreeItem *Tree::find(File item)
{ {
@ -682,7 +682,7 @@ bool Tree::setSchema(const TQString &name)
TQDragObject *Tree::dragObject() TQDragObject *Tree::dragObject()
{ {
if (currentItem() && static_cast<TreeItem*>(currentItem())->file()) if (currentItem() && static_cast<TreeItem*>(currentItem())->file())
return KListView::dragObject(); return TDEListView::dragObject();
return 0; return 0;
} }
@ -701,7 +701,7 @@ void Tree::setLimit(const TQString &text)
} }
void Tree::contextMenu(KListView*, TQListViewItem* i, const TQPoint& p) void Tree::contextMenu(TDEListView*, TQListViewItem* i, const TQPoint& p)
{ {
if (!i) return; if (!i) return;
delete lastMenu; delete lastMenu;

@ -14,7 +14,7 @@
class Oblique; class Oblique;
class Tree; class Tree;
class TreeItem : public KListViewItem class TreeItem : public TDEListViewItem
{ {
QueryGroup *mGroup; QueryGroup *mGroup;
File mFile; File mFile;
@ -31,11 +31,11 @@ public:
const QueryGroup *group() const { return mGroup; } const QueryGroup *group() const { return mGroup; }
void setGroup(QueryGroup *group) { mGroup = group; } void setGroup(QueryGroup *group) { mGroup = group; }
TreeItem *parent() { return static_cast<TreeItem*>(KListViewItem::parent()); } TreeItem *parent() { return static_cast<TreeItem*>(TDEListViewItem::parent()); }
Tree *tree(); Tree *tree();
TreeItem *itemBelow() { return static_cast<TreeItem*>(KListViewItem::itemBelow()); } TreeItem *itemBelow() { return static_cast<TreeItem*>(TDEListViewItem::itemBelow()); }
TreeItem *firstChild() { return static_cast<TreeItem*>(KListViewItem::firstChild()); } TreeItem *firstChild() { return static_cast<TreeItem*>(TDEListViewItem::firstChild()); }
TreeItem *nextSibling() { return static_cast<TreeItem*>(KListViewItem::nextSibling()); } TreeItem *nextSibling() { return static_cast<TreeItem*>(TDEListViewItem::nextSibling()); }
// for gdb, which sucks. // for gdb, which sucks.
TQString presentation() const; TQString presentation() const;
@ -83,7 +83,7 @@ private:
class FileMenu; class FileMenu;
class Loader; class Loader;
class Tree : public KListView class Tree : public TDEListView
{ {
Q_OBJECT Q_OBJECT
@ -151,7 +151,7 @@ public slots:
void setLimit(const TQString &text); void setLimit(const TQString &text);
private slots: private slots:
void contextMenu(KListView* l, TQListViewItem* i, const TQPoint& p); void contextMenu(TDEListView* l, TQListViewItem* i, const TQPoint& p);
void play(TQListViewItem *item); void play(TQListViewItem *item);
void destroyLoader(); void destroyLoader();

@ -30,7 +30,7 @@ public:
View::View(Oblique *oblique) View::View(Oblique *oblique)
: KMainWindow(0, 0) : TDEMainWindow(0, 0)
{ {
mOblique = oblique; mOblique = oblique;
mTree = 0; mTree = 0;
@ -41,13 +41,13 @@ View::View(Oblique *oblique)
setCentralWidget(mTabs); setCentralWidget(mTabs);
KAction *ac; TDEAction *ac;
ac = new KAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files"); ac = new TDEAction(i18n("Add &Files..."), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(addFiles()), actionCollection(), "add_files");
ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection.")); ac->setWhatsThis(i18n("Add a reference to a media file on disk to this collection."));
ac = new KAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir"); ac = new TDEAction(i18n("Add Fol&ders..."), "folder", 0, TQT_TQOBJECT(this), TQT_SLOT(addDirectory()), actionCollection(), "add_dir");
// ac = new KAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload"); // ac = new TDEAction(i18n("&Reload"), "reload", 0, oblique, TQT_SLOT(reload()), actionCollection(), "reload");
// ac->setWhatsThis(i18n("Reread the collection and meta-information from its files.")); // ac->setWhatsThis(i18n("Reread the collection and meta-information from its files."));
ac = new SliceListAction( ac = new SliceListAction(
@ -61,12 +61,12 @@ View::View(Oblique *oblique)
); );
mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree.")); mSchemaListAction->setWhatsThis(i18n("Select a schema to use to collate the tree."));
ac = new KAction( ac = new TDEAction(
i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT(addTab()), i18n("&New Tab"), "tab_new", "CTRL+SHIFT+N;CTRL+T", TQT_TQOBJECT(this), TQT_SLOT(addTab()),
actionCollection(), "newtab" actionCollection(), "newtab"
); );
mRemoveTabAction = new KAction( mRemoveTabAction = new TDEAction(
i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(removeTab()), i18n("&Close Current Tab"), "tab_remove", CTRL+Key_W, TQT_TQOBJECT(this), TQT_SLOT(removeTab()),
actionCollection(), "removecurrenttab" actionCollection(), "removecurrenttab"
); );
@ -79,7 +79,7 @@ View::View(Oblique *oblique)
TQt::AlignVCenter | TQt::ShowPrefix TQt::AlignVCenter | TQt::ShowPrefix
); );
l->adjustSize(); l->adjustSize();
new KWidgetAction(l, i18n("&Jump:"), KShortcut(ALT + Key_J), 0, 0, actionCollection(), "jump_label"); new KWidgetAction(l, i18n("&Jump:"), TDEShortcut(ALT + Key_J), 0, 0, actionCollection(), "jump_label");
LineEditAction *jumpAction = new LineEditAction(i18n("Jump Bar"), 0, 0, actionCollection(), "jump_text"); LineEditAction *jumpAction = new LineEditAction(i18n("Jump Bar"), 0, 0, actionCollection(), "jump_text");
jumpAction->setWhatsThis(i18n("Only display items which contain this string")); jumpAction->setWhatsThis(i18n("Only display items which contain this string"));
@ -241,8 +241,8 @@ void View::use(Slice *s)
LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name) LineEditAction::LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, TDEActionCollection *parent, const char *name)
: KWidgetAction(new KLineEdit(0), text, KShortcut(0), reciever, slot, parent, name) : KWidgetAction(new KLineEdit(0), text, TDEShortcut(0), reciever, slot, parent, name)
{ {
setAutoSized(true); setAutoSized(true);
} }

@ -13,7 +13,7 @@
class SchemaListAction; class SchemaListAction;
class TabWidget; class TabWidget;
class View : public KMainWindow class View : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -21,7 +21,7 @@ Q_OBJECT
Tree *mTree; Tree *mTree;
TQValueList<Tree*> mTrees; TQValueList<Tree*> mTrees;
TabWidget *mTabs; TabWidget *mTabs;
KAction *mRemoveTabAction; TDEAction *mRemoveTabAction;
SchemaListAction *mSchemaListAction; SchemaListAction *mSchemaListAction;
public: public:
@ -62,7 +62,7 @@ class LineEditAction : public KWidgetAction
Q_OBJECT Q_OBJECT
public: public:
LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, KActionCollection *parent, const char *name); LineEditAction(const TQString &text, const TQObject *reciever, const char *slot, TDEActionCollection *parent, const char *name);
KLineEdit *widget() { return static_cast<KLineEdit*>(KWidgetAction::widget()); } KLineEdit *widget() { return static_cast<KLineEdit*>(KWidgetAction::widget()); }
KLineEdit *lineEdit() { return widget(); } KLineEdit *lineEdit() { return widget(); }

@ -139,7 +139,7 @@ void WaveCapture::saveAs()
{ {
KURL url = dlg.selectedURL(); KURL url = dlg.selectedURL();
if (url.isValid()) if (url.isValid())
KRecentDocument::add( url ); TDERecentDocument::add( url );
m_job = TDEIO::file_move( KURL( filename2 ), url, -1, true ); m_job = TDEIO::file_move( KURL( filename2 ), url, -1, true );
connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( copyFinished( TDEIO::Job* ) ) ); connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( copyFinished( TDEIO::Job* ) ) );

Loading…
Cancel
Save