Rename a number of classes to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 2e53bd0b77
commit 9c9412b30c

@ -13,15 +13,15 @@
#include <tqdatastream.h> #include <tqdatastream.h>
#include <tqvbox.h> #include <tqvbox.h>
CategoryItem::CategoryItem( KListView *parent, const TQString &category ) CategoryItem::CategoryItem( TDEListView *parent, const TQString &category )
: KListViewItem( parent ), : TDEListViewItem( parent ),
m_category( category ) m_category( category )
{ {
init(); init();
} }
CategoryItem::CategoryItem( KListViewItem *parent, const TQString &category ) CategoryItem::CategoryItem( TDEListViewItem *parent, const TQString &category )
: KListViewItem( parent ), : TDEListViewItem( parent ),
m_category( category ) m_category( category )
{ {
init(); init();
@ -41,7 +41,7 @@ void CategoryItem::setOpen( bool open )
populate(); populate();
m_populated = true; m_populated = true;
} }
KListViewItem::setOpen( open ); TDEListViewItem::setOpen( open );
} }
void CategoryItem::populate() void CategoryItem::populate()
@ -63,7 +63,7 @@ void CategoryItem::gotCategories( const TQStringList &categories )
new CategoryItem( this, *it ); new CategoryItem( this, *it );
if ( !categories.isEmpty() ) if ( !categories.isEmpty() )
KListViewItem::setOpen( true ); TDEListViewItem::setOpen( true );
} }
DCOPRSSIface::DCOPRSSIface( TQObject *parent, const char *name ) : DCOPRSSIface::DCOPRSSIface( TQObject *parent, const char *name ) :
@ -97,7 +97,7 @@ FeedBrowserDlg::FeedBrowserDlg( TQWidget *parent, const char *name )
TQVBox *mainWidget = makeVBoxMainWidget(); TQVBox *mainWidget = makeVBoxMainWidget();
m_feedList = new KListView( mainWidget, "m_feedList" ); m_feedList = new TDEListView( mainWidget, "m_feedList" );
m_feedList->setAllColumnsShowFocus( true ); m_feedList->setAllColumnsShowFocus( true );
m_feedList->setRootIsDecorated( true ); m_feedList->setRootIsDecorated( true );
m_feedList->addColumn( i18n( "Name" ) ); m_feedList->addColumn( i18n( "Name" ) );

@ -24,13 +24,13 @@ class DCOPRSSIface : public TQObject, public DCOPObject
void gotCategories( const TQStringList &categories ); void gotCategories( const TQStringList &categories );
}; };
class CategoryItem : public TQObject, public KListViewItem class CategoryItem : public TQObject, public TDEListViewItem
{ {
Q_OBJECT Q_OBJECT
// //
public: public:
CategoryItem( KListView *parent, const TQString &category ); CategoryItem( TDEListView *parent, const TQString &category );
CategoryItem( KListViewItem *parent, const TQString &category ); CategoryItem( TDEListViewItem *parent, const TQString &category );
virtual void setOpen( bool open ); virtual void setOpen( bool open );
@ -62,7 +62,7 @@ class FeedBrowserDlg : public KDialogBase
void getTopCategories(); void getTopCategories();
DCOPRSSIface *m_dcopIface; DCOPRSSIface *m_dcopIface;
KListView *m_feedList; TDEListView *m_feedList;
}; };
#endif // FEEDBROWSER_H #endif // FEEDBROWSER_H

@ -112,9 +112,9 @@ HiddenFileView::HiddenFileView(ShareDlgImpl* shareDlg, SambaShare* share)
_share = share; _share = share;
_dlg = shareDlg; _dlg = shareDlg;
_hiddenActn = new KToggleAction(i18n("&Hide")); _hiddenActn = new TDEToggleAction(i18n("&Hide"));
_vetoActn = new KToggleAction(i18n("&Veto")); _vetoActn = new TDEToggleAction(i18n("&Veto"));
_vetoOplockActn = new KToggleAction(i18n("&Veto Oplock")); _vetoOplockActn = new TDEToggleAction(i18n("&Veto Oplock"));
initListView(); initListView();
@ -166,14 +166,14 @@ void HiddenFileView::initListView()
_vetoList = createRegExpList(_share->getValue("veto files")); _vetoList = createRegExpList(_share->getValue("veto files"));
_vetoOplockList = createRegExpList(_share->getValue("veto oplock files")); _vetoOplockList = createRegExpList(_share->getValue("veto oplock files"));
_popup = new KPopupMenu(_dlg->hiddenListView); _popup = new TDEPopupMenu(_dlg->hiddenListView);
_hiddenActn->plug(_popup); _hiddenActn->plug(_popup);
_vetoActn->plug(_popup); _vetoActn->plug(_popup);
_vetoOplockActn->plug(_popup); _vetoOplockActn->plug(_popup);
connect( _dlg->hiddenListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); connect( _dlg->hiddenListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
connect( _dlg->hiddenListView, TQT_SIGNAL(contextMenu(KListView*,TQListViewItem*,const TQPoint&)), connect( _dlg->hiddenListView, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)),
this, TQT_SLOT(showContextMenu())); this, TQT_SLOT(showContextMenu()));
connect( _dlg->hideDotFilesChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(hideDotFilesChkClicked(bool))); connect( _dlg->hideDotFilesChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(hideDotFilesChkClicked(bool)));
@ -360,7 +360,7 @@ void HiddenFileView::selectionChanged()
} }
} }
void HiddenFileView::checkBoxClicked(TQCheckBox* chkBox,KToggleAction* action,TQLineEdit* edit, int column,TQPtrList<TQRegExp> & reqExpList,bool b) { void HiddenFileView::checkBoxClicked(TQCheckBox* chkBox,TDEToggleAction* action,TQLineEdit* edit, int column,TQPtrList<TQRegExp> & reqExpList,bool b) {
// We don't save the old state so // We don't save the old state so
// disable the tristate mode // disable the tristate mode
chkBox->setTristate(false); chkBox->setTristate(false);

@ -54,8 +54,8 @@ protected:
KFileItem *_fileItem; KFileItem *_fileItem;
}; };
class KToggleAction; class TDEToggleAction;
class KPopupMenu; class TDEPopupMenu;
class ShareDlgImpl; class ShareDlgImpl;
@ -95,11 +95,11 @@ protected:
TQPtrList<TQRegExp> _vetoList; TQPtrList<TQRegExp> _vetoList;
TQPtrList<TQRegExp> _vetoOplockList; TQPtrList<TQRegExp> _vetoOplockList;
KToggleAction* _hiddenActn; TDEToggleAction* _hiddenActn;
KToggleAction* _vetoActn; TDEToggleAction* _vetoActn;
KToggleAction* _vetoOplockActn; TDEToggleAction* _vetoOplockActn;
KPopupMenu* _popup; TDEPopupMenu* _popup;
void initListView(); void initListView();
@ -130,7 +130,7 @@ protected slots:
void hiddenChkClicked(bool b); void hiddenChkClicked(bool b);
void vetoChkClicked(bool b); void vetoChkClicked(bool b);
void vetoOplockChkClicked(bool b); void vetoOplockChkClicked(bool b);
void checkBoxClicked(TQCheckBox* chkBox,KToggleAction* action,TQLineEdit* edit,int column,TQPtrList<TQRegExp> &reqExpList,bool b); void checkBoxClicked(TQCheckBox* chkBox,TDEToggleAction* action,TQLineEdit* edit,int column,TQPtrList<TQRegExp> &reqExpList,bool b);
void columnClicked(int column); void columnClicked(int column);
void showContextMenu(); void showContextMenu();
void updateView(); void updateView();

@ -659,7 +659,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>
@ -807,7 +807,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>
@ -983,7 +983,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>
@ -1161,7 +1161,7 @@ and reappear on the right-hand side, as UNIX users which are not Samba users.
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>

@ -1080,7 +1080,7 @@ void KcmSambaConf::loadUserTab()
it=added.find(unixUser->name); it=added.find(unixUser->name);
if (it == added.end()) if (it == added.end())
new KListViewItem(_interface->unixUsersListView, unixUser->name, TQString::number(unixUser->uid)); new TDEListViewItem(_interface->unixUsersListView, unixUser->name, TQString::number(unixUser->uid));
} }
_interface->unixUsersListView->setSelectionMode(TQListView::Extended); _interface->unixUsersListView->setSelectionMode(TQListView::Extended);
@ -1215,7 +1215,7 @@ void KcmSambaConf::removeSambaUserBtnClicked()
continue; continue;
} }
new KListViewItem(_interface->unixUsersListView, item->text(0), item->text(1)); new TDEListViewItem(_interface->unixUsersListView, item->text(0), item->text(1));
list.remove(item); list.remove(item);
delete item; delete item;
} }

@ -566,7 +566,7 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>

@ -40,8 +40,8 @@
class SambaShare; class SambaShare;
class TQWidget; class TQWidget;
class KPopupMenu; class TDEPopupMenu;
class KToggleAction; class TDEToggleAction;
class TQGroupBox; class TQGroupBox;
class UserTabImpl; class UserTabImpl;
class HiddenFileView; class HiddenFileView;

@ -37,7 +37,7 @@
*@author Jan Schäfer *@author Jan Schäfer
*/ */
class KListViewItem; class TDEListViewItem;
class SambaShare; class SambaShare;
/** /**

@ -65,7 +65,7 @@ void NFSDialog::initGUI() {
TQVBoxLayout *layout = new TQVBoxLayout( page ); TQVBoxLayout *layout = new TQVBoxLayout( page );
layout->addWidget( m_gui ); layout->addWidget( m_gui );
KAccel* accel = new KAccel( m_gui->listView ); TDEAccel* accel = new TDEAccel( m_gui->listView );
accel->insert( "Delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveHost())); accel->insert( "Delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveHost()));
} }

@ -96,7 +96,7 @@ The first column shows the name or address of the host, the second column shows
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="KListView" row="0" column="0" rowspan="4" colspan="1"> <widget class="TDEListView" row="0" column="0" rowspan="4" colspan="1">
<column> <column>
<property name="text"> <property name="text">
<string>Name/Address</string> <string>Name/Address</string>

@ -297,7 +297,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>Path</string> <string>Path</string>

@ -163,7 +163,7 @@ void KFileShareConfig::updateShareListView()
TQPixmap cancelPix = SmallIcon("button_cancel"); TQPixmap cancelPix = SmallIcon("button_cancel");
for ( TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it ) { for ( TQStringList::Iterator it = dirs.begin(); it != dirs.end(); ++it ) {
KListViewItem* item = new KListViewItem(m_ccgui->listView); TDEListViewItem* item = new TDEListViewItem(m_ccgui->listView);
item->setText(0,*it); item->setText(0,*it);
item->setPixmap(0, folderPix); item->setPixmap(0, folderPix);

@ -71,7 +71,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListBox" row="0" column="0" rowspan="3" colspan="1"> <widget class="TDEListBox" row="0" column="0" rowspan="3" colspan="1">
<property name="name"> <property name="name">
<cstring>listBox</cstring> <cstring>listBox</cstring>
</property> </property>

@ -9,7 +9,7 @@
------------------------------------------------------------- -------------------------------------------------------------
DictComboAction, special KAction subclasses used DictComboAction, special TDEAction subclasses used
DictLabelAction, in the toolbar DictLabelAction, in the toolbar
DictButtonAction DictButtonAction
@ -26,7 +26,7 @@
DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name, DictComboAction::DictComboAction( const TQString &text, TQObject *parent, const char *name,
bool editable, bool autoSized ) bool editable, bool autoSized )
: KAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(TDEGlobalSettings::completionMode()) : TDEAction( text, 0, parent, name ), m_editable(editable), m_autoSized(autoSized), m_compMode(TDEGlobalSettings::completionMode())
{ {
} }
@ -38,10 +38,10 @@ DictComboAction::~DictComboAction()
int DictComboAction::plug( TQWidget *widget, int index ) int DictComboAction::plug( TQWidget *widget, int index )
{ {
if ( widget->inherits( "KToolBar" ) ) if ( widget->inherits( "TDEToolBar" ) )
{ {
KToolBar* bar = static_cast<KToolBar*>( widget ); TDEToolBar* bar = static_cast<TDEToolBar*>( widget );
int id_ = KAction::getToolButtonID(); int id_ = TDEAction::getToolButtonID();
m_combo = new KComboBox(m_editable,bar); m_combo = new KComboBox(m_editable,bar);
m_combo->setCompletionMode(m_compMode); m_combo->setCompletionMode(m_compMode);
@ -68,9 +68,9 @@ int DictComboAction::plug( TQWidget *widget, int index )
void DictComboAction::unplug( TQWidget *widget ) void DictComboAction::unplug( TQWidget *widget )
{ {
if ( widget->inherits( "KToolBar" ) ) if ( widget->inherits( "TDEToolBar" ) )
{ {
KToolBar *bar = (KToolBar *)widget; TDEToolBar *bar = (TDEToolBar *)widget;
int idx = findContainer( bar ); int idx = findContainer( bar );
@ -194,7 +194,7 @@ void DictComboAction::slotComboActivated(const TQString &s)
DictLabelAction::DictLabelAction( const TQString &text, TQObject *parent, const char *name ) DictLabelAction::DictLabelAction( const TQString &text, TQObject *parent, const char *name )
: KAction( text, 0, parent, name ) : TDEAction( text, 0, parent, name )
{ {
} }
@ -206,11 +206,11 @@ DictLabelAction::~DictLabelAction()
int DictLabelAction::plug( TQWidget *widget, int index ) int DictLabelAction::plug( TQWidget *widget, int index )
{ {
if ( widget->inherits( "KToolBar" ) ) if ( widget->inherits( "TDEToolBar" ) )
{ {
KToolBar *tb = (KToolBar *)widget; TDEToolBar *tb = (TDEToolBar *)widget;
int id = KAction::getToolButtonID(); int id = TDEAction::getToolButtonID();
TQLabel *label = new TQLabel( text(), widget, "kde toolbar widget" ); TQLabel *label = new TQLabel( text(), widget, "kde toolbar widget" );
label->setMinimumWidth(label->sizeHint().width()); label->setMinimumWidth(label->sizeHint().width());
@ -235,9 +235,9 @@ int DictLabelAction::plug( TQWidget *widget, int index )
void DictLabelAction::unplug( TQWidget *widget ) void DictLabelAction::unplug( TQWidget *widget )
{ {
if ( widget->inherits( "KToolBar" ) ) if ( widget->inherits( "TDEToolBar" ) )
{ {
KToolBar *bar = (KToolBar *)widget; TDEToolBar *bar = (TDEToolBar *)widget;
int idx = findContainer( bar ); int idx = findContainer( bar );
@ -264,7 +264,7 @@ void DictLabelAction::setBuddy(TQWidget *buddy)
DictButtonAction::DictButtonAction( const TQString& text, TQObject* receiver, DictButtonAction::DictButtonAction( const TQString& text, TQObject* receiver,
const char* slot, TQObject* parent, const char* name ) const char* slot, TQObject* parent, const char* name )
: KAction( text, 0, receiver, slot, parent, name ) : TDEAction( text, 0, receiver, slot, parent, name )
{ {
} }
@ -276,11 +276,11 @@ DictButtonAction::~DictButtonAction()
int DictButtonAction::plug( TQWidget *widget, int index ) int DictButtonAction::plug( TQWidget *widget, int index )
{ {
if ( widget->inherits( "KToolBar" ) ) if ( widget->inherits( "TDEToolBar" ) )
{ {
KToolBar *tb = (KToolBar *)widget; TDEToolBar *tb = (TDEToolBar *)widget;
int id = KAction::getToolButtonID(); int id = TDEAction::getToolButtonID();
TQPushButton *button = new TQPushButton( text(), widget ); TQPushButton *button = new TQPushButton( text(), widget );
button->adjustSize(); button->adjustSize();
@ -302,9 +302,9 @@ int DictButtonAction::plug( TQWidget *widget, int index )
void DictButtonAction::unplug( TQWidget *widget ) void DictButtonAction::unplug( TQWidget *widget )
{ {
if ( widget->inherits( "KToolBar" ) ) if ( widget->inherits( "TDEToolBar" ) )
{ {
KToolBar *bar = (KToolBar *)widget; TDEToolBar *bar = (TDEToolBar *)widget;
int idx = findContainer( bar ); int idx = findContainer( bar );

@ -9,7 +9,7 @@
------------------------------------------------------------- -------------------------------------------------------------
DictComboAction, special KAction subclasses used DictComboAction, special TDEAction subclasses used
DictLabelAction, in the toolbar DictLabelAction, in the toolbar
DictButtonAction DictButtonAction
@ -28,7 +28,7 @@ class TQLabel;
class TQPushButton; class TQPushButton;
class DictComboAction : public KAction class DictComboAction : public TDEAction
{ {
Q_OBJECT Q_OBJECT
@ -71,7 +71,7 @@ class DictComboAction : public KAction
}; };
class DictLabelAction : public KAction class DictLabelAction : public TDEAction
{ {
Q_OBJECT Q_OBJECT
@ -91,7 +91,7 @@ class DictLabelAction : public KAction
}; };
class DictButtonAction : public KAction class DictButtonAction : public TDEAction
{ {
Q_OBJECT Q_OBJECT

@ -157,7 +157,7 @@ MatchView::MatchView(TQWidget *parent, const char *name)
connect(w_getAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(getAll())); connect(w_getAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(getAll()));
boxLayout->addWidget(w_getAll,0); boxLayout->addWidget(w_getAll,0);
connect(interface,TQT_SIGNAL(matchReady(const TQStringList &)),this,TQT_SLOT(newList(const TQStringList &))); connect(interface,TQT_SIGNAL(matchReady(const TQStringList &)),this,TQT_SLOT(newList(const TQStringList &)));
rightBtnMenu = new KPopupMenu(); rightBtnMenu = new TDEPopupMenu();
} }

@ -18,7 +18,7 @@
#define _MATCHVIEW_H_ #define _MATCHVIEW_H_
#include <tqlistview.h> #include <tqlistview.h>
class KPopupMenu; class TDEPopupMenu;
//********* MatchViewItem ******************************************** //********* MatchViewItem ********************************************
@ -98,7 +98,7 @@ private:
bool getOn, getAllOn; bool getOn, getAllOn;
KPopupMenu *rightBtnMenu; TDEPopupMenu *rightBtnMenu;
MatchViewItem *popupCurrent; MatchViewItem *popupCurrent;
TQString popupClip; // needed for rightbtn-popup menu TQString popupClip; // needed for rightbtn-popup menu
}; };

@ -901,9 +901,9 @@ void OptionsDialog::slotFontItemSelected(TQListBoxItem *it)
if (it) { if (it) {
FontListItem *fontItem = static_cast<FontListItem*>(it); FontListItem *fontItem = static_cast<FontListItem*>(it);
TQFont font = fontItem->font(); TQFont font = fontItem->font();
int result = KFontDialog::getFont(font,false,this); int result = TDEFontDialog::getFont(font,false,this);
if (result == KFontDialog::Accepted) { if (result == TDEFontDialog::Accepted) {
fontItem->setFont(font); fontItem->setFont(font);
f_List->triggerUpdate(false); f_List->triggerUpdate(false);
slotChanged(); slotChanged();

@ -143,7 +143,7 @@ QueryView::QueryView(TQWidget *_parent)
setFocusPolicy(TQ_NoFocus); setFocusPolicy(TQ_NoFocus);
connect(part, TQT_SIGNAL(completed()), TQT_SLOT(partCompleted())); connect(part, TQT_SIGNAL(completed()), TQT_SLOT(partCompleted()));
connect(part, TQT_SIGNAL(middleButtonClicked()), TQT_SLOT(middleButtonClicked())); connect(part, TQT_SIGNAL(middleButtonClicked()), TQT_SLOT(middleButtonClicked()));
rightBtnMenu = new KPopupMenu(this); rightBtnMenu = new TDEPopupMenu(this);
connect(part,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),this,TQT_SLOT(buildPopupMenu(const TQString &, const TQPoint &))); connect(part,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),this,TQT_SLOT(buildPopupMenu(const TQString &, const TQPoint &)));
connect(part->browserExtension(),TQT_SIGNAL(openURLRequest(const KURL &,const KParts::URLArgs &)), connect(part->browserExtension(),TQT_SIGNAL(openURLRequest(const KURL &,const KParts::URLArgs &)),
this,TQT_SLOT(slotURLRequest(const KURL &,const KParts::URLArgs &))); this,TQT_SLOT(slotURLRequest(const KURL &,const KParts::URLArgs &)));
@ -157,7 +157,7 @@ QueryView::~QueryView()
{} {}
void QueryView::setActions(KToolBarPopupAction* NactBack, KToolBarPopupAction* NactForward, DictComboAction* NactQueryCombo) void QueryView::setActions(TDEToolBarPopupAction* NactBack, TDEToolBarPopupAction* NactForward, DictComboAction* NactQueryCombo)
{ {
actBack = NactBack; actBack = NactBack;
connect(actBack->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(browseBack(int))); connect(actBack->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(browseBack(int)));
@ -282,7 +282,7 @@ void QueryView::copySelection()
void QueryView::showFindDialog() void QueryView::showFindDialog()
{ {
KAction *act = part->actionCollection()->action("find"); TDEAction *act = part->actionCollection()->action("find");
if (act) if (act)
act->activate(); act->activate();
} }

@ -24,7 +24,7 @@
class TQFile; class TQFile;
class KTempFile; class KTempFile;
class KPopupMenu; class TDEPopupMenu;
class DictComboAction; class DictComboAction;
@ -106,7 +106,7 @@ public:
QueryView(TQWidget *_parent = 0L); QueryView(TQWidget *_parent = 0L);
~QueryView(); ~QueryView();
void setActions(KToolBarPopupAction* NactBack, KToolBarPopupAction* NactForward, DictComboAction* NactQueryCombo); void setActions(TDEToolBarPopupAction* NactBack, TDEToolBarPopupAction* NactForward, DictComboAction* NactQueryCombo);
bool browseBackPossible() const; bool browseBackPossible() const;
bool browseForwardPossible() const; bool browseForwardPossible() const;
@ -164,10 +164,10 @@ private:
DictHTMLPart *part; // Widgets DictHTMLPart *part; // Widgets
KToolBarPopupAction *actBack, *actForward; TDEToolBarPopupAction *actBack, *actForward;
DictComboAction *actQueryCombo; DictComboAction *actQueryCombo;
KPopupMenu *rightBtnMenu; TDEPopupMenu *rightBtnMenu;
TQString popupLink,popupSelect; // needed for rightbtn-popup menu TQString popupLink,popupSelect; // needed for rightbtn-popup menu
TQPtrList<BrowseData> browseList; TQPtrList<BrowseData> browseList;

@ -51,7 +51,7 @@ GlobalData *global;
TopLevel::TopLevel(TQWidget* parent, const char* name) TopLevel::TopLevel(TQWidget* parent, const char* name)
: DCOPObject("KDictIface"), KMainWindow(parent, name, WType_TopLevel), : DCOPObject("KDictIface"), TDEMainWindow(parent, name, WType_TopLevel),
optDlg(0L), setsDlg(0L), stopRef(0) optDlg(0L), setsDlg(0L), stopRef(0)
{ {
kapp->dcopClient()->setDefaultObject(objId()); kapp->dcopClient()->setDefaultObject(objId());
@ -313,9 +313,9 @@ void TopLevel::setupActions()
actSave->setEnabled(false); actSave->setEnabled(false);
actPrint = KStdAction::print(TQT_TQOBJECT(queryView), TQT_SLOT(printQuery()), actionCollection()); actPrint = KStdAction::print(TQT_TQOBJECT(queryView), TQT_SLOT(printQuery()), actionCollection());
actPrint->setEnabled(false); actPrint->setEnabled(false);
actStartQuery = new KAction(i18n("St&art Query"),"reload", 0 , TQT_TQOBJECT(this), actStartQuery = new TDEAction(i18n("St&art Query"),"reload", 0 , TQT_TQOBJECT(this),
TQT_SLOT(doDefine()), actionCollection(), "start_query"); TQT_SLOT(doDefine()), actionCollection(), "start_query");
actStopQuery = new KAction(i18n("St&op Query"),"stop", 0 , TQT_TQOBJECT(this), actStopQuery = new TDEAction(i18n("St&op Query"),"stop", 0 , TQT_TQOBJECT(this),
TQT_SLOT(stopClients()), actionCollection(), "stop_query"); TQT_SLOT(stopClients()), actionCollection(), "stop_query");
actStopQuery->setEnabled(false); actStopQuery->setEnabled(false);
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection()); KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection());
@ -324,43 +324,43 @@ void TopLevel::setupActions()
actCopy = KStdAction::copy(TQT_TQOBJECT(queryView), TQT_SLOT(copySelection()), actionCollection()); actCopy = KStdAction::copy(TQT_TQOBJECT(queryView), TQT_SLOT(copySelection()), actionCollection());
actCopy->setEnabled(false); actCopy->setEnabled(false);
KStdAction::selectAll(TQT_TQOBJECT(queryView), TQT_SLOT(selectAll()), actionCollection()); KStdAction::selectAll(TQT_TQOBJECT(queryView), TQT_SLOT(selectAll()), actionCollection());
new KAction(i18n("&Define Clipboard Content"), "define_clip", 0 , TQT_TQOBJECT(this), new TDEAction(i18n("&Define Clipboard Content"), "define_clip", 0 , TQT_TQOBJECT(this),
TQT_SLOT(defineClipboard()), actionCollection(), "define_clipboard"); TQT_SLOT(defineClipboard()), actionCollection(), "define_clipboard");
new KAction(i18n("&Match Clipboard Content"), 0 , TQT_TQOBJECT(this), new TDEAction(i18n("&Match Clipboard Content"), 0 , TQT_TQOBJECT(this),
TQT_SLOT(matchClipboard()), actionCollection(), "match_clipboard"); TQT_SLOT(matchClipboard()), actionCollection(), "match_clipboard");
KStdAction::find(TQT_TQOBJECT(queryView), TQT_SLOT(showFindDialog()), actionCollection()); KStdAction::find(TQT_TQOBJECT(queryView), TQT_SLOT(showFindDialog()), actionCollection());
// history menu... // history menu...
actBack = new KToolBarPopupAction(i18n("&Back"), "back", KStdAccel::shortcut(KStdAccel::Back), actBack = new TDEToolBarPopupAction(i18n("&Back"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back),
TQT_TQOBJECT(queryView), TQT_SLOT(browseBack()), actionCollection(),"browse_back"); TQT_TQOBJECT(queryView), TQT_SLOT(browseBack()), actionCollection(),"browse_back");
actBack->setDelayed(true); actBack->setDelayed(true);
actBack->setStickyMenu(false); actBack->setStickyMenu(false);
actBack->setEnabled(false); actBack->setEnabled(false);
actForward = new KToolBarPopupAction(i18n("&Forward"), "forward", KStdAccel::shortcut(KStdAccel::Forward), actForward = new TDEToolBarPopupAction(i18n("&Forward"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward),
TQT_TQOBJECT(queryView), TQT_SLOT(browseForward()), actionCollection(),"browse_forward"); TQT_TQOBJECT(queryView), TQT_SLOT(browseForward()), actionCollection(),"browse_forward");
actForward->setDelayed(true); actForward->setDelayed(true);
actForward->setStickyMenu(false); actForward->setStickyMenu(false);
actForward->setEnabled(false); actForward->setEnabled(false);
new KAction(i18n("&Clear History"), 0 , TQT_TQOBJECT(this), new TDEAction(i18n("&Clear History"), 0 , TQT_TQOBJECT(this),
TQT_SLOT(clearQueryHistory()), actionCollection(), "clear_history"); TQT_SLOT(clearQueryHistory()), actionCollection(), "clear_history");
// server menu... // server menu...
new KAction(i18n("&Get Capabilities"), 0 , interface, new TDEAction(i18n("&Get Capabilities"), 0 , interface,
TQT_SLOT(updateServer()), actionCollection(), "get_capabilities"); TQT_SLOT(updateServer()), actionCollection(), "get_capabilities");
new KAction(i18n("Edit &Database Sets..."), "edit", 0 , TQT_TQOBJECT(this), new TDEAction(i18n("Edit &Database Sets..."), "edit", 0 , TQT_TQOBJECT(this),
TQT_SLOT(showSetsDialog()), actionCollection(), "edit_sets"); TQT_SLOT(showSetsDialog()), actionCollection(), "edit_sets");
new KAction(i18n("&Summary"), 0 , interface, new TDEAction(i18n("&Summary"), 0 , interface,
TQT_SLOT(showDatabases()), actionCollection(), "db_summary"); TQT_SLOT(showDatabases()), actionCollection(), "db_summary");
new KAction(i18n("S&trategy Information"), 0 , interface, new TDEAction(i18n("S&trategy Information"), 0 , interface,
TQT_SLOT(showStrategies()), actionCollection(), "strategy_info"); TQT_SLOT(showStrategies()), actionCollection(), "strategy_info");
new KAction(i18n("&Server Information"), 0 , interface, new TDEAction(i18n("&Server Information"), 0 , interface,
TQT_SLOT(showInfo()), actionCollection(), "server_info"); TQT_SLOT(showInfo()), actionCollection(), "server_info");
// settings menu... // settings menu...
createStandardStatusBarAction(); createStandardStatusBarAction();
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
actShowMatchList = new KToggleAction(i18n("Show &Match List"), 0 , TQT_TQOBJECT(this), actShowMatchList = new TDEToggleAction(i18n("Show &Match List"), 0 , TQT_TQOBJECT(this),
TQT_SLOT(toggleMatchListShow()), actionCollection(), "show_match"); TQT_SLOT(toggleMatchListShow()), actionCollection(), "show_match");
actShowMatchList->setCheckedState(i18n("Hide &Match List")); actShowMatchList->setCheckedState(i18n("Hide &Match List"));
actShowMatchList->setChecked(global->showMatchList); actShowMatchList->setChecked(global->showMatchList);
@ -370,7 +370,7 @@ actionCollection());
KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptionsDialog()), actionCollection()); KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showOptionsDialog()), actionCollection());
// toolbar... // toolbar...
new KAction(i18n("Clear Input Field"), "query_erase", 0 , TQT_TQOBJECT(this), new TDEAction(i18n("Clear Input Field"), "query_erase", 0 , TQT_TQOBJECT(this),
TQT_SLOT(clearInput()), actionCollection(), "clear_query"); TQT_SLOT(clearInput()), actionCollection(), "clear_query");
actQueryLabel = new DictLabelAction(i18n("&Look for:"), actionCollection(), "look_label"); actQueryLabel = new DictLabelAction(i18n("&Look for:"), actionCollection(), "look_label");
@ -503,7 +503,7 @@ void TopLevel::buildHistMenu()
unsigned int i = 0; unsigned int i = 0;
while ((i<10)&&(i<global->queryHistory.count())) { while ((i<10)&&(i<global->queryHistory.count())) {
historyActionList.append( new KAction(getShortString(global->queryHistory[i],70), 0, TQT_TQOBJECT(this), TQT_SLOT(queryHistMenu()), historyActionList.append( new TDEAction(getShortString(global->queryHistory[i],70), 0, TQT_TQOBJECT(this), TQT_SLOT(queryHistMenu()),
(TQObject*)0, global->queryHistory[i].utf8().data()) ); (TQObject*)0, global->queryHistory[i].utf8().data()) );
i++; i++;
} }
@ -542,7 +542,7 @@ void TopLevel::stratDbChanged()
dbActionList.clear(); dbActionList.clear();
for (unsigned int i=0;i<global->serverDatabases.count();i++) for (unsigned int i=0;i<global->serverDatabases.count();i++)
dbActionList.append( new KAction(global->serverDatabases[i], 0, TQT_TQOBJECT(this), TQT_SLOT(dbInfoMenuClicked()), dbActionList.append( new TDEAction(global->serverDatabases[i], 0, TQT_TQOBJECT(this), TQT_SLOT(dbInfoMenuClicked()),
(TQObject*)0, global->serverDatabases[i].utf8().data()) ); (TQObject*)0, global->serverDatabases[i].utf8().data()) );
plugActionList("db_detail", dbActionList); plugActionList("db_detail", dbActionList);

@ -23,8 +23,8 @@
class TQSplitter; class TQSplitter;
class KToggleAction; class TDEToggleAction;
class KToolBarPopupAction; class TDEToolBarPopupAction;
class DictLabelAction; class DictLabelAction;
class DictComboAction; class DictComboAction;
@ -35,7 +35,7 @@ class OptionsDialog;
class DbSetsDialog; class DbSetsDialog;
class TopLevel : public KMainWindow, virtual public KDictIface class TopLevel : public TDEMainWindow, virtual public KDictIface
{ {
Q_OBJECT Q_OBJECT
@ -129,13 +129,13 @@ private slots:
private: private:
KAction *actSave, *actPrint, *actStartQuery, *actStopQuery, *actCopy; TDEAction *actSave, *actPrint, *actStartQuery, *actStopQuery, *actCopy;
KToggleAction *actShowMatchList; TDEToggleAction *actShowMatchList;
DictLabelAction *actQueryLabel, *actDbLabel; DictLabelAction *actQueryLabel, *actDbLabel;
DictComboAction *actQueryCombo, *actDbCombo; DictComboAction *actQueryCombo, *actDbCombo;
DictButtonAction *actDefineBtn, *actMatchBtn; DictButtonAction *actDefineBtn, *actMatchBtn;
TQPtrList<KAction> historyActionList, dbActionList; TQPtrList<TDEAction> historyActionList, dbActionList;
KToolBarPopupAction *actBack, *actForward; TDEToolBarPopupAction *actBack, *actForward;
TQSplitter *splitter; // widgets.... TQSplitter *splitter; // widgets....
QueryView *queryView; QueryView *queryView;

@ -63,7 +63,7 @@ DlgIndividual::DlgIndividual(Transfer * _item)
// Actions // Actions
m_paDock = new KToggleAction(i18n("&Dock"),"tool_dock.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleDock()), TQT_TQOBJECT(this), "dockIndividual"); m_paDock = new TDEToggleAction(i18n("&Dock"),"tool_dock.png", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleDock()), TQT_TQOBJECT(this), "dockIndividual");
TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),KDialog::spacingHint() ); TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),KDialog::spacingHint() );
@ -101,9 +101,9 @@ DlgIndividual::DlgIndividual(Transfer * _item)
topLayout->addWidget(speedLabel); topLayout->addWidget(speedLabel);
// setup toolbar // setup toolbar
KToolBar *toolBar = new KToolBar(this); TDEToolBar *toolBar = new TDEToolBar(this);
toolBar->setIconText(KToolBar::IconOnly); toolBar->setIconText(TDEToolBar::IconOnly);
toolBar->setBarPos(KToolBar::Bottom); toolBar->setBarPos(TDEToolBar::Bottom);
toolBar->setMovingEnabled(false); toolBar->setMovingEnabled(false);
toolBar->setFlat(true); toolBar->setFlat(true);

@ -42,7 +42,7 @@ class TQTextEdit;
class TQCheckBox; class TQCheckBox;
class KPushButton; class KPushButton;
class KProgress; class KProgress;
class KToggleAction; class TDEToggleAction;
class KDateTimeWidget; class KDateTimeWidget;
class DockIndividual; class DockIndividual;
@ -95,7 +95,7 @@ protected:
KPushButton * pbAdvanced ; KPushButton * pbAdvanced ;
TQTabWidget * panelAdvanced; TQTabWidget * panelAdvanced;
KToggleAction * m_paDock; TDEToggleAction * m_paDock;
TQDateTime qdt; TQDateTime qdt;
KDateTimeWidget *spins; KDateTimeWidget *spins;

@ -46,7 +46,7 @@
<string>Font:</string> <string>Font:</string>
</property> </property>
</widget> </widget>
<widget class="KFontRequester" row="2" column="2" rowspan="1" colspan="5"> <widget class="TDEFontRequester" row="2" column="2" rowspan="1" colspan="5">
<property name="name"> <property name="name">
<cstring>le_font</cstring> <cstring>le_font</cstring>
</property> </property>

@ -93,7 +93,7 @@ void DockIndividual::setTip(const TQString & _tip)
#include "dockindividual.moc" #include "dockindividual.moc"
/** No descriptions */ /** No descriptions */
void DockIndividual::contextMenuAboutToShow ( KPopupMenu* menu ) void DockIndividual::contextMenuAboutToShow ( TDEPopupMenu* menu )
{ {
menu->removeItemAt (3); menu->removeItemAt (3);
} }

@ -31,7 +31,7 @@
#include <ksystemtray.h> #include <ksystemtray.h>
#include "common.h" #include "common.h"
class KPopupMenu; class TDEPopupMenu;
class DockIndividual : public KSystemTray { class DockIndividual : public KSystemTray {
Q_OBJECT Q_OBJECT
@ -43,7 +43,7 @@ public:
void setTip(const TQString &); void setTip(const TQString &);
void setValue(int value); void setValue(int value);
/** No descriptions */ /** No descriptions */
virtual void contextMenuAboutToShow ( KPopupMenu* menu ); virtual void contextMenuAboutToShow ( TDEPopupMenu* menu );
}; };
#endif #endif

@ -38,14 +38,14 @@
#include "docking.h" #include "docking.h"
DockWidget::DockWidget(KMainWidget * _parent):KSystemTray(_parent) DockWidget::DockWidget(TDEMainWidget * _parent):KSystemTray(_parent)
{ {
parent = _parent; parent = _parent;
setPixmap( loadIcon( "kget_dock" )); setPixmap( loadIcon( "kget_dock" ));
// popup menu for right mouse button // popup menu for right mouse button
KPopupMenu *popupMenu = contextMenu(); TDEPopupMenu *popupMenu = contextMenu();
parent->action("paste_transfer")->plug(popupMenu); parent->action("paste_transfer")->plug(popupMenu);
parent->action("drop_target")->plug(popupMenu); parent->action("drop_target")->plug(popupMenu);
parent->action("konqueror_integration")->plug(popupMenu); parent->action("konqueror_integration")->plug(popupMenu);

@ -35,8 +35,8 @@
#include <ksystemtray.h> #include <ksystemtray.h>
class KPopupMenu; class TDEPopupMenu;
class KMainWidget; class TDEMainWidget;
class DynamicTip : public TQToolTip class DynamicTip : public TQToolTip
{ {
@ -58,7 +58,7 @@ class DockWidget:public KSystemTray
public: public:
DockWidget(KMainWidget * parent); DockWidget(TDEMainWidget * parent);
~DockWidget(); ~DockWidget();
/** No descriptions */ /** No descriptions */
void updateToolTip( const TQString& ); void updateToolTip( const TQString& );
@ -75,7 +75,7 @@ protected:
void dropEvent(TQDropEvent *); void dropEvent(TQDropEvent *);
private: private:
KMainWidget *parent; TDEMainWidget *parent;
DynamicTip * dtip; DynamicTip * dtip;
}; };

@ -50,7 +50,7 @@
#include "settings.h" #include "settings.h"
#include "droptarget.h" #include "droptarget.h"
DropTarget::DropTarget(KMainWindow * mainWin):TQWidget() DropTarget::DropTarget(TDEMainWindow * mainWin):TQWidget()
{ {
int x = ksettings.dropPosition.x(); int x = ksettings.dropPosition.x();
int y = ksettings.dropPosition.y(); int y = ksettings.dropPosition.y();
@ -85,7 +85,7 @@ DropTarget::DropTarget(KMainWindow * mainWin):TQWidget()
setBackgroundPixmap( bgnd ); setBackgroundPixmap( bgnd );
// popup menu for right mouse button // popup menu for right mouse button
popupMenu = new KPopupMenu(); popupMenu = new TDEPopupMenu();
popupMenu->insertTitle(kapp->caption()); popupMenu->insertTitle(kapp->caption());
popupMenu->setCheckable(true); popupMenu->setCheckable(true);

@ -31,9 +31,9 @@
#include <tqbitmap.h> #include <tqbitmap.h>
#include <tqdragobject.h> #include <tqdragobject.h>
class KPopupMenu; class TDEPopupMenu;
class KMainWidget; class TDEMainWidget;
class KMainWindow; class TDEMainWindow;
class DropTarget:public TQWidget class DropTarget:public TQWidget
{ {
@ -41,7 +41,7 @@ class DropTarget:public TQWidget
public: public:
DropTarget(KMainWindow *); DropTarget(TDEMainWindow *);
~DropTarget(); ~DropTarget();
void updateStickyState(); void updateStickyState();
@ -64,8 +64,8 @@ private slots:
void toggleMinimizeRestore(); void toggleMinimizeRestore();
private: private:
KPopupMenu * popupMenu; TDEPopupMenu * popupMenu;
KMainWidget *parent; TDEMainWidget *parent;
bool b_sticky; bool b_sticky;

@ -38,16 +38,16 @@ LinkViewItem::LinkViewItem( TQListView *parent, const LinkItem *lnk )
/////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////
KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) KGetLinkView::KGetLinkView( TQWidget *parent, const char *name )
: KMainWindow( parent, name ) : TDEMainWindow( parent, name )
{ {
setPlainCaption( i18n( "KGet" ) ); setPlainCaption( i18n( "KGet" ) );
KAction* actionDownload = new KAction( i18n("Download Selected Files"), TDEAction* actionDownload = new TDEAction( i18n("Download Selected Files"),
"kget", CTRL+Key_D, "kget", CTRL+Key_D,
TQT_TQOBJECT(this), TQT_SLOT( slotStartLeech() ), TQT_TQOBJECT(this), TQT_SLOT( slotStartLeech() ),
actionCollection(), "startDownload" ); actionCollection(), "startDownload" );
KAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), TDEAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ),
actionCollection() ); actionCollection() );
m_links.setAutoDelete( true ); m_links.setAutoDelete( true );
@ -59,7 +59,7 @@ KGetLinkView::KGetLinkView( TQWidget *parent, const char *name )
TQVBoxLayout *layout = new TQVBoxLayout( mainWidget ); TQVBoxLayout *layout = new TQVBoxLayout( mainWidget );
setCentralWidget( mainWidget ); setCentralWidget( mainWidget );
m_view = new KListView( mainWidget, "listview" ); m_view = new TDEListView( mainWidget, "listview" );
m_view->setSelectionMode( TQListView::Extended ); m_view->setSelectionMode( TQListView::Extended );
m_view->addColumn( i18n("File Name") ); m_view->addColumn( i18n("File Name") );
m_view->addColumn( i18n("Description") ); m_view->addColumn( i18n("Description") );
@ -67,14 +67,14 @@ KGetLinkView::KGetLinkView( TQWidget *parent, const char *name )
m_view->addColumn( i18n("Location (URL)") ); m_view->addColumn( i18n("Location (URL)") );
m_view->setShowSortIndicator( true ); m_view->setShowSortIndicator( true );
KListViewSearchLineWidget *line = new KListViewSearchLineWidget( m_view, mainWidget, "search line" ); TDEListViewSearchLineWidget *line = new TDEListViewSearchLineWidget( m_view, mainWidget, "search line" );
layout->addWidget( line ); layout->addWidget( line );
layout->addWidget( m_view ); layout->addWidget( m_view );
// setting a fixed (not floating) toolbar // setting a fixed (not floating) toolbar
toolBar()->setMovingEnabled( false ); toolBar()->setMovingEnabled( false );
// setting Text next to Icons // setting Text next to Icons
toolBar()->setIconText( KToolBar::IconTextRight ); toolBar()->setIconText( TDEToolBar::IconTextRight );
} }
KGetLinkView::~KGetLinkView() KGetLinkView::~KGetLinkView()

@ -24,7 +24,7 @@ public:
}; };
class KGetLinkView : public KMainWindow class KGetLinkView : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -48,7 +48,7 @@ private:
TQPtrList<LinkItem> m_links; TQPtrList<LinkItem> m_links;
KListView *m_view; TDEListView *m_view;
}; };

@ -49,19 +49,19 @@ KGet_plug_in::KGet_plug_in( TQObject* parent, const char* name )
{ {
TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("kget", TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("kget",
KIcon::MainToolbar); KIcon::MainToolbar);
KActionMenu *menu = new KActionMenu( i18n("Download Manager"), pix, TDEActionMenu *menu = new TDEActionMenu( i18n("Download Manager"), pix,
actionCollection(), "kget_menu" ); actionCollection(), "kget_menu" );
menu->setDelayed( false ); menu->setDelayed( false );
connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( showPopup() )); connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( showPopup() ));
m_paToggleDropTarget=new KToggleAction(i18n("Show Drop Target"), m_paToggleDropTarget=new TDEToggleAction(i18n("Show Drop Target"),
KShortcut(), TDEShortcut(),
this, TQT_SLOT(slotShowDrop()), this, TQT_SLOT(slotShowDrop()),
actionCollection(), "show_drop" ); actionCollection(), "show_drop" );
menu->insert( m_paToggleDropTarget ); menu->insert( m_paToggleDropTarget );
KAction *action = new KAction(i18n("List All Links"), KShortcut(), TDEAction *action = new TDEAction(i18n("List All Links"), TDEShortcut(),
this, TQT_SLOT( slotShowLinks() ), this, TQT_SLOT( slotShowLinks() ),
actionCollection(), "show_links"); actionCollection(), "show_links");
menu->insert( action ); menu->insert( action );

@ -30,7 +30,7 @@ class KGet_plug_in : public KParts::Plugin
public: public:
KGet_plug_in( TQObject* parent = 0, const char* name = 0 ); KGet_plug_in( TQObject* parent = 0, const char* name = 0 );
KToggleAction *m_paToggleDropTarget ; TDEToggleAction *m_paToggleDropTarget ;
DCOPClient* p_dcopServer; DCOPClient* p_dcopServer;
virtual ~KGet_plug_in(); virtual ~KGet_plug_in();

@ -99,7 +99,7 @@ struct KURLPair
KURL src; KURL src;
}; };
KMainWidget *kmain = 0L; TDEMainWidget *kmain = 0L;
#define LOAD_ICON(X) TDEGlobal::iconLoader()->loadIcon(X, KIcon::MainToolbar) #define LOAD_ICON(X) TDEGlobal::iconLoader()->loadIcon(X, KIcon::MainToolbar)
@ -118,9 +118,9 @@ int ddp_sock = -1; /* Appletalk DDP socket */
KMainWidget::KMainWidget(bool bStartDocked) TDEMainWidget::TDEMainWidget(bool bStartDocked)
: KGetIface( "KGet-Interface" ), : KGetIface( "KGet-Interface" ),
KMainWindow(0, "kget mainwindow",0), TDEMainWindow(0, "kget mainwindow",0),
prefDlg( 0 ), kdock( 0 ) prefDlg( 0 ), kdock( 0 )
{ {
#ifdef _DEBUG #ifdef _DEBUG
@ -273,7 +273,7 @@ KMainWidget::KMainWidget(bool bStartDocked)
} }
KMainWidget::~KMainWidget() TDEMainWidget::~TDEMainWidget()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -291,7 +291,7 @@ KMainWidget::~KMainWidget()
} }
void KMainWidget::log(const TQString & message, bool statusbar) void TDEMainWidget::log(const TQString & message, bool statusbar)
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn <<" message= "<< message << endl; sDebugIn <<" message= "<< message << endl;
@ -309,7 +309,7 @@ void KMainWidget::log(const TQString & message, bool statusbar)
} }
void KMainWidget::slotSaveYourself() void TDEMainWidget::slotSaveYourself()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -324,7 +324,7 @@ void KMainWidget::slotSaveYourself()
} }
void KMainWidget::setupGUI() void TDEMainWidget::setupGUI()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -335,7 +335,7 @@ void KMainWidget::setupGUI()
myTransferList->setSorting(-1); myTransferList->setSorting(-1);
setListFont(); setListFont();
KActionCollection *coll = actionCollection(); TDEActionCollection *coll = actionCollection();
connect(myTransferList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateActions())); connect(myTransferList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateActions()));
connect(myTransferList, TQT_SIGNAL(transferSelected(Transfer *)), this, TQT_SLOT(slotOpenIndividual())); connect(myTransferList, TQT_SIGNAL(transferSelected(Transfer *)), this, TQT_SLOT(slotOpenIndividual()));
@ -345,45 +345,45 @@ void KMainWidget::setupGUI()
m_paOpenTransfer = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenTransfer()), coll, "open_transfer"); m_paOpenTransfer = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotOpenTransfer()), coll, "open_transfer");
m_paPasteTransfer = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPasteTransfer()), coll, "paste_transfer"); m_paPasteTransfer = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPasteTransfer()), coll, "paste_transfer");
m_paExportTransfers = new KAction(i18n("&Export Transfer List..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportTransfers()), coll, "export_transfers"); m_paExportTransfers = new TDEAction(i18n("&Export Transfer List..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportTransfers()), coll, "export_transfers");
m_paImportTransfers = new KAction(i18n("&Import Transfer List..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportTransfers()), coll, "import_transfers"); m_paImportTransfers = new TDEAction(i18n("&Import Transfer List..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportTransfers()), coll, "import_transfers");
m_paImportText = new KAction(i18n("Import Text &File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportTextFile()), coll, "import_text"); m_paImportText = new TDEAction(i18n("Import Text &File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportTextFile()), coll, "import_text");
m_paQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), coll, "quit"); m_paQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotQuit()), coll, "quit");
// transfer actions // transfer actions
m_paCopy = new KAction(i18n("&Copy URL to Clipboard"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyToClipboard()), coll, "copy_url"); m_paCopy = new TDEAction(i18n("&Copy URL to Clipboard"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyToClipboard()), coll, "copy_url");
m_paIndividual = new KAction(i18n("&Open Individual Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenIndividual()), coll, "open_individual"); m_paIndividual = new TDEAction(i18n("&Open Individual Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenIndividual()), coll, "open_individual");
m_paMoveToBegin = new KAction(i18n("Move to &Beginning"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveToBegin()), coll, "move_begin"); m_paMoveToBegin = new TDEAction(i18n("Move to &Beginning"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveToBegin()), coll, "move_begin");
m_paMoveToEnd = new KAction(i18n("Move to &End"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveToEnd()), coll, "move_end"); m_paMoveToEnd = new TDEAction(i18n("Move to &End"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotMoveToEnd()), coll, "move_end");
#ifdef _DEBUG #ifdef _DEBUG
sDebug << "Loading pics" << endl; sDebug << "Loading pics" << endl;
#endif #endif
m_paResume = new KAction(i18n("&Resume"),"tool_resume", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResumeCurrent()), coll, "resume"); m_paResume = new TDEAction(i18n("&Resume"),"tool_resume", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResumeCurrent()), coll, "resume");
m_paPause = new KAction(i18n("&Pause"),"tool_pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPauseCurrent()), coll, "pause"); m_paPause = new TDEAction(i18n("&Pause"),"tool_pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPauseCurrent()), coll, "pause");
m_paDelete = new KAction(i18n("&Delete"),"editdelete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrent()), coll, "delete"); m_paDelete = new TDEAction(i18n("&Delete"),"editdelete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrent()), coll, "delete");
m_paRestart = new KAction(i18n("Re&start"),"tool_restart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRestartCurrent()), coll, "restart"); m_paRestart = new TDEAction(i18n("Re&start"),"tool_restart", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRestartCurrent()), coll, "restart");
m_paQueue = new KRadioAction(i18n("&Queue"),"tool_queue", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQueueCurrent()), coll, "queue"); m_paQueue = new TDERadioAction(i18n("&Queue"),"tool_queue", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQueueCurrent()), coll, "queue");
m_paTimer = new KRadioAction(i18n("&Timer"),"tool_timer", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTimerCurrent()), coll, "timer"); m_paTimer = new TDERadioAction(i18n("&Timer"),"tool_timer", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTimerCurrent()), coll, "timer");
m_paDelay = new KRadioAction(i18n("De&lay"),"tool_delay", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDelayCurrent()), coll, "delay"); m_paDelay = new TDERadioAction(i18n("De&lay"),"tool_delay", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDelayCurrent()), coll, "delay");
m_paQueue->setExclusiveGroup("TransferMode"); m_paQueue->setExclusiveGroup("TransferMode");
m_paTimer->setExclusiveGroup("TransferMode"); m_paTimer->setExclusiveGroup("TransferMode");
m_paDelay->setExclusiveGroup("TransferMode"); m_paDelay->setExclusiveGroup("TransferMode");
// options actions // options actions
m_paUseAnimation = new KToggleAction(i18n("Use &Animation"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAnimation()), coll, "toggle_animation"); m_paUseAnimation = new TDEToggleAction(i18n("Use &Animation"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAnimation()), coll, "toggle_animation");
m_paExpertMode = new KToggleAction(i18n("&Expert Mode"),"tool_expert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleExpertMode()), coll, "expert_mode"); m_paExpertMode = new TDEToggleAction(i18n("&Expert Mode"),"tool_expert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleExpertMode()), coll, "expert_mode");
m_paUseLastDir = new KToggleAction(i18n("&Use-Last-Folder Mode"),"tool_uselastdir", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleUseLastDir()), coll, "use_last_dir"); m_paUseLastDir = new TDEToggleAction(i18n("&Use-Last-Folder Mode"),"tool_uselastdir", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleUseLastDir()), coll, "use_last_dir");
m_paAutoDisconnect = new KToggleAction(i18n("Auto-&Disconnect Mode"),"tool_disconnect", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoDisconnect()), coll, "auto_disconnect"); m_paAutoDisconnect = new TDEToggleAction(i18n("Auto-&Disconnect Mode"),"tool_disconnect", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoDisconnect()), coll, "auto_disconnect");
m_paAutoShutdown = new KToggleAction(i18n("Auto-S&hutdown Mode"), "tool_shutdown", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoShutdown()), coll, "auto_shutdown"); m_paAutoShutdown = new TDEToggleAction(i18n("Auto-S&hutdown Mode"), "tool_shutdown", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoShutdown()), coll, "auto_shutdown");
m_paOfflineMode = new KToggleAction(i18n("&Offline Mode"),"tool_offline_mode_off", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleOfflineMode()), coll, "offline_mode"); m_paOfflineMode = new TDEToggleAction(i18n("&Offline Mode"),"tool_offline_mode_off", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleOfflineMode()), coll, "offline_mode");
m_paAutoPaste = new KToggleAction(i18n("Auto-Pas&te Mode"),"tool_clipboard", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoPaste()), coll, "auto_paste"); m_paAutoPaste = new TDEToggleAction(i18n("Auto-Pas&te Mode"),"tool_clipboard", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoPaste()), coll, "auto_paste");
m_paPreferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), coll); m_paPreferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), coll);
@ -397,10 +397,10 @@ void KMainWidget::setupGUI()
// view actions // view actions
createStandardStatusBarAction(); createStandardStatusBarAction();
m_paShowLog = new KToggleAction(i18n("Show &Log Window"),"tool_logwindow", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleLogWindow()), coll, "toggle_log"); m_paShowLog = new TDEToggleAction(i18n("Show &Log Window"),"tool_logwindow", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleLogWindow()), coll, "toggle_log");
m_paShowLog->setCheckedState(i18n("Hide &Log Window")); m_paShowLog->setCheckedState(i18n("Hide &Log Window"));
m_paDropTarget = new KAction(i18n("Show Drop &Target"),"tool_drop_target", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleDropTarget()), coll, "drop_target"); m_paDropTarget = new TDEAction(i18n("Show Drop &Target"),"tool_drop_target", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleDropTarget()), coll, "drop_target");
m_paKonquerorIntegration = new KAction(i18n("Enable &KGet as Konqueror Download Manager"), "konqueror", 0, TQT_TQOBJECT(this), TQT_SLOT(slotKonquerorIntegration()), coll, "konqueror_integration"); m_paKonquerorIntegration = new TDEAction(i18n("Enable &KGet as Konqueror Download Manager"), "konqueror", 0, TQT_TQOBJECT(this), TQT_SLOT(slotKonquerorIntegration()), coll, "konqueror_integration");
if (ksettings.b_KonquerorIntegration) { if (ksettings.b_KonquerorIntegration) {
m_paKonquerorIntegration->setText(i18n("Disable &KGet as Konqueror Download Manager")); m_paKonquerorIntegration->setText(i18n("Disable &KGet as Konqueror Download Manager"));
} }
@ -429,7 +429,7 @@ void KMainWidget::setupGUI()
} }
void KMainWidget::setupWhatsThis() void TDEMainWidget::setupWhatsThis()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -502,7 +502,7 @@ void KMainWidget::setupWhatsThis()
} }
void KMainWidget::slotConfigureToolbars() void TDEMainWidget::slotConfigureToolbars()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -519,7 +519,7 @@ void KMainWidget::slotConfigureToolbars()
} }
void KMainWidget::slotNewToolbarConfig() void TDEMainWidget::slotNewToolbarConfig()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -534,7 +534,7 @@ void KMainWidget::slotNewToolbarConfig()
} }
void KMainWidget::slotImportTextFile() void TDEMainWidget::slotImportTextFile()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -567,7 +567,7 @@ void KMainWidget::slotImportTextFile()
} }
void KMainWidget::slotImportTransfers() void TDEMainWidget::slotImportTransfers()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -581,7 +581,7 @@ void KMainWidget::slotImportTransfers()
} }
void KMainWidget::readTransfers(bool ask_for_name) void TDEMainWidget::readTransfers(bool ask_for_name)
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -601,7 +601,7 @@ void KMainWidget::readTransfers(bool ask_for_name)
#endif #endif
} }
void KMainWidget::readTransfersEx(const KURL & file) void TDEMainWidget::readTransfersEx(const KURL & file)
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -629,7 +629,7 @@ void KMainWidget::readTransfersEx(const KURL & file)
} }
void KMainWidget::slotExportTransfers() void TDEMainWidget::slotExportTransfers()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -642,7 +642,7 @@ void KMainWidget::slotExportTransfers()
#endif #endif
} }
void KMainWidget::writeTransfers(bool ask_for_name) void TDEMainWidget::writeTransfers(bool ask_for_name)
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -680,7 +680,7 @@ void KMainWidget::writeTransfers(bool ask_for_name)
} }
void KMainWidget::writeLog() void TDEMainWidget::writeLog()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << "Writing log to file : " << logFileName.ascii() << endl; sDebugIn << "Writing log to file : " << logFileName.ascii() << endl;
@ -695,7 +695,7 @@ void KMainWidget::writeLog()
} }
void KMainWidget::slotQuit() void TDEMainWidget::slotQuit()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -730,7 +730,7 @@ void KMainWidget::slotQuit()
} }
void KMainWidget::slotResumeCurrent() void TDEMainWidget::slotResumeCurrent()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -750,7 +750,7 @@ void KMainWidget::slotResumeCurrent()
} }
void KMainWidget::slotPauseCurrent() void TDEMainWidget::slotPauseCurrent()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -775,7 +775,7 @@ void KMainWidget::slotPauseCurrent()
void KMainWidget::slotRestartCurrent() void TDEMainWidget::slotRestartCurrent()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -795,7 +795,7 @@ void KMainWidget::slotRestartCurrent()
} }
void KMainWidget::slotDeleteCurrent() void TDEMainWidget::slotDeleteCurrent()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -867,7 +867,7 @@ void KMainWidget::slotDeleteCurrent()
} }
void KMainWidget::stopAll() void TDEMainWidget::stopAll()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -890,7 +890,7 @@ void KMainWidget::stopAll()
} }
void KMainWidget::slotQueueCurrent() void TDEMainWidget::slotQueueCurrent()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -913,7 +913,7 @@ void KMainWidget::slotQueueCurrent()
} }
void KMainWidget::slotTimerCurrent() void TDEMainWidget::slotTimerCurrent()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -933,7 +933,7 @@ void KMainWidget::slotTimerCurrent()
} }
void KMainWidget::slotDelayCurrent() void TDEMainWidget::slotDelayCurrent()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -951,7 +951,7 @@ void KMainWidget::slotDelayCurrent()
} }
void KMainWidget::slotOpenTransfer() void TDEMainWidget::slotOpenTransfer()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -991,7 +991,7 @@ void KMainWidget::slotOpenTransfer()
void KMainWidget::slotCheckClipboard() void TDEMainWidget::slotCheckClipboard()
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -1018,7 +1018,7 @@ void KMainWidget::slotCheckClipboard()
} }
void KMainWidget::slotPasteTransfer() void TDEMainWidget::slotPasteTransfer()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1054,7 +1054,7 @@ void KMainWidget::slotPasteTransfer()
// destFile must be a filename, not a directory! And it will be deleted, if // destFile must be a filename, not a directory! And it will be deleted, if
// it exists already, without further notice. // it exists already, without further notice.
void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile) void TDEMainWidget::addTransferEx(const KURL& url, const KURL& destFile)
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1156,7 +1156,7 @@ void KMainWidget::addTransferEx(const KURL& url, const KURL& destFile)
} }
void KMainWidget::addTransfers( const KURL::List& src, const TQString& destDir ) void TDEMainWidget::addTransfers( const KURL::List& src, const TQString& destDir )
{ {
TQValueList<KURLPair> urls_orig; TQValueList<KURLPair> urls_orig;
@ -1327,7 +1327,7 @@ void KMainWidget::addTransfers( const KURL::List& src, const TQString& destDir )
checkQueue(); checkQueue();
} }
void KMainWidget::addTransfer(const TQString& src) void TDEMainWidget::addTransfer(const TQString& src)
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1345,7 +1345,7 @@ void KMainWidget::addTransfer(const TQString& src)
} }
void KMainWidget::checkQueue() void TDEMainWidget::checkQueue()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1406,7 +1406,7 @@ void KMainWidget::checkQueue()
} }
void KMainWidget::slotAnimTimeout() void TDEMainWidget::slotAnimTimeout()
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -1432,7 +1432,7 @@ void KMainWidget::slotAnimTimeout()
} }
void KMainWidget::slotTransferTimeout() void TDEMainWidget::slotTransferTimeout()
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -1465,7 +1465,7 @@ void KMainWidget::slotTransferTimeout()
} }
void KMainWidget::slotAutosaveTimeout() void TDEMainWidget::slotAutosaveTimeout()
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -1479,7 +1479,7 @@ void KMainWidget::slotAutosaveTimeout()
} }
void KMainWidget::slotStatusChanged(Transfer * item, int _operation) void TDEMainWidget::slotStatusChanged(Transfer * item, int _operation)
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -1551,7 +1551,7 @@ void KMainWidget::slotStatusChanged(Transfer * item, int _operation)
} }
void KMainWidget::dragEnterEvent(TQDragEnterEvent * event) void TDEMainWidget::dragEnterEvent(TQDragEnterEvent * event)
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -1565,7 +1565,7 @@ void KMainWidget::dragEnterEvent(TQDragEnterEvent * event)
} }
void KMainWidget::dropEvent(TQDropEvent * event) void TDEMainWidget::dropEvent(TQDropEvent * event)
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -1583,7 +1583,7 @@ void KMainWidget::dropEvent(TQDropEvent * event)
} }
void KMainWidget::slotCopyToClipboard() void TDEMainWidget::slotCopyToClipboard()
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -1605,7 +1605,7 @@ void KMainWidget::slotCopyToClipboard()
} }
void KMainWidget::slotMoveToBegin() void TDEMainWidget::slotMoveToBegin()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1620,7 +1620,7 @@ void KMainWidget::slotMoveToBegin()
} }
void KMainWidget::slotMoveToEnd() void TDEMainWidget::slotMoveToEnd()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1634,7 +1634,7 @@ void KMainWidget::slotMoveToEnd()
} }
void KMainWidget::slotOpenIndividual() void TDEMainWidget::slotOpenIndividual()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1650,7 +1650,7 @@ void KMainWidget::slotOpenIndividual()
#endif #endif
} }
bool KMainWidget::queryClose() bool TDEMainWidget::queryClose()
{ {
if( kapp->sessionSaving()) if( kapp->sessionSaving())
return true; return true;
@ -1658,7 +1658,7 @@ bool KMainWidget::queryClose()
return false; return false;
} }
void KMainWidget::setAutoSave() void TDEMainWidget::setAutoSave()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1676,7 +1676,7 @@ void KMainWidget::setAutoSave()
void KMainWidget::setAutoDisconnect() void TDEMainWidget::setAutoDisconnect()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1690,7 +1690,7 @@ void KMainWidget::setAutoDisconnect()
#endif #endif
} }
void KMainWidget::slotPreferences() void TDEMainWidget::slotPreferences()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1706,12 +1706,12 @@ void KMainWidget::slotPreferences()
#endif #endif
} }
void KMainWidget::slotConfigureNotifications() void TDEMainWidget::slotConfigureNotifications()
{ {
KNotifyDialog::configure(this); KNotifyDialog::configure(this);
} }
void KMainWidget::slotToggleLogWindow() void TDEMainWidget::slotToggleLogWindow()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1729,7 +1729,7 @@ void KMainWidget::slotToggleLogWindow()
} }
void KMainWidget::slotToggleAnimation() void TDEMainWidget::slotToggleAnimation()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1751,7 +1751,7 @@ void KMainWidget::slotToggleAnimation()
#endif #endif
} }
void KMainWidget::slotToggleOfflineMode() void TDEMainWidget::slotToggleOfflineMode()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn "ksettings.b_offlineMode = " << ksettings.b_offlineMode << endl; sDebugIn "ksettings.b_offlineMode = " << ksettings.b_offlineMode << endl;
@ -1781,7 +1781,7 @@ void KMainWidget::slotToggleOfflineMode()
} }
void KMainWidget::slotToggleExpertMode() void TDEMainWidget::slotToggleExpertMode()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1802,7 +1802,7 @@ void KMainWidget::slotToggleExpertMode()
} }
void KMainWidget::slotToggleUseLastDir() void TDEMainWidget::slotToggleUseLastDir()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1822,7 +1822,7 @@ void KMainWidget::slotToggleUseLastDir()
} }
void KMainWidget::slotToggleAutoDisconnect() void TDEMainWidget::slotToggleAutoDisconnect()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1843,7 +1843,7 @@ void KMainWidget::slotToggleAutoDisconnect()
} }
void KMainWidget::slotToggleAutoShutdown() void TDEMainWidget::slotToggleAutoShutdown()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1866,7 +1866,7 @@ void KMainWidget::slotToggleAutoShutdown()
} }
void KMainWidget::slotToggleAutoPaste() void TDEMainWidget::slotToggleAutoPaste()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1889,7 +1889,7 @@ void KMainWidget::slotToggleAutoPaste()
} }
void KMainWidget::slotToggleDropTarget() void TDEMainWidget::slotToggleDropTarget()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1913,7 +1913,7 @@ void KMainWidget::slotToggleDropTarget()
} }
void KMainWidget::slotKonquerorIntegration() void TDEMainWidget::slotKonquerorIntegration()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1940,7 +1940,7 @@ void KMainWidget::slotKonquerorIntegration()
} }
void KMainWidget::slotPopupMenu(Transfer * item) void TDEMainWidget::slotPopupMenu(Transfer * item)
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1963,7 +1963,7 @@ void KMainWidget::slotPopupMenu(Transfer * item)
} }
void KMainWidget::setListFont() void TDEMainWidget::setListFont()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -1976,7 +1976,7 @@ void KMainWidget::setListFont()
#endif #endif
} }
void KMainWidget::slotUpdateActions() void TDEMainWidget::slotUpdateActions()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -2137,7 +2137,7 @@ void KMainWidget::slotUpdateActions()
} }
void KMainWidget::updateStatusBar() void TDEMainWidget::updateStatusBar()
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -2201,7 +2201,7 @@ void KMainWidget::updateStatusBar()
} }
void KMainWidget::onlineDisconnect() void TDEMainWidget::onlineDisconnect()
{ {
#ifdef _DEBUG #ifdef _DEBUG
sDebugIn << endl; sDebugIn << endl;
@ -2229,7 +2229,7 @@ void KMainWidget::onlineDisconnect()
} }
void KMainWidget::slotCheckConnection() void TDEMainWidget::slotCheckConnection()
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -2255,7 +2255,7 @@ void KMainWidget::slotCheckConnection()
} }
void KMainWidget::checkOnline() void TDEMainWidget::checkOnline()
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -2351,7 +2351,7 @@ static int sockets_open()
/** No descriptions */ /** No descriptions */
void KMainWidget::customEvent(TQCustomEvent * _e) void TDEMainWidget::customEvent(TQCustomEvent * _e)
{ {
#ifdef _DEBUG #ifdef _DEBUG
//sDebugIn << endl; //sDebugIn << endl;
@ -2433,7 +2433,7 @@ void KMainWidget::customEvent(TQCustomEvent * _e)
#endif #endif
} }
TQString KMainWidget::getSaveDirectoryFor( const TQString& filename ) const TQString TDEMainWidget::getSaveDirectoryFor( const TQString& filename ) const
{ {
// first set destination directory to current directory ( which is also last used ) // first set destination directory to current directory ( which is also last used )
TQString destDir = ksettings.lastDirectory; TQString destDir = ksettings.lastDirectory;
@ -2456,7 +2456,7 @@ TQString KMainWidget::getSaveDirectoryFor( const TQString& filename ) const
return destDir; return destDir;
} }
bool KMainWidget::sanityChecksSuccessful( const KURL& url ) bool TDEMainWidget::sanityChecksSuccessful( const KURL& url )
{ {
if (!url.isValid() || !KProtocolInfo::supportsReading( url ) ) if (!url.isValid() || !KProtocolInfo::supportsReading( url ) )
{ {
@ -2508,12 +2508,12 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url )
return true; return true;
} }
bool KMainWidget::isDropTargetVisible() const bool TDEMainWidget::isDropTargetVisible() const
{ {
return m_showDropTarget; return m_showDropTarget;
} }
void KMainWidget::setDropTargetVisible( bool setVisible ) void TDEMainWidget::setDropTargetVisible( bool setVisible )
{ {
if ( setVisible != isDropTargetVisible() ) if ( setVisible != isDropTargetVisible() )
{ {
@ -2521,23 +2521,23 @@ void KMainWidget::setDropTargetVisible( bool setVisible )
} }
} }
void KMainWidget::setOfflineMode( bool offline ) void TDEMainWidget::setOfflineMode( bool offline )
{ {
if ( ksettings.b_offlineMode != offline ) if ( ksettings.b_offlineMode != offline )
slotToggleOfflineMode(); slotToggleOfflineMode();
} }
bool KMainWidget::isOfflineMode() const bool TDEMainWidget::isOfflineMode() const
{ {
return ksettings.b_offlineMode; return ksettings.b_offlineMode;
} }
void KMainWidget::activateDropTarget() void TDEMainWidget::activateDropTarget()
{ {
setDropTargetVisible( true ); setDropTargetVisible( true );
} }
void KMainWidget::slotShowMenubar() void TDEMainWidget::slotShowMenubar()
{ {
if(m_menubarAction->isChecked()) if(m_menubarAction->isChecked())
menuBar()->show(); menuBar()->show();

@ -35,9 +35,9 @@
#include "kget_iface.h" #include "kget_iface.h"
class KAction; class TDEAction;
//class KToggleAction; //class TDEToggleAction;
class KRadioAction; class TDERadioAction;
class DockWidget; class DockWidget;
class DropTarget; class DropTarget;
@ -49,7 +49,7 @@ class TransferList;
class Settings; class Settings;
class KMainWidget:public KMainWindow, virtual public KGetIface class TDEMainWidget:public TDEMainWindow, virtual public KGetIface
{ {
Q_OBJECT Q_OBJECT
@ -59,8 +59,8 @@ public:
enum StatusbarFields { ID_TOTAL_TRANSFERS = 1, ID_TOTAL_FILES, ID_TOTAL_SIZE, enum StatusbarFields { ID_TOTAL_TRANSFERS = 1, ID_TOTAL_FILES, ID_TOTAL_SIZE,
ID_TOTAL_TIME , ID_TOTAL_SPEED }; ID_TOTAL_TIME , ID_TOTAL_SPEED };
KMainWidget(bool bShowMain = false); TDEMainWidget(bool bShowMain = false);
~KMainWidget(); ~TDEMainWidget();
void addTransfer( const TQString& src ); void addTransfer( const TQString& src );
void addTransferEx( const KURL& url, void addTransferEx( const KURL& url,
@ -82,10 +82,10 @@ public:
friend class Settings; friend class Settings;
// Actions // Actions
KToggleAction *m_paShowLog; TDEToggleAction *m_paShowLog;
KToggleAction *m_menubarAction; TDEToggleAction *m_menubarAction;
KAction *m_paPreferences; TDEAction *m_paPreferences;
KAction *m_paQuit; TDEAction *m_paQuit;
bool b_viewLogWindow; bool b_viewLogWindow;
void readTransfersEx(const KURL & url); void readTransfersEx(const KURL & url);
@ -210,24 +210,24 @@ private:
int _sock; int _sock;
// Actions // Actions
KAction *m_paOpenTransfer, *m_paPasteTransfer, *m_paExportTransfers, *m_paImportTransfers; TDEAction *m_paOpenTransfer, *m_paPasteTransfer, *m_paExportTransfers, *m_paImportTransfers;
KAction *m_paImportText; TDEAction *m_paImportText;
KAction *m_paMoveToBegin, *m_paMoveToEnd, *m_paCopy, *m_paIndividual; TDEAction *m_paMoveToBegin, *m_paMoveToEnd, *m_paCopy, *m_paIndividual;
KAction *m_paResume, *m_paPause, *m_paDelete, *m_paRestart; TDEAction *m_paResume, *m_paPause, *m_paDelete, *m_paRestart;
KRadioAction *m_paQueue, *m_paTimer, *m_paDelay; TDERadioAction *m_paQueue, *m_paTimer, *m_paDelay;
KToggleAction *m_paUseAnimation; TDEToggleAction *m_paUseAnimation;
KToggleAction *m_paExpertMode, *m_paUseLastDir, *m_paOfflineMode; TDEToggleAction *m_paExpertMode, *m_paUseLastDir, *m_paOfflineMode;
KToggleAction *m_paAutoDisconnect, *m_paAutoShutdown, *m_paAutoPaste; TDEToggleAction *m_paAutoDisconnect, *m_paAutoShutdown, *m_paAutoPaste;
KAction *m_paDropTarget; TDEAction *m_paDropTarget;
KAction *m_paKonquerorIntegration; TDEAction *m_paKonquerorIntegration;
bool m_showDropTarget; bool m_showDropTarget;
}; };
extern KMainWidget *kmain; extern TDEMainWidget *kmain;
extern DropTarget *kdrop; extern DropTarget *kdrop;
#endif // _KMAINWIDGET_H_ #endif // _KMAINWIDGET_H_

@ -101,7 +101,7 @@ static void cleanup(void)
class KGetApp : public KUniqueApplication class KGetApp : public KUniqueApplication
{ {
private: private:
KMainWidget *kmainwidget; TDEMainWidget *kmainwidget;
public: public:
KGetApp() : KUniqueApplication() KGetApp() : KUniqueApplication()
@ -141,9 +141,9 @@ public:
if (kmainwidget==0) if (kmainwidget==0)
{ {
if(args->count()>0) if(args->count()>0)
kmainwidget=new KMainWidget(true); kmainwidget=new TDEMainWidget(true);
else else
kmainwidget=new KMainWidget(); kmainwidget=new TDEMainWidget();
setMainWidget(kmain); setMainWidget(kmain);
} }

@ -55,7 +55,7 @@ extern Settings ksettings;
Transfer::Transfer(TransferList * _view, const KURL & _src, const KURL & _dest, const uint _id) Transfer::Transfer(TransferList * _view, const KURL & _src, const KURL & _dest, const uint _id)
: TQObject( _view ), : TQObject( _view ),
KListViewItem(_view), TDEListViewItem(_view),
dlgIndividual( 0 ) dlgIndividual( 0 )
{ {
sDebugIn << endl; sDebugIn << endl;
@ -72,7 +72,7 @@ Transfer::Transfer(TransferList * _view, const KURL & _src, const KURL & _dest,
Transfer::Transfer(TransferList * _view, Transfer * after, const KURL & _src, const KURL & _dest, const uint _id) Transfer::Transfer(TransferList * _view, Transfer * after, const KURL & _src, const KURL & _dest, const uint _id)
: TQObject( _view ), : TQObject( _view ),
KListViewItem(_view, (TQListViewItem *) after), TDEListViewItem(_view, (TQListViewItem *) after),
src(_src), dest(_dest), view(_view), src(_src), dest(_dest), view(_view),
dlgIndividual( 0 ) dlgIndividual( 0 )
{ {
@ -124,19 +124,19 @@ Transfer::init(const uint _id)
connect(this, TQT_SIGNAL(log(uint, const TQString &, const TQString &)), kmain->logwin(), TQT_SLOT(logTransfer(uint, const TQString &, const TQString &))); connect(this, TQT_SIGNAL(log(uint, const TQString &, const TQString &)), kmain->logwin(), TQT_SLOT(logTransfer(uint, const TQString &, const TQString &)));
// setup actions // setup actions
m_paResume = new KAction(i18n("&Resume"), "tool_resume", 0, this, TQT_SLOT(slotResume()), this, "resume"); m_paResume = new TDEAction(i18n("&Resume"), "tool_resume", 0, this, TQT_SLOT(slotResume()), this, "resume");
m_paPause = new KAction(i18n("&Pause"), "tool_pause", 0, this, TQT_SLOT(slotRequestPause()), this, "pause"); m_paPause = new TDEAction(i18n("&Pause"), "tool_pause", 0, this, TQT_SLOT(slotRequestPause()), this, "pause");
m_paDelete = new KAction(i18n("&Delete"), "editdelete", 0, this, TQT_SLOT(slotRequestRemove()), this, "delete"); m_paDelete = new TDEAction(i18n("&Delete"), "editdelete", 0, this, TQT_SLOT(slotRequestRemove()), this, "delete");
m_paRestart = new KAction(i18n("Re&start"), "tool_restart", 0, this, TQT_SLOT(slotRequestRestart()), this, "restart"); m_paRestart = new TDEAction(i18n("Re&start"), "tool_restart", 0, this, TQT_SLOT(slotRequestRestart()), this, "restart");
m_paQueue = new KRadioAction(i18n("&Queue"), "tool_queue", 0, this, TQT_SLOT(slotQueue()), this, "queue"); m_paQueue = new TDERadioAction(i18n("&Queue"), "tool_queue", 0, this, TQT_SLOT(slotQueue()), this, "queue");
m_paTimer = new KRadioAction(i18n("&Timer"), "tool_timer", 0, this, TQT_SLOT(slotRequestSchedule()), this, "timer"); m_paTimer = new TDERadioAction(i18n("&Timer"), "tool_timer", 0, this, TQT_SLOT(slotRequestSchedule()), this, "timer");
m_paDelay = new KRadioAction(i18n("De&lay"), "tool_delay", 0, this, TQT_SLOT(slotRequestDelay()), this, "delay"); m_paDelay = new TDERadioAction(i18n("De&lay"), "tool_delay", 0, this, TQT_SLOT(slotRequestDelay()), this, "delay");
m_paQueue->setExclusiveGroup("TransferMode"); m_paQueue->setExclusiveGroup("TransferMode");
m_paTimer->setExclusiveGroup("TransferMode"); m_paTimer->setExclusiveGroup("TransferMode");
@ -144,7 +144,7 @@ Transfer::init(const uint _id)
// Actions // Actions
// m_paDock = new KAction(i18n("&Dock"),"tool_dock", 0, this,TQT_SLOT(slotRequestDelay()), this, "dockIndividual"); // m_paDock = new TDEAction(i18n("&Dock"),"tool_dock", 0, this,TQT_SLOT(slotRequestDelay()), this, "dockIndividual");
// setup individual transfer dialog // setup individual transfer dialog

@ -41,8 +41,8 @@
class TQTimer; class TQTimer;
class KSimpleConfig; class KSimpleConfig;
class KAction; class TDEAction;
class KRadioAction; class TDERadioAction;
@ -50,7 +50,7 @@ class DlgIndividual;
class TransferList; class TransferList;
class Transfer:public TQObject, public KListViewItem class Transfer:public TQObject, public TDEListViewItem
{ {
Q_OBJECT Q_OBJECT
@ -146,9 +146,9 @@ public:
// actions // actions
KAction *m_paResume, *m_paPause, *m_paDelete, *m_paRestart; TDEAction *m_paResume, *m_paPause, *m_paDelete, *m_paRestart;
//KAction *m_paDock; //TDEAction *m_paDock;
KRadioAction *m_paQueue, *m_paTimer, *m_paDelay; TDERadioAction *m_paQueue, *m_paTimer, *m_paDelay;
public: public:
void slotExecPause(); void slotExecPause();

@ -53,7 +53,7 @@ static int defaultColumnWidth[] = {
TransferList::TransferList(TQWidget * parent, const char *name) TransferList::TransferList(TQWidget * parent, const char *name)
: KListView(parent, name) : TDEListView(parent, name)
{ {
// enable selection of more than one item // enable selection of more than one item
setSelectionMode( TQListView::Extended ); setSelectionMode( TQListView::Extended );

@ -54,7 +54,7 @@ public:
}; };
class TransferList:public KListView class TransferList:public TDEListView
{ {
Q_OBJECT Q_OBJECT

@ -402,7 +402,7 @@ void KNewsTicker::setupArrowButton()
} }
KNewsTickerMenu::KNewsTickerMenu(KNewsTicker *parent, const char *name) KNewsTickerMenu::KNewsTickerMenu(KNewsTicker *parent, const char *name)
: KPopupMenu(parent, name), : TDEPopupMenu(parent, name),
m_parent(parent), m_parent(parent),
m_fullMenu(false) m_fullMenu(false)
{ {
@ -428,7 +428,7 @@ void KNewsTickerMenu::populateMenu()
for (; nIt != sources.end(); ++nIt) { for (; nIt != sources.end(); ++nIt) {
NewsSourceBase::Ptr ns = *nIt; NewsSourceBase::Ptr ns = *nIt;
KPopupMenu *submenu = new KPopupMenu; TDEPopupMenu *submenu = new TDEPopupMenu;
int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), TQT_TQOBJECT(this), TQT_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000); int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), TQT_TQOBJECT(this), TQT_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000);
setItemParameter(checkNewsId, sources.findIndex(ns)); setItemParameter(checkNewsId, sources.findIndex(ns));

@ -120,7 +120,7 @@ class KNewsTicker : public KPanelApplet, virtual public ConfigIface,
TQStringList m_pendingNewsUpdates; TQStringList m_pendingNewsUpdates;
}; };
class KNewsTickerMenu : public KPopupMenu class KNewsTickerMenu : public TDEPopupMenu
{ {
Q_OBJECT Q_OBJECT
// //

@ -103,7 +103,7 @@ KNewsTickerConfig::KNewsTickerConfig(ConfigAccess *cfg, TQWidget *parent, const
m_child->niInterval->setRange(4, 180); m_child->niInterval->setRange(4, 180);
m_child->lvNewsSources->setShowSortIndicator(true); m_child->lvNewsSources->setShowSortIndicator(true);
m_child->lvNewsSources->setSelectionModeExt(KListView::Extended); m_child->lvNewsSources->setSelectionModeExt(TDEListView::Extended);
m_child->lvNewsSources->setAcceptDrops(true); m_child->lvNewsSources->setAcceptDrops(true);
m_child->lvNewsSources->viewport()->setAcceptDrops(true); m_child->lvNewsSources->viewport()->setAcceptDrops(true);
m_child->lvNewsSources->viewport()->installEventFilter(this); m_child->lvNewsSources->viewport()->installEventFilter(this);
@ -112,8 +112,8 @@ KNewsTickerConfig::KNewsTickerConfig(ConfigAccess *cfg, TQWidget *parent, const
connect(m_newsIconMgr, TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), TQT_SLOT(slotGotNewsIcon(const KURL &, const TQPixmap &))); connect(m_newsIconMgr, TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), TQT_SLOT(slotGotNewsIcon(const KURL &, const TQPixmap &)));
connect(m_child->bChooseFont, TQT_SIGNAL(clicked()), TQT_SLOT(slotChooseFont())); connect(m_child->bChooseFont, TQT_SIGNAL(clicked()), TQT_SLOT(slotChooseFont()));
connect(m_child->lvNewsSources, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint &)), connect(m_child->lvNewsSources, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
TQT_SLOT(slotNewsSourceContextMenu(KListView *, TQListViewItem *, const TQPoint &))); TQT_SLOT(slotNewsSourceContextMenu(TDEListView *, TQListViewItem *, const TQPoint &)));
connect(m_child->lvNewsSources, TQT_SIGNAL(selectionChanged()), connect(m_child->lvNewsSources, TQT_SIGNAL(selectionChanged()),
TQT_SLOT(slotNewsSourceSelectionChanged())); TQT_SLOT(slotNewsSourceSelectionChanged()));
connect(m_child->lvNewsSources, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), connect(m_child->lvNewsSources, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
@ -221,7 +221,7 @@ void KNewsTickerConfig::save()
bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e) bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e)
{ {
//<HACK> //<HACK>
// "if ( e->type() == TQEvent::DragEnter ) {" shoult normaly be enough. but there must be a bug somewhere in KListView. // "if ( e->type() == TQEvent::DragEnter ) {" shoult normaly be enough. but there must be a bug somewhere in TDEListView.
if ( e->type() == TQEvent::DragMove ) { if ( e->type() == TQEvent::DragMove ) {
//</HACK> //</HACK>
TQDragEnterEvent *d = (TQDragEnterEvent*)e; TQDragEnterEvent *d = (TQDragEnterEvent*)e;
@ -349,12 +349,12 @@ void KNewsTickerConfig::removeFilter(TQListViewItem *item)
} }
} }
void KNewsTickerConfig::slotNewsSourceContextMenu(KListView *, TQListViewItem *item, const TQPoint &) void KNewsTickerConfig::slotNewsSourceContextMenu(TDEListView *, TQListViewItem *item, const TQPoint &)
{ {
if (!dynamic_cast<NewsSourceItem *>(item)) if (!dynamic_cast<NewsSourceItem *>(item))
return; return;
KPopupMenu *menu = new KPopupMenu(); TDEPopupMenu *menu = new TDEPopupMenu();
TQPixmap addIcon = SmallIcon(TQString::fromLatin1("news_subscribe")); TQPixmap addIcon = SmallIcon(TQString::fromLatin1("news_subscribe"));
TQPixmap modifyIcon = SmallIcon(TQString::fromLatin1("edit")); TQPixmap modifyIcon = SmallIcon(TQString::fromLatin1("edit"));
@ -388,11 +388,11 @@ void KNewsTickerConfig::slotNewsSourceContextMenu(KListView *, TQListViewItem *i
void KNewsTickerConfig::slotChooseFont() void KNewsTickerConfig::slotChooseFont()
{ {
KFontDialog fd(this, "Font Dialog", false, true); TDEFontDialog fd(this, "Font Dialog", false, true);
fd.setFont(m_font); fd.setFont(m_font);
if (fd.exec() == KFontDialog::Accepted) { if (fd.exec() == TDEFontDialog::Accepted) {
if (m_font != fd.font()) { if (m_font != fd.font()) {
m_font = fd.font(); m_font = fd.font();
} }

@ -78,7 +78,7 @@ class KNewsTickerConfig : public KDialogBase
void getNewsIcon(NewsSourceItem *, const KURL &); void getNewsIcon(NewsSourceItem *, const KURL &);
protected slots: protected slots:
void slotNewsSourceContextMenu(KListView *, TQListViewItem *, const TQPoint &); void slotNewsSourceContextMenu(TDEListView *, TQListViewItem *, const TQPoint &);
void slotChooseFont(); void slotChooseFont();
void slotAddNewsSource(); void slotAddNewsSource();
void slotAddFilter(); void slotAddFilter();

@ -244,7 +244,7 @@ The default value (30 minutes) should be appropriate and reasonable in most case
<property name="spacing"> <property name="spacing">
<number>4</number> <number>4</number>
</property> </property>
<widget class="KListView" row="0" column="0" rowspan="1" colspan="4"> <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="4">
<column> <column>
<property name="text"> <property name="text">
<string>Name of Site</string> <string>Name of Site</string>
@ -382,7 +382,7 @@ Note that you can also right-click on the list to open a menu which lets you add
<property name="spacing"> <property name="spacing">
<number>4</number> <number>4</number>
</property> </property>
<widget class="KListView" row="0" column="0" rowspan="1" colspan="3"> <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="3">
<column> <column>
<property name="text"> <property name="text">
<string>Action</string> <string>Action</string>

@ -173,7 +173,7 @@
<string>This list shows the headlines and links to the corresponding complete articles which have been stored in the source file whose properties you are watching.</string> <string>This list shows the headlines and links to the corresponding complete articles which have been stored in the source file whose properties you are watching.</string>
</property> </property>
</widget> </widget>
<widget class="KListBox" row="5" column="0" rowspan="1" colspan="5"> <widget class="TDEListBox" row="5" column="0" rowspan="1" colspan="5">
<property name="name"> <property name="name">
<cstring>lbArticles</cstring> <cstring>lbArticles</cstring>
</property> </property>

@ -66,7 +66,7 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<widget class="KListView" row="1" column="1"> <widget class="TDEListView" row="1" column="1">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>

@ -250,7 +250,7 @@
<cstring>groupList</cstring> <cstring>groupList</cstring>
</property> </property>
</widget> </widget>
<widget class="KListView" row="6" column="0" rowspan="1" colspan="2"> <widget class="TDEListView" row="6" column="0" rowspan="1" colspan="2">
<column> <column>
<property name="text"> <property name="text">
<string>Groups</string> <string>Groups</string>
@ -343,7 +343,7 @@
<string>&lt;p&gt;&lt;i&gt;Note&lt;/i&gt;: If a messaging service is missing from the list, please make sure you have created an account for it in Kopete, and that it ready to add new contacts.&lt;/p&gt;</string> <string>&lt;p&gt;&lt;i&gt;Note&lt;/i&gt;: If a messaging service is missing from the list, please make sure you have created an account for it in Kopete, and that it ready to add new contacts.&lt;/p&gt;</string>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Account</string> <string>Account</string>

@ -80,7 +80,7 @@
<string>&lt;p&gt;&lt;h2&gt;Select IM Accounts&lt;/h2&gt;&lt;/p&gt;</string> <string>&lt;p&gt;&lt;h2&gt;Select IM Accounts&lt;/h2&gt;&lt;/p&gt;</string>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Account</string> <string>Account</string>

@ -40,7 +40,7 @@
class ChatMembersListWidget::ToolTip : public TQToolTip class ChatMembersListWidget::ToolTip : public TQToolTip
{ {
public: public:
ToolTip( KListView *parent ) ToolTip( TDEListView *parent )
: TQToolTip( parent->viewport() ), m_listView ( parent ) : TQToolTip( parent->viewport() ), m_listView ( parent )
{ {
} }
@ -61,7 +61,7 @@ public:
} }
private: private:
KListView *m_listView; TDEListView *m_listView;
}; };
//END ChatMembersListWidget::ToolTip //END ChatMembersListWidget::ToolTip
@ -70,7 +70,7 @@ private:
//BEGIN ChatMembersListWidget::ContactItem //BEGIN ChatMembersListWidget::ContactItem
ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *parent, Kopete::Contact *contact ) ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *parent, Kopete::Contact *contact )
: KListViewItem( parent ), m_contact( contact ) : TDEListViewItem( parent ), m_contact( contact )
{ {
TQString nick = m_contact->property(Kopete::Global::Properties::self()->nickName().key()).value().toString(); TQString nick = m_contact->property(Kopete::Global::Properties::self()->nickName().key()).value().toString();
if ( nick.isEmpty() ) if ( nick.isEmpty() )
@ -111,7 +111,7 @@ void ChatMembersListWidget::ContactItem::reposition()
int ourWeight = session->contactOnlineStatus(m_contact).weight(); int ourWeight = session->contactOnlineStatus(m_contact).weight();
TQListViewItem *after = 0; TQListViewItem *after = 0;
for ( TQListViewItem *it = KListViewItem::listView()->firstChild(); it; it = it->nextSibling() ) for ( TQListViewItem *it = TDEListViewItem::listView()->firstChild(); it; it = it->nextSibling() )
{ {
ChatMembersListWidget::ContactItem *item = static_cast<ChatMembersListWidget::ContactItem*>(it); ChatMembersListWidget::ContactItem *item = static_cast<ChatMembersListWidget::ContactItem*>(it);
int theirWeight = session->contactOnlineStatus(item->m_contact).weight(); int theirWeight = session->contactOnlineStatus(item->m_contact).weight();
@ -134,7 +134,7 @@ void ChatMembersListWidget::ContactItem::reposition()
//BEGIN ChatMembersListWidget //BEGIN ChatMembersListWidget
ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *parent, const char *name ) ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWidget *parent, const char *name )
: KListView( parent, name ), m_session( session ) : TDEListView( parent, name ), m_session( session )
{ {
// use our own custom tooltips // use our own custom tooltips
setShowToolTips( false ); setShowToolTips( false );
@ -154,8 +154,8 @@ ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWi
for ( TQPtrListIterator<Kopete::Contact> it( session->members() ); it.current(); ++it ) for ( TQPtrListIterator<Kopete::Contact> it( session->members() ); it.current(); ++it )
slotContactAdded( *it ); slotContactAdded( *it );
connect( this, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem *, const TQPoint &) ), connect( this, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &) ),
TQT_SLOT( slotContextMenu(KListView*, TQListViewItem *, const TQPoint & ) ) ); TQT_SLOT( slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint & ) ) );
connect( this, TQT_SIGNAL( executed( TQListViewItem* ) ), connect( this, TQT_SIGNAL( executed( TQListViewItem* ) ),
TQT_SLOT( slotExecute( TQListViewItem * ) ) ); TQT_SLOT( slotExecute( TQListViewItem * ) ) );
@ -171,11 +171,11 @@ ChatMembersListWidget::~ChatMembersListWidget()
{ {
} }
void ChatMembersListWidget::slotContextMenu( KListView*, TQListViewItem *item, const TQPoint &point ) void ChatMembersListWidget::slotContextMenu( TDEListView*, TQListViewItem *item, const TQPoint &point )
{ {
if ( ContactItem *contactItem = dynamic_cast<ContactItem*>(item) ) if ( ContactItem *contactItem = dynamic_cast<ContactItem*>(item) )
{ {
KPopupMenu *p = contactItem->contact()->popupMenu( session() ); TDEPopupMenu *p = contactItem->contact()->popupMenu( session() );
connect( p, TQT_SIGNAL( aboutToHide() ), p, TQT_SLOT( deleteLater() ) ); connect( p, TQT_SIGNAL( aboutToHide() ), p, TQT_SLOT( deleteLater() ) );
p->popup( point ); p->popup( point );
} }

@ -32,7 +32,7 @@ class OnlineStatus;
/** /**
* @author Richard Smith <kde@metafoo.co.uk> * @author Richard Smith <kde@metafoo.co.uk>
*/ */
class ChatMembersListWidget : public KListView class ChatMembersListWidget : public TDEListView
{ {
Q_OBJECT Q_OBJECT
@ -61,7 +61,7 @@ private slots:
/** /**
* Show the context menu for @p item at @p point * Show the context menu for @p item at @p point
*/ */
void slotContextMenu( KListView*, TQListViewItem *item, const TQPoint &point ); void slotContextMenu( TDEListView*, TQListViewItem *item, const TQPoint &point );
/** /**
* Called when a contact is added to the chat session. * Called when a contact is added to the chat session.
@ -96,7 +96,7 @@ private:
ToolTip *m_toolTip; ToolTip *m_toolTip;
}; };
class ChatMembersListWidget::ContactItem : public TQObject, public KListViewItem class ChatMembersListWidget::ContactItem : public TQObject, public TDEListViewItem
{ {
Q_OBJECT Q_OBJECT

@ -142,12 +142,12 @@ public:
DOM::HTMLElement activeElement; DOM::HTMLElement activeElement;
KAction *copyAction; TDEAction *copyAction;
KAction *saveAction; TDEAction *saveAction;
KAction *printAction; TDEAction *printAction;
KAction *closeAction; TDEAction *closeAction;
KAction *copyURLAction; TDEAction *copyURLAction;
KAction *importEmoticon; TDEAction *importEmoticon;
ChatWindowStyle *currentChatStyle; ChatWindowStyle *currentChatStyle;
Kopete::Contact *latestContact; Kopete::Contact *latestContact;
@ -263,8 +263,8 @@ ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, co
d->saveAction = KStdAction::saveAs( this, TQT_SLOT(save()), actionCollection() ); d->saveAction = KStdAction::saveAs( this, TQT_SLOT(save()), actionCollection() );
d->printAction = KStdAction::print( this, TQT_SLOT(print()),actionCollection() ); d->printAction = KStdAction::print( this, TQT_SLOT(print()),actionCollection() );
d->closeAction = KStdAction::close( this, TQT_SLOT(slotCloseView()),actionCollection() ); d->closeAction = KStdAction::close( this, TQT_SLOT(slotCloseView()),actionCollection() );
d->importEmoticon = new KAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() ); d->importEmoticon = new TDEAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() );
d->copyURLAction = new KAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() ); d->copyURLAction = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() );
// read formatting override flags // read formatting override flags
readOverrides(); readOverrides();
@ -710,7 +710,7 @@ void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point )
if ( d->activeElement.isNull() ) if ( d->activeElement.isNull() )
return; return;
KPopupMenu *chatWindowPopup = 0L; TDEPopupMenu *chatWindowPopup = 0L;
if ( Kopete::Contact *contact = contactFromNode( d->activeElement ) ) if ( Kopete::Contact *contact = contactFromNode( d->activeElement ) )
{ {
@ -719,7 +719,7 @@ void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point )
} }
else else
{ {
chatWindowPopup = new KPopupMenu(); chatWindowPopup = new TDEPopupMenu();
if ( d->activeElement.className() == "KopeteDisplayName" ) if ( d->activeElement.className() == "KopeteDisplayName" )
{ {

@ -30,7 +30,7 @@ namespace Kopete
class ChatSession; class ChatSession;
class Contact; class Contact;
} }
class KPopupMenu; class TDEPopupMenu;
class ChatWindowStyle; class ChatWindowStyle;
/** /**
@ -128,7 +128,7 @@ signals:
/** /**
* Emits before the context menu is about to show * Emits before the context menu is about to show
*/ */
void contextMenuEvent( const TQString &textUnderMouse, KPopupMenu *popupMenu ); void contextMenuEvent( const TQString &textUnderMouse, TDEPopupMenu *popupMenu );
/** /**
* Emits before the tooltip is about to show * Emits before the tooltip is about to show

@ -1067,7 +1067,7 @@ void ChatView::dropEvent ( TQDropEvent * event )
void ChatView::registerContextMenuHandler( TQObject *target, const char* slot ) void ChatView::registerContextMenuHandler( TQObject *target, const char* slot )
{ {
connect( m_messagePart, connect( m_messagePart,
TQT_SIGNAL( contextMenuEvent( Kopete::Message &, const TQString &, KPopupMenu * ) ), TQT_SIGNAL( contextMenuEvent( Kopete::Message &, const TQString &, TDEPopupMenu * ) ),
target, target,
slot slot
); );

@ -287,7 +287,7 @@ void KopeteChatWindow::slotTabContextMenu( TQWidget *tab, const TQPoint &pos )
{ {
m_popupView = static_cast<ChatView*>( tab ); m_popupView = static_cast<ChatView*>( tab );
KPopupMenu *popup = new KPopupMenu; TDEPopupMenu *popup = new TDEPopupMenu;
popup->insertTitle( KStringHandler::rsqueeze( m_popupView->caption() ) ); popup->insertTitle( KStringHandler::rsqueeze( m_popupView->caption() ) );
actionContactMenu->plug( popup ); actionContactMenu->plug( popup );
@ -309,42 +309,42 @@ ChatView *KopeteChatWindow::activeView()
void KopeteChatWindow::initActions(void) void KopeteChatWindow::initActions(void)
{ {
KActionCollection *coll = actionCollection(); TDEActionCollection *coll = actionCollection();
createStandardStatusBarAction(); createStandardStatusBarAction();
chatSend = new KAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), TQKeySequence(Key_Return) , chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), TQKeySequence(Key_Return) ,
TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), coll, "chat_send" ); TQT_TQOBJECT(this), TQT_SLOT( slotSendMessage() ), coll, "chat_send" );
chatSend->setEnabled( false ); chatSend->setEnabled( false );
KStdAction::save ( TQT_TQOBJECT(this), TQT_SLOT(slotChatSave()), coll ); KStdAction::save ( TQT_TQOBJECT(this), TQT_SLOT(slotChatSave()), coll );
KStdAction::print ( TQT_TQOBJECT(this), TQT_SLOT(slotChatPrint()), coll ); KStdAction::print ( TQT_TQOBJECT(this), TQT_SLOT(slotChatPrint()), coll );
KAction* quitAction = KStdAction::quit ( TQT_TQOBJECT(this), TQT_SLOT(close()), coll ); TDEAction* quitAction = KStdAction::quit ( TQT_TQOBJECT(this), TQT_SLOT(close()), coll );
quitAction->setText( i18n("Close All Chats") ); quitAction->setText( i18n("Close All Chats") );
tabClose = KStdAction::close ( TQT_TQOBJECT(this), TQT_SLOT(slotChatClosed()), coll, "tabs_close" ); tabClose = KStdAction::close ( TQT_TQOBJECT(this), TQT_SLOT(slotChatClosed()), coll, "tabs_close" );
tabRight=new KAction( i18n( "&Activate Next Tab" ), 0, KStdAccel::tabNext(), tabRight=new TDEAction( i18n( "&Activate Next Tab" ), 0, TDEStdAccel::tabNext(),
TQT_TQOBJECT(this), TQT_SLOT( slotNextTab() ), coll, "tabs_right" ); TQT_TQOBJECT(this), TQT_SLOT( slotNextTab() ), coll, "tabs_right" );
tabLeft=new KAction( i18n( "&Activate Previous Tab" ), 0, KStdAccel::tabPrev(), tabLeft=new TDEAction( i18n( "&Activate Previous Tab" ), 0, TDEStdAccel::tabPrev(),
TQT_TQOBJECT(this), TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" ); TQT_TQOBJECT(this), TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" );
tabLeft->setEnabled( false ); tabLeft->setEnabled( false );
tabRight->setEnabled( false ); tabRight->setEnabled( false );
nickComplete = new KAction( i18n( "Nic&k Completion" ), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT( slotNickComplete() ), coll , "nick_compete"); nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, TQT_TQOBJECT(this), TQT_SLOT( slotNickComplete() ), coll , "nick_compete");
nickComplete->setShortcut( TQKeySequence( Key_Tab ) ); nickComplete->setShortcut( TQKeySequence( Key_Tab ) );
tabDetach = new KAction( i18n( "&Detach Chat" ), TQString::fromLatin1( "tab_breakoff" ), 0, tabDetach = new TDEAction( i18n( "&Detach Chat" ), TQString::fromLatin1( "tab_breakoff" ), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" ); TQT_TQOBJECT(this), TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" );
tabDetach->setEnabled( false ); tabDetach->setEnabled( false );
actionDetachMenu = new KActionMenu( i18n( "&Move Tab to Window" ), TQString::fromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" ); actionDetachMenu = new TDEActionMenu( i18n( "&Move Tab to Window" ), TQString::fromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" );
actionDetachMenu->setDelayed( false ); actionDetachMenu->setDelayed( false );
connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareDetachMenu()) ); connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareDetachMenu()) );
connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDetachChat(int)) ); connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDetachChat(int)) );
actionTabPlacementMenu = new KActionMenu( i18n( "&Tab Placement" ), coll, "tabs_placement" ); actionTabPlacementMenu = new TDEActionMenu( i18n( "&Tab Placement" ), coll, "tabs_placement" );
connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPreparePlacementMenu()) ); connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPreparePlacementMenu()) );
connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPlaceTabs(int)) ); connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPlaceTabs(int)) );
@ -354,15 +354,15 @@ void KopeteChatWindow::initActions(void)
KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll); KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll);
KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), coll); KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), coll);
new KAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFont() ), coll, "format_font" ); new TDEAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFont() ), coll, "format_font" );
new KAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" ); new TDEAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" );
new KAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" ); new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" );
historyUp = new KAction( i18n( "Previous History" ), TQString(), 0, historyUp = new TDEAction( i18n( "Previous History" ), TQString(), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotHistoryUp() ), coll, "history_up" ); TQT_TQOBJECT(this), TQT_SLOT( slotHistoryUp() ), coll, "history_up" );
historyUp->setShortcut( TQKeySequence(CTRL + Key_Up) ); historyUp->setShortcut( TQKeySequence(CTRL + Key_Up) );
historyDown = new KAction( i18n( "Next History" ), TQString(), 0, historyDown = new TDEAction( i18n( "Next History" ), TQString(), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotHistoryDown() ), coll, "history_down" ); TQT_TQOBJECT(this), TQT_SLOT( slotHistoryDown() ), coll, "history_down" );
historyDown->setShortcut( TQKeySequence(CTRL + Key_Down) ); historyDown->setShortcut( TQKeySequence(CTRL + Key_Down) );
@ -371,14 +371,14 @@ void KopeteChatWindow::initActions(void)
KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotViewMenuBar()), coll ); KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotViewMenuBar()), coll );
membersLeft = new KToggleAction( i18n( "Place to Left of Chat Area" ), TQString(), 0, membersLeft = new TDEToggleAction( i18n( "Place to Left of Chat Area" ), TQString(), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" ); TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" );
membersRight = new KToggleAction( i18n( "Place to Right of Chat Area" ), TQString(), 0, membersRight = new TDEToggleAction( i18n( "Place to Right of Chat Area" ), TQString(), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" ); TQT_TQOBJECT(this), TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" );
toggleMembers = new KToggleAction( i18n( "Show" ), TQString(), 0, toggleMembers = new TDEToggleAction( i18n( "Show" ), TQString(), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" ); TQT_TQOBJECT(this), TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" );
toggleMembers->setCheckedState(i18n("Hide")); toggleMembers->setCheckedState(i18n("Hide"));
toggleAutoSpellCheck = new KToggleAction( i18n( "Automatic Spell Checking" ), TQString(), 0, toggleAutoSpellCheck = new TDEToggleAction( i18n( "Automatic Spell Checking" ), TQString(), 0,
TQT_TQOBJECT(this), TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" ); TQT_TQOBJECT(this), TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" );
toggleAutoSpellCheck->setChecked( true ); toggleAutoSpellCheck->setChecked( true );
@ -386,7 +386,7 @@ void KopeteChatWindow::initActions(void)
actionSmileyMenu->setDelayed( false ); actionSmileyMenu->setDelayed( false );
connect(actionSmileyMenu, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSmileyActivated(const TQString &))); connect(actionSmileyMenu, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSmileyActivated(const TQString &)));
actionContactMenu = new KActionMenu(i18n("Co&ntacts"), coll, "contacts_menu" ); actionContactMenu = new TDEActionMenu(i18n("Co&ntacts"), coll, "contacts_menu" );
actionContactMenu->setDelayed( false ); actionContactMenu->setDelayed( false );
connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareContactMenu()) ); connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareContactMenu()) );
@ -981,7 +981,7 @@ void KopeteChatWindow::slotPrepareContactMenu(void)
for ( contact = m_them.first(); contact; contact = m_them.next() ) for ( contact = m_them.first(); contact; contact = m_them.next() )
{ {
KPopupMenu *p = contact->popupMenu(); TDEPopupMenu *p = contact->popupMenu();
connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()), connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()),
p, TQT_SLOT(deleteLater() ) ); p, TQT_SLOT(deleteLater() ) );
@ -993,7 +993,7 @@ void KopeteChatWindow::slotPrepareContactMenu(void)
//FIXME: This number should be a config option //FIXME: This number should be a config option
if( ++contactCount == 15 && contact != m_them.getLast() ) if( ++contactCount == 15 && contact != m_them.getLast() )
{ {
KActionMenu *moreMenu = new KActionMenu( i18n("More..."), TDEActionMenu *moreMenu = new TDEActionMenu( i18n("More..."),
TQString::fromLatin1("folder_open"), TQT_TQOBJECT(contactsMenu) ); TQString::fromLatin1("folder_open"), TQT_TQOBJECT(contactsMenu) );
connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()), connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()),
moreMenu, TQT_SLOT(deleteLater() ) ); moreMenu, TQT_SLOT(deleteLater() ) );
@ -1176,7 +1176,7 @@ void KopeteChatWindow::closeEvent( TQCloseEvent * e )
KopeteApplication *app = static_cast<KopeteApplication *>( kapp ); KopeteApplication *app = static_cast<KopeteApplication *>( kapp );
if ( KopetePrefs::prefs()->showTray() && !app->isShuttingDown() && !app->sessionSaving() ) { if ( KopetePrefs::prefs()->showTray() && !app->isShuttingDown() && !app->sessionSaving() ) {
// hide(); // hide();
// BEGIN of code borrowed from KMainWindow::closeEvent // BEGIN of code borrowed from TDEMainWindow::closeEvent
// Save settings if auto-save is enabled, and settings have changed // Save settings if auto-save is enabled, and settings have changed
if ( settingsDirty() && autoSaveSettings() ) if ( settingsDirty() && autoSaveSettings() )
saveAutoSaveSettings(); saveAutoSaveSettings();
@ -1184,10 +1184,10 @@ void KopeteChatWindow::closeEvent( TQCloseEvent * e )
if ( queryClose() ) { if ( queryClose() ) {
e->accept(); e->accept();
} }
// END of code borrowed from KMainWindow::closeEvent // END of code borrowed from TDEMainWindow::closeEvent
} }
else else
KMainWindow::closeEvent( e ); TDEMainWindow::closeEvent( e );
} }
void KopeteChatWindow::slotConfKeys() void KopeteChatWindow::slotConfKeys()

@ -24,9 +24,9 @@
#include "kopetecontact.h" #include "kopetecontact.h"
#include "tdeversion.h" #include "tdeversion.h"
class KAction; class TDEAction;
class KToggleAction; class TDEToggleAction;
class KActionMenu; class TDEActionMenu;
class KTempFile; class KTempFile;
class TQPixmap; class TQPixmap;
class TQTabWidget; class TQTabWidget;
@ -39,7 +39,7 @@ class KTabWidget;
class TQLabel; class TQLabel;
class KopeteEmoticonAction; class KopeteEmoticonAction;
class KopeteView; class KopeteView;
class KSelectAction; class TDESelectAction;
class ChatView; class ChatView;
namespace Kopete namespace Kopete
@ -96,7 +96,7 @@ public:
void setStatus( const TQString & ); void setStatus( const TQString & );
/** /**
* Reimplemented from KMainWindow - asks each ChatView in the window if it is ok to close the window * Reimplemented from TDEMainWindow - asks each ChatView in the window if it is ok to close the window
* @return true if no ChatView objects to closing. * @return true if no ChatView objects to closing.
*/ */
virtual bool queryClose(); virtual bool queryClose();
@ -140,28 +140,28 @@ private:
TQMovie animIcon; TQMovie animIcon;
TQPixmap normalIcon; TQPixmap normalIcon;
KAction *chatSend; TDEAction *chatSend;
KAction *historyUp; TDEAction *historyUp;
KAction *historyDown; TDEAction *historyDown;
KAction *nickComplete; TDEAction *nickComplete;
KToggleAction *mStatusbarAction; TDEToggleAction *mStatusbarAction;
KAction *tabLeft; TDEAction *tabLeft;
KAction *tabRight; TDEAction *tabRight;
KAction *tabDetach; TDEAction *tabDetach;
KAction* tabClose; TDEAction* tabClose;
KToggleAction* membersLeft; TDEToggleAction* membersLeft;
KToggleAction* membersRight; TDEToggleAction* membersRight;
KToggleAction* toggleMembers; TDEToggleAction* toggleMembers;
KToggleAction* toggleAutoSpellCheck; TDEToggleAction* toggleAutoSpellCheck;
KopeteEmoticonAction *actionSmileyMenu; KopeteEmoticonAction *actionSmileyMenu;
KActionMenu *actionActionMenu; TDEActionMenu *actionActionMenu;
KActionMenu *actionContactMenu; TDEActionMenu *actionContactMenu;
KActionMenu *actionDetachMenu; TDEActionMenu *actionDetachMenu;
KActionMenu *actionTabPlacementMenu; TDEActionMenu *actionTabPlacementMenu;
TQString statusMsg; TQString statusMsg;
signals: signals:

@ -86,14 +86,14 @@ public:
TQSplitter *split; TQSplitter *split;
ChatMessagePart *messagePart; ChatMessagePart *messagePart;
KopeteEmailWindow::WindowMode mode; KopeteEmailWindow::WindowMode mode;
KAction *chatSend; TDEAction *chatSend;
TQLabel *anim; TQLabel *anim;
TQMovie animIcon; TQMovie animIcon;
TQPixmap normalIcon; TQPixmap normalIcon;
TQString unreadMessageFrom; TQString unreadMessageFrom;
ChatTextEditPart *editPart; ChatTextEditPart *editPart;
KActionMenu *actionActionMenu; TDEActionMenu *actionActionMenu;
KopeteEmoticonAction *actionSmileyMenu; KopeteEmoticonAction *actionSmileyMenu;
}; };
@ -204,9 +204,9 @@ KopeteEmailWindow::~KopeteEmailWindow()
void KopeteEmailWindow::initActions(void) void KopeteEmailWindow::initActions(void)
{ {
KActionCollection *coll = actionCollection(); TDEActionCollection *coll = actionCollection();
d->chatSend = new KAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), 0, d->chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail_send" ), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotReplySend() ), coll, "chat_send" ); TQT_TQOBJECT(this), TQT_SLOT( slotReplySend() ), coll, "chat_send" );
//Default to 'Return' for sending messages //Default to 'Return' for sending messages
d->chatSend->setShortcut( TQKeySequence( Key_Return ) ); d->chatSend->setShortcut( TQKeySequence( Key_Return ) );
@ -217,11 +217,11 @@ void KopeteEmailWindow::initActions(void)
KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll); KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), coll);
KStdAction::paste( TQT_TQOBJECT(d->editPart->widget()), TQT_SLOT( paste() ), coll ); KStdAction::paste( TQT_TQOBJECT(d->editPart->widget()), TQT_SLOT( paste() ), coll );
new KAction( i18n( "&Set Font..." ), TQString::fromLatin1( "charset" ), 0, new TDEAction( i18n( "&Set Font..." ), TQString::fromLatin1( "charset" ), 0,
d->editPart, TQT_SLOT( setFont() ), coll, "format_font" ); d->editPart, TQT_SLOT( setFont() ), coll, "format_font" );
new KAction( i18n( "Set Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, new TDEAction( i18n( "Set Text &Color..." ), TQString::fromLatin1( "pencil" ), 0,
d->editPart, TQT_SLOT( setFgColor() ), coll, "format_color" ); d->editPart, TQT_SLOT( setFgColor() ), coll, "format_color" );
new KAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0,
d->editPart, TQT_SLOT( setBgColor() ), coll, "format_bgcolor" ); d->editPart, TQT_SLOT( setBgColor() ), coll, "format_bgcolor" );
KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotViewMenuBar() ), coll ); KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT( slotViewMenuBar() ), coll );
@ -509,7 +509,7 @@ void KopeteEmailWindow::raise(bool activate)
if ( !KWin::windowInfo( winId(), NET::WMDesktop ).onAllDesktops() ) if ( !KWin::windowInfo( winId(), NET::WMDesktop ).onAllDesktops() )
KWin::setOnDesktop( winId(), KWin::currentDesktop() ); KWin::setOnDesktop( winId(), KWin::currentDesktop() );
KMainWindow::raise(); TDEMainWindow::raise();
/* Removed Nov 2003 /* Removed Nov 2003
According to Zack, the user double-clicking a contact is not valid reason for a non-pager According to Zack, the user double-clicking a contact is not valid reason for a non-pager

@ -1,7 +1,7 @@
/* /*
kopeteemoticonaction.cpp kopeteemoticonaction.cpp
KAction to show the emoticon selector TDEAction to show the emoticon selector
Copyright (c) 2002 by Stefan Gehn <metz AT gehn.net> Copyright (c) 2002 by Stefan Gehn <metz AT gehn.net>
Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> Copyright (c) 2003 by Martijn Klingens <klingens@kde.org>
@ -42,7 +42,7 @@ public:
{ {
m_delayed = true; m_delayed = true;
m_stickyMenu = true; m_stickyMenu = true;
m_popup = new KPopupMenu(0L,"KopeteEmoticonActionPrivate::m_popup"); m_popup = new TDEPopupMenu(0L,"KopeteEmoticonActionPrivate::m_popup");
emoticonSelector = new EmoticonSelector( m_popup, "KopeteEmoticonActionPrivate::emoticonSelector"); emoticonSelector = new EmoticonSelector( m_popup, "KopeteEmoticonActionPrivate::emoticonSelector");
m_popup->insertItem( emoticonSelector ); m_popup->insertItem( emoticonSelector );
// TODO: Maybe connect to kopeteprefs and redo list only on config changes // TODO: Maybe connect to kopeteprefs and redo list only on config changes
@ -55,14 +55,14 @@ public:
m_popup = 0; m_popup = 0;
} }
KPopupMenu *m_popup; TDEPopupMenu *m_popup;
EmoticonSelector *emoticonSelector; EmoticonSelector *emoticonSelector;
bool m_delayed; bool m_delayed;
bool m_stickyMenu; bool m_stickyMenu;
}; };
KopeteEmoticonAction::KopeteEmoticonAction( TQObject* parent, const char* name ) KopeteEmoticonAction::KopeteEmoticonAction( TQObject* parent, const char* name )
: KAction( i18n( "Add Smiley" ), 0, parent, name ) : TDEAction( i18n( "Add Smiley" ), 0, parent, name )
{ {
d = new KopeteEmoticonActionPrivate; d = new KopeteEmoticonActionPrivate;
@ -103,7 +103,7 @@ void KopeteEmoticonAction::popup( const TQPoint& global )
popupMenu()->popup( global ); popupMenu()->popup( global );
} }
KPopupMenu* KopeteEmoticonAction::popupMenu() const TDEPopupMenu* KopeteEmoticonAction::popupMenu() const
{ {
return d->m_popup; return d->m_popup;
} }
@ -130,7 +130,7 @@ void KopeteEmoticonAction::setStickyMenu(bool sticky)
int KopeteEmoticonAction::plug( TQWidget* widget, int index ) int KopeteEmoticonAction::plug( TQWidget* widget, int index )
{ {
if (kapp && !kapp->authorizeKAction(name())) if (kapp && !kapp->authorizeTDEAction(name()))
return -1; return -1;
// kdDebug(14010) << "KopeteEmoticonAction::plug( " << widget << ", " << index << " )" << endl; // kdDebug(14010) << "KopeteEmoticonAction::plug( " << widget << ", " << index << " )" << endl;
@ -157,11 +157,11 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
return containerCount() - 1; return containerCount() - 1;
} }
// KDE4/TQt TODO: Use qobject_cast instead. // KDE4/TQt TODO: Use qobject_cast instead.
else if ( widget->inherits( "KToolBar" ) ) else if ( widget->inherits( "TDEToolBar" ) )
{ {
KToolBar *bar = static_cast<KToolBar *>( widget ); TDEToolBar *bar = static_cast<TDEToolBar *>( widget );
int id_ = KAction::getToolButtonID(); int id_ = TDEAction::getToolButtonID();
if ( icon().isEmpty() && !iconSet(KIcon::Small).isNull() ) if ( icon().isEmpty() && !iconSet(KIcon::Small).isNull() )
{ {

@ -1,7 +1,7 @@
/* /*
kopeteemoticonaction.h kopeteemoticonaction.h
KAction to show the emoticon selector TDEAction to show the emoticon selector
Copyright (c) 2002 by Stefan Gehn <metz AT gehn.net> Copyright (c) 2002 by Stefan Gehn <metz AT gehn.net>
Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> Copyright (c) 2003 by Martijn Klingens <klingens@kde.org>
@ -23,7 +23,7 @@
#include <kaction.h> #include <kaction.h>
class KopeteEmoticonAction : public KAction class KopeteEmoticonAction : public TDEAction
{ {
Q_OBJECT Q_OBJECT
@ -35,18 +35,18 @@ public:
KopeteEmoticonAction( TQObject *parent = 0, const char *name = 0 ); KopeteEmoticonAction( TQObject *parent = 0, const char *name = 0 );
virtual ~KopeteEmoticonAction(); virtual ~KopeteEmoticonAction();
KPopupMenu * popupMenu() const; TDEPopupMenu * popupMenu() const;
void popup( const TQPoint &global ); void popup( const TQPoint &global );
/** /**
* Returns true if this action creates a delayed popup menu * Returns true if this action creates a delayed popup menu
* when plugged in a KToolbar. * when plugged in a TDEToolbar.
*/ */
bool delayed() const; bool delayed() const;
/** /**
* If set to true, this action will create a delayed popup menu * If set to true, this action will create a delayed popup menu
* when plugged in a KToolbar. Otherwise it creates a normal popup. * when plugged in a TDEToolbar. Otherwise it creates a normal popup.
* Default: delayed * Default: delayed
* *
* Remember that if the "main" action (the toolbar button itself) * Remember that if the "main" action (the toolbar button itself)
@ -55,7 +55,7 @@ public:
* On the opposite, if the main action can be clicked, it can only happen * On the opposite, if the main action can be clicked, it can only happen
* in a toolbar: in a menu, the parent of a submenu can't be activated. * in a toolbar: in a menu, the parent of a submenu can't be activated.
* To get a "normal" menu item when plugged a menu (and no submenu) * To get a "normal" menu item when plugged a menu (and no submenu)
* use KToolBarPopupAction. * use TDEToolBarPopupAction.
*/ */
void setDelayed( bool delayed ); void setDelayed( bool delayed );
@ -67,7 +67,7 @@ public:
/** /**
* If set to true, this action will create a sticky popup menu * If set to true, this action will create a sticky popup menu
* when plugged in a KToolbar. * when plugged in a TDEToolbar.
* "Sticky", means it's visible until a selection is made or the mouse is * "Sticky", means it's visible until a selection is made or the mouse is
* clicked elsewhere. This feature allows you to make a selection without * clicked elsewhere. This feature allows you to make a selection without
* having to press and hold down the mouse while making a selection. * having to press and hold down the mouse while making a selection.

@ -122,51 +122,51 @@ TDEAboutData *KopeteRichTextEditPart::createAboutData()
return aboutData; return aboutData;
} }
void KopeteRichTextEditPart::createActions( KActionCollection *ac ) void KopeteRichTextEditPart::createActions( TDEActionCollection *ac )
{ {
enableRichText = new KToggleAction(i18n("Enable &Rich Text"), "pencil", 0, enableRichText = new TDEToggleAction(i18n("Enable &Rich Text"), "pencil", 0,
ac, "enableRichText" ); ac, "enableRichText" );
enableRichText->setCheckedState(i18n("Disable &Rich Text")); enableRichText->setCheckedState(i18n("Disable &Rich Text"));
connect( enableRichText, TQT_SIGNAL( toggled(bool) ), connect( enableRichText, TQT_SIGNAL( toggled(bool) ),
this, TQT_SLOT( slotSetRichTextEnabled(bool) ) ); this, TQT_SLOT( slotSetRichTextEnabled(bool) ) );
checkSpelling = new KAction( i18n("Check &Spelling"), "spellcheck", 0, checkSpelling = new TDEAction( i18n("Check &Spelling"), "spellcheck", 0,
TQT_TQOBJECT(editor), TQT_SLOT( checkSpelling() ), ac, "check_spelling" ); TQT_TQOBJECT(editor), TQT_SLOT( checkSpelling() ), ac, "check_spelling" );
//Fg Color //Fg Color
actionFgColor = new KAction( i18n("Text &Color..."), "color_line", 0, actionFgColor = new TDEAction( i18n("Text &Color..."), "color_line", 0,
this, TQT_SLOT( setFgColor() ), this, TQT_SLOT( setFgColor() ),
ac, "format_color" ); ac, "format_color" );
//BG Color //BG Color
actionBgColor = new KAction( i18n("Background Co&lor..."), "color_fill", 0, actionBgColor = new TDEAction( i18n("Background Co&lor..."), "color_fill", 0,
this, TQT_SLOT( setBgColor() ), this, TQT_SLOT( setBgColor() ),
ac, "format_bgcolor" ); ac, "format_bgcolor" );
//Font Family //Font Family
action_font = new KFontAction( i18n("&Font"), 0, action_font = new TDEFontAction( i18n("&Font"), 0,
ac, "format_font" ); ac, "format_font" );
connect( action_font, TQT_SIGNAL( activated( const TQString & ) ), connect( action_font, TQT_SIGNAL( activated( const TQString & ) ),
this, TQT_SLOT( setFont( const TQString & ) ) ); this, TQT_SLOT( setFont( const TQString & ) ) );
//Font Size //Font Size
action_font_size = new KFontSizeAction( i18n("Font &Size"), 0, action_font_size = new TDEFontSizeAction( i18n("Font &Size"), 0,
ac, "format_font_size" ); ac, "format_font_size" );
connect( action_font_size, TQT_SIGNAL( fontSizeChanged(int) ), connect( action_font_size, TQT_SIGNAL( fontSizeChanged(int) ),
this, TQT_SLOT( setFontSize(int) ) ); this, TQT_SLOT( setFontSize(int) ) );
//Formatting //Formatting
action_bold = new KToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B, action_bold = new TDEToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
ac, "format_bold" ); ac, "format_bold" );
connect( action_bold, TQT_SIGNAL( toggled(bool) ), connect( action_bold, TQT_SIGNAL( toggled(bool) ),
this, TQT_SLOT( setBold(bool) ) ); this, TQT_SLOT( setBold(bool) ) );
action_italic = new KToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I, action_italic = new TDEToggleAction( i18n("&Italic"), "text_italic", CTRL+Key_I,
ac, "format_italic" ); ac, "format_italic" );
connect( action_italic, TQT_SIGNAL( toggled(bool) ), connect( action_italic, TQT_SIGNAL( toggled(bool) ),
this, TQT_SLOT( setItalic(bool) ) ); this, TQT_SLOT( setItalic(bool) ) );
action_underline = new KToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U, action_underline = new TDEToggleAction( i18n("&Underline"), "text_under", CTRL+Key_U,
ac, "format_underline" ); ac, "format_underline" );
connect( action_underline, TQT_SIGNAL( toggled(bool) ), connect( action_underline, TQT_SIGNAL( toggled(bool) ),
this, TQT_SLOT( setUnderline(bool) ) ); this, TQT_SLOT( setUnderline(bool) ) );
@ -180,22 +180,22 @@ void KopeteRichTextEditPart::createActions( KActionCollection *ac )
updateFont(); updateFont();
//Alignment //Alignment
action_align_left = new KToggleAction( i18n("Align &Left"), "text_left", 0, action_align_left = new TDEToggleAction( i18n("Align &Left"), "text_left", 0,
ac, "format_align_left" ); ac, "format_align_left" );
connect( action_align_left, TQT_SIGNAL( toggled(bool) ), connect( action_align_left, TQT_SIGNAL( toggled(bool) ),
this, TQT_SLOT( setAlignLeft(bool) ) ); this, TQT_SLOT( setAlignLeft(bool) ) );
action_align_center = new KToggleAction( i18n("Align &Center"), "text_center", 0, action_align_center = new TDEToggleAction( i18n("Align &Center"), "text_center", 0,
ac, "format_align_center" ); ac, "format_align_center" );
connect( action_align_center, TQT_SIGNAL( toggled(bool) ), connect( action_align_center, TQT_SIGNAL( toggled(bool) ),
this, TQT_SLOT( setAlignCenter(bool) ) ); this, TQT_SLOT( setAlignCenter(bool) ) );
action_align_right = new KToggleAction( i18n("Align &Right"), "text_right", 0, action_align_right = new TDEToggleAction( i18n("Align &Right"), "text_right", 0,
ac, "format_align_right" ); ac, "format_align_right" );
connect( action_align_right, TQT_SIGNAL( toggled(bool) ), connect( action_align_right, TQT_SIGNAL( toggled(bool) ),
this, TQT_SLOT( setAlignRight(bool) ) ); this, TQT_SLOT( setAlignRight(bool) ) );
action_align_justify = new KToggleAction( i18n("&Justify"), "text_block", 0, action_align_justify = new TDEToggleAction( i18n("&Justify"), "text_block", 0,
ac, "format_align_justify" ); ac, "format_align_justify" );
connect( action_align_justify, TQT_SIGNAL( toggled(bool) ), connect( action_align_justify, TQT_SIGNAL( toggled(bool) ),
this, TQT_SLOT( setAlignJustify(bool) ) ); this, TQT_SLOT( setAlignJustify(bool) ) );
@ -448,7 +448,7 @@ void KopeteRichTextEditPart::setFontSize( int size )
void KopeteRichTextEditPart::setFont() void KopeteRichTextEditPart::setFont()
{ {
KFontDialog::getFont(mFont, false, editor); TDEFontDialog::getFont(mFont, false, editor);
setFont(mFont); setFont(mFont);
writeConfig(); writeConfig();
} }

@ -10,9 +10,9 @@
class TDEAboutData; class TDEAboutData;
class KTextEdit; class KTextEdit;
class KFontAction; class TDEFontAction;
class KFontSizeAction; class TDEFontSizeAction;
class KToggleAction; class TDEToggleAction;
class KopeteTextEdit; class KopeteTextEdit;
/** /**
@ -89,7 +89,7 @@ class KopeteRichTextEditPart : public KParts::ReadOnlyPart
/** /**
* Creates the part's actions in the specified action collection. * Creates the part's actions in the specified action collection.
*/ */
virtual void createActions( KActionCollection *ac ); virtual void createActions( TDEActionCollection *ac );
protected slots: protected slots:
@ -108,23 +108,23 @@ class KopeteRichTextEditPart : public KParts::ReadOnlyPart
void writeConfig(); void writeConfig();
KopeteTextEdit *editor; KopeteTextEdit *editor;
KAction *checkSpelling; TDEAction *checkSpelling;
KToggleAction *enableRichText; TDEToggleAction *enableRichText;
KAction *actionFgColor; TDEAction *actionFgColor;
KAction *actionBgColor; TDEAction *actionBgColor;
KToggleAction *action_bold; TDEToggleAction *action_bold;
KToggleAction *action_italic; TDEToggleAction *action_italic;
KToggleAction *action_underline; TDEToggleAction *action_underline;
KFontAction *action_font; TDEFontAction *action_font;
KFontSizeAction *action_font_size; TDEFontSizeAction *action_font_size;
KToggleAction *action_align_left; TDEToggleAction *action_align_left;
KToggleAction *action_align_right; TDEToggleAction *action_align_right;
KToggleAction *action_align_center; TDEToggleAction *action_align_center;
KToggleAction *action_align_justify; TDEToggleAction *action_align_justify;
int m_capabilities; int m_capabilities;
bool m_richTextAvailable; bool m_richTextAvailable;

@ -39,10 +39,10 @@
#include "kopeteprotocol.h" #include "kopeteprotocol.h"
#include "kopeteaccount.h" #include "kopeteaccount.h"
class KopeteAccountLVI : public KListViewItem class KopeteAccountLVI : public TDEListViewItem
{ {
public: public:
KopeteAccountLVI( Kopete::Account *a, KListView *p ) : KListViewItem( p ){ m_account = a; } KopeteAccountLVI( Kopete::Account *a, TDEListView *p ) : TDEListViewItem( p ){ m_account = a; }
Kopete::Account *account() { return m_account; } Kopete::Account *account() { return m_account; }
private: private:

@ -62,7 +62,7 @@
<string>Remove selected account</string> <string>Remove selected account</string>
</property> </property>
</widget> </widget>
<widget class="KListView" row="0" column="0" rowspan="8" colspan="1"> <widget class="TDEListView" row="0" column="0" rowspan="8" colspan="1">
<column> <column>
<property name="text"> <property name="text">
<string>Protocol</string> <string>Protocol</string>

@ -61,7 +61,7 @@
<property name="orientation"> <property name="orientation">
<enum>Horizontal</enum> <enum>Horizontal</enum>
</property> </property>
<widget class="KListBox"> <widget class="TDEListBox">
<property name="name"> <property name="name">
<cstring>styleList</cstring> <cstring>styleList</cstring>
</property> </property>

@ -138,7 +138,7 @@
<string>Background color:</string> <string>Background color:</string>
</property> </property>
</widget> </widget>
<widget class="KFontRequester" row="0" column="1" rowspan="1" colspan="3"> <widget class="TDEFontRequester" row="0" column="1" rowspan="1" colspan="3">
<property name="name"> <property name="name">
<cstring>fontFace</cstring> <cstring>fontFace</cstring>
</property> </property>
@ -253,7 +253,7 @@
<string>Group font:</string> <string>Group font:</string>
</property> </property>
</widget> </widget>
<widget class="KFontRequester"> <widget class="TDEFontRequester">
<property name="name"> <property name="name">
<cstring>mGroupFont</cstring> <cstring>mGroupFont</cstring>
</property> </property>
@ -282,7 +282,7 @@
<string>Normal font:</string> <string>Normal font:</string>
</property> </property>
</widget> </widget>
<widget class="KFontRequester"> <widget class="TDEFontRequester">
<property name="name"> <property name="name">
<cstring>mNormalFont</cstring> <cstring>mNormalFont</cstring>
</property> </property>
@ -311,7 +311,7 @@
<string>Small font:</string> <string>Small font:</string>
</property> </property>
</widget> </widget>
<widget class="KFontRequester"> <widget class="TDEFontRequester">
<property name="name"> <property name="name">
<cstring>mSmallFont</cstring> <cstring>mSmallFont</cstring>
</property> </property>

@ -55,7 +55,7 @@
<string>Select emoticon theme:</string> <string>Select emoticon theme:</string>
</property> </property>
</widget> </widget>
<widget class="KListBox"> <widget class="TDEListBox">
<property name="name"> <property name="name">
<cstring>icon_theme_list</cstring> <cstring>icon_theme_list</cstring>
</property> </property>

@ -101,7 +101,7 @@ EmoticonsEditDialog::EmoticonsEditDialog(TQWidget *parent, TQString theme, const
for(TQMap<TQString, TQStringList>::Iterator it = smileys.begin(); it != smileys.end(); ++it ) for(TQMap<TQString, TQStringList>::Iterator it = smileys.begin(); it != smileys.end(); ++it )
{ {
KListViewItem *itm = new KListViewItem(mMainWidget->klvEmoticons); TDEListViewItem *itm = new TDEListViewItem(mMainWidget->klvEmoticons);
itm->setPixmap(0, TQPixmap(it.key())); itm->setPixmap(0, TQPixmap(it.key()));
itm->setText(2, TQFileInfo(it.key()).baseName()); itm->setText(2, TQFileInfo(it.key()).baseName());
TQString text = *it.data().at(0); TQString text = *it.data().at(0);
@ -228,7 +228,7 @@ void EmoticonsEditDialog::addEmoticon(TQString emo, TQString text, bool copy)
if(copy) if(copy)
TDEIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false )); TDEIO::copy(emo, TDEGlobal::dirs()->saveLocation( "emoticons", themeName, false ));
KListViewItem *itm = new KListViewItem(mMainWidget->klvEmoticons); TDEListViewItem *itm = new TDEListViewItem(mMainWidget->klvEmoticons);
itm->setPixmap(0, TQPixmap(emo)); itm->setPixmap(0, TQPixmap(emo));
itm->setText(1, text); itm->setText(1, text);
itm->setText(2, TQFileInfo(emo).baseName()); itm->setText(2, TQFileInfo(emo).baseName());

@ -70,7 +70,7 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<widget class="KListView" row="0" column="0"> <widget class="TDEListView" row="0" column="0">
<property name="name"> <property name="name">
<cstring>klvEmoticons</cstring> <cstring>klvEmoticons</cstring>
</property> </property>

@ -30,17 +30,17 @@
#include <klistview.h> #include <klistview.h>
#include <klocale.h> #include <klocale.h>
class TooltipItem : public KListViewItem class TooltipItem : public TDEListViewItem
{ {
public: public:
TooltipItem(KListView *parent, const TQString& label, const TQString& propertyName) TooltipItem(TDEListView *parent, const TQString& label, const TQString& propertyName)
: KListViewItem(parent, label), : TDEListViewItem(parent, label),
mPropName(propertyName) mPropName(propertyName)
{ {
} }
TooltipItem(KListView *parent, TQListViewItem *item, const TQString& label, const TQString& propertyName) TooltipItem(TDEListView *parent, TQListViewItem *item, const TQString& label, const TQString& propertyName)
: KListViewItem(parent, item, label), : TDEListViewItem(parent, item, label),
mPropName(propertyName) mPropName(propertyName)
{ {
} }

@ -65,7 +65,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></string> <string></string>
@ -179,7 +179,7 @@
</spacer> </spacer>
</vbox> </vbox>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string></string> <string></string>

@ -107,7 +107,7 @@ void KopeteAddressBookExport::fetchKABCData()
} }
} }
void KopeteAddressBookExport::fetchPhoneNumbers( KListBox * listBox, int type, uint& counter ) void KopeteAddressBookExport::fetchPhoneNumbers( TDEListBox * listBox, int type, uint& counter )
{ {
KABC::PhoneNumber::List phones = mAddressee.phoneNumbers( type ); KABC::PhoneNumber::List phones = mAddressee.phoneNumbers( type );
counter = phones.count(); counter = phones.count();
@ -156,7 +156,7 @@ void KopeteAddressBookExport::populateIM( const Kopete::Contact *contact, const
} }
} }
void KopeteAddressBookExport::populateIM( const Kopete::Contact *contact, const TQPixmap &icon, KListBox *listBox, const Kopete::ContactPropertyTmpl &property ) void KopeteAddressBookExport::populateIM( const Kopete::Contact *contact, const TQPixmap &icon, TDEListBox *listBox, const Kopete::ContactPropertyTmpl &property )
{ {
Kopete::ContactProperty prop = contact->property( property ); Kopete::ContactProperty prop = contact->property( property );
if ( !prop.isNull() ) if ( !prop.isNull() )
@ -274,7 +274,7 @@ bool KopeteAddressBookExport::newValue( TQComboBox *combo )
( combo->text( combo->currentItem() ) == combo->text( 0 ) ) ); ( combo->text( combo->currentItem() ) == combo->text( 0 ) ) );
} }
TQStringList KopeteAddressBookExport::newValues( KListBox *listBox, uint counter ) TQStringList KopeteAddressBookExport::newValues( TDEListBox *listBox, uint counter )
{ {
TQStringList newValues; TQStringList newValues;
// need to iterate all items except those from KABC and check if selected and not same as the first // need to iterate all items except those from KABC and check if selected and not same as the first

@ -28,7 +28,7 @@
class AddressBookExportUI; class AddressBookExportUI;
class KDialogBase; class KDialogBase;
class KListBox; class TDEListBox;
class KComboBox; class KComboBox;
namespace Kopete namespace Kopete
@ -65,7 +65,7 @@ protected:
/** /**
* Populate a listbox with a given type of phone number * Populate a listbox with a given type of phone number
*/ */
void fetchPhoneNumbers( KListBox * listBox, int type, uint& counter ); void fetchPhoneNumbers( TDEListBox * listBox, int type, uint& counter );
/** /**
* Populate the GUI with data from IM systems * Populate the GUI with data from IM systems
*/ */
@ -79,11 +79,11 @@ protected:
* Populate a listbox with a contact's IM data * Populate a listbox with a contact's IM data
*/ */
void populateIM( const Kopete::Contact *contact, const TQPixmap &icon, void populateIM( const Kopete::Contact *contact, const TQPixmap &icon,
KListBox *combo, const Kopete::ContactPropertyTmpl &property ); TDEListBox *combo, const Kopete::ContactPropertyTmpl &property );
/** Check the selected item is not the first (existing KABC) item, or the same as it */ /** Check the selected item is not the first (existing KABC) item, or the same as it */
bool newValue( TQComboBox *combo ); bool newValue( TQComboBox *combo );
TQStringList newValues( KListBox *listBox, uint counter ); TQStringList newValues( TDEListBox *listBox, uint counter );
// the GUI // the GUI
TQWidget *mParent; TQWidget *mParent;

@ -41,7 +41,7 @@
<cstring>mPhones</cstring> <cstring>mPhones</cstring>
</property> </property>
</widget> </widget>
<widget class="KListBox" row="5" column="1"> <widget class="TDEListBox" row="5" column="1">
<property name="name"> <property name="name">
<cstring>mWorkPhones</cstring> <cstring>mWorkPhones</cstring>
</property> </property>
@ -49,7 +49,7 @@
<enum>Extended</enum> <enum>Extended</enum>
</property> </property>
</widget> </widget>
<widget class="KListBox" row="6" column="1"> <widget class="TDEListBox" row="6" column="1">
<property name="name"> <property name="name">
<cstring>mMobilePhones</cstring> <cstring>mMobilePhones</cstring>
</property> </property>
@ -57,7 +57,7 @@
<enum>Extended</enum> <enum>Extended</enum>
</property> </property>
</widget> </widget>
<widget class="KListBox" row="4" column="1"> <widget class="TDEListBox" row="4" column="1">
<property name="name"> <property name="name">
<cstring>mHomePhones</cstring> <cstring>mHomePhones</cstring>
</property> </property>
@ -124,7 +124,7 @@
<cstring>comboBox2</cstring> <cstring>comboBox2</cstring>
</property> </property>
</widget> </widget>
<widget class="KListBox" row="2" column="1"> <widget class="TDEListBox" row="2" column="1">
<property name="name"> <property name="name">
<cstring>mEmails</cstring> <cstring>mEmails</cstring>
</property> </property>

@ -81,19 +81,19 @@ class KopeteContactListViewPrivate
public: public:
std::auto_ptr<ContactListViewStrategy> viewStrategy; std::auto_ptr<ContactListViewStrategy> viewStrategy;
void updateViewStrategy( KListView *view ); void updateViewStrategy( TDEListView *view );
}; };
class ContactListViewStrategy class ContactListViewStrategy
{ {
public: public:
ContactListViewStrategy( KListView *view ) ContactListViewStrategy( TDEListView *view )
: _listView( view ) : _listView( view )
{ {
view->clear(); view->clear();
} }
virtual ~ContactListViewStrategy() {} virtual ~ContactListViewStrategy() {}
KListView *listView() { return _listView; } TDEListView *listView() { return _listView; }
void addCurrentItems() void addCurrentItems()
{ {
// Add the already existing groups now // Add the already existing groups now
@ -147,13 +147,13 @@ protected:
} }
private: private:
KListView *_listView; TDEListView *_listView;
}; };
class ArrangeByGroupsViewStrategy : public ContactListViewStrategy class ArrangeByGroupsViewStrategy : public ContactListViewStrategy
{ {
public: public:
ArrangeByGroupsViewStrategy( KListView *view ) ArrangeByGroupsViewStrategy( TDEListView *view )
: ContactListViewStrategy( view ) : ContactListViewStrategy( view )
{ {
addCurrentItems(); addCurrentItems();
@ -242,7 +242,7 @@ private:
class ArrangeByPresenceViewStrategy : public ContactListViewStrategy class ArrangeByPresenceViewStrategy : public ContactListViewStrategy
{ {
public: public:
ArrangeByPresenceViewStrategy( KListView *view ) ArrangeByPresenceViewStrategy( TDEListView *view )
: ContactListViewStrategy( view ) : ContactListViewStrategy( view )
, m_onlineItem( new KopeteStatusGroupViewItem( Kopete::OnlineStatus::Online, listView() ) ) , m_onlineItem( new KopeteStatusGroupViewItem( Kopete::OnlineStatus::Online, listView() ) )
, m_offlineItem( new KopeteStatusGroupViewItem( Kopete::OnlineStatus::Offline, listView() ) ) , m_offlineItem( new KopeteStatusGroupViewItem( Kopete::OnlineStatus::Offline, listView() ) )
@ -357,7 +357,7 @@ private:
TQGuardedPtr<KopeteGroupViewItem> m_temporaryItem; TQGuardedPtr<KopeteGroupViewItem> m_temporaryItem;
}; };
void KopeteContactListViewPrivate::updateViewStrategy( KListView *view ) void KopeteContactListViewPrivate::updateViewStrategy( TDEListView *view )
{ {
// this is a bit nasty, but this function needs changing if we add // this is a bit nasty, but this function needs changing if we add
// more view strategies anyway, so it should be fine. // more view strategies anyway, so it should be fine.
@ -411,8 +411,8 @@ KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name
setFullWidth( true ); setFullWidth( true );
connect( this, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), connect( this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ),
TQT_SLOT( slotContextMenu( KListView *, TQListViewItem *, const TQPoint & ) ) ); TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ), connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ),
TQT_SLOT( slotExpanded( TQListViewItem * ) ) ); TQT_SLOT( slotExpanded( TQListViewItem * ) ) );
connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ), connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ),
@ -459,7 +459,7 @@ KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name
slotSettingsChanged(); slotSettingsChanged();
} }
void KopeteContactListView::initActions( KActionCollection *ac ) void KopeteContactListView::initActions( TDEActionCollection *ac )
{ {
actionUndo = KStdAction::undo( TQT_TQOBJECT(this) , TQT_SLOT( slotUndo() ) , ac ); actionUndo = KStdAction::undo( TQT_TQOBJECT(this) , TQT_SLOT( slotUndo() ) , ac );
actionRedo = KStdAction::redo( TQT_TQOBJECT(this) , TQT_SLOT( slotRedo() ) , ac ); actionRedo = KStdAction::redo( TQT_TQOBJECT(this) , TQT_SLOT( slotRedo() ) , ac );
@ -467,7 +467,7 @@ void KopeteContactListView::initActions( KActionCollection *ac )
actionRedo->setEnabled(false); actionRedo->setEnabled(false);
new KAction( i18n( "Create New Group..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ), new TDEAction( i18n( "Create New Group..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( addGroup() ),
ac, "AddGroup" ); ac, "AddGroup" );
actionSendMessage = KopeteStdAction::sendMessage( actionSendMessage = KopeteStdAction::sendMessage(
@ -482,19 +482,19 @@ void KopeteContactListView::initActions( KActionCollection *ac )
actionRemove = KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ), actionRemove = KopeteStdAction::deleteContact( TQT_TQOBJECT(this), TQT_SLOT( slotRemove() ),
ac, "contactRemove" ); ac, "contactRemove" );
actionSendEmail = new KAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ), actionSendEmail = new TDEAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ),
0, TQT_TQOBJECT(this), TQT_SLOT( slotSendEmail() ), ac, "contactSendEmail" ); 0, TQT_TQOBJECT(this), TQT_SLOT( slotSendEmail() ), ac, "contactSendEmail" );
/* this actionRename is buggy, and useless with properties, removed in kopeteui.rc*/ /* this actionRename is buggy, and useless with properties, removed in kopeteui.rc*/
actionRename = new KAction( i18n( "Rename" ), "filesaveas", 0, actionRename = new TDEAction( i18n( "Rename" ), "filesaveas", 0,
TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), ac, "contactRename" ); TQT_TQOBJECT(this), TQT_SLOT( slotRename() ), ac, "contactRename" );
actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ), actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( slotSendFile() ),
ac, "contactSendFile" ); ac, "contactSendFile" );
actionAddContact = new KActionMenu( i18n( "&Add Contact" ), actionAddContact = new TDEActionMenu( i18n( "&Add Contact" ),
TQString::fromLatin1( "add_user" ), ac , "contactAddContact" ); TQString::fromLatin1( "add_user" ), ac , "contactAddContact" );
actionAddContact->popupMenu()->insertTitle( i18n("Select Account") ); actionAddContact->popupMenu()->insertTitle( i18n("Select Account") );
actionAddTemporaryContact = new KAction( i18n( "Add to Your Contact List" ), "add_user", 0, actionAddTemporaryContact = new TDEAction( i18n( "Add to Your Contact List" ), "add_user", 0,
TQT_TQOBJECT(this), TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" ); TQT_TQOBJECT(this), TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" );
connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotMetaContactSelected( bool ) ) ); connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotMetaContactSelected( bool ) ) );
@ -502,7 +502,7 @@ void KopeteContactListView::initActions( KActionCollection *ac )
connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountRegistered( Kopete::Account* )), TQT_SLOT(slotAddSubContactActionNewAccount(Kopete::Account*))); connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountRegistered( Kopete::Account* )), TQT_SLOT(slotAddSubContactActionNewAccount(Kopete::Account*)));
connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountUnregistered( const Kopete::Account* )), TQT_SLOT(slotAddSubContactActionAccountDeleted(const Kopete::Account *))); connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountUnregistered( const Kopete::Account* )), TQT_SLOT(slotAddSubContactActionAccountDeleted(const Kopete::Account *)));
actionProperties = new KAction( i18n( "&Properties" ), "edit_user", TQt::Key_Alt + TQt::Key_Return, actionProperties = new TDEAction( i18n( "&Properties" ), "edit_user", TQt::Key_Alt + TQt::Key_Return,
TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), ac, "contactProperties" ); TQT_TQOBJECT(this), TQT_SLOT( slotProperties() ), ac, "contactProperties" );
// Update enabled/disabled actions // Update enabled/disabled actions
@ -516,7 +516,7 @@ KopeteContactListView::~KopeteContactListView()
void KopeteContactListView::slotAddSubContactActionNewAccount(Kopete::Account* account) void KopeteContactListView::slotAddSubContactActionNewAccount(Kopete::Account* account)
{ {
KAction *action = new KAction( account->accountLabel(), account->accountIcon(), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAddContact()), account); TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAddContact()), account);
m_accountAddContactMap.insert( account, action); m_accountAddContactMap.insert( account, action);
actionAddContact->insert( action ); actionAddContact->insert( action );
} }
@ -526,7 +526,7 @@ void KopeteContactListView::slotAddSubContactActionAccountDeleted(const Kopete::
kdDebug(14000) << k_funcinfo << endl; kdDebug(14000) << k_funcinfo << endl;
if ( m_accountAddContactMap.contains( account ) ) if ( m_accountAddContactMap.contains( account ) )
{ {
KAction *action = m_accountAddContactMap[account]; TDEAction *action = m_accountAddContactMap[account];
m_accountAddContactMap.remove( account ); m_accountAddContactMap.remove( account );
actionAddContact->remove( action ); actionAddContact->remove( action );
} }
@ -636,7 +636,7 @@ void KopeteContactListView::slotCollapsed( TQListViewItem *item )
} }
} }
void KopeteContactListView::slotContextMenu( KListView * /*listview*/, void KopeteContactListView::slotContextMenu( TDEListView * /*listview*/,
TQListViewItem *item, const TQPoint &point ) TQListViewItem *item, const TQPoint &point )
{ {
// FIXME: this code should be moved to the various list view item classes. // FIXME: this code should be moved to the various list view item classes.
@ -659,7 +659,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/,
int nb = Kopete::ContactList::self()->selectedMetaContacts().count() + int nb = Kopete::ContactList::self()->selectedMetaContacts().count() +
Kopete::ContactList::self()->selectedGroups().count(); Kopete::ContactList::self()->selectedGroups().count();
KMainWindow *window = dynamic_cast<KMainWindow *>(topLevelWidget()); TDEMainWindow *window = dynamic_cast<TDEMainWindow *>(topLevelWidget());
if ( !window ) if ( !window )
{ {
kdError( 14000 ) << k_funcinfo << "Main window not found, unable to display context-menu; " kdError( 14000 ) << k_funcinfo << "Main window not found, unable to display context-menu; "
@ -677,13 +677,13 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/,
Kopete::Contact *c = metaLVI->contactForPoint( TQPoint( px, py ) ) ; Kopete::Contact *c = metaLVI->contactForPoint( TQPoint( px, py ) ) ;
if ( c ) if ( c )
{ {
KPopupMenu *p = c->popupMenu(); TDEPopupMenu *p = c->popupMenu();
connect( p, TQT_SIGNAL( aboutToHide() ), p, TQT_SLOT( deleteLater() ) ); connect( p, TQT_SIGNAL( aboutToHide() ), p, TQT_SLOT( deleteLater() ) );
p->popup( point ); p->popup( point );
} }
else else
{ {
KPopupMenu *popup = dynamic_cast<KPopupMenu *>( TDEPopupMenu *popup = dynamic_cast<TDEPopupMenu *>(
window->factory()->container( "contact_popup", window ) ); window->factory()->container( "contact_popup", window ) );
if ( popup ) if ( popup )
{ {
@ -709,7 +709,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/,
sep = false; sep = false;
} }
KPopupMenu *contactMenu = it.current()->popupMenu(); TDEPopupMenu *contactMenu = it.current()->popupMenu();
connect( popup, TQT_SIGNAL( aboutToHide() ), contactMenu, TQT_SLOT( deleteLater() ) ); connect( popup, TQT_SIGNAL( aboutToHide() ), contactMenu, TQT_SLOT( deleteLater() ) );
TQString nick=c->property(Kopete::Global::Properties::self()->nickName()).value().toString(); TQString nick=c->property(Kopete::Global::Properties::self()->nickName()).value().toString();
TQString text= nick.isEmpty() ? c->contactId() : i18n( "Translators: format: '<displayName> (<id>)'", "%2 <%1>" ). arg( c->contactId(), nick ); TQString text= nick.isEmpty() ? c->contactId() : i18n( "Translators: format: '<displayName> (<id>)'", "%2 <%1>" ). arg( c->contactId(), nick );
@ -727,7 +727,7 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/,
} }
else if ( groupvi && nb == 1 ) else if ( groupvi && nb == 1 )
{ {
KPopupMenu *popup = dynamic_cast<KPopupMenu *>( TDEPopupMenu *popup = dynamic_cast<TDEPopupMenu *>(
window->factory()->container( "group_popup", window ) ); window->factory()->container( "group_popup", window ) );
if ( popup ) if ( popup )
{ {
@ -745,14 +745,14 @@ void KopeteContactListView::slotContextMenu( KListView * /*listview*/,
} }
else if ( nb >= 1 ) else if ( nb >= 1 )
{ {
KPopupMenu *popup = dynamic_cast<KPopupMenu *>( TDEPopupMenu *popup = dynamic_cast<TDEPopupMenu *>(
window->factory()->container( "contactlistitems_popup", window ) ); window->factory()->container( "contactlistitems_popup", window ) );
if ( popup ) if ( popup )
popup->popup( point ); popup->popup( point );
} }
else else
{ {
KPopupMenu *popup = dynamic_cast<KPopupMenu *>( TDEPopupMenu *popup = dynamic_cast<TDEPopupMenu *>(
window->factory()->container( "contactlist_popup", window ) ); window->factory()->container( "contactlist_popup", window ) );
if ( popup ) if ( popup )
{ {
@ -1066,7 +1066,7 @@ bool KopeteContactListView::acceptDrag(TQDropEvent *e) const
TQListViewItem *source=currentItem(); TQListViewItem *source=currentItem();
TQListViewItem *parent; TQListViewItem *parent;
TQListViewItem *afterme; TQListViewItem *afterme;
// Due to a little design problem in KListView::findDrop() we can't // Due to a little design problem in TDEListView::findDrop() we can't
// call it directly from a const method until KDE 4.0, but as the // call it directly from a const method until KDE 4.0, but as the
// method is in fact const we can of course get away with a // method is in fact const we can of course get away with a
// const_cast... // const_cast...
@ -1204,7 +1204,7 @@ void KopeteContactListView::findDrop(const TQPoint &pos, TQListViewItem *&parent
void KopeteContactListView::contentsMousePressEvent( TQMouseEvent *e ) void KopeteContactListView::contentsMousePressEvent( TQMouseEvent *e )
{ {
KListView::contentsMousePressEvent( e ); TDEListView::contentsMousePressEvent( e );
if (e->button() == Qt::LeftButton ) if (e->button() == Qt::LeftButton )
{ {
TQPoint p=contentsToViewport(e->pos()); TQPoint p=contentsToViewport(e->pos());

@ -38,10 +38,10 @@ class KopeteMetaContactLVI;
class KopeteGroupViewItem; class KopeteGroupViewItem;
class KopeteStatusGroupViewItem; class KopeteStatusGroupViewItem;
class KRootPixmap; class KRootPixmap;
class KActionCollection; class TDEActionCollection;
class KAction; class TDEAction;
class KListAction; class TDEListAction;
class KActionMenu; class TDEActionMenu;
class KopeteContactListViewPrivate; class KopeteContactListViewPrivate;
@ -68,7 +68,7 @@ public:
/** /**
* Init MetaContact related actions * Init MetaContact related actions
*/ */
void initActions(KActionCollection*); void initActions(TDEActionCollection*);
/** /**
* Add a given group name and return it * Add a given group name and return it
@ -127,7 +127,7 @@ private slots:
void slotViewSelectionChanged(); void slotViewSelectionChanged();
void slotListSelectionChanged(); void slotListSelectionChanged();
void slotContextMenu(KListView*,TQListViewItem *item, const TQPoint &point ); void slotContextMenu(TDEListView*,TQListViewItem *item, const TQPoint &point );
void slotExpanded( TQListViewItem *item ); void slotExpanded( TQListViewItem *item );
void slotCollapsed( TQListViewItem *item ); void slotCollapsed( TQListViewItem *item );
@ -192,18 +192,18 @@ private:
TQPoint m_startDragPos; TQPoint m_startDragPos;
/* ACTIONS */ /* ACTIONS */
KAction *actionSendMessage; TDEAction *actionSendMessage;
KAction *actionStartChat; TDEAction *actionStartChat;
KAction *actionSendFile; TDEAction *actionSendFile;
KAction *actionSendEmail; TDEAction *actionSendEmail;
KListAction *actionMove; TDEListAction *actionMove;
KListAction *actionCopy; TDEListAction *actionCopy;
KAction *actionRename; TDEAction *actionRename;
KAction *actionRemove; TDEAction *actionRemove;
KAction *actionAddTemporaryContact; TDEAction *actionAddTemporaryContact;
KAction *actionProperties; TDEAction *actionProperties;
KAction *actionUndo; TDEAction *actionUndo;
KAction *actionRedo; TDEAction *actionRedo;
KopeteContactListViewPrivate *d; KopeteContactListViewPrivate *d;
@ -223,8 +223,8 @@ public:
public: public:
// This is public so the chatwinodw can handle sub actions // This is public so the chatwinodw can handle sub actions
// FIXME: do we not believe in accessor functions any more? // FIXME: do we not believe in accessor functions any more?
KActionMenu *actionAddContact; TDEActionMenu *actionAddContact;
TQMap<const Kopete::Account *, KAction *> m_accountAddContactMap; TQMap<const Kopete::Account *, TDEAction *> m_accountAddContactMap;
}; };
struct KopeteContactListView::UndoItem struct KopeteContactListView::UndoItem

@ -29,9 +29,9 @@
#include "kopetecontactlist.h" #include "kopetecontactlist.h"
#include "kopetegroup.h" #include "kopetegroup.h"
KopeteGroupListAction::KopeteGroupListAction( const TQString &text, const TQString &pix, const KShortcut &cut, const TQObject *receiver, KopeteGroupListAction::KopeteGroupListAction( const TQString &text, const TQString &pix, const TDEShortcut &cut, const TQObject *receiver,
const char *slot, TQObject *parent, const char *name ) const char *slot, TQObject *parent, const char *name )
: KListAction( text, pix, cut, parent, name ) : TDEListAction( text, pix, cut, parent, name )
{ {
connect( this, TQT_SIGNAL( activated() ), receiver, slot ); connect( this, TQT_SIGNAL( activated() ), receiver, slot );

@ -26,13 +26,13 @@
/** /**
* Action used for Copy To and Move To * Action used for Copy To and Move To
*/ */
class KopeteGroupListAction : public KListAction class KopeteGroupListAction : public TDEListAction
{ {
Q_OBJECT Q_OBJECT
public: public:
KopeteGroupListAction( const TQString &, const TQString &, const KShortcut &, KopeteGroupListAction( const TQString &, const TQString &, const TDEShortcut &,
const TQObject *, const char *, TQObject *, const char * ); const TQObject *, const char *, TQObject *, const char * );
~KopeteGroupListAction(); ~KopeteGroupListAction();

@ -192,20 +192,20 @@ TQString KopeteGroupViewItem::key( int, bool ) const
void KopeteGroupViewItem::startRename( int /*col*/ ) void KopeteGroupViewItem::startRename( int /*col*/ )
{ {
//kdDebug(14000) << k_funcinfo << endl; //kdDebug(14000) << k_funcinfo << endl;
KListViewItem::startRename( 0 ); TDEListViewItem::startRename( 0 );
} }
void KopeteGroupViewItem::okRename( int col ) void KopeteGroupViewItem::okRename( int col )
{ {
//kdDebug(14000) << k_funcinfo << endl; //kdDebug(14000) << k_funcinfo << endl;
KListViewItem::okRename(col); TDEListViewItem::okRename(col);
setRenameEnabled( 0, false ); setRenameEnabled( 0, false );
} }
void KopeteGroupViewItem::cancelRename( int col ) void KopeteGroupViewItem::cancelRename( int col )
{ {
//kdDebug(14000) << k_funcinfo << endl; //kdDebug(14000) << k_funcinfo << endl;
KListViewItem::cancelRename(col); TDEListViewItem::cancelRename(col);
setRenameEnabled( 0, false ); setRenameEnabled( 0, false );
} }
@ -265,7 +265,7 @@ TQString KopeteGroupViewItem::text( int column ) const
if ( column == 0 ) if ( column == 0 )
return d->name->text(); return d->name->text();
else else
return KListViewItem::text( column ); return TDEListViewItem::text( column );
} }
void KopeteGroupViewItem::setText( int column, const TQString &text ) void KopeteGroupViewItem::setText( int column, const TQString &text )
@ -282,7 +282,7 @@ void KopeteGroupViewItem::setText( int column, const TQString &text )
group()->setDisplayName( text ); group()->setDisplayName( text );
} }
else else
KListViewItem::setText( column, text ); TDEListViewItem::setText( column, text );
} }
#include "kopetegroupviewitem.moc" #include "kopetegroupviewitem.moc"

@ -46,7 +46,7 @@ public:
virtual void startRename( int col ); virtual void startRename( int col );
/** /**
* reimplemented from KListViewItem to take into account our alternate text storage * reimplemented from TDEListViewItem to take into account our alternate text storage
*/ */
virtual TQString text( int column ) const; virtual TQString text( int column ) const;
virtual void setText( int column, const TQString &text ); virtual void setText( int column, const TQString &text );

@ -1,5 +1,5 @@
/* /*
kopetemetacontactlvi.cpp - Kopete Meta Contact KListViewItem kopetemetacontactlvi.cpp - Kopete Meta Contact TDEListViewItem
Copyright (c) 2004 by Richard Smith <kde@metafoo.co.uk> Copyright (c) 2004 by Richard Smith <kde@metafoo.co.uk>
Copyright (c) 2002-2004 by Martijn Klingens <klingens@kde.org> Copyright (c) 2002-2004 by Martijn Klingens <klingens@kde.org>
@ -169,7 +169,7 @@ public:
KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *parent ) KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, KopeteGroupViewItem *parent )
: ListView::Item( parent, contact, "MetaContactLVI" ) : ListView::Item( parent, contact, "MetaContactLVI" )
//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) //: TQObject( contact, "MetaContactLVI" ), TDEListViewItem( parent )
{ {
m_metaContact = contact; m_metaContact = contact;
m_isTopLevel = false; m_isTopLevel = false;
@ -182,7 +182,7 @@ KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, Kopete
KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *parent ) KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListViewItem *parent )
: ListView::Item( parent, contact, "MetaContactLVI" ) : ListView::Item( parent, contact, "MetaContactLVI" )
//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) //: TQObject( contact, "MetaContactLVI" ), TDEListViewItem( parent )
{ {
m_metaContact = contact; m_metaContact = contact;
@ -195,7 +195,7 @@ KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQList
KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *parent ) KopeteMetaContactLVI::KopeteMetaContactLVI( Kopete::MetaContact *contact, TQListView *parent )
: ListView::Item( parent, contact, "MetaContactLVI" ) : ListView::Item( parent, contact, "MetaContactLVI" )
//: TQObject( contact, "MetaContactLVI" ), KListViewItem( parent ) //: TQObject( contact, "MetaContactLVI" ), TDEListViewItem( parent )
{ {
m_metaContact = contact; m_metaContact = contact;
@ -280,13 +280,13 @@ void KopeteMetaContactLVI::movedToDifferentGroup()
// create a spacer if wanted // create a spacer if wanted
// I assume that the safety property that allows the delete in slotConfigChanged holds here - Will // I assume that the safety property that allows the delete in slotConfigChanged holds here - Will
delete d->spacerBox->component( 0 ); delete d->spacerBox->component( 0 );
if ( KListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() && if ( TDEListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() &&
!KopetePrefs::prefs()->treeView() ) !KopetePrefs::prefs()->treeView() )
{ {
new ListView::SpacerComponent( d->spacerBox, 20, 0 ); new ListView::SpacerComponent( d->spacerBox, 20, 0 );
} }
KopeteGroupViewItem *group_item = dynamic_cast<KopeteGroupViewItem*>(KListViewItem::parent()); KopeteGroupViewItem *group_item = dynamic_cast<KopeteGroupViewItem*>(TDEListViewItem::parent());
if ( group_item ) if ( group_item )
{ {
m_isTopLevel = false; m_isTopLevel = false;
@ -582,18 +582,18 @@ void KopeteMetaContactLVI::slotRemoveFromGroup()
void KopeteMetaContactLVI::startRename( int /*col*/ ) void KopeteMetaContactLVI::startRename( int /*col*/ )
{ {
KListViewItem::startRename( 0 ); TDEListViewItem::startRename( 0 );
} }
void KopeteMetaContactLVI::okRename( int col ) void KopeteMetaContactLVI::okRename( int col )
{ {
KListViewItem::okRename( col ); TDEListViewItem::okRename( col );
setRenameEnabled( 0, false ); setRenameEnabled( 0, false );
} }
void KopeteMetaContactLVI::cancelRename( int col ) void KopeteMetaContactLVI::cancelRename( int col )
{ {
KListViewItem::cancelRename( col ); TDEListViewItem::cancelRename( col );
setRenameEnabled( 0, false ); setRenameEnabled( 0, false );
} }
@ -658,7 +658,7 @@ void KopeteMetaContactLVI::slotConfigChanged()
// create a spacer if wanted // create a spacer if wanted
delete d->spacerBox->component( 0 ); delete d->spacerBox->component( 0 );
if ( KListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() && if ( TDEListViewItem::parent() && KopetePrefs::prefs()->contactListIndentContacts() &&
!KopetePrefs::prefs()->treeView() ) !KopetePrefs::prefs()->treeView() )
{ {
new ListView::SpacerComponent( d->spacerBox, 20, 0 ); new ListView::SpacerComponent( d->spacerBox, 20, 0 );
@ -1094,7 +1094,7 @@ TQString KopeteMetaContactLVI::text( int column ) const
if ( column == 0 ) if ( column == 0 )
return d->nameText->text(); return d->nameText->text();
else else
return KListViewItem::text( column ); return TDEListViewItem::text( column );
} }
void KopeteMetaContactLVI::setText( int column, const TQString &text ) void KopeteMetaContactLVI::setText( int column, const TQString &text )
@ -1102,7 +1102,7 @@ void KopeteMetaContactLVI::setText( int column, const TQString &text )
if ( column == 0 ) if ( column == 0 )
rename( text ); rename( text );
else else
KListViewItem::setText( column, text ); TDEListViewItem::setText( column, text );
} }
#include "kopetemetacontactlvi.moc" #include "kopetemetacontactlvi.moc"

@ -1,5 +1,5 @@
/* /*
kopetemetacontactlvi.h - Kopete Meta Contact KListViewItem kopetemetacontactlvi.h - Kopete Meta Contact TDEListViewItem
Copyright (c) 2004 by Richard Smith <kde@metafoo.co.uk> Copyright (c) 2004 by Richard Smith <kde@metafoo.co.uk>
Copyright (c) 2002-2003 by Olivier Goffart <ogoffart @ kde.org> Copyright (c) 2002-2003 by Olivier Goffart <ogoffart @ kde.org>
@ -31,8 +31,8 @@
class TQVariant; class TQVariant;
class KAction; class TDEAction;
class KListAction; class TDEListAction;
namespace Kopete namespace Kopete
{ {
@ -116,7 +116,7 @@ public:
bool isGrouped() const; bool isGrouped() const;
/** /**
* reimplemented from KListViewItem to take into account our alternate text storage * reimplemented from TDEListViewItem to take into account our alternate text storage
*/ */
virtual TQString text( int column ) const; virtual TQString text( int column ) const;
virtual void setText( int column, const TQString &text ); virtual void setText( int column, const TQString &text );

@ -72,7 +72,7 @@ KopeteApplication::KopeteApplication()
* TQApplication thinks the application shuts down (this is usually the case * TQApplication thinks the application shuts down (this is usually the case
* when the loop_level goes down to zero) . So it emits aboutToQuit(), to * when the loop_level goes down to zero) . So it emits aboutToQuit(), to
* which TDEApplication is connected and re-emits shutdown() , to which again * which TDEApplication is connected and re-emits shutdown() , to which again
* KMainWindow (a KopeteWindow instance exists already) is connected. KMainWindow's * TDEMainWindow (a KopeteWindow instance exists already) is connected. TDEMainWindow's
* shuttingDown() slot calls queryExit() which results in KopeteWindow::queryExit() * shuttingDown() slot calls queryExit() which results in KopeteWindow::queryExit()
* calling unloadPlugins() . This of course is wrong and just shouldn't happen. * calling unloadPlugins() . This of course is wrong and just shouldn't happen.
* The workaround is to simply delay the initialization of all this to a point * The workaround is to simply delay the initialization of all this to a point
@ -316,7 +316,7 @@ void KopeteApplication::quitKopete()
m_isShuttingDown = true; m_isShuttingDown = true;
// close all windows // close all windows
TQPtrListIterator<KMainWindow> it(*KMainWindow::memberList); TQPtrListIterator<TDEMainWindow> it(*TDEMainWindow::memberList);
for (it.toFirst(); it.current(); ++it) for (it.toFirst(); it.current(); ++it)
{ {
if ( !it.current()->close() ) if ( !it.current()->close() )

@ -107,7 +107,7 @@ void KopeteEditGlobalIdentityWidget::iconSizeChanged()
{ {
kdDebug(14000) << k_funcinfo << "Changing icon size (i.e the picture size)" << endl; kdDebug(14000) << k_funcinfo << "Changing icon size (i.e the picture size)" << endl;
KToolBar *tb = (KToolBar*)sender(); TDEToolBar *tb = (TDEToolBar*)sender();
if(tb) if(tb)
{ {
// Update the picture (change the size of it) // Update the picture (change the size of it)

@ -96,12 +96,12 @@ void GlobalStatusMessageIconLabel::mouseReleaseEvent( TQMouseEvent *event )
} }
//END GlobalStatusMessageIconLabel //END GlobalStatusMessageIconLabel
/* KMainWindow is very broken from our point of view - it deref()'s the app /* TDEMainWindow is very broken from our point of view - it deref()'s the app
* when the last visible KMainWindow is destroyed. But when our main window is * when the last visible TDEMainWindow is destroyed. But when our main window is
* hidden when it's in the tray,closing the last chatwindow would cause the app * hidden when it's in the tray,closing the last chatwindow would cause the app
* to quit. - Richard * to quit. - Richard
* *
* Fortunately KMainWindow checks queryExit before deref()ing the Kapplication. * Fortunately TDEMainWindow checks queryExit before deref()ing the Kapplication.
* KopeteWindow reimplements queryExit() and only returns true if it is shutting down * KopeteWindow reimplements queryExit() and only returns true if it is shutting down
* (either because the user quit Kopete, or the session manager did). * (either because the user quit Kopete, or the session manager did).
* *
@ -121,7 +121,7 @@ void GlobalStatusMessageIconLabel::mouseReleaseEvent( TQMouseEvent *event )
*/ */
KopeteWindow::KopeteWindow( TQWidget *parent, const char *name ) KopeteWindow::KopeteWindow( TQWidget *parent, const char *name )
: KMainWindow( parent, name, WType_TopLevel ) : TDEMainWindow( parent, name, WType_TopLevel )
{ {
// Applications should ensure that their StatusBar exists before calling createGUI() // Applications should ensure that their StatusBar exists before calling createGUI()
// so that the StatusBar is always correctly positioned when KDE is configured to use // so that the StatusBar is always correctly positioned when KDE is configured to use
@ -205,7 +205,7 @@ void KopeteWindow::initView()
void KopeteWindow::initActions() void KopeteWindow::initActions()
{ {
// this action menu contains one action per account and is updated when accounts are registered/unregistered // this action menu contains one action per account and is updated when accounts are registered/unregistered
actionAddContact = new KActionMenu( i18n( "&Add Contact" ), "add_user", actionAddContact = new TDEActionMenu( i18n( "&Add Contact" ), "add_user",
actionCollection(), "AddContact" ); actionCollection(), "AddContact" );
actionAddContact->setDelayed( false ); actionAddContact->setDelayed( false );
// this signal mapper is needed to call slotAddContact with the correct arguments // this signal mapper is needed to call slotAddContact with the correct arguments
@ -214,20 +214,20 @@ void KopeteWindow::initActions()
this, TQT_SLOT( slotAddContactDialogInternal( const TQString & ) ) ); this, TQT_SLOT( slotAddContactDialogInternal( const TQString & ) ) );
/* ConnectAll is now obsolete. "Go online" has replaced it. /* ConnectAll is now obsolete. "Go online" has replaced it.
actionConnect = new KAction( i18n( "&Connect Accounts" ), "connect_creating", actionConnect = new TDEAction( i18n( "&Connect Accounts" ), "connect_creating",
0, Kopete::AccountManager::self(), TQT_SLOT( connectAll() ), 0, Kopete::AccountManager::self(), TQT_SLOT( connectAll() ),
actionCollection(), "ConnectAll" ); actionCollection(), "ConnectAll" );
*/ */
actionDisconnect = new KAction( i18n( "O&ffline" ), "connect_no", actionDisconnect = new TDEAction( i18n( "O&ffline" ), "connect_no",
0, TQT_TQOBJECT(this), TQT_SLOT( slotDisconnectAll() ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotDisconnectAll() ),
actionCollection(), "DisconnectAll" ); actionCollection(), "DisconnectAll" );
actionExportContacts = new KAction( i18n( "&Export Contacts..." ), "", 0, TQT_TQOBJECT(this), actionExportContacts = new TDEAction( i18n( "&Export Contacts..." ), "", 0, TQT_TQOBJECT(this),
TQT_SLOT( showExportDialog() ),actionCollection(), "ExportContacts" ); TQT_SLOT( showExportDialog() ),actionCollection(), "ExportContacts" );
/* the connection menu has been replaced by the set status menu /* the connection menu has been replaced by the set status menu
actionConnectionMenu = new KActionMenu( i18n("Connection"),"connect_established", actionConnectionMenu = new TDEActionMenu( i18n("Connection"),"connect_established",
actionCollection(), "Connection" ); actionCollection(), "Connection" );
actionConnectionMenu->setDelayed( false ); actionConnectionMenu->setDelayed( false );
@ -237,32 +237,32 @@ void KopeteWindow::initActions()
*/ */
actionDisconnect->setEnabled(false); actionDisconnect->setEnabled(false);
selectAway = new KAction( i18n("&Away"), SmallIcon("kopeteaway"), 0, selectAway = new TDEAction( i18n("&Away"), SmallIcon("kopeteaway"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotGlobalAway() ), actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotGlobalAway() ), actionCollection(),
"SetAwayAll" ); "SetAwayAll" );
selectBusy = new KAction( i18n("&Busy"), SmallIcon("kopeteaway"), 0, selectBusy = new TDEAction( i18n("&Busy"), SmallIcon("kopeteaway"), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotGlobalBusy() ), actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotGlobalBusy() ), actionCollection(),
"SetBusyAll" ); "SetBusyAll" );
actionSetInvisible = new KAction( i18n( "&Invisible" ), "kopeteavailable", 0 , actionSetInvisible = new TDEAction( i18n( "&Invisible" ), "kopeteavailable", 0 ,
TQT_TQOBJECT(this), TQT_SLOT( slotSetInvisibleAll() ), actionCollection(), TQT_TQOBJECT(this), TQT_SLOT( slotSetInvisibleAll() ), actionCollection(),
"SetInvisibleAll" ); "SetInvisibleAll" );
/*actionSetAvailable = new KAction( i18n( "&Online" ), /*actionSetAvailable = new TDEAction( i18n( "&Online" ),
"kopeteavailable", 0 , Kopete::AccountManager::self(), "kopeteavailable", 0 , Kopete::AccountManager::self(),
TQT_SLOT( setAvailableAll() ), actionCollection(), TQT_SLOT( setAvailableAll() ), actionCollection(),
"SetAvailableAll" );*/ "SetAvailableAll" );*/
actionSetAvailable = new KAction( i18n("&Online"), actionSetAvailable = new TDEAction( i18n("&Online"),
SmallIcon("kopeteavailable"), 0, TQT_TQOBJECT(this), SmallIcon("kopeteavailable"), 0, TQT_TQOBJECT(this),
TQT_SLOT( slotGlobalAvailable() ), actionCollection(), TQT_SLOT( slotGlobalAvailable() ), actionCollection(),
"SetAvailableAll" ); "SetAvailableAll" );
actionAwayMenu = new KActionMenu( i18n("&Set Status"), "kopeteavailable", actionAwayMenu = new TDEActionMenu( i18n("&Set Status"), "kopeteavailable",
actionCollection(), "Status" ); actionCollection(), "Status" );
actionAwayMenu->setDelayed( false ); actionAwayMenu->setDelayed( false );
actionAwayMenu->insert(actionSetAvailable); actionAwayMenu->insert(actionSetAvailable);
@ -280,17 +280,17 @@ void KopeteWindow::initActions()
statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar"); statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar");
KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection(), "settings_keys" ); KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection(), "settings_keys" );
new KAction( i18n( "Configure Plugins..." ), "input_devices_settings", 0, TQT_TQOBJECT(this), new TDEAction( i18n( "Configure Plugins..." ), "input_devices_settings", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotConfigurePlugins() ), actionCollection(), "settings_plugins" ); TQT_SLOT( slotConfigurePlugins() ), actionCollection(), "settings_plugins" );
new KAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this), new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, TQT_TQOBJECT(this),
TQT_SLOT( slotConfGlobalKeys() ), actionCollection(), "settings_global" ); TQT_SLOT( slotConfGlobalKeys() ), actionCollection(), "settings_global" );
KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection() ); KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection() );
KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfNotifications()), actionCollection(), "settings_notifications" ); KStdAction::configureNotifications(TQT_TQOBJECT(this), TQT_SLOT(slotConfNotifications()), actionCollection(), "settings_notifications" );
actionShowOffliners = new KToggleAction( i18n( "Show Offline &Users" ), "show_offliners", CTRL + Key_U, actionShowOffliners = new TDEToggleAction( i18n( "Show Offline &Users" ), "show_offliners", CTRL + Key_U,
TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" ); TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" );
actionShowEmptyGroups = new KToggleAction( i18n( "Show Empty &Groups" ), "folder", CTRL + Key_G, actionShowEmptyGroups = new TDEToggleAction( i18n( "Show Empty &Groups" ), "folder", CTRL + Key_G,
TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" ); TQT_TQOBJECT(this), TQT_SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" );
actionShowOffliners->setCheckedState(i18n("Hide Offline &Users")); actionShowOffliners->setCheckedState(i18n("Hide Offline &Users"));
@ -304,7 +304,7 @@ void KopeteWindow::initActions()
new KWidgetAction( searchLabel, i18n( "Search:" ), 0, 0, 0, actionCollection(), "quicksearch_label" ); new KWidgetAction( searchLabel, i18n( "Search:" ), 0, 0, 0, actionCollection(), "quicksearch_label" );
quickSearch->setAutoSized( true ); quickSearch->setAutoSized( true );
// quick search bar - clear button // quick search bar - clear button
KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ),
TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase",
0, TQT_TQOBJECT(searchBar), TQT_SLOT( clear() ), actionCollection(), "quicksearch_reset" ); 0, TQT_TQOBJECT(searchBar), TQT_SLOT( clear() ), actionCollection(), "quicksearch_reset" );
resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n" resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n"
@ -316,8 +316,8 @@ void KopeteWindow::initActions()
KWidgetAction *editGlobalAction = new KWidgetAction( editGlobalIdentityWidget, i18n("Edit Global Identity Widget"), 0, 0, 0, actionCollection(), "editglobal_widget"); KWidgetAction *editGlobalAction = new KWidgetAction( editGlobalIdentityWidget, i18n("Edit Global Identity Widget"), 0, 0, 0, actionCollection(), "editglobal_widget");
editGlobalAction->setAutoSized( true ); editGlobalAction->setAutoSized( true );
// KActionMenu for selecting the global status message(kopeteonlinestatus_0) // TDEActionMenu for selecting the global status message(kopeteonlinestatus_0)
KActionMenu * setStatusMenu = new KActionMenu( i18n( "Set Status Message" ), "kopeteeditstatusmessage", actionCollection(), "SetStatusMessage" ); TDEActionMenu * setStatusMenu = new TDEActionMenu( i18n( "Set Status Message" ), "kopeteeditstatusmessage", actionCollection(), "SetStatusMessage" );
setStatusMenu->setDelayed( false ); setStatusMenu->setDelayed( false );
connect( setStatusMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT(slotBuildStatusMessageMenu() ) ); connect( setStatusMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT(slotBuildStatusMessageMenu() ) );
connect( setStatusMenu->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_SLOT(slotStatusMessageSelected( int ) ) ); connect( setStatusMenu->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_SLOT(slotStatusMessageSelected( int ) ) );
@ -380,7 +380,7 @@ void KopeteWindow::initSystray()
{ {
m_tray = KopeteSystemTray::systemTray( this, "KopeteSystemTray" ); m_tray = KopeteSystemTray::systemTray( this, "KopeteSystemTray" );
Kopete::UI::Global::setSysTrayWId( m_tray->winId() ); Kopete::UI::Global::setSysTrayWId( m_tray->winId() );
KPopupMenu *tm = m_tray->contextMenu(); TDEPopupMenu *tm = m_tray->contextMenu();
// NOTE: This is in reverse order because we insert // NOTE: This is in reverse order because we insert
// at the top of the menu, not at bottom! // at the top of the menu, not at bottom!
@ -391,8 +391,8 @@ void KopeteWindow::initSystray()
//actionConnectionMenu->plug ( tm, 1 ); //actionConnectionMenu->plug ( tm, 1 );
tm->insertSeparator( 1 ); tm->insertSeparator( 1 );
TQObject::connect( m_tray, TQT_SIGNAL( aboutToShowMenu( KPopupMenu * ) ), TQObject::connect( m_tray, TQT_SIGNAL( aboutToShowMenu( TDEPopupMenu * ) ),
this, TQT_SLOT( slotTrayAboutToShowMenu( KPopupMenu * ) ) ); this, TQT_SLOT( slotTrayAboutToShowMenu( TDEPopupMenu * ) ) );
TQObject::connect( m_tray, TQT_SIGNAL( quitSelected() ), this, TQT_SLOT( slotQuit() ) ); TQObject::connect( m_tray, TQT_SIGNAL( quitSelected() ), this, TQT_SLOT( slotQuit() ) );
} }
@ -403,8 +403,8 @@ KopeteWindow::~KopeteWindow()
bool KopeteWindow::eventFilter( TQObject* target, TQEvent* event ) bool KopeteWindow::eventFilter( TQObject* target, TQEvent* event )
{ {
KToolBar* toolBar = dynamic_cast<KToolBar*>( target ); TDEToolBar* toolBar = dynamic_cast<TDEToolBar*>( target );
KAction* resetAction = actionCollection()->action( "quicksearch_reset" ); TDEAction* resetAction = actionCollection()->action( "quicksearch_reset" );
if ( toolBar && resetAction && resetAction->isPlugged( toolBar ) ) if ( toolBar && resetAction && resetAction->isPlugged( toolBar ) )
{ {
@ -414,10 +414,10 @@ bool KopeteWindow::eventFilter( TQObject* target, TQEvent* event )
resetAction->activate(); resetAction->activate();
return true; return true;
} }
return KMainWindow::eventFilter( target, event ); return TDEMainWindow::eventFilter( target, event );
} }
return KMainWindow::eventFilter( target, event ); return TDEMainWindow::eventFilter( target, event );
} }
void KopeteWindow::loadOptions() void KopeteWindow::loadOptions()
@ -657,7 +657,7 @@ void KopeteWindow::closeEvent( TQCloseEvent *e )
// window is closed. // window is closed.
KopeteApplication *app = static_cast<KopeteApplication *>( kapp ); KopeteApplication *app = static_cast<KopeteApplication *>( kapp );
if ( KopetePrefs::prefs()->showTray() && !app->isShuttingDown() && !app->sessionSaving() ) { if ( KopetePrefs::prefs()->showTray() && !app->isShuttingDown() && !app->sessionSaving() ) {
// BEGIN of code borrowed from KMainWindow::closeEvent // BEGIN of code borrowed from TDEMainWindow::closeEvent
// Save settings if auto-save is enabled, and settings have changed // Save settings if auto-save is enabled, and settings have changed
if ( settingsDirty() && autoSaveSettings() ) if ( settingsDirty() && autoSaveSettings() )
saveAutoSaveSettings(); saveAutoSaveSettings();
@ -665,13 +665,13 @@ void KopeteWindow::closeEvent( TQCloseEvent *e )
if ( queryClose() ) { if ( queryClose() ) {
e->accept(); e->accept();
} }
// END of code borrowed from KMainWindow::closeEvent // END of code borrowed from TDEMainWindow::closeEvent
kdDebug( 14000 ) << k_funcinfo << "just closing because we have a system tray icon" << endl; kdDebug( 14000 ) << k_funcinfo << "just closing because we have a system tray icon" << endl;
} }
else else
{ {
kdDebug( 14000 ) << k_funcinfo << "delegating to KMainWindow::closeEvent()" << endl; kdDebug( 14000 ) << k_funcinfo << "delegating to TDEMainWindow::closeEvent()" << endl;
KMainWindow::closeEvent( e ); TDEMainWindow::closeEvent( e );
} }
} }
@ -728,7 +728,7 @@ void KopeteWindow::slotAccountRegistered( Kopete::Account *account )
// add an item for this account to the add contact actionmenu // add an item for this account to the add contact actionmenu
TQString s = "actionAdd%1Contact"; TQString s = "actionAdd%1Contact";
s.arg( account->accountId() ); s.arg( account->accountId() );
KAction *action = new KAction( account->accountLabel(), account->accountIcon(), 0 , addContactMapper, TQT_SLOT( map() ), account, s.latin1() ); TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , addContactMapper, TQT_SLOT( map() ), account, s.latin1() );
addContactMapper->setMapping( action, account->protocol()->pluginId() + TQChar(0xE000) + account->accountId() ); addContactMapper->setMapping( action, account->protocol()->pluginId() + TQChar(0xE000) + account->accountId() );
actionAddContact->insert( action ); actionAddContact->insert( action );
} }
@ -757,12 +757,12 @@ void KopeteWindow::slotAccountUnregistered( const Kopete::Account *account)
// update add contact actionmenu // update add contact actionmenu
TQString s = "actionAdd%1Contact"; TQString s = "actionAdd%1Contact";
s.arg( account->accountId() ); s.arg( account->accountId() );
// KAction * action = actionCollection()->action( account->accountId() ); // TDEAction * action = actionCollection()->action( account->accountId() );
Kopete::Account * myAccount = const_cast< Kopete::Account * > ( account ); Kopete::Account * myAccount = const_cast< Kopete::Account * > ( account );
KAction * action = static_cast< KAction *>( myAccount->child( s.latin1() ) ); TDEAction * action = static_cast< TDEAction *>( myAccount->child( s.latin1() ) );
if ( action ) if ( action )
{ {
kdDebug(14000) << " found KAction " << action << " with name: " << action->name() << endl; kdDebug(14000) << " found TDEAction " << action << " with name: " << action->name() << endl;
addContactMapper->removeMappings( action ); addContactMapper->removeMappings( action );
actionAddContact->remove( action ); actionAddContact->remove( action );
} }
@ -878,7 +878,7 @@ void KopeteWindow::makeTrayToolTip()
void KopeteWindow::slotAccountStatusIconRightClicked( Kopete::Account *account, const TQPoint &p ) void KopeteWindow::slotAccountStatusIconRightClicked( Kopete::Account *account, const TQPoint &p )
{ {
KActionMenu *actionMenu = account->actionMenu(); TDEActionMenu *actionMenu = account->actionMenu();
if ( !actionMenu ) if ( !actionMenu )
return; return;
@ -886,12 +886,12 @@ void KopeteWindow::slotAccountStatusIconRightClicked( Kopete::Account *account,
actionMenu->popupMenu()->popup( p ); actionMenu->popupMenu()->popup( p );
} }
void KopeteWindow::slotTrayAboutToShowMenu( KPopupMenu * popup ) void KopeteWindow::slotTrayAboutToShowMenu( TDEPopupMenu * popup )
{ {
TQPtrList<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts(); TQPtrList<Kopete::Account> accounts = Kopete::AccountManager::self()->accounts();
for(Kopete::Account *a=accounts.first() ; a; a=accounts.next() ) for(Kopete::Account *a=accounts.first() ; a; a=accounts.next() )
{ {
KActionMenu *menu = a->actionMenu(); TDEActionMenu *menu = a->actionMenu();
if( menu ) if( menu )
menu->plug(popup, 1 ); menu->plug(popup, 1 );
@ -907,7 +907,7 @@ void KopeteWindow::slotTrayAboutToShowMenu( KPopupMenu * popup )
//kdDebug( 14000 ) << k_funcinfo << endl; //kdDebug( 14000 ) << k_funcinfo << endl;
if ( Kopete::AccountManager::self()->accounts( proto ).count() > 0 ) if ( Kopete::AccountManager::self()->accounts( proto ).count() > 0 )
{ {
KActionMenu *menu = proto->protocolActions(); TDEActionMenu *menu = proto->protocolActions();
connect( menu->popupMenu(), TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) ); connect( menu->popupMenu(), TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) );
menu->popupMenu()->popup( p ); menu->popupMenu()->popup( p );
@ -969,11 +969,11 @@ void KopeteWindow::setStatusMessage( const TQString & message )
void KopeteWindow::slotBuildStatusMessageMenu() void KopeteWindow::slotBuildStatusMessageMenu()
{ {
TQObject * senderObj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )); TQObject * senderObj = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>( sender() ));
m_globalStatusMessageMenu = static_cast<KPopupMenu *>( TQT_TQWIDGET(senderObj) ); m_globalStatusMessageMenu = static_cast<TDEPopupMenu *>( TQT_TQWIDGET(senderObj) );
m_globalStatusMessageMenu->clear(); m_globalStatusMessageMenu->clear();
// pop up a menu containing the away messages, and a lineedit // pop up a menu containing the away messages, and a lineedit
// see kopeteaway // see kopeteaway
//messageMenu = new KPopupMenu( this ); //messageMenu = new TDEPopupMenu( this );
// messageMenu->insertTitle( i18n( "Status Message" ) ); // messageMenu->insertTitle( i18n( "Status Message" ) );
TQHBox * newMessageBox = new TQHBox( 0 ); TQHBox * newMessageBox = new TQHBox( 0 );
newMessageBox->setMargin( 1 ); newMessageBox->setMargin( 1 );
@ -1033,7 +1033,7 @@ void KopeteWindow::slotNewStatusMessageEntered()
void KopeteWindow::slotGlobalStatusMessageIconClicked( const TQPoint &position ) void KopeteWindow::slotGlobalStatusMessageIconClicked( const TQPoint &position )
{ {
KPopupMenu *statusMessageIconMenu = new KPopupMenu(this, "statusMessageIconMenu"); TDEPopupMenu *statusMessageIconMenu = new TDEPopupMenu(this, "statusMessageIconMenu");
connect(statusMessageIconMenu, TQT_SIGNAL( aboutToShow() ), connect(statusMessageIconMenu, TQT_SIGNAL( aboutToShow() ),
this, TQT_SLOT(slotBuildStatusMessageMenu())); this, TQT_SLOT(slotBuildStatusMessageMenu()));
connect( statusMessageIconMenu, TQT_SIGNAL( activated( int ) ), connect( statusMessageIconMenu, TQT_SIGNAL( activated( int ) ),

@ -32,13 +32,13 @@ class TQSignalMapper;
class TQMouseEvent; class TQMouseEvent;
class TQPoint; class TQPoint;
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class TDEGlobalAccel; class TDEGlobalAccel;
class KSelectAction; class TDESelectAction;
class KSqueezedTextLabel; class KSqueezedTextLabel;
class KToggleAction; class TDEToggleAction;
class KopeteAccountStatusBarIcon; class KopeteAccountStatusBarIcon;
class KopeteContactListView; class KopeteContactListView;
@ -58,7 +58,7 @@ class Protocol;
/** /**
* @author Duncan Mac-Vicar P. <duncan@kde.org> * @author Duncan Mac-Vicar P. <duncan@kde.org>
*/ */
class KopeteWindow : public KMainWindow class KopeteWindow : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -155,7 +155,7 @@ private slots:
void slotAccountStatusIconRightClicked( Kopete::Account *a, void slotAccountStatusIconRightClicked( Kopete::Account *a,
const TQPoint &p ); const TQPoint &p );
void slotTrayAboutToShowMenu(KPopupMenu *); void slotTrayAboutToShowMenu(TDEPopupMenu *);
/** /**
* Show the Add Contact wizard * Show the Add Contact wizard
@ -198,28 +198,28 @@ public:
KopeteContactListView *contactlist; KopeteContactListView *contactlist;
// Some Actions // Some Actions
KActionMenu* actionAddContact; TDEActionMenu* actionAddContact;
//KActionMenu* actionConnectionMenu; //TDEActionMenu* actionConnectionMenu;
//KAction* actionConnect; //TDEAction* actionConnect;
KAction* actionDisconnect; TDEAction* actionDisconnect;
KAction* actionExportContacts; TDEAction* actionExportContacts;
KActionMenu* actionAwayMenu; TDEActionMenu* actionAwayMenu;
KActionMenu* actionDockMenu; TDEActionMenu* actionDockMenu;
KAction* selectAway; TDEAction* selectAway;
KAction* selectBusy; TDEAction* selectBusy;
KAction* actionSetAvailable; TDEAction* actionSetAvailable;
KAction* actionSetInvisible; TDEAction* actionSetInvisible;
KAction* actionPrefs; TDEAction* actionPrefs;
KAction* actionQuit; TDEAction* actionQuit;
KAction* actionSave; TDEAction* actionSave;
KToggleAction *menubarAction; TDEToggleAction *menubarAction;
KToggleAction *statusbarAction; TDEToggleAction *statusbarAction;
KToggleAction *actionShowOffliners; TDEToggleAction *actionShowOffliners;
KToggleAction *actionShowEmptyGroups; TDEToggleAction *actionShowEmptyGroups;
TDEGlobalAccel *globalAccel; TDEGlobalAccel *globalAccel;
KopeteEditGlobalIdentityWidget *editGlobalIdentityWidget; KopeteEditGlobalIdentityWidget *editGlobalIdentityWidget;
@ -257,7 +257,7 @@ private:
*/ */
TQPtrDict<TQObject> m_accountStatusBarIcons; TQPtrDict<TQObject> m_accountStatusBarIcons;
KSqueezedTextLabel * m_globalStatusMessage; KSqueezedTextLabel * m_globalStatusMessage;
KPopupMenu * m_globalStatusMessageMenu; TDEPopupMenu * m_globalStatusMessageMenu;
TQLineEdit * m_newMessageEdit; TQLineEdit * m_newMessageEdit;
TQString m_globalStatusMessageStored; TQString m_globalStatusMessageStored;
}; };

@ -78,7 +78,7 @@ KopeteSystemTray::KopeteSystemTray(TQWidget* parent, const char* name)
// in the close widget click case, we only want to hide the parent window // in the close widget click case, we only want to hide the parent window
// so instead, we make it call our general purpose quit slot on the window, which causes a window close and everything else we need // so instead, we make it call our general purpose quit slot on the window, which causes a window close and everything else we need
// KDE4 - app will have to listen for quitSelected instead // KDE4 - app will have to listen for quitSelected instead
KAction *quit = actionCollection()->action( "file_quit" ); TDEAction *quit = actionCollection()->action( "file_quit" );
quit->disconnect(); quit->disconnect();
KopeteWindow *myParent = static_cast<KopeteWindow *>( parent ); KopeteWindow *myParent = static_cast<KopeteWindow *>( parent );
connect( quit, TQT_SIGNAL( activated() ), myParent, TQT_SLOT( slotQuit() ) ); connect( quit, TQT_SIGNAL( activated() ), myParent, TQT_SLOT( slotQuit() ) );
@ -124,7 +124,7 @@ void KopeteSystemTray::mouseDoubleClickEvent( TQMouseEvent *me )
} }
} }
void KopeteSystemTray::contextMenuAboutToShow( KPopupMenu *me ) void KopeteSystemTray::contextMenuAboutToShow( TDEPopupMenu *me )
{ {
//kdDebug(14010) << k_funcinfo << "Called." << endl; //kdDebug(14010) << k_funcinfo << "Called." << endl;
emit aboutToShowMenu( me ); emit aboutToShowMenu( me );

@ -29,8 +29,8 @@
class TQTimer; class TQTimer;
class TQPoint; class TQPoint;
class KPopupMenu; class TDEPopupMenu;
class KActionMenu; class TDEActionMenu;
class KopeteBalloon; class KopeteBalloon;
/** /**
@ -60,15 +60,15 @@ public:
void stopBlink(); void stopBlink();
bool isBlinking() const { return mIsBlinking; }; bool isBlinking() const { return mIsBlinking; };
KPopupMenu *contextMenu() const { return KSystemTray::contextMenu(); }; TDEPopupMenu *contextMenu() const { return KSystemTray::contextMenu(); };
protected: protected:
virtual void mousePressEvent( TQMouseEvent *e ); virtual void mousePressEvent( TQMouseEvent *e );
virtual void mouseDoubleClickEvent( TQMouseEvent *me ); virtual void mouseDoubleClickEvent( TQMouseEvent *me );
virtual void contextMenuAboutToShow( KPopupMenu * ); virtual void contextMenuAboutToShow( TDEPopupMenu * );
signals: signals:
void aboutToShowMenu(KPopupMenu *am); void aboutToShowMenu(TDEPopupMenu *am);
private slots: private slots:
void slotBlink(); void slotBlink();

@ -135,17 +135,17 @@ void KPixmapRegionSelectorWidget::updatePixmap()
} }
KPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu()
{ {
KPopupMenu *popup=new KPopupMenu(this, "PixmapRegionSelectorPopup"); TDEPopupMenu *popup=new TDEPopupMenu(this, "PixmapRegionSelectorPopup");
popup->insertTitle(i18n("Image Operations")); popup->insertTitle(i18n("Image Operations"));
KAction *action = new KAction(i18n("&Rotate Clockwise"), "rotate_cw", TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "rotate_cw",
0, this, TQT_SLOT(rotateClockwise()), 0, this, TQT_SLOT(rotateClockwise()),
popup, "rotateclockwise"); popup, "rotateclockwise");
action->plug(popup); action->plug(popup);
action = new KAction(i18n("Rotate &Counterclockwise"), "rotate_ccw", action = new TDEAction(i18n("Rotate &Counterclockwise"), "rotate_ccw",
0, this, TQT_SLOT(rotateCounterclockwise()), 0, this, TQT_SLOT(rotateCounterclockwise()),
popup, "rotatecounterclockwise"); popup, "rotatecounterclockwise");
action->plug(popup); action->plug(popup);
@ -215,7 +215,7 @@ bool KPixmapRegionSelectorWidget::eventFilter(TQObject *obj, TQEvent *ev)
if ( mev->button() == RightButton ) if ( mev->button() == RightButton )
{ {
KPopupMenu *popup = createPopupMenu( ); TDEPopupMenu *popup = createPopupMenu( );
popup->exec( mev->globalPos() ); popup->exec( mev->globalPos() );
delete popup; delete popup;
return TRUE; return TRUE;

@ -25,7 +25,7 @@
#include <tqlabel.h> #include <tqlabel.h>
#include <kimageeffect.h> #include <kimageeffect.h>
class KPopupMenu; class TDEPopupMenu;
#include "kopete_export.h" #include "kopete_export.h"
@ -136,9 +136,9 @@ public slots:
protected: protected:
/** /**
* Creates a KPopupMenu with the menu that appears when clicking with the right button on the label * Creates a TDEPopupMenu with the menu that appears when clicking with the right button on the label
*/ */
virtual KPopupMenu *createPopupMenu(); virtual TDEPopupMenu *createPopupMenu();
private: private:
bool eventFilter(TQObject *obj, TQEvent *ev); bool eventFilter(TQObject *obj, TQEvent *ev);

@ -163,15 +163,15 @@ bool KAutoConfig::retrieveSettings(bool trackChanges){
// KDE // KDE
changedMap.insert( TQString::fromLatin1("KComboBox"), TQT_SIGNAL(activated (int))); changedMap.insert( TQString::fromLatin1("KComboBox"), TQT_SIGNAL(activated (int)));
changedMap.insert( TQString::fromLatin1("KFontCombo"), TQT_SIGNAL(activated (int))); changedMap.insert( TQString::fromLatin1("TDEFontCombo"), TQT_SIGNAL(activated (int)));
changedMap.insert( TQString::fromLatin1("KFontRequester"), TQT_SIGNAL(fontSelected(const TQFont &))); changedMap.insert( TQString::fromLatin1("TDEFontRequester"), TQT_SIGNAL(fontSelected(const TQFont &)));
changedMap.insert( TQString::fromLatin1("KFontChooser"), TQT_SIGNAL(fontSelected(const TQFont &))); changedMap.insert( TQString::fromLatin1("TDEFontChooser"), TQT_SIGNAL(fontSelected(const TQFont &)));
changedMap.insert( TQString::fromLatin1("KHistoryCombo"), TQT_SIGNAL(activated (int))); changedMap.insert( TQString::fromLatin1("KHistoryCombo"), TQT_SIGNAL(activated (int)));
changedMap.insert( TQString::fromLatin1("KColorButton"), TQT_SIGNAL(changed(const TQColor &))); changedMap.insert( TQString::fromLatin1("KColorButton"), TQT_SIGNAL(changed(const TQColor &)));
changedMap.insert( TQString::fromLatin1("KDatePicker"), TQT_SIGNAL(dateSelected (TQDate))); changedMap.insert( TQString::fromLatin1("KDatePicker"), TQT_SIGNAL(dateSelected (TQDate)));
changedMap.insert( TQString::fromLatin1("KEditListBox"), TQT_SIGNAL(changed())); changedMap.insert( TQString::fromLatin1("KEditListBox"), TQT_SIGNAL(changed()));
changedMap.insert( TQString::fromLatin1("KListBox"), TQT_SIGNAL(selectionChanged())); changedMap.insert( TQString::fromLatin1("TDEListBox"), TQT_SIGNAL(selectionChanged()));
changedMap.insert( TQString::fromLatin1("KLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); changedMap.insert( TQString::fromLatin1("KLineEdit"), TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert( TQString::fromLatin1("KPasswordEdit"), TQT_SIGNAL(textChanged(const TQString &))); changedMap.insert( TQString::fromLatin1("KPasswordEdit"), TQT_SIGNAL(textChanged(const TQString &)));
changedMap.insert( TQString::fromLatin1("KRestrictedLine"), TQT_SIGNAL(textChanged(const TQString &))); changedMap.insert( TQString::fromLatin1("KRestrictedLine"), TQT_SIGNAL(textChanged(const TQString &)));

@ -358,10 +358,10 @@ bool Account::addContact(const TQString &contactId , MetaContact *parent, AddMod
return success; return success;
} }
KActionMenu * Account::actionMenu() TDEActionMenu * Account::actionMenu()
{ {
//default implementation //default implementation
KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); TDEActionMenu *menu = new TDEActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this );
TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString();
menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ),
@ -370,7 +370,7 @@ KActionMenu * Account::actionMenu()
OnlineStatusManager::self()->createAccountStatusActions(this, menu); OnlineStatusManager::self()->createAccountStatusActions(this, menu);
menu->popupMenu()->insertSeparator(); menu->popupMenu()->insertSeparator();
menu->insert( new KAction ( i18n( "Properties" ), 0, this, TQT_SLOT( editAccount() ), menu, "actionAccountProperties" ) ); menu->insert( new TDEAction ( i18n( "Properties" ), 0, this, TQT_SLOT( editAccount() ), menu, "actionAccountProperties" ) );
return menu; return menu;
} }

@ -27,7 +27,7 @@
#include <tqdict.h> #include <tqdict.h>
class TQDomNode; class TQDomNode;
class KActionMenu; class TDEActionMenu;
class TDEConfigGroup; class TDEConfigGroup;
namespace Kopete namespace Kopete
@ -221,7 +221,7 @@ public:
* *
* @see OnlineStatusManager::registerOnlineStatus * @see OnlineStatusManager::registerOnlineStatus
*/ */
virtual KActionMenu* actionMenu() ; virtual TDEActionMenu* actionMenu() ;
/** /**
* @brief Retrieve the list of contacts for this account * @brief Retrieve the list of contacts for this account

@ -160,7 +160,7 @@ public slots:
* Make all accounts Available, by setting status, and connecting if necessary. * Make all accounts Available, by setting status, and connecting if necessary.
* Accounts are connected based on their excludeConnect() setting. * Accounts are connected based on their excludeConnect() setting.
* Accounts which are already connected are controlled regardless of their excludeConnect() setting. * Accounts which are already connected are controlled regardless of their excludeConnect() setting.
* This is a slot, so you can connect directly to it from e.g. a KAction. * This is a slot, so you can connect directly to it from e.g. a TDEAction.
* @param awayReason is the away(status) message that will be set. * @param awayReason is the away(status) message that will be set.
*/ */
void setAvailableAll( const TQString &awayReason = TQString() ); void setAvailableAll( const TQString &awayReason = TQString() );

@ -36,9 +36,9 @@ public:
}; };
AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const KShortcut &cut, AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const TDEShortcut &cut,
const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
: KSelectAction(text, pix, cut, parent, name ) , d(new Private( OnlineStatus() ) ) : TDESelectAction(text, pix, cut, parent, name ) , d(new Private( OnlineStatus() ) )
{ {
TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ), TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ),
this, TQT_SLOT( slotAwayChanged() ) ); this, TQT_SLOT( slotAwayChanged() ) );
@ -52,9 +52,9 @@ AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const KShortc
slotAwayChanged(); slotAwayChanged();
} }
AwayAction::AwayAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, const KShortcut &cut, AwayAction::AwayAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, const TDEShortcut &cut,
const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) const TQObject *receiver, const char *slot, TQObject *parent, const char *name )
: KSelectAction(text, pix, cut, parent, name ) , d(new Private( status ) ) : TDESelectAction(text, pix, cut, parent, name ) , d(new Private( status ) )
{ {
TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ), TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ),
this, TQT_SLOT( slotAwayChanged() ) ); this, TQT_SLOT( slotAwayChanged() ) );

@ -32,12 +32,12 @@ class OnlineStatus;
/** /**
* @class Kopete::AwayAction * @class Kopete::AwayAction
* *
* Kopete::AwayAction is a KAction that lets you select an away message * Kopete::AwayAction is a TDEAction that lets you select an away message
* from the list of predefined away messages, or enter a custom one. * from the list of predefined away messages, or enter a custom one.
* *
* @author Jason Keirstead <jason@keirstead.org> * @author Jason Keirstead <jason@keirstead.org>
*/ */
class KOPETE_EXPORT AwayAction : public KSelectAction class KOPETE_EXPORT AwayAction : public TDESelectAction
{ {
Q_OBJECT Q_OBJECT
@ -45,10 +45,10 @@ class KOPETE_EXPORT AwayAction : public KSelectAction
/** /**
* Constructor * Constructor
* @p text, @p pix, @p cut, @p receiver, @p slot, @p parent and * @p text, @p pix, @p cut, @p receiver, @p slot, @p parent and
* @p name are all handled by KSelectAction. * @p name are all handled by TDESelectAction.
**/ **/
AwayAction(const TQString &text, const TQIconSet &pix, AwayAction(const TQString &text, const TQIconSet &pix,
const KShortcut &cut, const TQObject *receiver, const char *slot, const TDEShortcut &cut, const TQObject *receiver, const char *slot,
TQObject *parent, const char *name = 0); TQObject *parent, const char *name = 0);
/** /**
@ -56,10 +56,10 @@ class KOPETE_EXPORT AwayAction : public KSelectAction
* @param status the OnlineStatus that appears in the signal * @param status the OnlineStatus that appears in the signal
* @param slot must have the following signature: ( const OnlineStatus &, const TQString & ) * @param slot must have the following signature: ( const OnlineStatus &, const TQString & )
* @p text, @p pix, @p cut, @p receiver, @p slot, @p parent and * @p text, @p pix, @p cut, @p receiver, @p slot, @p parent and
* @p name are all handled by KSelectAction. * @p name are all handled by TDESelectAction.
**/ **/
AwayAction(const OnlineStatus &status, const TQString &text, const TQIconSet &pix, AwayAction(const OnlineStatus &status, const TQString &text, const TQIconSet &pix,
const KShortcut &cut, const TQObject *receiver, const char *slot, const TDEShortcut &cut, const TQObject *receiver, const char *slot,
TQObject *parent, const char *name = 0); TQObject *parent, const char *name = 0);
/** /**

@ -55,7 +55,7 @@ class KopeteCommandGUIClient : public TQObject, public KXMLGUIClient
for( TQDictIterator<Kopete::Command> it( mCommands ); it.current(); ++it ) for( TQDictIterator<Kopete::Command> it( mCommands ); it.current(); ++it )
{ {
KAction *a = static_cast<KAction*>( it.current() ); TDEAction *a = static_cast<TDEAction*>( it.current() );
actionCollection()->insert( a ); actionCollection()->insert( a );
TQDomElement newNode = doc.createElement( TQString::fromLatin1("Action") ); TQDomElement newNode = doc.createElement( TQString::fromLatin1("Action") );
newNode.setAttribute( TQString::fromLatin1("name"), newNode.setAttribute( TQString::fromLatin1("name"),
@ -89,7 +89,7 @@ struct CommandHandlerPrivate
Kopete::CommandHandler *s_handler; Kopete::CommandHandler *s_handler;
TQMap<TDEProcess*,ManagerPair> processMap; TQMap<TDEProcess*,ManagerPair> processMap;
bool inCommand; bool inCommand;
TQPtrList<KAction> m_commands; TQPtrList<TDEAction> m_commands;
}; };
CommandHandlerPrivate *Kopete::CommandHandler::p = 0L; CommandHandlerPrivate *Kopete::CommandHandler::p = 0L;
@ -157,7 +157,7 @@ Kopete::CommandHandler *Kopete::CommandHandler::commandHandler()
} }
void Kopete::CommandHandler::registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot, void Kopete::CommandHandler::registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot,
const TQString &help, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix ) const TQString &help, uint minArgs, int maxArgs, const TDEShortcut &cut, const TQString &pix )
{ {
TQString lowerCommand = command.lower(); TQString lowerCommand = command.lower();
@ -173,7 +173,7 @@ void Kopete::CommandHandler::unregisterCommand( TQObject *parent, const TQString
} }
void Kopete::CommandHandler::registerAlias( TQObject *parent, const TQString &alias, const TQString &formatString, void Kopete::CommandHandler::registerAlias( TQObject *parent, const TQString &alias, const TQString &formatString,
const TQString &help, CommandType type, uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix ) const TQString &help, CommandType type, uint minArgs, int maxArgs, const TDEShortcut &cut, const TQString &pix )
{ {
TQString lowerAlias = alias.lower(); TQString lowerAlias = alias.lower();

@ -88,7 +88,7 @@ class KOPETE_EXPORT CommandHandler : public TQObject
*/ */
void registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot, void registerCommand( TQObject *parent, const TQString &command, const char* handlerSlot,
const TQString &help = TQString(), uint minArgs = 0, int maxArgs = -1, const TQString &help = TQString(), uint minArgs = 0, int maxArgs = -1,
const KShortcut &cut = 0, const TQString &pix = TQString() ); const TDEShortcut &cut = 0, const TQString &pix = TQString() );
/** /**
* \brief Register a command alias. * \brief Register a command alias.
@ -114,7 +114,7 @@ class KOPETE_EXPORT CommandHandler : public TQObject
CommandType = SystemAlias, CommandType = SystemAlias,
uint minArgs = 0, uint minArgs = 0,
int maxArgs = -1, int maxArgs = -1,
const KShortcut &cut = 0, const TDEShortcut &cut = 0,
const TQString &pix = TQString() ); const TQString &pix = TQString() );
/** /**

@ -193,10 +193,10 @@ void Contact::slotAddContact()
} }
} }
KPopupMenu* Contact::popupMenu( ChatSession *manager ) TDEPopupMenu* Contact::popupMenu( ChatSession *manager )
{ {
// Build the menu // Build the menu
KPopupMenu *menu = new KPopupMenu(); TDEPopupMenu *menu = new TDEPopupMenu();
// insert title // insert title
TQString titleText; TQString titleText;
@ -209,7 +209,7 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager )
if( metaContact() && metaContact()->isTemporary() && contactId() != account()->myself()->contactId() ) if( metaContact() && metaContact()->isTemporary() && contactId() != account()->myself()->contactId() )
{ {
KAction *actionAddContact = new KAction( i18n( "&Add to Your Contact List" ), TQString::fromLatin1( "add_user" ), TDEAction *actionAddContact = new TDEAction( i18n( "&Add to Your Contact List" ), TQString::fromLatin1( "add_user" ),
0, TQT_TQOBJECT(this), TQT_SLOT( slotAddContact() ), TQT_TQOBJECT(menu), "actionAddContact" ); 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddContact() ), TQT_TQOBJECT(menu), "actionAddContact" );
actionAddContact->plug( menu ); actionAddContact->plug( menu );
menu->insertSeparator(); menu->insertSeparator();
@ -219,15 +219,15 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager )
bool reach = account()->isConnected() && isReachable(); bool reach = account()->isConnected() && isReachable();
bool myself = (this == account()->myself()); bool myself = (this == account()->myself());
KAction *actionSendMessage = KopeteStdAction::sendMessage( TQT_TQOBJECT(this), TQT_SLOT( sendMessage() ), TQT_TQOBJECT(menu), "actionSendMessage" ); TDEAction *actionSendMessage = KopeteStdAction::sendMessage( TQT_TQOBJECT(this), TQT_SLOT( sendMessage() ), TQT_TQOBJECT(menu), "actionSendMessage" );
actionSendMessage->setEnabled( reach && !myself ); actionSendMessage->setEnabled( reach && !myself );
actionSendMessage->plug( menu ); actionSendMessage->plug( menu );
KAction *actionChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( startChat() ), TQT_TQOBJECT(menu), "actionChat" ); TDEAction *actionChat = KopeteStdAction::chat( TQT_TQOBJECT(this), TQT_SLOT( startChat() ), TQT_TQOBJECT(menu), "actionChat" );
actionChat->setEnabled( reach && !myself ); actionChat->setEnabled( reach && !myself );
actionChat->plug( menu ); actionChat->plug( menu );
KAction *actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( sendFile() ), TQT_TQOBJECT(menu), "actionSendFile" ); TDEAction *actionSendFile = KopeteStdAction::sendFile( TQT_TQOBJECT(this), TQT_SLOT( sendFile() ), TQT_TQOBJECT(menu), "actionSendFile" );
actionSendFile->setEnabled( reach && d->fileCapable && !myself ); actionSendFile->setEnabled( reach && d->fileCapable && !myself );
actionSendFile->plug( menu ); actionSendFile->plug( menu );
@ -235,12 +235,12 @@ KPopupMenu* Contact::popupMenu( ChatSession *manager )
// through the use of the customContextMenuActions() function // through the use of the customContextMenuActions() function
// Get the custom actions from the protocols ( pure virtual function ) // Get the custom actions from the protocols ( pure virtual function )
TQPtrList<KAction> *customActions = customContextMenuActions( manager ); TQPtrList<TDEAction> *customActions = customContextMenuActions( manager );
if( customActions && !customActions->isEmpty() ) if( customActions && !customActions->isEmpty() )
{ {
menu->insertSeparator(); menu->insertSeparator();
for( KAction *a = customActions->first(); a; a = customActions->next() ) for( TDEAction *a = customActions->first(); a; a = customActions->next() )
a->plug( menu ); a->plug( menu );
} }
delete customActions; delete customActions;
@ -511,12 +511,12 @@ void Contact::setIcon( const TQString& icon )
return; return;
} }
TQPtrList<KAction> *Contact::customContextMenuActions() TQPtrList<TDEAction> *Contact::customContextMenuActions()
{ {
return 0L; return 0L;
} }
TQPtrList<KAction> *Contact::customContextMenuActions( ChatSession * /* manager */ ) TQPtrList<TDEAction> *Contact::customContextMenuActions( ChatSession * /* manager */ )
{ {
return customContextMenuActions(); return customContextMenuActions();
} }

@ -28,8 +28,8 @@
#include "kopete_export.h" #include "kopete_export.h"
class TQImage; class TQImage;
class KPopupMenu; class TDEPopupMenu;
class KAction; class TDEAction;
namespace Kopete namespace Kopete
{ {
@ -223,12 +223,12 @@ public:
* @return Collection of menu items to be show on the context menu * @return Collection of menu items to be show on the context menu
* @todo if possible, try to use KXMLGUI * @todo if possible, try to use KXMLGUI
*/ */
virtual TQPtrList<KAction> *customContextMenuActions(); virtual TQPtrList<TDEAction> *customContextMenuActions();
/** /**
* @todo What is this function for ? * @todo What is this function for ?
*/ */
virtual TQPtrList<KAction> *customContextMenuActions( ChatSession *manager ); virtual TQPtrList<TDEAction> *customContextMenuActions( ChatSession *manager );
/** /**
* @brief Get the Context Menu for this contact * @brief Get the Context Menu for this contact
@ -236,7 +236,7 @@ public:
* This menu includes generic actions common to each protocol, and action defined in * This menu includes generic actions common to each protocol, and action defined in
* @ref customContextMenuActions() * @ref customContextMenuActions()
*/ */
KPopupMenu *popupMenu( ChatSession *manager = 0L ); TDEPopupMenu *popupMenu( ChatSession *manager = 0L );
/** /**
* \brief Get whether or not this contact is capable of file transfers * \brief Get whether or not this contact is capable of file transfers
@ -426,7 +426,7 @@ public slots:
/** /**
* Changes the MetaContact that this contact is a part of. This function * Changes the MetaContact that this contact is a part of. This function
* is called by the KAction changeMetaContact that is part of the context * is called by the TDEAction changeMetaContact that is part of the context
* menu. * menu.
*/ */
void changeMetaContact(); void changeMetaContact();

@ -224,7 +224,7 @@ signals:
/** /**
* This signal is emitted each time the selection has changed. the bool is set to true if only one meta contact has been selected, * This signal is emitted each time the selection has changed. the bool is set to true if only one meta contact has been selected,
* and set to false if none, or several contacts are selected * and set to false if none, or several contacts are selected
* you can connect this signal to KAction::setEnabled if you have an action which is applied to only one contact * you can connect this signal to TDEAction::setEnabled if you have an action which is applied to only one contact
*/ */
void metaContactSelected(bool); void metaContactSelected(bool);

@ -181,7 +181,7 @@ public:
* Constructor. * Constructor.
* *
* @p Creates a new OnlineStatus object and registers it with the @ref Kopete::OnlineStatusManager. * @p Creates a new OnlineStatus object and registers it with the @ref Kopete::OnlineStatusManager.
* Registration allows you to generate a KActionMenu filled with KActions for changing to this OnlineStatus, * Registration allows you to generate a TDEActionMenu filled with TDEActions for changing to this OnlineStatus,
* using Kopete::Account::accountMenu(). * using Kopete::Account::accountMenu().
* *
* @p Note that weight has an additional significance for registered protocols when used for menu generation. * @p Note that weight has an additional significance for registered protocols when used for menu generation.

@ -368,7 +368,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const
return basis; return basis;
} }
void OnlineStatusManager::createAccountStatusActions( Account *account , KActionMenu *parent) void OnlineStatusManager::createAccountStatusActions( Account *account , TDEActionMenu *parent)
{ {
Private::ProtocolMap protocolMap=d->registeredStatus[account->protocol()]; Private::ProtocolMap protocolMap=d->registeredStatus[account->protocol()];
Private::ProtocolMap::Iterator it; Private::ProtocolMap::Iterator it;
@ -380,14 +380,14 @@ void OnlineStatusManager::createAccountStatusActions( Account *account , KAction
OnlineStatus status=it.key(); OnlineStatus status=it.key();
TQString caption=it.data().caption; TQString caption=it.data().caption;
KAction *action; TDEAction *action;
// Any existing actions owned by the account are reused by recovering them // Any existing actions owned by the account are reused by recovering them
// from the parent's child list. // from the parent's child list.
// The description of the onlinestatus is used as the qobject name // The description of the onlinestatus is used as the qobject name
// This is safe as long as OnlineStatus are immutable // This is safe as long as OnlineStatus are immutable
TQCString actionName = status.description().ascii(); TQCString actionName = status.description().ascii();
if ( !( action = static_cast<KAction*>( account->child( actionName ) ) ) ) if ( !( action = static_cast<TDEAction*>( account->child( actionName ) ) ) )
{ {
if(options & OnlineStatusManager::HasAwayMessage) if(options & OnlineStatusManager::HasAwayMessage)
{ {
@ -417,7 +417,7 @@ void OnlineStatusManager::createAccountStatusActions( Account *account , KAction
OnlineStatusAction::OnlineStatusAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *parent, const char *name) OnlineStatusAction::OnlineStatusAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *parent, const char *name)
: KAction( text, pix, KShortcut() , parent, name) , m_status(status) : TDEAction( text, pix, TDEShortcut() , parent, name) , m_status(status)
{ {
connect(this,TQT_SIGNAL(activated()),this,TQT_SLOT(slotActivated())); connect(this,TQT_SIGNAL(activated()),this,TQT_SLOT(slotActivated()));
} }

@ -26,7 +26,7 @@
class TQString; class TQString;
class TQPixmap; class TQPixmap;
class TQColor; class TQColor;
class KActionMenu; class TDEActionMenu;
namespace Kopete namespace Kopete
{ {
@ -115,7 +115,7 @@ public:
* @param account the account * @param account the account
* @param parent the ActionMenu where action are inserted * @param parent the ActionMenu where action are inserted
*/ */
void createAccountStatusActions( Account *account , KActionMenu *parent); void createAccountStatusActions( Account *account , TDEActionMenu *parent);
/** /**
* return the status of the @p protocol which is in the category @p category * return the status of the @p protocol which is in the category @p category
@ -149,7 +149,7 @@ private:
/** /**
* @internal * @internal
*/ */
class OnlineStatusAction : public KAction class OnlineStatusAction : public TDEAction
{ {
Q_OBJECT Q_OBJECT

@ -28,7 +28,7 @@
#include <kopetemessage.h> //TODO: remove #include <kopetemessage.h> //TODO: remove
namespace DOM { class Node; } //TODO: remove namespace DOM { class Node; } //TODO: remove
class KAction; //TODO: remove class TDEAction; //TODO: remove
class KPluginInfo; class KPluginInfo;

@ -27,8 +27,8 @@
Kopete::Command::Command( TQObject *parent, const TQString &command, const char* handlerSlot, Kopete::Command::Command( TQObject *parent, const TQString &command, const char* handlerSlot,
const TQString &help, Kopete::CommandHandler::CommandType type, const TQString &formatString, const TQString &help, Kopete::CommandHandler::CommandType type, const TQString &formatString,
uint minArgs, int maxArgs, const KShortcut &cut, const TQString &pix ) uint minArgs, int maxArgs, const TDEShortcut &cut, const TQString &pix )
: KAction( command[0].upper() + command.right( command.length() - 1).lower(), pix, cut, parent, : TDEAction( command[0].upper() + command.right( command.length() - 1).lower(), pix, cut, parent,
( command.lower() + TQString::fromLatin1("_command") ).latin1() ) ( command.lower() + TQString::fromLatin1("_command") ).latin1() )
{ {
init( command, handlerSlot, help, type, formatString, minArgs, maxArgs ); init( command, handlerSlot, help, type, formatString, minArgs, maxArgs );
@ -88,7 +88,7 @@ void Kopete::Command::processCommand( const TQString &args, Kopete::ChatSession
"\"%1\" has a maximum of %n arguments.", m_minArgs) "\"%1\" has a maximum of %n arguments.", m_minArgs)
.arg( text() ), manager, gui ); .arg( text() ), manager, gui );
} }
else if( !TDEApplication::kApplication()->authorizeKAction( name() ) ) else if( !TDEApplication::kApplication()->authorizeTDEAction( name() ) )
{ {
printError( i18n("You are not authorized to perform the command \"%1\".").arg(text()), manager, gui ); printError( i18n("You are not authorized to perform the command \"%1\".").arg(text()), manager, gui );
} }

@ -27,7 +27,7 @@ namespace Kopete
class ChatSession; class ChatSession;
class Command : public KAction class Command : public TDEAction
{ {
Q_OBJECT Q_OBJECT
@ -52,7 +52,7 @@ class Command : public KAction
*/ */
Command( TQObject *parent, const TQString &command, const char* handlerSlot, Command( TQObject *parent, const TQString &command, const char* handlerSlot,
const TQString &help = TQString(), CommandHandler::CommandType type = CommandHandler::Normal, const TQString &formatString = TQString(), const TQString &help = TQString(), CommandHandler::CommandType type = CommandHandler::Normal, const TQString &formatString = TQString(),
uint minArgs = 0, int maxArgs = -1, const KShortcut &cut = 0, uint minArgs = 0, int maxArgs = -1, const TDEShortcut &cut = 0,
const TQString &pix = TQString() ); const TQString &pix = TQString() );
/** /**

@ -26,14 +26,14 @@
#include <kdebug.h> #include <kdebug.h>
#include <klistview.h> #include <klistview.h>
class AccountListViewItem : public KListViewItem class AccountListViewItem : public TDEListViewItem
{ {
private: private:
Kopete::Account *mAccount; Kopete::Account *mAccount;
public: public:
AccountListViewItem(TQListView *parent, Kopete::Account *acc) AccountListViewItem(TQListView *parent, Kopete::Account *acc)
: KListViewItem(parent) : TDEListViewItem(parent)
{ {
if (acc==0) if (acc==0)
return; return;
@ -57,7 +57,7 @@ class AccountListViewItem : public KListViewItem
class AccountSelectorPrivate class AccountSelectorPrivate
{ {
public: public:
KListView *lv; TDEListView *lv;
Kopete::Protocol *proto; Kopete::Protocol *proto;
}; };
@ -93,7 +93,7 @@ void AccountSelector::initUI()
{ {
kdDebug(14010) << k_funcinfo << endl; kdDebug(14010) << k_funcinfo << endl;
(new TQVBoxLayout(this))->setAutoAdd(true); (new TQVBoxLayout(this))->setAutoAdd(true);
d->lv = new KListView(this); d->lv = new TDEListView(this);
d->lv->setFullWidth(true); d->lv->setFullWidth(true);
d->lv->addColumn(TQString::fromLatin1("")); d->lv->addColumn(TQString::fromLatin1(""));
d->lv->header()->hide(); d->lv->header()->hide();

@ -25,7 +25,7 @@
class AccountSelectorPrivate; class AccountSelectorPrivate;
class TQListViewItem; class TQListViewItem;
/** /**
* \brief widget to select an account, based on KListView * \brief widget to select an account, based on TDEListView
* @author Stefan Gehn <metz AT gehn.net> * @author Stefan Gehn <metz AT gehn.net>
*/ */
class KOPETE_EXPORT AccountSelector : public TQWidget class KOPETE_EXPORT AccountSelector : public TQWidget
@ -38,7 +38,7 @@ Q_OBJECT
* Constructor. * Constructor.
* *
* The parameters @p parent and @p name are handled by * The parameters @p parent and @p name are handled by
* KListView. * TDEListView.
*/ */
AccountSelector(TQWidget *parent=0, const char *name=0); AccountSelector(TQWidget *parent=0, const char *name=0);
@ -46,7 +46,7 @@ Q_OBJECT
* Constructor for a list of accounts for one protocol only * Constructor for a list of accounts for one protocol only
* *
* The parameters @p parent and @p name are handled by * The parameters @p parent and @p name are handled by
* KListView. @p proto defines the protocol whose accounts are * TDEListView. @p proto defines the protocol whose accounts are
* shown in the list * shown in the list
*/ */
AccountSelector(Kopete::Protocol *proto, TQWidget *parent=0, const char *name=0); AccountSelector(Kopete::Protocol *proto, TQWidget *parent=0, const char *name=0);

@ -72,7 +72,7 @@ AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const ch
connect( m_addressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) ); connect( m_addressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) );
//We should add a clear KAction here. But we can't really do that with a designer file :\ this sucks //We should add a clear TDEAction here. But we can't really do that with a designer file :\ this sucks
addresseeListView->setColumnText(2, SmallIconSet(TQString::fromLatin1("email")), i18n("Email")); addresseeListView->setColumnText(2, SmallIconSet(TQString::fromLatin1("email")), i18n("Email"));

@ -71,7 +71,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
</widget> </widget>
<widget class="KListView" row="2" column="0" rowspan="1" colspan="2"> <widget class="TDEListView" row="2" column="0" rowspan="1" colspan="2">
<column> <column>
<property name="text"> <property name="text">
<string>Photo</string> <string>Photo</string>
@ -153,7 +153,7 @@
<cstring>kListViewSearchLine</cstring> <cstring>kListViewSearchLine</cstring>
</property> </property>
</widget> </widget>
<widget class="KListViewSearchLine"> <widget class="TDEListViewSearchLine">
<property name="name"> <property name="name">
<cstring>kListViewSearchLine</cstring> <cstring>kListViewSearchLine</cstring>
</property> </property>

@ -28,7 +28,7 @@
#include "addresseeitem.h" #include "addresseeitem.h"
AddresseeItem::AddresseeItem( TQListView *parent, const KABC::Addressee &addressee) : AddresseeItem::AddresseeItem( TQListView *parent, const KABC::Addressee &addressee) :
KListViewItem( parent ), TDEListViewItem( parent ),
mAddressee( addressee ) mAddressee( addressee )
{ {
//We can't save showphoto because we don't have a d pointer //We can't save showphoto because we don't have a d pointer

@ -32,7 +32,7 @@
/** /**
@short Special ListViewItem @short Special ListViewItem
*/ */
class AddresseeItem : public KListViewItem class AddresseeItem : public TDEListViewItem
{ {
public: public:

@ -1,5 +1,5 @@
/* /*
kopetecontactaction.cpp - KAction for selecting a Kopete::Contact kopetecontactaction.cpp - TDEAction for selecting a Kopete::Contact
Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> Copyright (c) 2003 by Martijn Klingens <klingens@kde.org>
@ -22,8 +22,8 @@
#include "kopeteonlinestatus.h" #include "kopeteonlinestatus.h"
KopeteContactAction::KopeteContactAction( Kopete::Contact *contact, const TQObject *receiver, KopeteContactAction::KopeteContactAction( Kopete::Contact *contact, const TQObject *receiver,
const char *slot, KAction *parent ) const char *slot, TDEAction *parent )
: KAction( contact->metaContact()->displayName(), TQIconSet( contact->onlineStatus().iconFor( contact ) ), KShortcut(), : TDEAction( contact->metaContact()->displayName(), TQIconSet( contact->onlineStatus().iconFor( contact ) ), TDEShortcut(),
parent, contact->contactId().latin1() ) parent, contact->contactId().latin1() )
{ {
m_contact = contact; m_contact = contact;

@ -1,5 +1,5 @@
/* /*
kopetecontactaction.cpp - KAction for selecting a Kopete::Contact kopetecontactaction.cpp - TDEAction for selecting a Kopete::Contact
Copyright (c) 2003 by Martijn Klingens <klingens@kde.org> Copyright (c) 2003 by Martijn Klingens <klingens@kde.org>
@ -29,7 +29,7 @@ class Contact;
/** /**
* @author Martijn Klingens <klingens@kde.org> * @author Martijn Klingens <klingens@kde.org>
*/ */
class KOPETE_EXPORT KopeteContactAction : public KAction class KOPETE_EXPORT KopeteContactAction : public TDEAction
{ {
Q_OBJECT Q_OBJECT
@ -38,7 +38,7 @@ public:
/** /**
* Create a new KopeteContactAction * Create a new KopeteContactAction
*/ */
KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, KAction* parent ); KopeteContactAction( Kopete::Contact *contact, const TQObject* receiver, const char* slot, TDEAction* parent );
~KopeteContactAction(); ~KopeteContactAction();
Kopete::Contact * contact() const; Kopete::Contact * contact() const;

@ -103,7 +103,7 @@ struct ListView::Private
}; };
ListView::ListView( TQWidget *parent, const char *name ) ListView::ListView( TQWidget *parent, const char *name )
: KListView( parent, name ), d( new Private ) : TDEListView( parent, name ), d( new Private )
{ {
connect( &d->sortTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSort() ) ); connect( &d->sortTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSort() ) );
@ -111,8 +111,8 @@ ListView::ListView( TQWidget *parent, const char *name )
setShowToolTips( false ); setShowToolTips( false );
d->toolTip.reset( new ToolTip( viewport(), this ) ); d->toolTip.reset( new ToolTip( viewport(), this ) );
connect( this, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), connect( this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ),
TQT_SLOT( slotContextMenu( KListView *, TQListViewItem *, const TQPoint & ) ) ); TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) );
@ -147,7 +147,7 @@ void ListView::slotDoubleClicked( TQListViewItem *item )
setOpen( item, !isOpen( item ) ); setOpen( item, !isOpen( item ) );
} }
void ListView::slotContextMenu( KListView * /*listview*/, void ListView::slotContextMenu( TDEListView * /*listview*/,
TQListViewItem *item, const TQPoint &/*point*/ ) TQListViewItem *item, const TQPoint &/*point*/ )
{ {
if ( item && !item->isSelected() ) if ( item && !item->isSelected() )
@ -197,7 +197,7 @@ void ListView::keyPressEvent( TQKeyEvent *e )
emitExecute( currentItem(), p, 0 ); emitExecute( currentItem(), p, 0 );
} }
else else
KListView::keyPressEvent(e); TDEListView::keyPressEvent(e);
} }
void ListView::delayedSort() void ListView::delayedSort()

@ -29,7 +29,7 @@ namespace ListView {
* @author Engin AYDOGAN <engin@bzzzt.biz> * @author Engin AYDOGAN <engin@bzzzt.biz>
* @author Richard Smith <kde@metafoo.co.uk> * @author Richard Smith <kde@metafoo.co.uk>
*/ */
class ListView : public KListView class ListView : public TDEListView
{ {
Q_OBJECT Q_OBJECT
@ -59,7 +59,7 @@ public slots:
protected: protected:
virtual void keyPressEvent( TQKeyEvent *e ); virtual void keyPressEvent( TQKeyEvent *e );
private slots: private slots:
void slotContextMenu(KListView*,TQListViewItem *item, const TQPoint &point ); void slotContextMenu(TDEListView*,TQListViewItem *item, const TQPoint &point );
void slotDoubleClicked( TQListViewItem *item ); void slotDoubleClicked( TQListViewItem *item );
private: private:
struct Private; struct Private;

@ -1280,13 +1280,13 @@ bool Item::Private::fadeVisibility = true;
bool Item::Private::foldVisibility = true; bool Item::Private::foldVisibility = true;
Item::Item( TQListViewItem *parent, TQObject *owner, const char *name ) Item::Item( TQListViewItem *parent, TQObject *owner, const char *name )
: TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) ) : TQObject( owner, name ), TDEListViewItem( parent ), d( new Private(this) )
{ {
initLVI(); initLVI();
} }
Item::Item( TQListView *parent, TQObject *owner, const char *name ) Item::Item( TQListView *parent, TQObject *owner, const char *name )
: TQObject( owner, name ), KListViewItem( parent ), d( new Private(this) ) : TQObject( owner, name ), TDEListViewItem( parent ), d( new Private(this) )
{ {
initLVI(); initLVI();
} }
@ -1469,7 +1469,7 @@ void Item::relayout()
void Item::setup() void Item::setup()
{ {
KListViewItem::setup(); TDEListViewItem::setup();
slotLayoutItems(); slotLayoutItems();
} }
@ -1484,7 +1484,7 @@ void Item::setHeight( int )
int vis = TQMIN( d->visibilityLevel, Private::visibilityFoldSteps ); int vis = TQMIN( d->visibilityLevel, Private::visibilityFoldSteps );
minHeight = (minHeight * vis) / Private::visibilityFoldSteps; minHeight = (minHeight * vis) / Private::visibilityFoldSteps;
} }
KListViewItem::setHeight( minHeight ); TDEListViewItem::setHeight( minHeight );
} }
int Item::width( const TQFontMetrics &, const TQListView *lv, int c ) const int Item::width( const TQFontMetrics &, const TQListView *lv, int c ) const
@ -1498,15 +1498,15 @@ void Item::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt
{ {
TQPixmap back( width, height() ); TQPixmap back( width, height() );
TQPainter paint( &back ); TQPainter paint( &back );
//KListViewItem::paintCell( &paint, cg, column, width, align ); //TDEListViewItem::paintCell( &paint, cg, column, width, align );
// PASTED FROM KLISTVIEWITEM: // PASTED FROM KLISTVIEWITEM:
// set the alternate cell background colour if necessary // set the alternate cell background colour if necessary
TQColorGroup _cg = cg; TQColorGroup _cg = cg;
if (isAlternate()) if (isAlternate())
if (listView()->viewport()->backgroundMode()==TQt::FixedColor) if (listView()->viewport()->backgroundMode()==TQt::FixedColor)
_cg.setColor(TQColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground()); _cg.setColor(TQColorGroup::Background, static_cast< TDEListView* >(listView())->alternateBackground());
else else
_cg.setColor(TQColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground()); _cg.setColor(TQColorGroup::Base, static_cast< TDEListView* >(listView())->alternateBackground());
// PASTED FROM TQLISTVIEWITEM // PASTED FROM TQLISTVIEWITEM
{ {
TQPainter *p = &paint; TQPainter *p = &paint;

@ -451,7 +451,7 @@ public:
* *
* @author Richard Smith <kde@metafoo.co.uk> * @author Richard Smith <kde@metafoo.co.uk>
*/ */
class Item : public TQObject, public KListViewItem, public ComponentBase class Item : public TQObject, public TDEListViewItem, public ComponentBase
{ {
Q_OBJECT Q_OBJECT

@ -25,12 +25,12 @@ namespace UI {
namespace ListView { namespace ListView {
SearchLine::SearchLine( TQWidget *parent, ListView *listView, const char *name ) SearchLine::SearchLine( TQWidget *parent, ListView *listView, const char *name )
: KListViewSearchLine( parent, listView, name ) : TDEListViewSearchLine( parent, listView, name )
{ {
} }
SearchLine::SearchLine(TQWidget *parent, const char *name) SearchLine::SearchLine(TQWidget *parent, const char *name)
: KListViewSearchLine( parent, 0, name ) : TDEListViewSearchLine( parent, 0, name )
{ {
} }
@ -58,9 +58,9 @@ void SearchLine::updateSearch( const TQString &s )
switch( listView()->selectionMode() ) switch( listView()->selectionMode() )
{ {
case KListView::NoSelection: case TDEListView::NoSelection:
break; break;
case KListView::Single: case TDEListView::Single:
currentItem = listView()->selectedItem(); currentItem = listView()->selectedItem();
break; break;
default: default:

@ -26,7 +26,7 @@ namespace ListView {
class ListView; class ListView;
class SearchLine : public KListViewSearchLine class SearchLine : public TDEListViewSearchLine
{ {
Q_OBJECT Q_OBJECT
@ -41,7 +41,7 @@ public:
SearchLine( TQWidget *parent, ListView *listView = 0, const char *name = 0 ); SearchLine( TQWidget *parent, ListView *listView = 0, const char *name = 0 );
/** /**
* Constructs a SearchLine without any ListView to filter. The * Constructs a SearchLine without any ListView to filter. The
* KListView object has to be set later with setListView(). * TDEListView object has to be set later with setListView().
*/ */
SearchLine(TQWidget *parent, const char *name); SearchLine(TQWidget *parent, const char *name);
/** /**

@ -36,11 +36,11 @@
KSettings::Dialog *KopetePreferencesAction::s_settingsDialog = 0L; KSettings::Dialog *KopetePreferencesAction::s_settingsDialog = 0L;
KopetePreferencesAction::KopetePreferencesAction( KActionCollection *parent, const char *name ) KopetePreferencesAction::KopetePreferencesAction( TDEActionCollection *parent, const char *name )
#if KDE_IS_VERSION( 3, 3, 90 ) #if KDE_IS_VERSION( 3, 3, 90 )
: KAction( KStdGuiItem::configure(), 0, 0, 0, parent, name ) : TDEAction( KStdGuiItem::configure(), 0, 0, 0, parent, name )
#else #else
: KAction( KGuiItem( i18n( "&Configure Kopete..." ), : TDEAction( KGuiItem( i18n( "&Configure Kopete..." ),
TQString::fromLatin1( "configure" ) ), 0, 0, 0, parent, name ) TQString::fromLatin1( "configure" ) ), 0, 0, 0, parent, name )
#endif #endif
{ {
@ -63,64 +63,64 @@ void KopetePreferencesAction::slotShowPreferences()
KWin::activateWindow( s_settingsDialog->dialog()->winId() ); KWin::activateWindow( s_settingsDialog->dialog()->winId() );
} }
KAction * KopeteStdAction::preferences( KActionCollection *parent, const char *name ) TDEAction * KopeteStdAction::preferences( TDEActionCollection *parent, const char *name )
{ {
return new KopetePreferencesAction( parent, name ); return new KopetePreferencesAction( parent, name );
} }
KAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) TDEAction * KopeteStdAction::chat( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
{ {
return new KAction( i18n( "Start &Chat..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); return new TDEAction( i18n( "Start &Chat..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
} }
KAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) TDEAction * KopeteStdAction::sendMessage( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
{ {
return new KAction( i18n( "&Send Single Message..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name ); return new TDEAction( i18n( "&Send Single Message..." ), TQString::fromLatin1( "mail_generic" ), 0, recvr, slot, parent, name );
} }
KAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) TDEAction * KopeteStdAction::contactInfo( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
{ {
return new KAction( i18n( "User &Info" ), TQString::fromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name ); return new TDEAction( i18n( "User &Info" ), TQString::fromLatin1( "messagebox_info" ), 0, recvr, slot, parent, name );
} }
KAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) TDEAction * KopeteStdAction::sendFile( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
{ {
return new KAction( i18n( "Send &File..." ), TQString::fromLatin1( "attach" ), 0, recvr, slot, parent, name ); return new TDEAction( i18n( "Send &File..." ), TQString::fromLatin1( "attach" ), 0, recvr, slot, parent, name );
} }
KAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) TDEAction * KopeteStdAction::viewHistory( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
{ {
return new KAction( i18n( "View &History..." ), TQString::fromLatin1( "history" ), 0, recvr, slot, parent, name ); return new TDEAction( i18n( "View &History..." ), TQString::fromLatin1( "history" ), 0, recvr, slot, parent, name );
} }
KAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) TDEAction * KopeteStdAction::addGroup( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
{ {
return new KAction( i18n( "&Create Group..." ), TQString::fromLatin1( "folder" ), 0, recvr, slot, parent, name ); return new TDEAction( i18n( "&Create Group..." ), TQString::fromLatin1( "folder" ), 0, recvr, slot, parent, name );
} }
KAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) TDEAction * KopeteStdAction::changeMetaContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
{ {
return new KAction( i18n( "Cha&nge Meta Contact..." ), TQString::fromLatin1( "move" ), 0, recvr, slot, parent, name ); return new TDEAction( i18n( "Cha&nge Meta Contact..." ), TQString::fromLatin1( "move" ), 0, recvr, slot, parent, name );
} }
KAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) TDEAction * KopeteStdAction::deleteContact( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
{ {
return new KAction( i18n( "&Delete Contact" ), TQString::fromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, parent, name ); return new TDEAction( i18n( "&Delete Contact" ), TQString::fromLatin1( "delete_user" ), TQt::Key_Delete, recvr, slot, parent, name );
} }
KAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *parent, const char *name ) TDEAction * KopeteStdAction::changeAlias( const TQObject *recvr, const char *slot, TQObject *parent, const char *name )
{ {
return new KAction( i18n( "Change A&lias..." ), TQString::fromLatin1( "signature" ), 0, recvr, slot, parent, name ); return new TDEAction( i18n( "Change A&lias..." ), TQString::fromLatin1( "signature" ), 0, recvr, slot, parent, name );
} }
KAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) TDEAction * KopeteStdAction::blockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
{ {
return new KAction( i18n( "&Block Contact" ), TQString::fromLatin1( "player_pause" ), 0, recvr, slot, parent, name ); return new TDEAction( i18n( "&Block Contact" ), TQString::fromLatin1( "player_pause" ), 0, recvr, slot, parent, name );
} }
KAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name ) TDEAction * KopeteStdAction::unblockContact( const TQObject *recvr, const char *slot, TQObject* parent, const char *name )
{ {
return new KAction( i18n( "Un&block Contact" ), TQString::fromLatin1( "player_play" ), 0, recvr, slot, parent, name ); return new TDEAction( i18n( "Un&block Contact" ), TQString::fromLatin1( "player_play" ), 0, recvr, slot, parent, name );
} }
#include "kopetestdaction.moc" #include "kopetestdaction.moc"

@ -34,57 +34,57 @@ public:
/** /**
* Standard action to start a chat * Standard action to start a chat
*/ */
static KAction *chat( const TQObject *recvr, const char *slot, static TDEAction *chat( const TQObject *recvr, const char *slot,
TQObject* parent, const char *name = 0 ); TQObject* parent, const char *name = 0 );
/** /**
* Standard action to send a single message * Standard action to send a single message
*/ */
static KAction *sendMessage(const TQObject *recvr, const char *slot, static TDEAction *sendMessage(const TQObject *recvr, const char *slot,
TQObject* parent, const char *name = 0); TQObject* parent, const char *name = 0);
/** /**
* Standard action to open a user info dialog * Standard action to open a user info dialog
*/ */
static KAction *contactInfo(const TQObject *recvr, const char *slot, static TDEAction *contactInfo(const TQObject *recvr, const char *slot,
TQObject* parent, const char *name = 0); TQObject* parent, const char *name = 0);
/** /**
* Standard action to open a history dialog or something similar * Standard action to open a history dialog or something similar
*/ */
static KAction *viewHistory(const TQObject *recvr, const char *slot, static TDEAction *viewHistory(const TQObject *recvr, const char *slot,
TQObject* parent, const char *name = 0); TQObject* parent, const char *name = 0);
/** /**
* Standard action to initiate sending a file to a contact * Standard action to initiate sending a file to a contact
*/ */
static KAction *sendFile(const TQObject *recvr, const char *slot, static TDEAction *sendFile(const TQObject *recvr, const char *slot,
TQObject* parent, const char *name = 0); TQObject* parent, const char *name = 0);
/** /**
* Standard action to change a contacts @ref Kopete::MetaContact * Standard action to change a contacts @ref Kopete::MetaContact
*/ */
static KAction *changeMetaContact(const TQObject *recvr, const char *slot, static TDEAction *changeMetaContact(const TQObject *recvr, const char *slot,
TQObject* parent, const char *name = 0); TQObject* parent, const char *name = 0);
/** /**
* Standard action to add a group * Standard action to add a group
*/ */
static KAction *addGroup(const TQObject *recvr, const char *slot, static TDEAction *addGroup(const TQObject *recvr, const char *slot,
TQObject* parent, const char *name = 0); TQObject* parent, const char *name = 0);
/** /**
* Standard action to delete a contact * Standard action to delete a contact
*/ */
static KAction *deleteContact(const TQObject *recvr, const char *slot, static TDEAction *deleteContact(const TQObject *recvr, const char *slot,
TQObject* parent, const char *name = 0); TQObject* parent, const char *name = 0);
/** /**
* Standard action to change a contact alias/nickname in your contactlist * Standard action to change a contact alias/nickname in your contactlist
*/ */
static KAction *changeAlias(const TQObject *recvr, const char *slot, static TDEAction *changeAlias(const TQObject *recvr, const char *slot,
TQObject* parent, const char *name = 0); TQObject* parent, const char *name = 0);
/** /**
* Standard action to block a contact * Standard action to block a contact
*/ */
static KAction *blockContact(const TQObject *recvr, const char *slot, static TDEAction *blockContact(const TQObject *recvr, const char *slot,
TQObject* parent, const char *name = 0); TQObject* parent, const char *name = 0);
/** /**
* Standard action to unblock a contact * Standard action to unblock a contact
*/ */
static KAction *unblockContact(const TQObject *recvr, const char *slot, static TDEAction *unblockContact(const TQObject *recvr, const char *slot,
TQObject* parent, const char *name = 0); TQObject* parent, const char *name = 0);
/** /**
@ -92,7 +92,7 @@ public:
* *
* The object has no signal/slot, the prefs are automatically shown * The object has no signal/slot, the prefs are automatically shown
*/ */
static KAction *preferences(KActionCollection *parent, const char *name = 0); static TDEAction *preferences(TDEActionCollection *parent, const char *name = 0);
}; };
@ -101,13 +101,13 @@ namespace KSettings
class Dialog; class Dialog;
} }
class KOPETE_EXPORT KopetePreferencesAction : public KAction class KOPETE_EXPORT KopetePreferencesAction : public TDEAction
{ {
Q_OBJECT Q_OBJECT
public: public:
KopetePreferencesAction( KActionCollection *parent, const char *name = 0 ); KopetePreferencesAction( TDEActionCollection *parent, const char *name = 0 );
~KopetePreferencesAction(); ~KopetePreferencesAction();
protected slots: protected slots:

@ -136,7 +136,7 @@ class KOPETE_EXPORT KopeteView
* menus that can be extended * menus that can be extended
* *
* @param target A target TQObject for the contextMenuEvent signal of the view * @param target A target TQObject for the contextMenuEvent signal of the view
* @param slot A slot that matches the signature ( TQString&, KPopupMenu *) * @param slot A slot that matches the signature ( TQString&, TDEPopupMenu *)
*/ */
virtual void registerContextMenuHandler( TQObject *target, const char*slot ){ Q_UNUSED(target); Q_UNUSED(slot); }; virtual void registerContextMenuHandler( TQObject *target, const char*slot ){ Q_UNUSED(target); Q_UNUSED(slot); };
@ -152,7 +152,7 @@ class KOPETE_EXPORT KopeteView
* to show tooltips * to show tooltips
* *
* @param target A target TQObject for the contextMenuEvent signal of the view * @param target A target TQObject for the contextMenuEvent signal of the view
* @param slot A slot that matches the signature ( TQString&, KPopupMenu *) * @param slot A slot that matches the signature ( TQString&, TDEPopupMenu *)
*/ */
virtual void registerTooltipHandler( TQObject *target, const char*slot ){ Q_UNUSED(target); Q_UNUSED(slot); }; virtual void registerTooltipHandler( TQObject *target, const char*slot ){ Q_UNUSED(target); Q_UNUSED(slot); };

@ -86,7 +86,7 @@ Do not include the '/' in the command (if you do it will be stripped off anyway)
<string>&amp;Cancel</string> <string>&amp;Cancel</string>
</property> </property>
</widget> </widget>
<widget class="KListView" row="2" column="1" rowspan="1" colspan="2"> <widget class="TDEListView" row="2" column="1" rowspan="1" colspan="2">
<column> <column>
<property name="text"> <property name="text">
<string>Protocols</string> <string>Protocols</string>

@ -16,7 +16,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListView" row="0" column="0" rowspan="1" colspan="3"> <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="3">
<column> <column>
<property name="text"> <property name="text">
<string>Alias</string> <string>Alias</string>

@ -37,7 +37,7 @@ ContactNotesPlugin::ContactNotesPlugin( TQObject *parent, const char *name, cons
else else
pluginStatic_ = this; pluginStatic_ = this;
KAction *m_actionEdit=new KAction( i18n("&Notes"), "identity", 0, this, TQT_SLOT (slotEditInfo()), actionCollection() , "editContactNotes"); TDEAction *m_actionEdit=new TDEAction( i18n("&Notes"), "identity", 0, this, TQT_SLOT (slotEditInfo()), actionCollection() , "editContactNotes");
connect ( Kopete::ContactList::self() , TQT_SIGNAL( metaContactSelected(bool)) , m_actionEdit , TQT_SLOT(setEnabled(bool))); connect ( Kopete::ContactList::self() , TQT_SIGNAL( metaContactSelected(bool)) , m_actionEdit , TQT_SLOT(setEnabled(bool)));
m_actionEdit->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count()==1 ); m_actionEdit->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count()==1 );

@ -25,8 +25,8 @@
#include "kopeteplugin.h" #include "kopeteplugin.h"
class TQString; class TQString;
class KAction; class TDEAction;
class KActionCollection; class TDEActionCollection;
namespace Kopete { class MetaContact; } namespace Kopete { class MetaContact; }

@ -48,7 +48,7 @@ CryptographyGUIClient::CryptographyGUIClient(Kopete::ChatSession *parent )
setInstance( KGenericFactory<CryptographyPlugin>::instance() ); setInstance( KGenericFactory<CryptographyPlugin>::instance() );
m_action=new KToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" ); m_action=new TDEToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" );
m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::fromLatin1("off") ) ; m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::fromLatin1("off") ) ;
setXMLFile("cryptographychatui.rc"); setXMLFile("cryptographychatui.rc");

@ -19,7 +19,7 @@
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
namespace Kopete { class ChatSession; } namespace Kopete { class ChatSession; }
class KToggleAction; class TDEToggleAction;
/** /**
*@author Olivier Goffart *@author Olivier Goffart
@ -33,7 +33,7 @@ public:
~CryptographyGUIClient(); ~CryptographyGUIClient();
private: private:
KToggleAction *m_action; TDEToggleAction *m_action;
private slots: private slots:
void slotToggled(); void slotToggled();

@ -68,7 +68,7 @@ CryptographyPlugin::CryptographyPlugin( TQObject *parent, const char *name, cons
TQObject::connect(m_cachedPass_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForgetCachedPass() )); TQObject::connect(m_cachedPass_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForgetCachedPass() ));
KAction *action=new KAction( i18n("&Select Cryptography Public Key..."), "encrypted", 0, this, TQT_SLOT (slotSelectContactKey()), actionCollection() , "contactSelectKey"); TDEAction *action=new TDEAction( i18n("&Select Cryptography Public Key..."), "encrypted", 0, this, TQT_SLOT (slotSelectContactKey()), actionCollection() , "contactSelectKey");
connect ( Kopete::ContactList::self() , TQT_SIGNAL( metaContactSelected(bool)) , action , TQT_SLOT(setEnabled(bool))); connect ( Kopete::ContactList::self() , TQT_SIGNAL( metaContactSelected(bool)) , action , TQT_SLOT(setEnabled(bool)));
action->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count()==1 ); action->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count()==1 );
@ -138,12 +138,12 @@ bool CryptographyPlugin::passphraseHandling()
} }
/*KActionCollection *CryptographyPlugin::customChatActions(Kopete::ChatSession *KMM) /*TDEActionCollection *CryptographyPlugin::customChatActions(Kopete::ChatSession *KMM)
{ {
delete m_actionCollection; delete m_actionCollection;
m_actionCollection = new KActionCollection(this); m_actionCollection = new TDEActionCollection(this);
KAction *actionTranslate = new KAction( i18n ("Translate"), 0, TDEAction *actionTranslate = new TDEAction( i18n ("Translate"), 0,
this, TQT_SLOT( slotTranslateChat() ), m_actionCollection, "actionTranslate" ); this, TQT_SLOT( slotTranslateChat() ), m_actionCollection, "actionTranslate" );
m_actionCollection->insert( actionTranslate ); m_actionCollection->insert( actionTranslate );

@ -48,7 +48,7 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20); keyPair=loader->loadIcon("kgpg_key2",KIcon::Small,20);
setMinimumSize(300,200); setMinimumSize(300,200);
keysListpr = new KListView( page ); keysListpr = new TDEListView( page );
keysListpr->setRootIsDecorated(true); keysListpr->setRootIsDecorated(true);
keysListpr->addColumn( i18n( "Name" ) ); keysListpr->addColumn( i18n( "Name" ) );
keysListpr->setShowSortIndicator(true); keysListpr->setShowSortIndicator(true);
@ -146,8 +146,8 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo
pclose(fp2); pclose(fp2);
if (!tst.isEmpty() && (!dead)) if (!tst.isEmpty() && (!dead))
{ {
KListViewItem *item=new KListViewItem(keysListpr,extractKeyName(tst)); TDEListViewItem *item=new TDEListViewItem(keysListpr,extractKeyName(tst));
KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(tr).arg(val)); TDEListViewItem *sub= new TDEListViewItem(item,i18n("ID: %1, trust: %2, expiration: %3").arg(id).arg(tr).arg(val));
sub->setSelectable(false); sub->setSelectable(false);
item->setPixmap(0,keyPair); item->setPixmap(0,keyPair);
} }

@ -23,7 +23,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
class KListView; class TDEListView;
class TQCheckBox; class TQCheckBox;
struct gpgKey { struct gpgKey {
@ -45,7 +45,7 @@ class KgpgSelKey : public KDialogBase
public: public:
KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool showlocal=true); KgpgSelKey( TQWidget *parent = 0, const char *name = 0,bool showlocal=true);
KListView *keysListpr; TDEListView *keysListpr;
TQPixmap keyPair; TQPixmap keyPair;
TQCheckBox *local; TQCheckBox *local;
private slots: private slots:

@ -54,7 +54,7 @@
///////////////// klistviewitem special ///////////////// klistviewitem special
class UpdateViewItem2 : public KListViewItem class UpdateViewItem2 : public TDEListViewItem
{ {
public: public:
UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault); UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault);
@ -64,7 +64,7 @@ public:
}; };
UpdateViewItem2::UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault) UpdateViewItem2::UpdateViewItem2(TQListView *parent, TQString name,TQString mail,TQString id,bool isDefault)
: KListViewItem(parent) : TDEListViewItem(parent)
{ {
def=isDefault; def=isDefault;
setText(0,name); setText(0,name);
@ -80,7 +80,7 @@ void UpdateViewItem2::paintCell(TQPainter *p, const TQColorGroup &cg,int column,
font.setBold(true); font.setBold(true);
p->setFont(font); p->setFont(font);
} }
KListViewItem::paintCell(p, cg, column, width, alignment); TDEListViewItem::paintCell(p, cg, column, width, alignment);
} }
TQString UpdateViewItem2 :: key(int c,bool ) const TQString UpdateViewItem2 :: key(int c,bool ) const
@ -90,7 +90,7 @@ TQString UpdateViewItem2 :: key(int c,bool ) const
/////////////// main view /////////////// main view
popupPublic::popupPublic(TQWidget *parent, const char *name,TQString sfile,bool filemode,KShortcut goDefaultKey): popupPublic::popupPublic(TQWidget *parent, const char *name,TQString sfile,bool filemode,TDEShortcut goDefaultKey):
KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent, name,true) KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent, name,true)
{ {
TQWidget *page = plainPage(); TQWidget *page = plainPage();
@ -120,10 +120,10 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left" clearSearch->setIconSet(SmallIconSet(TQApplication::reverseLayout() ? "clear_left"
: "locationbar_erase")); : "locationbar_erase"));
(void) new TQLabel(i18n("Search: "),hBar); (void) new TQLabel(i18n("Search: "),hBar);
KListViewSearchLine* listViewSearch = new KListViewSearchLine(hBar); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(hBar);
connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear()));
keysList = new KListView( page ); keysList = new TDEListView( page );
keysList->addColumn(i18n("Name")); keysList->addColumn(i18n("Name"));
keysList->addColumn(i18n("Email")); keysList->addColumn(i18n("Email"));
keysList->addColumn(i18n("ID")); keysList->addColumn(i18n("ID"));
@ -135,7 +135,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
keysList->setShowSortIndicator(true); keysList->setShowSortIndicator(true);
keysList->setFullWidth(true); keysList->setFullWidth(true);
keysList->setAllColumnsShowFocus(true); keysList->setAllColumnsShowFocus(true);
keysList->setSelectionModeExt(KListView::Extended); keysList->setSelectionModeExt(TDEListView::Extended);
keysList->setColumnWidthMode(0,TQListView::Manual); keysList->setColumnWidthMode(0,TQListView::Manual);
keysList->setColumnWidthMode(1,TQListView::Manual); keysList->setColumnWidthMode(1,TQListView::Manual);
keysList->setColumnWidth(0,210); keysList->setColumnWidth(0,210);
@ -143,8 +143,8 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent
boutonboxoptions=new TQButtonGroup(5,Qt::Vertical ,page,0); boutonboxoptions=new TQButtonGroup(5,Qt::Vertical ,page,0);
KActionCollection *actcol=new KActionCollection(this); TDEActionCollection *actcol=new TDEActionCollection(this);
(void) new KAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, TQT_TQOBJECT(this), TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key");
CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions); CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions);
@ -452,7 +452,7 @@ void popupPublic::slotprocread(KProcIO *p)
bool isDefaultKey=false; bool isDefaultKey=false;
if (id.right(8)==defaultKey) isDefaultKey=true; if (id.right(8)==defaultKey) isDefaultKey=true;
UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey); UpdateViewItem2 *item=new UpdateViewItem2(keysList,keyname,keymail,id,isDefaultKey);
//KListViewItem *sub= new KListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val)); //TDEListViewItem *sub= new TDEListViewItem(item,i18n("ID: %1, trust: %2, validity: %3").arg(id).arg(tr).arg(val));
//sub->setSelectable(false); //sub->setSelectable(false);
if (seclist.find(tst,0,FALSE)!=-1) if (seclist.find(tst,0,FALSE)!=-1)
item->setPixmap(0,keyPair); item->setPixmap(0,keyPair);

@ -27,7 +27,7 @@
class TQPushButton; class TQPushButton;
class TQCheckBox; class TQCheckBox;
class KListView; class TDEListView;
class TQButtonGroup; class TQButtonGroup;
class KProcIO; class KProcIO;
@ -37,9 +37,9 @@ class popupPublic : public KDialogBase //TQDialog
public: public:
popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,KShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home)); popupPublic(TQWidget *parent=0, const char *name=0,TQString sfile="",bool filemode=false,TDEShortcut goDefaultKey=TQKeySequence(CTRL+TQt::Key_Home));
~popupPublic(); ~popupPublic();
KListView *keysList; TDEListView *keysList;
TQCheckBox *CBarmor,*CBuntrusted,*CBshred,*CBsymmetric,*CBhideid; TQCheckBox *CBarmor,*CBuntrusted,*CBshred,*CBsymmetric,*CBhideid;
bool fmode,trusted; bool fmode,trusted;
TQPixmap keyPair,keySingle,keyGroup; TQPixmap keyPair,keySingle,keyGroup;

@ -69,7 +69,7 @@
<string>Rename...</string> <string>Rename...</string>
</property> </property>
</widget> </widget>
<widget class="KListView" row="0" column="0" rowspan="1" colspan="3"> <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="3">
<column> <column>
<property name="text"> <property name="text">
<string>Filters</string> <string>Filters</string>

@ -57,10 +57,10 @@
#include <kstdaction.h> #include <kstdaction.h>
#include <kaction.h> #include <kaction.h>
class KListViewDateItem : public KListViewItem class TDEListViewDateItem : public TDEListViewItem
{ {
public: public:
KListViewDateItem(KListView* parent, TQDate date, Kopete::MetaContact *mc); TDEListViewDateItem(TDEListView* parent, TQDate date, Kopete::MetaContact *mc);
TQDate date() { return mDate; } TQDate date() { return mDate; }
Kopete::MetaContact *metaContact() { return mMetaContact; } Kopete::MetaContact *metaContact() { return mMetaContact; }
@ -73,20 +73,20 @@ private:
KListViewDateItem::KListViewDateItem(KListView* parent, TQDate date, Kopete::MetaContact *mc) TDEListViewDateItem::TDEListViewDateItem(TDEListView* parent, TQDate date, Kopete::MetaContact *mc)
: KListViewItem(parent, date.toString(Qt::ISODate), mc->displayName()) : TDEListViewItem(parent, date.toString(Qt::ISODate), mc->displayName())
{ {
mDate = date; mDate = date;
mMetaContact = mc; mMetaContact = mc;
} }
int KListViewDateItem::compare(TQListViewItem *i, int col, bool ascending) const int TDEListViewDateItem::compare(TQListViewItem *i, int col, bool ascending) const
{ {
if (col) if (col)
return TQListViewItem::compare(i, col, ascending); return TQListViewItem::compare(i, col, ascending);
//compare dates - do NOT use ascending var here //compare dates - do NOT use ascending var here
KListViewDateItem* item = static_cast<KListViewDateItem*>(i); TDEListViewDateItem* item = static_cast<TDEListViewDateItem*>(i);
if ( mDate < item->date() ) if ( mDate < item->date() )
return -1; return -1;
return ( mDate > item->date() ); return ( mDate > item->date() );
@ -173,9 +173,9 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent,
connect(mHtmlPart, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotRightClick(const TQString &, const TQPoint &))); connect(mHtmlPart, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotRightClick(const TQString &, const TQPoint &)));
//initActions //initActions
KActionCollection* ac = new KActionCollection(this); TDEActionCollection* ac = new TDEActionCollection(this);
mCopyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac ); mCopyAct = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), ac );
mCopyURLAct = new KAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac ); mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "editcopy" ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL() ), ac );
resize(650, 700); resize(650, 700);
centerOnScreen(this); centerOnScreen(this);
@ -232,7 +232,7 @@ void HistoryDialog::slotLoadDays()
{ {
TQDate c2Date(pair.date().year(),pair.date().month(),dayList[i]); TQDate c2Date(pair.date().year(),pair.date().month(),dayList[i]);
if (mInit.dateMCList.find(pair) == mInit.dateMCList.end()) if (mInit.dateMCList.find(pair) == mInit.dateMCList.end())
new KListViewDateItem(mMainWidget->dateListView, c2Date, pair.metaContact()); new TDEListViewDateItem(mMainWidget->dateListView, c2Date, pair.metaContact());
} }
mMainWidget->searchProgress->advance(1); mMainWidget->searchProgress->advance(1);
TQTimer::singleShot(0,this,TQT_SLOT(slotLoadDays())); TQTimer::singleShot(0,this,TQT_SLOT(slotLoadDays()));
@ -319,7 +319,7 @@ void HistoryDialog::init(Kopete::Contact *c)
void HistoryDialog::dateSelected(TQListViewItem* it) void HistoryDialog::dateSelected(TQListViewItem* it)
{ {
KListViewDateItem *item = static_cast<KListViewDateItem*>(it); TDEListViewDateItem *item = static_cast<TDEListViewDateItem*>(it);
if (!item) return; if (!item) return;
@ -420,11 +420,11 @@ void HistoryDialog::slotSearchTextChanged(const TQString& searchText)
void HistoryDialog::listViewShowElements(bool s) void HistoryDialog::listViewShowElements(bool s)
{ {
KListViewDateItem* item = static_cast<KListViewDateItem*>(mMainWidget->dateListView->firstChild()); TDEListViewDateItem* item = static_cast<TDEListViewDateItem*>(mMainWidget->dateListView->firstChild());
while (item != 0) while (item != 0)
{ {
item->setVisible(s); item->setVisible(s);
item = static_cast<KListViewDateItem*>(item->nextSibling()); item = static_cast<TDEListViewDateItem*>(item->nextSibling());
} }
} }
@ -440,7 +440,7 @@ void HistoryDialog::slotSearchErase()
* How does the search work * How does the search work
* ------------------------ * ------------------------
* We do the search respecting the current metacontact filter item. To do this, we iterate over the * We do the search respecting the current metacontact filter item. To do this, we iterate over the
* elements in the KListView (KListViewDateItems) and, for each one, we iterate over its subcontacts, * elements in the TDEListView (TDEListViewDateItems) and, for each one, we iterate over its subcontacts,
* manually searching the log files of each one. To avoid searching files twice, the months that have * manually searching the log files of each one. To avoid searching files twice, the months that have
* been searched already are stored in searchedMonths. The matches are placed in the matches TQMap. * been searched already are stored in searchedMonths. The matches are placed in the matches TQMap.
* Finally, the current date item is checked in the matches TQMap, and if it is present, it is shown. * Finally, the current date item is checked in the matches TQMap, and if it is present, it is shown.
@ -472,9 +472,9 @@ void HistoryDialog::slotSearch()
mSearching = true; mSearching = true;
// iterate over items in the date list widget // iterate over items in the date list widget
for(KListViewDateItem *curItem = static_cast<KListViewDateItem*>(mMainWidget->dateListView->firstChild()); for(TDEListViewDateItem *curItem = static_cast<TDEListViewDateItem*>(mMainWidget->dateListView->firstChild());
curItem != 0; curItem != 0;
curItem = static_cast<KListViewDateItem *>(curItem->nextSibling()) curItem = static_cast<TDEListViewDateItem *>(curItem->nextSibling())
) )
{ {
tqApp->processEvents(); tqApp->processEvents();
@ -574,8 +574,8 @@ void HistoryDialog::doneProgressBar()
void HistoryDialog::slotRightClick(const TQString &url, const TQPoint &point) void HistoryDialog::slotRightClick(const TQString &url, const TQPoint &point)
{ {
KPopupMenu *chatWindowPopup = 0L; TDEPopupMenu *chatWindowPopup = 0L;
chatWindowPopup = new KPopupMenu(); chatWindowPopup = new TDEPopupMenu();
if ( !url.isEmpty() ) if ( !url.isEmpty() )
{ {

@ -40,7 +40,7 @@ class KURL;
namespace KParts { struct URLArgs; class Part; } namespace KParts { struct URLArgs; class Part; }
class KListViewDateItem; class TDEListViewDateItem;
class DMPair class DMPair
{ {
@ -117,7 +117,7 @@ class HistoryDialog : public KDialogBase
/** /**
* Search if @param item already has @param text child * Search if @param item already has @param text child
*/ */
bool hasChild(KListViewItem* item, int month); bool hasChild(TDEListViewItem* item, int month);
/** /**
* We show history dialog to look at the log for a metacontact. Here is this metacontact. * We show history dialog to look at the log for a metacontact. Here is this metacontact.
@ -139,8 +139,8 @@ class HistoryDialog : public KDialogBase
bool mSearching; bool mSearching;
KAction *mCopyAct; TDEAction *mCopyAct;
KAction *mCopyURLAct; TDEAction *mCopyURLAct;
TQString mURL; TQString mURL;
}; };

@ -41,7 +41,7 @@ HistoryGUIClient::HistoryGUIClient(Kopete::ChatSession *parent, const char *name
TQPtrList<Kopete::Contact> mb=m_manager->members(); TQPtrList<Kopete::Contact> mb=m_manager->members();
m_logger=new HistoryLogger( mb.first() , this ); m_logger=new HistoryLogger( mb.first() , this );
actionLast=new KAction( i18n("History Last" ), TQString::fromLatin1( "finish" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" ); actionLast=new TDEAction( i18n("History Last" ), TQString::fromLatin1( "finish" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" );
actionPrev = KStdAction::back( this, TQT_SLOT(slotPrevious()), actionCollection() , "historyPrevious" ); actionPrev = KStdAction::back( this, TQT_SLOT(slotPrevious()), actionCollection() , "historyPrevious" );
actionNext = KStdAction::forward( this, TQT_SLOT(slotNext()), actionCollection() , "historyNext" ); actionNext = KStdAction::forward( this, TQT_SLOT(slotNext()), actionCollection() , "historyNext" );

@ -21,7 +21,7 @@
namespace Kopete { class ChatSession; } namespace Kopete { class ChatSession; }
class HistoryLogger; class HistoryLogger;
class KAction; class TDEAction;
/** /**
*@author Olivier Goffart *@author Olivier Goffart
@ -48,9 +48,9 @@ private:
//int m_nbAutoChatWindow; //int m_nbAutoChatWindow;
//unsigned int m_nbChatWindow; //unsigned int m_nbChatWindow;
KAction *actionPrev; TDEAction *actionPrev;
KAction *actionNext; TDEAction *actionNext;
KAction *actionLast; TDEAction *actionLast;
}; };
#endif #endif

@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( kopete_history, HistoryPluginFactory( &aboutdata )
HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ ) HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ )
: Kopete::Plugin( HistoryPluginFactory::instance(), parent, name ), m_loggerFactory( this ) : Kopete::Plugin( HistoryPluginFactory::instance(), parent, name ), m_loggerFactory( this )
{ {
KAction *viewMetaContactHistory = new KAction( i18n("View &History" ), TDEAction *viewMetaContactHistory = new TDEAction( i18n("View &History" ),
TQString::fromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()), TQString::fromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()),
actionCollection(), "viewMetaContactHistory" ); actionCollection(), "viewMetaContactHistory" );
viewMetaContactHistory->setEnabled( viewMetaContactHistory->setEnabled(

@ -28,7 +28,7 @@
#include "kopetemessagehandler.h" #include "kopetemessagehandler.h"
class KopeteView; class KopeteView;
class KActionCollection; class TDEActionCollection;
namespace Kopete namespace Kopete
{ {

@ -145,7 +145,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="KListViewSearchLine"> <widget class="TDEListViewSearchLine">
<property name="name"> <property name="name">
<cstring>dateSearchLine</cstring> <cstring>dateSearchLine</cstring>
</property> </property>
@ -173,7 +173,7 @@
</size> </size>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Date</string> <string>Date</string>

@ -41,7 +41,7 @@ LatexGUIClient::LatexGUIClient( Kopete::ChatSession *parent, const char *name )
m_manager = parent; m_manager = parent;
new KAction( i18n( "Preview Latex Images" ), "latex", CTRL + Key_L, this, TQT_SLOT( slotPreview() ), actionCollection(), "latexPreview" ); new TDEAction( i18n( "Preview Latex Images" ), "latex", CTRL + Key_L, this, TQT_SLOT( slotPreview() ), actionCollection(), "latexPreview" );
setXMLFile( "latexchatui.rc" ); setXMLFile( "latexchatui.rc" );
} }

@ -38,7 +38,7 @@ NetMeetingGUIClient::NetMeetingGUIClient( MSNChatSession *parent, const char *n
setInstance(KGenericFactory<NetMeetingPlugin>::instance()); setInstance(KGenericFactory<NetMeetingPlugin>::instance());
m_manager=parent; m_manager=parent;
new KAction( i18n( "Invite to Use NetMeeting" ), 0, this, TQT_SLOT( slotStartInvitation() ), actionCollection() , "netmeeting" ) ; new TDEAction( i18n( "Invite to Use NetMeeting" ), 0, this, TQT_SLOT( slotStartInvitation() ), actionCollection() , "netmeeting" ) ;
setXMLFile("netmeetingchatui.rc"); setXMLFile("netmeetingchatui.rc");
} }

@ -36,7 +36,7 @@ How contact specific plugin data works
Each metacontact has a method pluginData(KopetePlugin *). This takes a pointer to a plugin, and returns a QStringList containing the metacontact's data for that plugin. A corresponding setPluginData() method changes this. Who is responsible for making sure this data persists? Each metacontact has a method pluginData(KopetePlugin *). This takes a pointer to a plugin, and returns a QStringList containing the metacontact's data for that plugin. A corresponding setPluginData() method changes this. Who is responsible for making sure this data persists?
What about custom actions? What about custom actions?
KopetePlugin::custom[Chat|ContextMenuActions] both return a set of KActions that the plugin wants to have added to the UI. Looking at contactnotes, it seems that this set is recreated every time thses methods are called and they change the state of the plugin (currentContact). Is this so that the context menu is generated individually for each MC, so that the method that is called when the men item is clicked know which MC it applies to? KopetePlugin::custom[Chat|ContextMenuActions] both return a set of TDEActions that the plugin wants to have added to the UI. Looking at contactnotes, it seems that this set is recreated every time thses methods are called and they change the state of the plugin (currentContact). Is this so that the context menu is generated individually for each MC, so that the method that is called when the men item is clicked know which MC it applies to?
Choosing whether to advertise to all contacts Choosing whether to advertise to all contacts
We can either advertise periodically to (some) contacts, or we could just add an Action to advertise what we're currently listening to. We can either advertise periodically to (some) contacts, or we could just add an Action to advertise what we're currently listening to.

@ -34,7 +34,7 @@ NowListeningGUIClient::NowListeningGUIClient( Kopete::ChatSession *parent, NowLi
{ {
connect(plugin, TQT_SIGNAL(readyForUnload()), TQT_SLOT(slotPluginUnloaded())); connect(plugin, TQT_SIGNAL(readyForUnload()), TQT_SLOT(slotPluginUnloaded()));
m_msgManager = parent; m_msgManager = parent;
m_action = new KAction( i18n( "Send Media Info" ), 0, this, m_action = new TDEAction( i18n( "Send Media Info" ), 0, this,
TQT_SLOT( slotAdvertToCurrentChat() ), actionCollection(), "actionSendAdvert" ); TQT_SLOT( slotAdvertToCurrentChat() ), actionCollection(), "actionSendAdvert" );
setXMLFile("nowlisteningchatui.rc"); setXMLFile("nowlisteningchatui.rc");
} }

@ -24,7 +24,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <kxmlguiclient.h> #include <kxmlguiclient.h>
class KAction; class TDEAction;
class NowListeningPlugin; class NowListeningPlugin;
namespace Kopete { namespace Kopete {
@ -46,7 +46,7 @@ protected slots:
private: private:
Kopete::ChatSession* m_msgManager; Kopete::ChatSession* m_msgManager;
KAction* m_action; TDEAction* m_action;
}; };
#endif #endif

@ -295,7 +295,7 @@ in place of your status message.</string>
<string>Use &amp;specified media player</string> <string>Use &amp;specified media player</string>
</property> </property>
</widget> </widget>
<widget class="KListBox"> <widget class="TDEListBox">
<property name="name"> <property name="name">
<cstring>kcfg_SelectedMediaPlayer</cstring> <cstring>kcfg_SelectedMediaPlayer</cstring>
</property> </property>

@ -218,7 +218,7 @@
<string>Choose the accounts to ignore:</string> <string>Choose the accounts to ignore:</string>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Account</string> <string>Account</string>

@ -359,7 +359,7 @@ void StatisticsDialog::generatePageFromTQStringList(TQStringList values, const T
// TQDateTime listViewDT1, listViewDT2; // TQDateTime listViewDT1, listViewDT2;
// listViewDT1.setTime_t(values[i+1].toInt()); // listViewDT1.setTime_t(values[i+1].toInt());
// listViewDT2.setTime_t(values[i+2].toInt()); // listViewDT2.setTime_t(values[i+2].toInt());
// new KListViewItem(mainWidget->listView, values[i], values[i+1], values[i+2], listViewDT1.toString(), listViewDT2.toString()); // new TDEListViewItem(mainWidget->listView, values[i], values[i+1], values[i+2], listViewDT1.toString(), listViewDT2.toString());
} }

@ -52,7 +52,7 @@ StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQ
{ {
KAction *viewMetaContactStatistics = new KAction( i18n("View &Statistics" ), TDEAction *viewMetaContactStatistics = new TDEAction( i18n("View &Statistics" ),
TQString::fromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()), TQString::fromLatin1( "log" ), 0, this, TQT_SLOT(slotViewStatistics()),
actionCollection(), "viewMetaContactStatistics" ); actionCollection(), "viewMetaContactStatistics" );
viewMetaContactStatistics->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count() == 1); viewMetaContactStatistics->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count() == 1);

@ -39,7 +39,7 @@ class StatisticsContact;
class StatisticsDCOPIface; class StatisticsDCOPIface;
class KopeteView; class KopeteView;
class KActionCollection; class TDEActionCollection;
/** \section Kopete Statistics Plugin /** \section Kopete Statistics Plugin
* *

@ -49,7 +49,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListBox" row="0" column="0" rowspan="5" colspan="1"> <widget class="TDEListBox" row="0" column="0" rowspan="5" colspan="1">
<property name="name"> <property name="name">
<cstring>mColorsListBox</cstring> <cstring>mColorsListBox</cstring>
</property> </property>

@ -41,7 +41,7 @@ TranslatorGUIClient::TranslatorGUIClient( Kopete::ChatSession *parent, const cha
m_manager = parent; m_manager = parent;
new KAction( i18n( "Translate" ), "locale", CTRL + Key_T, this, TQT_SLOT( slotTranslateChat() ), actionCollection(), "translateCurrentMessage" ); new TDEAction( i18n( "Translate" ), "locale", CTRL + Key_T, this, TQT_SLOT( slotTranslateChat() ), actionCollection(), "translateCurrentMessage" );
setXMLFile( "translatorchatui.rc" ); setXMLFile( "translatorchatui.rc" );
} }

@ -76,7 +76,7 @@ TranslatorPlugin::TranslatorPlugin( TQObject *parent, const char *name, const TQ
for ( int k = 0; k <= m_languages->numLanguages(); k++ ) for ( int k = 0; k <= m_languages->numLanguages(); k++ )
keys << m[ m_languages->languageKey( k ) ]; keys << m[ m_languages->languageKey( k ) ];
m_actionLanguage = new KSelectAction( i18n( "Set &Language" ), "locale", 0, actionCollection(), "contactLanguage" ); m_actionLanguage = new TDESelectAction( i18n( "Set &Language" ), "locale", 0, actionCollection(), "contactLanguage" );
m_actionLanguage->setItems( keys ); m_actionLanguage->setItems( keys );
connect( m_actionLanguage, TQT_SIGNAL( activated() ), this, TQT_SLOT(slotSetLanguage() ) ); connect( m_actionLanguage, TQT_SIGNAL( activated() ), this, TQT_SLOT(slotSetLanguage() ) );
connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotSelectionChanged( bool ) ) ); connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotSelectionChanged( bool ) ) );

@ -34,7 +34,7 @@
class TQString; class TQString;
class KSelectAction; class TDESelectAction;
namespace Kopete { class Message; } namespace Kopete { class Message; }
namespace Kopete { class MetaContact; } namespace Kopete { class MetaContact; }
@ -93,7 +93,7 @@ private:
TQMap< TDEIO::Job *, TQCString> m_data; TQMap< TDEIO::Job *, TQCString> m_data;
TQMap< TDEIO::Job *, bool> m_completed; TQMap< TDEIO::Job *, bool> m_completed;
KSelectAction* m_actionLanguage; TDESelectAction* m_actionLanguage;
static TranslatorPlugin* pluginStatic_; static TranslatorPlugin* pluginStatic_;
TranslatorLanguages *m_languages; TranslatorLanguages *m_languages;

@ -30,8 +30,8 @@
class TQTimer; class TQTimer;
class KTempFile; class KTempFile;
namespace Kopete { class MetaContact; } namespace Kopete { class MetaContact; }
class KToggleAction; class TDEToggleAction;
class KActionCollection; class TDEActionCollection;
typedef TQValueList<Kopete::Protocol*> ProtocolList; typedef TQValueList<Kopete::Protocol*> ProtocolList;

@ -70,12 +70,12 @@ public:
KFileDialog* saveListDialog; KFileDialog* saveListDialog;
KFileDialog* loadListDialog; KFileDialog* loadListDialog;
KActionMenu* actionMenu_; TDEActionMenu* actionMenu_;
KAction* searchAction; TDEAction* searchAction;
KAction* listputAction; TDEAction* listputAction;
KAction* listToFileAction; TDEAction* listToFileAction;
KAction* listFromFileAction; TDEAction* listFromFileAction;
KAction* friendsModeAction; TDEAction* friendsModeAction;
bool connectWithSSL; bool connectWithSSL;
int currentServer; int currentServer;
@ -183,19 +183,19 @@ GaduAccount::~GaduAccount()
void void
GaduAccount::initActions() GaduAccount::initActions()
{ {
p->searchAction = new KAction( i18n( "&Search for Friends" ), "", 0, p->searchAction = new TDEAction( i18n( "&Search for Friends" ), "", 0,
this, TQT_SLOT( slotSearch() ), this, "actionSearch" ); this, TQT_SLOT( slotSearch() ), this, "actionSearch" );
p->listputAction = new KAction( i18n( "Export Contacts to Server" ), "", 0, p->listputAction = new TDEAction( i18n( "Export Contacts to Server" ), "", 0,
this, TQT_SLOT( slotExportContactsList() ), this, "actionListput" ); this, TQT_SLOT( slotExportContactsList() ), this, "actionListput" );
p->listToFileAction = new KAction( i18n( "Export Contacts to File..." ), "", 0, p->listToFileAction = new TDEAction( i18n( "Export Contacts to File..." ), "", 0,
this, TQT_SLOT( slotExportContactsListToFile() ), this, "actionListputFile" ); this, TQT_SLOT( slotExportContactsListToFile() ), this, "actionListputFile" );
p->listFromFileAction = new KAction( i18n( "Import Contacts From File..." ), "", 0, p->listFromFileAction = new TDEAction( i18n( "Import Contacts From File..." ), "", 0,
this, TQT_SLOT( slotImportContactsFromFile() ), this, "actionListgetFile" ); this, TQT_SLOT( slotImportContactsFromFile() ), this, "actionListgetFile" );
p->friendsModeAction = new KToggleAction( i18n( "Only for Friends" ), "", 0, p->friendsModeAction = new TDEToggleAction( i18n( "Only for Friends" ), "", 0,
this, TQT_SLOT( slotFriendsMode() ), this, this, TQT_SLOT( slotFriendsMode() ), this,
"actionFriendsMode" ); "actionFriendsMode" );
static_cast<KToggleAction*>(p->friendsModeAction)->setChecked( p->forFriends ); static_cast<TDEToggleAction*>(p->friendsModeAction)->setChecked( p->forFriends );
} }
void void
@ -246,12 +246,12 @@ GaduAccount::setAway( bool isAway, const TQString& awayMessage )
} }
KActionMenu* TDEActionMenu*
GaduAccount::actionMenu() GaduAccount::actionMenu()
{ {
kdDebug(14100) << "actionMenu() " << endl; kdDebug(14100) << "actionMenu() " << endl;
p->actionMenu_ = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); p->actionMenu_ = new TDEActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this );
p->actionMenu_->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%1 <%2> " ). p->actionMenu_->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%1 <%2> " ).
arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(), accountId() ) ); arg( myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(), accountId() ) );
@ -286,23 +286,23 @@ GaduAccount::actionMenu()
else { else {
p->listFromFileAction->setEnabled( TRUE ); p->listFromFileAction->setEnabled( TRUE );
} }
p->actionMenu_->insert( new KAction( i18n( "Go O&nline" ), p->actionMenu_->insert( new TDEAction( i18n( "Go O&nline" ),
GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ), GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ),
0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) ); 0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) );
p->actionMenu_->insert( new KAction( i18n( "Set &Busy" ), p->actionMenu_->insert( new TDEAction( i18n( "Set &Busy" ),
GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ), GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ),
0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) ); 0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) );
p->actionMenu_->insert( new KAction( i18n( "Set &Invisible" ), p->actionMenu_->insert( new TDEAction( i18n( "Set &Invisible" ),
GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ), GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ),
0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) ); 0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) );
p->actionMenu_->insert( new KAction( i18n( "Go &Offline" ), p->actionMenu_->insert( new TDEAction( i18n( "Go &Offline" ),
GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ), GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ),
0, this, TQT_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) ); 0, this, TQT_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) );
p->actionMenu_->insert( new KAction( i18n( "Set &Description..." ), "info", p->actionMenu_->insert( new TDEAction( i18n( "Set &Description..." ), "info",
0, this, TQT_SLOT( slotDescription() ), this, "actionGaduDescription" ) ); 0, this, TQT_SLOT( slotDescription() ), this, "actionGaduDescription" ) );
p->actionMenu_->insert( p->friendsModeAction ); p->actionMenu_->insert( p->friendsModeAction );

@ -47,7 +47,7 @@ namespace Kopete { class Protocol; }
namespace Kopete { class Message; } namespace Kopete { class Message; }
class GaduCommand; class GaduCommand;
class TQTimer; class TQTimer;
class KActionMenu; class TDEActionMenu;
class GaduDCC; class GaduDCC;
class GaduDCCTransaction; class GaduDCCTransaction;
@ -61,7 +61,7 @@ public:
~GaduAccount(); ~GaduAccount();
//{ //{
void setAway( bool isAway, const TQString& awayMessage = TQString() ); void setAway( bool isAway, const TQString& awayMessage = TQString() );
KActionMenu* actionMenu(); TDEActionMenu* actionMenu();
void dccRequest( GaduContact* ); void dccRequest( GaduContact* );
void sendFile( GaduContact* , TQString& ); void sendFile( GaduContact* , TQString& );
//} //}

@ -190,18 +190,18 @@ GaduContact::isReachable()
return account_->isConnected(); return account_->isConnected();
} }
TQPtrList<KAction>* TQPtrList<TDEAction>*
GaduContact::customContextMenuActions() GaduContact::customContextMenuActions()
{ {
TQPtrList<KAction> *fakeCollection = new TQPtrList<KAction>(); TQPtrList<TDEAction> *fakeCollection = new TQPtrList<TDEAction>();
//show profile //show profile
KAction* actionShowProfile = new KAction( i18n("Show Profile") , "info", 0, TDEAction* actionShowProfile = new TDEAction( i18n("Show Profile") , "info", 0,
this, TQT_SLOT( slotShowPublicProfile() ), this, TQT_SLOT( slotShowPublicProfile() ),
this, "actionShowPublicProfile" ); this, "actionShowPublicProfile" );
fakeCollection->append( actionShowProfile ); fakeCollection->append( actionShowProfile );
KAction* actionEditContact = new KAction( i18n("Edit...") , "edit", 0, TDEAction* actionEditContact = new TDEAction( i18n("Edit...") , "edit", 0,
this, TQT_SLOT( slotEditContact() ), this, TQT_SLOT( slotEditContact() ),
this, "actionEditContact" ); this, "actionEditContact" );

@ -34,7 +34,7 @@
#include <libgadu.h> #include <libgadu.h>
class KAction; class TDEAction;
class GaduAccount; class GaduAccount;
namespace Kopete { class Account; } namespace Kopete { class Account; }
namespace Kopete { class ChatSession; } namespace Kopete { class ChatSession; }
@ -52,7 +52,7 @@ public:
virtual bool isReachable(); virtual bool isReachable();
virtual void serialize( TQMap<TQString, TQString>&, TQMap<TQString, TQString>& ); virtual void serialize( TQMap<TQString, TQString>&, TQMap<TQString, TQString>& );
virtual TQPtrList<KAction>* customContextMenuActions(); virtual TQPtrList<TDEAction>* customContextMenuActions();
virtual TQString identityId() const; virtual TQString identityId() const;
GaduContactsList::ContactLine* contactDetails(); GaduContactsList::ContactLine* contactDetails();
@ -99,9 +99,9 @@ private:
TQString parentIdentity_; TQString parentIdentity_;
GaduAccount* account_; GaduAccount* account_;
KAction* actionSendMessage_; TDEAction* actionSendMessage_;
KAction* actionInfo_; TDEAction* actionInfo_;
KAction* actionRemove_; TDEAction* actionRemove_;
TQPtrList<Kopete::Contact> thisContact_; TQPtrList<Kopete::Contact> thisContact_;

@ -31,8 +31,8 @@
#include "gaducommands.h" #include "gaducommands.h"
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class TQWidget; class TQWidget;
class TQString; class TQString;

@ -408,7 +408,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KListView" row="0" column="0"> <widget class="TDEListView" row="0" column="0">
<column> <column>
<property name="text"> <property name="text">
<string>Status</string> <string>Status</string>

@ -79,11 +79,11 @@ GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *parent, const TQString& a
TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ), TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ),
TQT_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); TQT_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) );
m_actionAutoReply = new KAction ( i18n( "&Set Auto-Reply..." ), TQString(), 0, this, m_actionAutoReply = new TDEAction ( i18n( "&Set Auto-Reply..." ), TQString(), 0, this,
TQT_SLOT( slotSetAutoReply() ), this, "actionSetAutoReply"); TQT_SLOT( slotSetAutoReply() ), this, "actionSetAutoReply");
m_actionJoinChatRoom = new KAction ( i18n( "&Join Channel..." ), TQString(), 0, this, m_actionJoinChatRoom = new TDEAction ( i18n( "&Join Channel..." ), TQString(), 0, this,
TQT_SLOT( slotJoinChatRoom() ), this, "actionJoinChatRoom"); TQT_SLOT( slotJoinChatRoom() ), this, "actionJoinChatRoom");
m_actionManagePrivacy = new KAction ( i18n( "&Manage Privacy..." ), TQString(), 0, this, m_actionManagePrivacy = new TDEAction ( i18n( "&Manage Privacy..." ), TQString(), 0, this,
TQT_SLOT( slotPrivacy() ), this, "actionPrivacy"); TQT_SLOT( slotPrivacy() ), this, "actionPrivacy");
m_connector = 0; m_connector = 0;
@ -100,9 +100,9 @@ GroupWiseAccount::~GroupWiseAccount()
cleanup(); cleanup();
} }
KActionMenu* GroupWiseAccount::actionMenu() TDEActionMenu* GroupWiseAccount::actionMenu()
{ {
KActionMenu *m_actionMenu=Kopete::Account::actionMenu(); TDEActionMenu *m_actionMenu=Kopete::Account::actionMenu();
m_actionAutoReply->setEnabled( isConnected() ); m_actionAutoReply->setEnabled( isConnected() );
m_actionManagePrivacy->setEnabled( isConnected() ); m_actionManagePrivacy->setEnabled( isConnected() );
@ -112,7 +112,7 @@ KActionMenu* GroupWiseAccount::actionMenu()
m_actionMenu->insert( m_actionJoinChatRoom ); m_actionMenu->insert( m_actionJoinChatRoom );
/* Used for debugging */ /* Used for debugging */
/* /*
theActionMenu->insert( new KAction ( "Test rtfize()", TQString(), 0, this, theActionMenu->insert( new TDEAction ( "Test rtfize()", TQString(), 0, this,
TQT_SLOT( slotTestRTFize() ), this, TQT_SLOT( slotTestRTFize() ), this,
"actionTestRTFize") ); "actionTestRTFize") );
*/ */

@ -29,7 +29,7 @@
#include <managedconnectionaccount.h> #include <managedconnectionaccount.h>
class KActionMenu; class TDEActionMenu;
namespace Kopete { namespace Kopete {
class Contact; class Contact;
@ -65,7 +65,7 @@ public:
/** /**
* Construct the context menu used for the status bar icon * Construct the context menu used for the status bar icon
*/ */
virtual KActionMenu* actionMenu(); virtual TDEActionMenu* actionMenu();
// DEBUG ONLY // DEBUG ONLY
void dumpManagers(); void dumpManagers();
@ -322,10 +322,10 @@ protected:
void cleanup(); void cleanup();
private: private:
// action menu and its actions // action menu and its actions
KActionMenu * m_actionMenu; TDEActionMenu * m_actionMenu;
KAction * m_actionAutoReply; TDEAction * m_actionAutoReply;
KAction * m_actionManagePrivacy; TDEAction * m_actionManagePrivacy;
KAction * m_actionJoinChatRoom; TDEAction * m_actionJoinChatRoom;
// Network code // Network code
KNetworkConnector * m_connector; KNetworkConnector * m_connector;
TQCA::TLS * m_TQCATLS; TQCA::TLS * m_TQCATLS;
@ -344,7 +344,7 @@ private:
* @internal * @internal
* An action that selects an OnlineStatus and provides a status message, but not using Kopete::Away, because the status message relates only to this status. * An action that selects an OnlineStatus and provides a status message, but not using Kopete::Away, because the status message relates only to this status.
*/ */
/*class OnlineStatusMessageAction : public KAction /*class OnlineStatusMessageAction : public TDEAction
{ {
Q_OBJECT Q_OBJECT

@ -158,15 +158,15 @@ Kopete::ChatSession * GroupWiseContact::manager( Kopete::Contact::CanCreateFlags
return account()->chatSession( chatMembers, TQString(), canCreate ); return account()->chatSession( chatMembers, TQString(), canCreate );
} }
TQPtrList<KAction> *GroupWiseContact::customContextMenuActions() TQPtrList<TDEAction> *GroupWiseContact::customContextMenuActions()
{ {
TQPtrList<KAction> *m_actionCollection = new TQPtrList<KAction>; TQPtrList<TDEAction> *m_actionCollection = new TQPtrList<TDEAction>;
// Block/unblock Contact // Block/unblock Contact
TQString label = account()->isContactBlocked( m_dn ) ? i18n( "Unblock User" ) : i18n( "Block User" ); TQString label = account()->isContactBlocked( m_dn ) ? i18n( "Unblock User" ) : i18n( "Block User" );
if( !m_actionBlock ) if( !m_actionBlock )
{ {
m_actionBlock = new KAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlock() ), m_actionBlock = new TDEAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlock() ),
this, "actionBlock" ); this, "actionBlock" );
} }
else else

@ -37,8 +37,8 @@
#include "gwfield.h" #include "gwfield.h"
#include "gwmessagemanager.h" #include "gwmessagemanager.h"
class KAction; class TDEAction;
class KActionCollection; class TDEActionCollection;
namespace Kopete { class Account; } namespace Kopete { class Account; }
class GroupWiseAccount; class GroupWiseAccount;
class GroupWiseChatSession; class GroupWiseChatSession;
@ -100,7 +100,7 @@ public:
/** /**
* Return the actions for this contact * Return the actions for this contact
*/ */
virtual TQPtrList<KAction> *customContextMenuActions(); virtual TQPtrList<TDEAction> *customContextMenuActions();
/** /**
* Returns a Kopete::ChatSession associated with this contact * Returns a Kopete::ChatSession associated with this contact
@ -173,15 +173,15 @@ protected slots:
*/ */
void receivePrivacyChanged( const TQString &, bool ); void receivePrivacyChanged( const TQString &, bool );
protected: protected:
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
int m_objectId; int m_objectId;
int m_parentId; int m_parentId;
int m_sequence; int m_sequence;
TQString m_dn; TQString m_dn;
TQString m_displayName; TQString m_displayName;
KAction* m_actionPrefs; TDEAction* m_actionPrefs;
KAction *m_actionBlock; TDEAction *m_actionBlock;
// Novell Messenger Properties, as received by the server. // Novell Messenger Properties, as received by the server.
// Unfortunately we don't the domain of the set of keys, so they are not easily mappable to KopeteContactProperties // Unfortunately we don't the domain of the set of keys, so they are not easily mappable to KopeteContactProperties
TQMap< TQString, TQString > m_serverProperties; TQMap< TQString, TQString > m_serverProperties;

@ -62,13 +62,13 @@ GroupWiseChatSession::GroupWiseChatSession(const Kopete::Contact* user, Kopete::
TQT_SLOT( slotGotNotTypingNotification( const ConferenceEvent & ) ) ); TQT_SLOT( slotGotNotTypingNotification( const ConferenceEvent & ) ) );
// Set up the Invite menu // Set up the Invite menu
m_actionInvite = new KActionMenu( i18n( "&Invite" ), actionCollection() , "gwInvite" ); m_actionInvite = new TDEActionMenu( i18n( "&Invite" ), actionCollection() , "gwInvite" );
connect( m_actionInvite->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT(slotActionInviteAboutToShow() ) ) ; connect( m_actionInvite->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT(slotActionInviteAboutToShow() ) ) ;
m_secure = new KAction( i18n( "Security Status" ), "encrypted", KShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" ); m_secure = new TDEAction( i18n( "Security Status" ), "encrypted", TDEShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" );
m_secure->setToolTip( i18n( "Conversation is secure" ) ); m_secure->setToolTip( i18n( "Conversation is secure" ) );
m_logging = new KAction( i18n( "Archiving Status" ), "logchat", KShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" ); m_logging = new TDEAction( i18n( "Archiving Status" ), "logchat", TDEShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" );
updateArchiving(); updateArchiving();
setXMLFile("gwchatui.rc"); setXMLFile("gwchatui.rc");
@ -295,7 +295,7 @@ void GroupWiseChatSession::dequeueMessagesAndInvites()
void GroupWiseChatSession::slotActionInviteAboutToShow() void GroupWiseChatSession::slotActionInviteAboutToShow()
{ {
// We can't simply insert KAction in this menu bebause we don't know when to delete them. // We can't simply insert TDEAction in this menu bebause we don't know when to delete them.
// items inserted with insert items are automatically deleted when we call clear // items inserted with insert items are automatically deleted when we call clear
m_inviteActions.setAutoDelete(true); m_inviteActions.setAutoDelete(true);
@ -309,14 +309,14 @@ void GroupWiseChatSession::slotActionInviteAboutToShow()
{ {
if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() )
{ {
KAction *a=new KopeteContactAction( it.current(), this, TDEAction *a=new KopeteContactAction( it.current(), this,
TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite );
m_actionInvite->insert( a ); m_actionInvite->insert( a );
m_inviteActions.append( a ) ; m_inviteActions.append( a ) ;
} }
} }
// Invite someone off-list // Invite someone off-list
KAction *b=new KAction( i18n ("&Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); TDEAction *b=new TDEAction( i18n ("&Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" );
m_actionInvite->insert( b ); m_actionInvite->insert( b );
m_inviteActions.append( b ) ; m_inviteActions.append( b ) ;
} }
@ -330,7 +330,7 @@ void GroupWiseChatSession::slotInviteContact( Kopete::Contact * contact )
} }
else else
{ {
TQWidget * w = view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; TQWidget * w = view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L;
bool ok; bool ok;
TQRegExp rx( ".*" ); TQRegExp rx( ".*" );
@ -358,7 +358,7 @@ void GroupWiseChatSession::slotInviteOtherContact()
if ( !m_searchDlg ) if ( !m_searchDlg )
{ {
// show search dialog // show search dialog
TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : TQWidget * w = ( view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) :
Kopete::UI::Global::mainWidget() ); Kopete::UI::Global::mainWidget() );
m_searchDlg = new KDialogBase( w, "invitesearchdialog", false, i18n( "Search for Contact to Invite" ), KDialogBase::Ok|KDialogBase::Cancel ); m_searchDlg = new KDialogBase( w, "invitesearchdialog", false, i18n( "Search for Contact to Invite" ), KDialogBase::Ok|KDialogBase::Cancel );
m_search = new GroupWiseContactSearch( account(), TQListView::Single, true, m_searchDlg, "invitesearchwidget" ); m_search = new GroupWiseContactSearch( account(), TQListView::Single, true, m_searchDlg, "invitesearchwidget" );
@ -375,7 +375,7 @@ void GroupWiseChatSession::slotSearchedForUsers()
TQValueList< ContactDetails > selected = m_search->selectedResults(); TQValueList< ContactDetails > selected = m_search->selectedResults();
if ( selected.count() ) if ( selected.count() )
{ {
TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : TQWidget * w = ( view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) :
Kopete::UI::Global::mainWidget() ); Kopete::UI::Global::mainWidget() );
ContactDetails cd = selected.first(); ContactDetails cd = selected.first();
bool ok; bool ok;
@ -501,14 +501,14 @@ void GroupWiseChatSession::updateArchiving()
void GroupWiseChatSession::slotShowSecurity() void GroupWiseChatSession::slotShowSecurity()
{ {
TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : TQWidget * w = ( view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) :
Kopete::UI::Global::mainWidget() ); Kopete::UI::Global::mainWidget() );
KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security Status" ) ); KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is secured with SSL security." ), i18n("Security Status" ) );
} }
void GroupWiseChatSession::slotShowArchiving() void GroupWiseChatSession::slotShowArchiving()
{ {
TQWidget * w = ( view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : TQWidget * w = ( view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) :
Kopete::UI::Global::mainWidget() ); Kopete::UI::Global::mainWidget() );
KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving Status" ) ); KMessageBox::queuedMessageBox( w, KMessageBox::Information, i18n( "This conversation is being logged administratively." ), i18n("Archiving Status" ) );
} }

@ -19,8 +19,8 @@
#include "gwerror.h" #include "gwerror.h"
class TQLabel; class TQLabel;
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class KDialogBase; class KDialogBase;
class GroupWiseAccount; class GroupWiseAccount;
class GroupWiseContact; class GroupWiseContact;
@ -153,11 +153,11 @@ private:
TQValueList< Kopete::Message > m_pendingOutgoingMessages; // messages queued while we wait for the server to tell us the conference is created. TQValueList< Kopete::Message > m_pendingOutgoingMessages; // messages queued while we wait for the server to tell us the conference is created.
Kopete::ContactPtrList m_pendingInvites; // people we wanted to invite to the conference, queued while waiting for the conference to be created. Kopete::ContactPtrList m_pendingInvites; // people we wanted to invite to the conference, queued while waiting for the conference to be created.
KActionMenu *m_actionInvite; TDEActionMenu *m_actionInvite;
TQPtrList<KAction> m_inviteActions; TQPtrList<TDEAction> m_inviteActions;
// labels showing secure and logging status // labels showing secure and logging status
KAction *m_secure; TDEAction *m_secure;
KAction *m_logging; TDEAction *m_logging;
// search widget and dialog used for inviting contacts // search widget and dialog used for inviting contacts
GroupWiseContactSearch * m_search; GroupWiseContactSearch * m_search;
KDialogBase * m_searchDlg; KDialogBase * m_searchDlg;

@ -331,7 +331,7 @@
<cstring>kListBox1</cstring> <cstring>kListBox1</cstring>
</property> </property>
</widget> </widget>
<widget class="KListBox"> <widget class="TDEListBox">
<property name="name"> <property name="name">
<cstring>m_acl</cstring> <cstring>m_acl</cstring>
</property> </property>

@ -16,7 +16,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>Chatroom </string> <string>Chatroom </string>

@ -117,7 +117,7 @@ void GroupWiseContactProperties::setupProperties( TQMap< TQString, TQString > se
else else
localised = key; localised = key;
new KListViewItem( m_propsWidget->m_propsView, localised, it.data() ); new TDEListViewItem( m_propsWidget->m_propsView, localised, it.data() );
} }
} }

@ -25,7 +25,7 @@
class GroupWiseContactPropsWidget; class GroupWiseContactPropsWidget;
class KDialogBase; class KDialogBase;
class TQListViewItem; class TQListViewItem;
class KAction; class TDEAction;
/** /**
Logic, wrapping UI, for displaying contact properties Logic, wrapping UI, for displaying contact properties
@ -54,7 +54,7 @@ protected slots:
void slotCopy(); void slotCopy();
private: private:
GroupWiseContactPropsWidget * m_propsWidget; GroupWiseContactPropsWidget * m_propsWidget;
KAction * m_copyAction; TDEAction * m_copyAction;
KDialogBase * m_dialog; KDialogBase * m_dialog;
}; };

@ -163,7 +163,7 @@
<string>Additional properties:</string> <string>Additional properties:</string>
</property> </property>
</widget> </widget>
<widget class="KListView"> <widget class="TDEListView">
<column> <column>
<property name="text"> <property name="text">
<string>Property</string> <string>Property</string>

@ -19,7 +19,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>Name</string> <string>Name</string>

@ -207,9 +207,9 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T
setAccountLabel( TQString::fromLatin1("%1@%2").arg(mNickName,networkName) ); setAccountLabel( TQString::fromLatin1("%1@%2").arg(mNickName,networkName) );
m_myServer = m_contactManager->myServer(); m_myServer = m_contactManager->myServer();
m_joinChannelAction = new KAction ( i18n("Join Channel..."), TQString(), 0, this, m_joinChannelAction = new TDEAction ( i18n("Join Channel..."), TQString(), 0, this,
TQT_SLOT(slotJoinChannel()), this); TQT_SLOT(slotJoinChannel()), this);
m_searchChannelAction = new KAction ( i18n("Search Channels..."), TQString(), 0, this, m_searchChannelAction = new TDEAction ( i18n("Search Channels..."), TQString(), 0, this,
TQT_SLOT(slotSearchChannels()), this); TQT_SLOT(slotSearchChannels()), this);
} }
@ -414,11 +414,11 @@ void IRCAccount::setMessageDestinations( int serverNotices, int serverMessages,
m_errorMessages = (MessageDestination)errorMessages; m_errorMessages = (MessageDestination)errorMessages;
} }
KActionMenu *IRCAccount::actionMenu() TDEActionMenu *IRCAccount::actionMenu()
{ {
TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).arg( accountId() ).arg( myself()->onlineStatus().description() ); TQString menuTitle = TQString::fromLatin1( " %1 <%2> " ).arg( accountId() ).arg( myself()->onlineStatus().description() );
KActionMenu *mActionMenu = Kopete::Account::actionMenu(); TDEActionMenu *mActionMenu = Kopete::Account::actionMenu();
m_joinChannelAction->setEnabled( isConnected() ); m_joinChannelAction->setEnabled( isConnected() );
m_searchChannelAction->setEnabled( isConnected() ); m_searchChannelAction->setEnabled( isConnected() );
@ -426,11 +426,11 @@ KActionMenu *IRCAccount::actionMenu()
mActionMenu->popupMenu()->insertSeparator(); mActionMenu->popupMenu()->insertSeparator();
mActionMenu->insert(m_joinChannelAction); mActionMenu->insert(m_joinChannelAction);
mActionMenu->insert(m_searchChannelAction); mActionMenu->insert(m_searchChannelAction);
mActionMenu->insert( new KAction ( i18n("Show Server Window"), TQString(), 0, this, TQT_SLOT(slotShowServerWindow()), mActionMenu ) ); mActionMenu->insert( new TDEAction ( i18n("Show Server Window"), TQString(), 0, this, TQT_SLOT(slotShowServerWindow()), mActionMenu ) );
if( m_engine->isConnected() && m_engine->useSSL() ) if( m_engine->isConnected() && m_engine->useSSL() )
{ {
mActionMenu->insert( new KAction ( i18n("Show Security Information"), "", 0, m_engine, mActionMenu->insert( new TDEAction ( i18n("Show Security Information"), "", 0, m_engine,
TQT_SLOT(showInfoDialog()), mActionMenu ) ); TQT_SLOT(showInfoDialog()), mActionMenu ) );
} }

@ -48,8 +48,8 @@ class ChatSession;
class MetaContact; class MetaContact;
} }
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
struct IRCHost struct IRCHost
{ {
@ -156,7 +156,7 @@ public:
public slots: public slots:
virtual KActionMenu *actionMenu(); virtual TDEActionMenu *actionMenu();
virtual void setAway( bool isAway, const TQString &awayMessage = TQString() ); virtual void setAway( bool isAway, const TQString &awayMessage = TQString() );
@ -239,8 +239,8 @@ private:
TQMap< TQString, TQString > m_customCtcp; TQMap< TQString, TQString > m_customCtcp;
Kopete::ChatSession *commandSource; Kopete::ChatSession *commandSource;
KAction *m_joinChannelAction; TDEAction *m_joinChannelAction;
KAction *m_searchChannelAction; TDEAction *m_searchChannelAction;
}; };
#endif #endif

@ -59,11 +59,11 @@ IRCChannelContact::IRCChannelContact(IRCContactManager *contactManager, const TQ
this, TQT_SLOT(slotChannelListed(const TQString &, uint, const TQString &))); this, TQT_SLOT(slotChannelListed(const TQString &, uint, const TQString &)));
actionJoin = 0L; actionJoin = 0L;
actionModeT = new KToggleAction(i18n("Only Operators Can Change &Topic"), 0, this, TQT_SLOT(slotModeChanged()), this ); actionModeT = new TDEToggleAction(i18n("Only Operators Can Change &Topic"), 0, this, TQT_SLOT(slotModeChanged()), this );
actionModeN = new KToggleAction(i18n("&No Outside Messages"), 0, this, TQT_SLOT(slotModeChanged()), this ); actionModeN = new TDEToggleAction(i18n("&No Outside Messages"), 0, this, TQT_SLOT(slotModeChanged()), this );
actionModeS = new KToggleAction(i18n("&Secret"), 0, this, TQT_SLOT(slotModeChanged()), this ); actionModeS = new TDEToggleAction(i18n("&Secret"), 0, this, TQT_SLOT(slotModeChanged()), this );
actionModeM = new KToggleAction(i18n("&Moderated"), 0, this, TQT_SLOT(slotModeChanged()), this ); actionModeM = new TDEToggleAction(i18n("&Moderated"), 0, this, TQT_SLOT(slotModeChanged()), this );
actionModeI = new KToggleAction(i18n("&Invite Only"), 0, this, TQT_SLOT(slotModeChanged()), this ); actionModeI = new TDEToggleAction(i18n("&Invite Only"), 0, this, TQT_SLOT(slotModeChanged()), this );
actionHomePage = 0L; actionHomePage = 0L;
updateStatus(); updateStatus();
@ -653,19 +653,19 @@ bool IRCChannelContact::modeEnabled( TQChar mode, TQString *value )
return false; return false;
} }
TQPtrList<KAction> *IRCChannelContact::customContextMenuActions() TQPtrList<TDEAction> *IRCChannelContact::customContextMenuActions()
{ {
TQPtrList<KAction> *mCustomActions = new TQPtrList<KAction>(); TQPtrList<TDEAction> *mCustomActions = new TQPtrList<TDEAction>();
if( !actionJoin ) if( !actionJoin )
{ {
actionJoin = new KAction(i18n("&Join"), 0, this, TQT_SLOT(join()), this, "actionJoin"); actionJoin = new TDEAction(i18n("&Join"), 0, this, TQT_SLOT(join()), this, "actionJoin");
actionPart = new KAction(i18n("&Part"), 0, this, TQT_SLOT(partAction()), this, "actionPart"); actionPart = new TDEAction(i18n("&Part"), 0, this, TQT_SLOT(partAction()), this, "actionPart");
actionTopic = new KAction(i18n("Change &Topic..."), 0, this, TQT_SLOT(setTopic()), this, "actionTopic"); actionTopic = new TDEAction(i18n("Change &Topic..."), 0, this, TQT_SLOT(setTopic()), this, "actionTopic");
actionModeMenu = new KActionMenu(i18n("Channel Modes"), 0, this, "actionModeMenu"); actionModeMenu = new TDEActionMenu(i18n("Channel Modes"), 0, this, "actionModeMenu");
if( !property(m_protocol->propHomepage).value().isNull() ) if( !property(m_protocol->propHomepage).value().isNull() )
{ {
actionHomePage = new KAction( i18n("Visit &Homepage"), 0, this, actionHomePage = new TDEAction( i18n("Visit &Homepage"), 0, this,
TQT_SLOT(slotHomepage()), this, "actionHomepage"); TQT_SLOT(slotHomepage()), this, "actionHomepage");
} }
else if( actionHomePage ) else if( actionHomePage )

@ -21,11 +21,11 @@
#include "irccontact.h" #include "irccontact.h"
class KActionCollection; class TDEActionCollection;
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class KCodecAction; class KCodecAction;
class KToggleAction; class TDEToggleAction;
namespace Kopete { class MetaContact; } namespace Kopete { class MetaContact; }
namespace Kopete { class ChatSession; } namespace Kopete { class ChatSession; }
@ -74,7 +74,7 @@ public:
bool modeEnabled( TQChar mode, TQString *value = 0 ); bool modeEnabled( TQChar mode, TQString *value = 0 );
// Kopete::Contact stuff // Kopete::Contact stuff
virtual TQPtrList<KAction> *customContextMenuActions(); virtual TQPtrList<TDEAction> *customContextMenuActions();
virtual const TQString caption() const; virtual const TQString caption() const;
//Methods handled by the signal mapper //Methods handled by the signal mapper
@ -131,18 +131,18 @@ private slots:
void slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus); void slotOnlineStatusChanged(Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus);
private: private:
KAction *actionJoin; TDEAction *actionJoin;
KAction *actionPart; TDEAction *actionPart;
KAction *actionTopic; TDEAction *actionTopic;
KAction *actionHomePage; TDEAction *actionHomePage;
KActionMenu *actionModeMenu; TDEActionMenu *actionModeMenu;
KCodecAction *codecAction; KCodecAction *codecAction;
KToggleAction *actionModeT; // Only Operators Can Change Topic TDEToggleAction *actionModeT; // Only Operators Can Change Topic
KToggleAction *actionModeN; // No Outside Messages TDEToggleAction *actionModeN; // No Outside Messages
KToggleAction *actionModeS; // Secret TDEToggleAction *actionModeS; // Secret
KToggleAction *actionModeI; // Invite Only TDEToggleAction *actionModeI; // Invite Only
KToggleAction *actionModeM; // Moderated TDEToggleAction *actionModeM; // Moderated
TQString mTopic; TQString mTopic;
TQString mPassword; TQString mPassword;

@ -53,7 +53,7 @@ IRCGUIClient::IRCGUIClient( Kopete::ChatSession *parent ) : TQObject(parent) , K
setXMLFile("ircchatui.rc"); setXMLFile("ircchatui.rc");
unplugActionList( "irccontactactionlist" ); unplugActionList( "irccontactactionlist" );
TQPtrList<KAction> *actions = m_user->customContextMenuActions( parent ); TQPtrList<TDEAction> *actions = m_user->customContextMenuActions( parent );
plugActionList( "irccontactactionlist", *actions ); plugActionList( "irccontactactionlist", *actions );
delete actions; delete actions;
*/ */
@ -62,10 +62,10 @@ IRCGUIClient::IRCGUIClient( Kopete::ChatSession *parent ) : TQObject(parent) , K
TQDomDocument doc = domDocument(); TQDomDocument doc = domDocument();
TQDomNode menu = doc.documentElement().firstChild().firstChild(); TQDomNode menu = doc.documentElement().firstChild().firstChild();
TQPtrList<KAction> *actions = m_user->customContextMenuActions( parent ); TQPtrList<TDEAction> *actions = m_user->customContextMenuActions( parent );
if( actions ) if( actions )
{ {
for( KAction *a = actions->first(); a; a = actions->next() ) for( TDEAction *a = actions->first(); a; a = actions->next() )
{ {
actionCollection()->insert( a ); actionCollection()->insert( a );
TQDomElement newNode = doc.createElement( "Action" ); TQDomElement newNode = doc.createElement( "Action" );

@ -382,7 +382,7 @@ void IRCProtocol::slotMessageFilter( Kopete::Message &msg )
} }
} }
TQPtrList<KAction> *IRCProtocol::customChatWindowPopupActions( const Kopete::Message &m, DOM::Node &n ) TQPtrList<TDEAction> *IRCProtocol::customChatWindowPopupActions( const Kopete::Message &m, DOM::Node &n )
{ {
DOM::HTMLElement e = n; DOM::HTMLElement e = n;

@ -98,7 +98,7 @@ public:
virtual Kopete::Account* createNewAccount(const TQString &accountId); virtual Kopete::Account* createNewAccount(const TQString &accountId);
virtual TQPtrList<KAction> *customChatWindowPopupActions( const Kopete::Message &, DOM::Node & ); virtual TQPtrList<TDEAction> *customChatWindowPopupActions( const Kopete::Message &, DOM::Node & );
static IRCProtocol *protocol(); static IRCProtocol *protocol();

@ -27,9 +27,9 @@
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <tqstringlist.h> #include <tqstringlist.h>
class KActionCollection; class TDEActionCollection;
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class KopeteView; class KopeteView;
class IRCContactManager; class IRCContactManager;

@ -524,45 +524,45 @@ void IRCUserContact::newWhoReply( const TQString &channel, const TQString &user,
} }
} }
TQPtrList<KAction> *IRCUserContact::customContextMenuActions( Kopete::ChatSession *manager ) TQPtrList<TDEAction> *IRCUserContact::customContextMenuActions( Kopete::ChatSession *manager )
{ {
if( manager ) if( manager )
{ {
TQPtrList<KAction> *mCustomActions = new TQPtrList<KAction> (); TQPtrList<TDEAction> *mCustomActions = new TQPtrList<TDEAction> ();
mActiveManager = manager; mActiveManager = manager;
Kopete::ContactPtrList members = mActiveManager->members(); Kopete::ContactPtrList members = mActiveManager->members();
IRCChannelContact *isChannel = dynamic_cast<IRCChannelContact*>( members.first() ); IRCChannelContact *isChannel = dynamic_cast<IRCChannelContact*>( members.first() );
if( !actionCtcpMenu ) if( !actionCtcpMenu )
{ {
actionCtcpMenu = new KActionMenu(i18n("C&TCP"), 0, this ); actionCtcpMenu = new TDEActionMenu(i18n("C&TCP"), 0, this );
actionCtcpMenu->insert( new KAction(i18n("&Version"), 0, this, actionCtcpMenu->insert( new TDEAction(i18n("&Version"), 0, this,
TQT_SLOT(slotCtcpVersion()), actionCtcpMenu) ); TQT_SLOT(slotCtcpVersion()), actionCtcpMenu) );
actionCtcpMenu->insert( new KAction(i18n("&Ping"), 0, this, actionCtcpMenu->insert( new TDEAction(i18n("&Ping"), 0, this,
TQT_SLOT(slotCtcpPing()), actionCtcpMenu) ); TQT_SLOT(slotCtcpPing()), actionCtcpMenu) );
actionModeMenu = new KActionMenu(i18n("&Modes"), 0, this, "actionModeMenu"); actionModeMenu = new TDEActionMenu(i18n("&Modes"), 0, this, "actionModeMenu");
actionModeMenu->insert( new KAction(i18n("&Op"), 0, this, actionModeMenu->insert( new TDEAction(i18n("&Op"), 0, this,
TQT_SLOT(slotOp()), actionModeMenu, "actionOp") ); TQT_SLOT(slotOp()), actionModeMenu, "actionOp") );
actionModeMenu->insert( new KAction(i18n("&Deop"), 0, this, actionModeMenu->insert( new TDEAction(i18n("&Deop"), 0, this,
TQT_SLOT(slotDeop()), actionModeMenu, "actionDeop") ); TQT_SLOT(slotDeop()), actionModeMenu, "actionDeop") );
actionModeMenu->insert( new KAction(i18n("&Voice"), 0, this, actionModeMenu->insert( new TDEAction(i18n("&Voice"), 0, this,
TQT_SLOT(slotVoice()), actionModeMenu, "actionVoice") ); TQT_SLOT(slotVoice()), actionModeMenu, "actionVoice") );
actionModeMenu->insert( new KAction(i18n("Devoice"), 0, this, actionModeMenu->insert( new TDEAction(i18n("Devoice"), 0, this,
TQT_SLOT(slotDevoice()), actionModeMenu, "actionDevoice") ); TQT_SLOT(slotDevoice()), actionModeMenu, "actionDevoice") );
actionModeMenu->setEnabled( false ); actionModeMenu->setEnabled( false );
actionKick = new KAction(i18n("&Kick"), 0, this, TQT_SLOT(slotKick()), this); actionKick = new TDEAction(i18n("&Kick"), 0, this, TQT_SLOT(slotKick()), this);
actionKick->setEnabled( false ); actionKick->setEnabled( false );
actionBanMenu = new KActionMenu(i18n("&Ban"), 0, this, "actionBanMenu"); actionBanMenu = new TDEActionMenu(i18n("&Ban"), 0, this, "actionBanMenu");
actionBanMenu->insert( new KAction(i18n("Host (*!*@host.domain.net)"), 0, this, actionBanMenu->insert( new TDEAction(i18n("Host (*!*@host.domain.net)"), 0, this,
TQT_SLOT(slotBanHost()), actionBanMenu ) ); TQT_SLOT(slotBanHost()), actionBanMenu ) );
actionBanMenu->insert( new KAction(i18n("Domain (*!*@*.domain.net)"), 0, this, actionBanMenu->insert( new TDEAction(i18n("Domain (*!*@*.domain.net)"), 0, this,
TQT_SLOT(slotBanDomain()), actionBanMenu ) ); TQT_SLOT(slotBanDomain()), actionBanMenu ) );
actionBanMenu->insert( new KAction(i18n("User@Host (*!*user@host.domain.net)"), 0, this, actionBanMenu->insert( new TDEAction(i18n("User@Host (*!*user@host.domain.net)"), 0, this,
TQT_SLOT(slotBanUserHost()), actionBanMenu ) ); TQT_SLOT(slotBanUserHost()), actionBanMenu ) );
actionBanMenu->insert( new KAction(i18n("User@Domain (*!*user@*.domain.net)"), 0, this, actionBanMenu->insert( new TDEAction(i18n("User@Domain (*!*user@*.domain.net)"), 0, this,
TQT_SLOT(slotBanUserDomain()), actionBanMenu ) ); TQT_SLOT(slotBanUserDomain()), actionBanMenu ) );
actionBanMenu->setEnabled( false ); actionBanMenu->setEnabled( false );

@ -25,9 +25,9 @@
class TQTimer; class TQTimer;
class KActionCollection; class TDEActionCollection;
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class KCodecAction; class KCodecAction;
class IRCContactManager; class IRCContactManager;
@ -68,7 +68,7 @@ public:
IRCUserContact(IRCContactManager *, const TQString &nickname, Kopete::MetaContact *mc); IRCUserContact(IRCContactManager *, const TQString &nickname, Kopete::MetaContact *mc);
// Kopete::Contact stuff // Kopete::Contact stuff
virtual TQPtrList<KAction> *customContextMenuActions( Kopete::ChatSession *manager ); virtual TQPtrList<TDEAction> *customContextMenuActions( Kopete::ChatSession *manager );
virtual const TQString caption() const; virtual const TQString caption() const;
void setAway(bool isAway); void setAway(bool isAway);
@ -132,10 +132,10 @@ private:
void contactMode(const TQString &mode); void contactMode(const TQString &mode);
void updateInfo(); void updateInfo();
KActionMenu *actionModeMenu; TDEActionMenu *actionModeMenu;
KActionMenu *actionCtcpMenu; TDEActionMenu *actionCtcpMenu;
KAction *actionKick; TDEAction *actionKick;
KActionMenu *actionBanMenu; TDEActionMenu *actionBanMenu;
KCodecAction *codecAction; KCodecAction *codecAction;
Kopete::ChatSession *mActiveManager; Kopete::ChatSession *mActiveManager;
TQTimer *mOnlineTimer; TQTimer *mOnlineTimer;

@ -20,8 +20,8 @@
#include "kcodecaction.h" #include "kcodecaction.h"
KCodecAction::KCodecAction( const TQString &text, const KShortcut &cut, KCodecAction::KCodecAction( const TQString &text, const TDEShortcut &cut,
TQObject *parent, const char *name ) : KSelectAction( text, "", cut, parent, name ) TQObject *parent, const char *name ) : TDESelectAction( text, "", cut, parent, name )
{ {
TQObject::connect( this, TQT_SIGNAL( activated( const TQString & ) ), TQObject::connect( this, TQT_SIGNAL( activated( const TQString & ) ),
this, TQT_SLOT( slotActivated( const TQString & ) ) ); this, TQT_SLOT( slotActivated( const TQString & ) ) );

@ -26,12 +26,12 @@
#include <kaction.h> #include <kaction.h>
#endif #endif
class KCodecAction : public KSelectAction class KCodecAction : public TDESelectAction
{ {
Q_OBJECT Q_OBJECT
public: public:
KCodecAction( const TQString &text, const KShortcut &cut = KShortcut(), KCodecAction( const TQString &text, const TDEShortcut &cut = TDEShortcut(),
TQObject *parent = 0, const char *name = 0 ); TQObject *parent = 0, const char *name = 0 );
void setCodec( const TQTextCodec *codec ); void setCodec( const TQTextCodec *codec );

@ -38,19 +38,19 @@
#include <tqspinbox.h> #include <tqspinbox.h>
#include <tqwhatsthis.h> #include <tqwhatsthis.h>
class ChannelListItem : public KListViewItem class ChannelListItem : public TDEListViewItem
{ {
public: public:
ChannelListItem( KListView *parent, TQString arg1, TQString arg2, TQString arg3 ); ChannelListItem( TDEListView *parent, TQString arg1, TQString arg2, TQString arg3 );
virtual int compare( TQListViewItem *i, int col, bool ascending ) const; virtual int compare( TQListViewItem *i, int col, bool ascending ) const;
virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align ); virtual void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
private: private:
KListView *parentList; TDEListView *parentList;
}; };
ChannelListItem::ChannelListItem( KListView *parent, TQString arg1, TQString arg2, TQString arg3 ) : ChannelListItem::ChannelListItem( TDEListView *parent, TQString arg1, TQString arg2, TQString arg3 ) :
KListViewItem( parent, parent->lastItem() ), parentList( parent ) TDEListViewItem( parent, parent->lastItem() ), parentList( parent )
{ {
setText(0, arg1); setText(0, arg1);
setText(1, arg2); setText(1, arg2);
@ -76,15 +76,15 @@ void ChannelListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int colum
{ {
TQPixmap back( width, height() ); TQPixmap back( width, height() );
TQPainter paint( &back ); TQPainter paint( &back );
//KListViewItem::paintCell( &paint, cg, column, width, align ); //TDEListViewItem::paintCell( &paint, cg, column, width, align );
// PASTED FROM KLISTVIEWITEM: // PASTED FROM KLISTVIEWITEM:
// set the alternate cell background colour if necessary // set the alternate cell background colour if necessary
TQColorGroup _cg = cg; TQColorGroup _cg = cg;
if (isAlternate()) if (isAlternate())
if (listView()->viewport()->backgroundMode()==TQt::FixedColor) if (listView()->viewport()->backgroundMode()==TQt::FixedColor)
_cg.setColor(TQColorGroup::Background, static_cast< KListView* >(listView())->alternateBackground()); _cg.setColor(TQColorGroup::Background, static_cast< TDEListView* >(listView())->alternateBackground());
else else
_cg.setColor(TQColorGroup::Base, static_cast< KListView* >(listView())->alternateBackground()); _cg.setColor(TQColorGroup::Base, static_cast< TDEListView* >(listView())->alternateBackground());
// PASTED FROM TQLISTVIEWITEM // PASTED FROM TQLISTVIEWITEM
{ {
TQPainter *p = &paint; TQPainter *p = &paint;
@ -186,7 +186,7 @@ ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine )
layout72_2->addWidget( mSearchButton ); layout72_2->addWidget( mSearchButton );
ChannelListLayout->addLayout( layout72_2 ); ChannelListLayout->addLayout( layout72_2 );
mChannelList = new KListView( this, "mChannelList" ); mChannelList = new TDEListView( this, "mChannelList" );
mChannelList->addColumn( i18n( "Channel" ) ); mChannelList->addColumn( i18n( "Channel" ) );
mChannelList->addColumn( i18n( "Users" ) ); mChannelList->addColumn( i18n( "Users" ) );
mChannelList->header()->setResizeEnabled( FALSE, mChannelList->header()->count() - 1 ); mChannelList->header()->setResizeEnabled( FALSE, mChannelList->header()->count() - 1 );

@ -30,7 +30,7 @@ class TQGridLayout;
class TQLabel; class TQLabel;
class TQLineEdit; class TQLineEdit;
class TQPushButton; class TQPushButton;
class KListView; class TDEListView;
class TQSpinBox; class TQSpinBox;
class TQListViewItem; class TQListViewItem;
@ -67,7 +67,7 @@ class ChannelList
TQLineEdit* channelSearch; TQLineEdit* channelSearch;
TQSpinBox* numUsers; TQSpinBox* numUsers;
TQPushButton* mSearchButton; TQPushButton* mSearchButton;
KListView* mChannelList; TDEListView* mChannelList;
TQVBoxLayout* ChannelListLayout; TQVBoxLayout* ChannelListLayout;
TQHBoxLayout* layout72_2; TQHBoxLayout* layout72_2;
KIRC::Engine *m_engine; KIRC::Engine *m_engine;

@ -757,7 +757,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>CTCP</string> <string>CTCP</string>
@ -915,7 +915,7 @@
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
<widget class="KListView" row="0" column="0"> <widget class="TDEListView" row="0" column="0">
<column> <column>
<property name="text"> <property name="text">
<string>Command</string> <string>Command</string>

@ -106,11 +106,11 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident
} }
} }
connect( commandList, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), connect( commandList, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ),
this, TQT_SLOT( slotCommandContextMenu( KListView *, TQListViewItem *, const TQPoint & ) ) ); this, TQT_SLOT( slotCommandContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
connect( ctcpList, TQT_SIGNAL( contextMenu( KListView *, TQListViewItem *, const TQPoint & ) ), connect( ctcpList, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ),
this, TQT_SLOT( slotCtcpContextMenu( KListView *, TQListViewItem *, const TQPoint & ) ) ); this, TQT_SLOT( slotCtcpContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) );
connect( addButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCommand() ) ); connect( addButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCommand() ) );
connect( editButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotEditNetworks() ) ); connect( editButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotEditNetworks() ) );
@ -171,7 +171,7 @@ void IRCEditAccountWidget::slotUpdateNetworkDescription( const TQString &network
); );
} }
void IRCEditAccountWidget::slotCommandContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) void IRCEditAccountWidget::slotCommandContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p )
{ {
TQPopupMenu popup; TQPopupMenu popup;
popup.insertItem( i18n("Remove Command"), 1 ); popup.insertItem( i18n("Remove Command"), 1 );
@ -179,7 +179,7 @@ void IRCEditAccountWidget::slotCommandContextMenu( KListView *, TQListViewItem *
delete item; delete item;
} }
void IRCEditAccountWidget::slotCtcpContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) void IRCEditAccountWidget::slotCtcpContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p )
{ {
TQPopupMenu popup; TQPopupMenu popup;
popup.insertItem( i18n("Remove CTCP Reply"), 1 ); popup.insertItem( i18n("Remove CTCP Reply"), 1 );

@ -23,7 +23,7 @@
class IRCProtocol; class IRCProtocol;
class IRCAccount; class IRCAccount;
class KListView; class TDEListView;
class TQListViewItem; class TQListViewItem;
class IRCEditAccountWidget : public IRCEditAccountBase, public KopeteEditAccountWidget class IRCEditAccountWidget : public IRCEditAccountBase, public KopeteEditAccountWidget
@ -40,8 +40,8 @@ class IRCEditAccountWidget : public IRCEditAccountBase, public KopeteEditAccount
virtual Kopete::Account *apply(); virtual Kopete::Account *apply();
private slots: private slots:
void slotCommandContextMenu( KListView*, TQListViewItem*, const TQPoint & ); void slotCommandContextMenu( TDEListView*, TQListViewItem*, const TQPoint & );
void slotCtcpContextMenu( KListView*, TQListViewItem*, const TQPoint & ); void slotCtcpContextMenu( TDEListView*, TQListViewItem*, const TQPoint & );
void slotAddCommand(); void slotAddCommand();
void slotAddCtcp(); void slotAddCtcp();
void slotEditNetworks(); void slotEditNetworks();

@ -170,15 +170,15 @@ void JabberAccount::setS5BServerPort ( int port )
} }
KActionMenu *JabberAccount::actionMenu () TDEActionMenu *JabberAccount::actionMenu ()
{ {
KActionMenu *m_actionMenu = Kopete::Account::actionMenu(); TDEActionMenu *m_actionMenu = Kopete::Account::actionMenu();
m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->popupMenu()->insertSeparator();
KAction *action; TDEAction *action;
action = new KAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat"); action = new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat");
m_actionMenu->insert(action); m_actionMenu->insert(action);
action->setEnabled( isConnected() ); action->setEnabled( isConnected() );
@ -189,17 +189,17 @@ KActionMenu *JabberAccount::actionMenu ()
m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->popupMenu()->insertSeparator();
action = new KAction ( i18n ("Services..."), "jabber_serv_on", 0, action = new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0,
this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices"); this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices");
action->setEnabled( isConnected() ); action->setEnabled( isConnected() );
m_actionMenu->insert ( action ); m_actionMenu->insert ( action );
action = new KAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0, action = new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0,
this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ; this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ;
action->setEnabled( isConnected() ); action->setEnabled( isConnected() );
m_actionMenu->insert ( action ); m_actionMenu->insert ( action );
action = new KAction ( i18n ("Edit User Info..."), "identity", 0, action = new TDEAction ( i18n ("Edit User Info..."), "identity", 0,
this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") ; this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") ;
action->setEnabled( isConnected() ); action->setEnabled( isConnected() );
m_actionMenu->insert ( action ); m_actionMenu->insert ( action );

@ -35,7 +35,7 @@
class TQString; class TQString;
class TQStringList; class TQStringList;
class KActionMenu; class TDEActionMenu;
class JabberResourcePool; class JabberResourcePool;
class JabberContact; class JabberContact;
class JabberContactPool; class JabberContactPool;
@ -64,7 +64,7 @@ public:
~JabberAccount (); ~JabberAccount ();
/* Returns the action menu for this account. */ /* Returns the action menu for this account. */
virtual KActionMenu *actionMenu (); virtual TDEActionMenu *actionMenu ();
/* Return the resource of the client */ /* Return the resource of the client */
const TQString resource () const; const TQString resource () const;

@ -78,7 +78,7 @@ public:
* Create custom context menu items for the contact * Create custom context menu items for the contact
* FIXME: implement manager version here? * FIXME: implement manager version here?
*/ */
virtual TQPtrList<KAction> *customContextMenuActions () = 0; virtual TQPtrList<TDEAction> *customContextMenuActions () = 0;
/** /**
* Serialize contact * Serialize contact

@ -127,9 +127,9 @@ void JabberBookmarks::insertGroupChat(const XMPP::Jid &jid)
m_conferencesJID += jid.full(); m_conferencesJID += jid.full();
} }
KAction * JabberBookmarks::bookmarksAction(TQObject *parent) TDEAction * JabberBookmarks::bookmarksAction(TQObject *parent)
{ {
KSelectAction *groupchatBM = new KSelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" ); TDESelectAction *groupchatBM = new TDESelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" );
groupchatBM->setItems(m_conferencesJID); groupchatBM->setItems(m_conferencesJID);
TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&))); TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&)));
return groupchatBM; return groupchatBM;

@ -26,7 +26,7 @@ namespace XMPP { class Jid; }
class JabberAccount; class JabberAccount;
class JabberProtocol; class JabberProtocol;
class KAction; class TDEAction;
/** /**
* This is a class that hanlde the bookmark collection (JEP-0048) * This is a class that hanlde the bookmark collection (JEP-0048)
@ -53,7 +53,7 @@ class JabberBookmarks : public TQObject
/** /**
* return an action that will be added in the jabber popup menu * return an action that will be added in the jabber popup menu
*/ */
KAction *bookmarksAction(TQObject * parent); TDEAction *bookmarksAction(TQObject * parent);
private slots: private slots:
void accountConnected(); void accountConnected();
void slotReceivedBookmarks(); void slotReceivedBookmarks();

@ -65,7 +65,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas
slotUpdateDisplayName (); slotUpdateDisplayName ();
#ifdef SUPPORT_JINGLE #ifdef SUPPORT_JINGLE
KAction *jabber_voicecall = new KAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQT_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" ); TDEAction *jabber_voicecall = new TDEAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQT_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" );
setInstance(protocol->instance()); setInstance(protocol->instance());
jabber_voicecall->setEnabled( false ); jabber_voicecall->setEnabled( false );
@ -85,7 +85,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas
#endif #endif
new KAction( i18n( "Send File" ), "attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" ); new TDEAction( i18n( "Send File" ), "attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" );
setXMLFile("jabberchatui.rc"); setXMLFile("jabberchatui.rc");

@ -127,46 +127,46 @@ JabberContact::~JabberContact()
kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << contactId() << " is destroyed - " << this << endl; kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << contactId() << " is destroyed - " << this << endl;
} }
TQPtrList<KAction> *JabberContact::customContextMenuActions () TQPtrList<TDEAction> *JabberContact::customContextMenuActions ()
{ {
TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>(); TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>();
KActionMenu *actionAuthorization = new KActionMenu ( i18n ("Authorization"), "connect_established", this, "jabber_authorization"); TDEActionMenu *actionAuthorization = new TDEActionMenu ( i18n ("Authorization"), "connect_established", this, "jabber_authorization");
KAction *resendAuthAction, *requestAuthAction, *removeAuthAction; TDEAction *resendAuthAction, *requestAuthAction, *removeAuthAction;
resendAuthAction = new KAction (i18n ("(Re)send Authorization To"), "mail_forward", 0, resendAuthAction = new TDEAction (i18n ("(Re)send Authorization To"), "mail_forward", 0,
this, TQT_SLOT (slotSendAuth ()), actionAuthorization, "actionSendAuth"); this, TQT_SLOT (slotSendAuth ()), actionAuthorization, "actionSendAuth");
resendAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::To || mRosterItem.subscription().type() == XMPP::Subscription::None ); resendAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::To || mRosterItem.subscription().type() == XMPP::Subscription::None );
actionAuthorization->insert(resendAuthAction); actionAuthorization->insert(resendAuthAction);
requestAuthAction = new KAction (i18n ("(Re)request Authorization From"), "mail_reply", 0, requestAuthAction = new TDEAction (i18n ("(Re)request Authorization From"), "mail_reply", 0,
this, TQT_SLOT (slotRequestAuth ()), actionAuthorization, "actionRequestAuth"); this, TQT_SLOT (slotRequestAuth ()), actionAuthorization, "actionRequestAuth");
requestAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::From || mRosterItem.subscription().type() == XMPP::Subscription::None ); requestAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::From || mRosterItem.subscription().type() == XMPP::Subscription::None );
actionAuthorization->insert(requestAuthAction); actionAuthorization->insert(requestAuthAction);
removeAuthAction = new KAction (i18n ("Remove Authorization From"), "mail_delete", 0, removeAuthAction = new TDEAction (i18n ("Remove Authorization From"), "mail_delete", 0,
this, TQT_SLOT (slotRemoveAuth ()), actionAuthorization, "actionRemoveAuth"); this, TQT_SLOT (slotRemoveAuth ()), actionAuthorization, "actionRemoveAuth");
removeAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::Both || mRosterItem.subscription().type() == XMPP::Subscription::From ); removeAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::Both || mRosterItem.subscription().type() == XMPP::Subscription::From );
actionAuthorization->insert(removeAuthAction); actionAuthorization->insert(removeAuthAction);
KActionMenu *actionSetAvailability = new KActionMenu (i18n ("Set Availability"), "kopeteavailable", this, "jabber_online"); TDEActionMenu *actionSetAvailability = new TDEActionMenu (i18n ("Set Availability"), "kopeteavailable", this, "jabber_online");
actionSetAvailability->insert(new KAction (i18n ("Online"), protocol()->JabberKOSOnline.iconFor(this), actionSetAvailability->insert(new TDEAction (i18n ("Online"), protocol()->JabberKOSOnline.iconFor(this),
0, this, TQT_SLOT (slotStatusOnline ()), actionSetAvailability, "actionOnline")); 0, this, TQT_SLOT (slotStatusOnline ()), actionSetAvailability, "actionOnline"));
actionSetAvailability->insert(new KAction (i18n ("Free to Chat"), protocol()->JabberKOSChatty.iconFor(this), actionSetAvailability->insert(new TDEAction (i18n ("Free to Chat"), protocol()->JabberKOSChatty.iconFor(this),
0, this, TQT_SLOT (slotStatusChatty ()), actionSetAvailability, "actionChatty")); 0, this, TQT_SLOT (slotStatusChatty ()), actionSetAvailability, "actionChatty"));
actionSetAvailability->insert(new KAction (i18n ("Away"), protocol()->JabberKOSAway.iconFor(this), actionSetAvailability->insert(new TDEAction (i18n ("Away"), protocol()->JabberKOSAway.iconFor(this),
0, this, TQT_SLOT (slotStatusAway ()), actionSetAvailability, "actionAway")); 0, this, TQT_SLOT (slotStatusAway ()), actionSetAvailability, "actionAway"));
actionSetAvailability->insert(new KAction (i18n ("Extended Away"), protocol()->JabberKOSXA.iconFor(this), actionSetAvailability->insert(new TDEAction (i18n ("Extended Away"), protocol()->JabberKOSXA.iconFor(this),
0, this, TQT_SLOT (slotStatusXA ()), actionSetAvailability, "actionXA")); 0, this, TQT_SLOT (slotStatusXA ()), actionSetAvailability, "actionXA"));
actionSetAvailability->insert(new KAction (i18n ("Do Not Disturb"), protocol()->JabberKOSDND.iconFor(this), actionSetAvailability->insert(new TDEAction (i18n ("Do Not Disturb"), protocol()->JabberKOSDND.iconFor(this),
0, this, TQT_SLOT (slotStatusDND ()), actionSetAvailability, "actionDND")); 0, this, TQT_SLOT (slotStatusDND ()), actionSetAvailability, "actionDND"));
actionSetAvailability->insert(new KAction (i18n ("Invisible"), protocol()->JabberKOSInvisible.iconFor(this), actionSetAvailability->insert(new TDEAction (i18n ("Invisible"), protocol()->JabberKOSInvisible.iconFor(this),
0, this, TQT_SLOT (slotStatusInvisible ()), actionSetAvailability, "actionInvisible")); 0, this, TQT_SLOT (slotStatusInvisible ()), actionSetAvailability, "actionInvisible"));
KActionMenu *actionSelectResource = new KActionMenu (i18n ("Select Resource"), "connect_no", this, "actionSelectResource"); TDEActionMenu *actionSelectResource = new TDEActionMenu (i18n ("Select Resource"), "connect_no", this, "actionSelectResource");
// if the contact is online, display the resources we have for it, // if the contact is online, display the resources we have for it,
// otherwise disable the menu // otherwise disable the menu
@ -203,7 +203,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions ()
{ {
if( i == activeItem ) if( i == activeItem )
{ {
actionSelectResource->insert ( new KAction( ( *it ), "button_ok", 0, this, TQT_SLOT( slotSelectResource() ), actionSelectResource->insert ( new TDEAction( ( *it ), "button_ok", 0, this, TQT_SLOT( slotSelectResource() ),
actionSelectResource, TQString::number( i ).latin1() ) ); actionSelectResource, TQString::number( i ).latin1() ) );
} }
else else
@ -215,7 +215,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions ()
TQIconSet iconSet ( !i ? TQIconSet iconSet ( !i ?
protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () )); protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () ));
actionSelectResource->insert ( new KAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ), actionSelectResource->insert ( new TDEAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ),
actionSelectResource, TQString::number( i ).latin1() ) ); actionSelectResource, TQString::number( i ).latin1() ) );
} }
@ -230,7 +230,7 @@ TQPtrList<KAction> *JabberContact::customContextMenuActions ()
#ifdef SUPPORT_JINGLE #ifdef SUPPORT_JINGLE
KAction *actionVoiceCall = new KAction (i18n ("Voice call"), "voicecall", 0, this, TQT_SLOT (voiceCall ()), this, "jabber_voicecall"); TDEAction *actionVoiceCall = new TDEAction (i18n ("Voice call"), "voicecall", 0, this, TQT_SLOT (voiceCall ()), this, "jabber_voicecall");
actionVoiceCall->setEnabled( false ); actionVoiceCall->setEnabled( false );
actionCollection->append( actionVoiceCall ); actionCollection->append( actionVoiceCall );
@ -1075,7 +1075,7 @@ void JabberContact::sendSubscription ( const TQString& subType )
void JabberContact::slotSelectResource () void JabberContact::slotSelectResource ()
{ {
int currentItem = TQString ( static_cast<const KAction *>( sender() )->name () ).toUInt (); int currentItem = TQString ( static_cast<const TDEAction *>( sender() )->name () ).toUInt ();
/* /*
* Warn the user if there is already an active chat window. * Warn the user if there is already an active chat window.
@ -1101,7 +1101,7 @@ void JabberContact::slotSelectResource ()
} }
else else
{ {
TQString selectedResource = static_cast<const KAction *>(sender())->text(); TQString selectedResource = static_cast<const TDEAction *>(sender())->text();
kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Moving to resource " << selectedResource << endl; kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Moving to resource " << selectedResource << endl;

@ -47,7 +47,7 @@ public:
* Create custom context menu items for the contact * Create custom context menu items for the contact
* FIXME: implement manager version here? * FIXME: implement manager version here?
*/ */
TQPtrList<KAction> *customContextMenuActions (); TQPtrList<TDEAction> *customContextMenuActions ();
/** /**
* Start a rename request. * Start a rename request.

@ -109,11 +109,11 @@ JabberGroupContact::~JabberGroupContact ()
} }
} }
TQPtrList<KAction> *JabberGroupContact::customContextMenuActions () TQPtrList<TDEAction> *JabberGroupContact::customContextMenuActions ()
{ {
TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>(); TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>();
KAction *actionSetNick = new KAction (i18n ("Change nick name"), 0, 0, this, TQT_SLOT (slotChangeNick()), this, "jabber_changenick"); TDEAction *actionSetNick = new TDEAction (i18n ("Change nick name"), 0, 0, this, TQT_SLOT (slotChangeNick()), this, "jabber_changenick");
actionCollection->append( actionSetNick ); actionCollection->append( actionSetNick );
return actionCollection; return actionCollection;

@ -40,7 +40,7 @@ public:
* Create custom context menu items for the contact * Create custom context menu items for the contact
* FIXME: implement manager version here? * FIXME: implement manager version here?
*/ */
TQPtrList<KAction> *customContextMenuActions (); TQPtrList<TDEAction> *customContextMenuActions ();
/** /**
* Deal with an incoming message for this contact. * Deal with an incoming message for this contact.

@ -56,7 +56,7 @@ JabberGroupMemberContact::~JabberGroupMemberContact ()
} }
} }
TQPtrList<KAction> *JabberGroupMemberContact::customContextMenuActions () TQPtrList<TDEAction> *JabberGroupMemberContact::customContextMenuActions ()
{ {
return 0; return 0;

@ -41,7 +41,7 @@ public:
* Create custom context menu items for the contact * Create custom context menu items for the contact
* FIXME: implement manager version here? * FIXME: implement manager version here?
*/ */
TQPtrList<KAction> *customContextMenuActions (); TQPtrList<TDEAction> *customContextMenuActions ();
/** /**
* Return message manager for this instance. * Return message manager for this instance.

@ -121,43 +121,43 @@ JabberTransport::~JabberTransport ()
m_account->removeTransport( myself()->contactId() ); m_account->removeTransport( myself()->contactId() );
} }
KActionMenu *JabberTransport::actionMenu () TDEActionMenu *JabberTransport::actionMenu ()
{ {
KActionMenu *menu = new KActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this ); TDEActionMenu *menu = new TDEActionMenu( accountId(), myself()->onlineStatus().iconFor( this ), this );
TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString(); TQString nick = myself()->property( Kopete::Global::Properties::self()->nickName()).value().toString();
menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), menu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ),
nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick ) nick.isNull() ? accountLabel() : i18n( "%2 <%1>" ).arg( accountLabel(), nick )
); );
TQPtrList<KAction> *customActions = myself()->customContextMenuActions( ); TQPtrList<TDEAction> *customActions = myself()->customContextMenuActions( );
if( customActions && !customActions->isEmpty() ) if( customActions && !customActions->isEmpty() )
{ {
menu->popupMenu()->insertSeparator(); menu->popupMenu()->insertSeparator();
for( KAction *a = customActions->first(); a; a = customActions->next() ) for( TDEAction *a = customActions->first(); a; a = customActions->next() )
a->plug( menu->popupMenu() ); a->plug( menu->popupMenu() );
} }
delete customActions; delete customActions;
return menu; return menu;
/* KActionMenu *m_actionMenu = Kopete::Account::actionMenu(); /* TDEActionMenu *m_actionMenu = Kopete::Account::actionMenu();
m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->popupMenu()->insertSeparator();
m_actionMenu->insert(new KAction (i18n ("Join Groupchat..."), "jabber_group", 0, m_actionMenu->insert(new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0,
this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat")); this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat"));
m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->popupMenu()->insertSeparator();
m_actionMenu->insert ( new KAction ( i18n ("Services..."), "jabber_serv_on", 0, m_actionMenu->insert ( new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0,
this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices") ); this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices") );
m_actionMenu->insert ( new KAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0, m_actionMenu->insert ( new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail_new", 0,
this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ); this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") );
m_actionMenu->insert ( new KAction ( i18n ("Edit User Info..."), "identity", 0, m_actionMenu->insert ( new TDEAction ( i18n ("Edit User Info..."), "identity", 0,
this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") ); this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") );
return m_actionMenu;*/ return m_actionMenu;*/

@ -61,7 +61,7 @@ public:
~JabberTransport (); ~JabberTransport ();
/** Returns the action menu for this account. */ /** Returns the action menu for this account. */
virtual KActionMenu *actionMenu (); virtual TDEActionMenu *actionMenu ();
/** the parent account */ /** the parent account */
JabberAccount *account() const JabberAccount *account() const

@ -131,14 +131,14 @@ void MeanwhileAccount::disconnect(Kopete::Account::DisconnectReason reason)
m_session = 0L; m_session = 0L;
} }
KActionMenu * MeanwhileAccount::actionMenu() TDEActionMenu * MeanwhileAccount::actionMenu()
{ {
KActionMenu *menu = Kopete::Account::actionMenu(); TDEActionMenu *menu = Kopete::Account::actionMenu();
menu->popupMenu()->insertSeparator(); menu->popupMenu()->insertSeparator();
#if 0 #if 0
menu->insert(new KAction(i18n("&Change Status Message"), TQString(), 0, menu->insert(new TDEAction(i18n("&Change Status Message"), TQString(), 0,
this, TQT_SLOT(meanwhileChangeStatus()), this, this, TQT_SLOT(meanwhileChangeStatus()), this,
"meanwhileChangeStatus")); "meanwhileChangeStatus"));
//infoPlugin->addCustomMenus(theMenu); //infoPlugin->addCustomMenus(theMenu);

@ -52,7 +52,7 @@ public:
virtual void disconnect(Kopete::Account::DisconnectReason reason); virtual void disconnect(Kopete::Account::DisconnectReason reason);
virtual KActionMenu *actionMenu(); virtual TDEActionMenu *actionMenu();
/** Get the server host name */ /** Get the server host name */
TQString getServerName(); TQString getServerName();

@ -22,8 +22,8 @@
#include "kopetemessage.h" #include "kopetemessage.h"
#include "meanwhileaccount.h" #include "meanwhileaccount.h"
class KAction; class TDEAction;
class KActionCollection; class TDEActionCollection;
namespace Kopete { class Account; } namespace Kopete { class Account; }
namespace Kopete { class ChatSession; } namespace Kopete { class ChatSession; }
namespace Kopete { class MetaContact; } namespace Kopete { class MetaContact; }

@ -32,6 +32,6 @@ void MeanwhilePlugin::showUserInfo(const TQString &/*userid*/)
{ {
} }
void MeanwhilePlugin::addCustomMenus(KActionMenu *menu) void MeanwhilePlugin::addCustomMenus(TDEActionMenu *menu)
{ {
} }

@ -41,7 +41,7 @@ public:
/* if you want to provide more functions on the rightclick dropdown /* if you want to provide more functions on the rightclick dropdown
* menu...implement this * menu...implement this
*/ */
virtual void addCustomMenus(KActionMenu *menu); virtual void addCustomMenus(TDEActionMenu *menu);
}; };
#endif #endif

@ -80,9 +80,9 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch
TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) )); TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ));
m_openInboxAction = new KAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" );
m_changeDNAction = new KAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" ); m_changeDNAction = new TDEAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" );
m_startChatAction = new KAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" ); m_startChatAction = new TDEAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" );
TDEConfigGroup *config=configGroup(); TDEConfigGroup *config=configGroup();
@ -241,9 +241,9 @@ void MSNAccount::disconnect()
m_notifySocket->disconnect(); m_notifySocket->disconnect();
} }
KActionMenu * MSNAccount::actionMenu() TDEActionMenu * MSNAccount::actionMenu()
{ {
KActionMenu *m_actionMenu=Kopete::Account::actionMenu(); TDEActionMenu *m_actionMenu=Kopete::Account::actionMenu();
if ( isConnected() ) if ( isConnected() )
{ {
m_openInboxAction->setEnabled( true ); m_openInboxAction->setEnabled( true );
@ -267,8 +267,8 @@ KActionMenu * MSNAccount::actionMenu()
m_actionMenu->insert( m_openInboxAction ); m_actionMenu->insert( m_openInboxAction );
#if !defined NDEBUG #if !defined NDEBUG
KActionMenu *debugMenu = new KActionMenu( "Debug", m_actionMenu ); TDEActionMenu *debugMenu = new TDEActionMenu( "Debug", m_actionMenu );
debugMenu->insert( new KAction( i18n( "Send Raw C&ommand..." ), 0, debugMenu->insert( new TDEAction( i18n( "Send Raw C&ommand..." ), 0,
this, TQT_SLOT( slotDebugRawCommand() ), debugMenu, "m_debugRawCommand" ) ); this, TQT_SLOT( slotDebugRawCommand() ), debugMenu, "m_debugRawCommand" ) );
m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->popupMenu()->insertSeparator();
m_actionMenu->insert( debugMenu ); m_actionMenu->insert( debugMenu );

@ -25,8 +25,8 @@
#include "msnprotocol.h" #include "msnprotocol.h"
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class MSNNotifySocket; class MSNNotifySocket;
class MSNContact; class MSNContact;
@ -48,7 +48,7 @@ public:
/* /*
* return the menu for this account * return the menu for this account
*/ */
virtual KActionMenu* actionMenu(); virtual TDEActionMenu* actionMenu();
//------ internal functions //------ internal functions
/** /**
@ -205,9 +205,9 @@ private slots:
private: private:
MSNNotifySocket *m_notifySocket; MSNNotifySocket *m_notifySocket;
KAction *m_openInboxAction; TDEAction *m_openInboxAction;
KAction *m_startChatAction; TDEAction *m_startChatAction;
KAction *m_changeDNAction; TDEAction *m_changeDNAction;
// status which will be using for connecting // status which will be using for connecting
Kopete::OnlineStatus m_connectstatus; Kopete::OnlineStatus m_connectstatus;

@ -75,27 +75,27 @@ MSNChatSession::MSNChatSession( Kopete::Protocol *protocol, const Kopete::Contac
protocol, TQT_SIGNAL( invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ) ) ); protocol, TQT_SIGNAL( invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ) ) );
m_actionInvite = new KActionMenu( i18n( "&Invite" ), "kontact_contacts", actionCollection(), "msnInvite" ); m_actionInvite = new TDEActionMenu( i18n( "&Invite" ), "kontact_contacts", actionCollection(), "msnInvite" );
connect ( m_actionInvite->popupMenu() , TQT_SIGNAL( aboutToShow() ) , this , TQT_SLOT(slotActionInviteAboutToShow() ) ) ; connect ( m_actionInvite->popupMenu() , TQT_SIGNAL( aboutToShow() ) , this , TQT_SLOT(slotActionInviteAboutToShow() ) ) ;
#if !defined NDEBUG #if !defined NDEBUG
new KAction( i18n( "Send Raw C&ommand..." ), 0, this, TQT_SLOT( slotDebugRawCommand() ), actionCollection(), "msnDebugRawCommand" ) ; new TDEAction( i18n( "Send Raw C&ommand..." ), 0, this, TQT_SLOT( slotDebugRawCommand() ), actionCollection(), "msnDebugRawCommand" ) ;
#endif #endif
m_actionNudge=new KAction( i18n( "Send Nudge" ), "bell", 0, this, TQT_SLOT(slotSendNudge() ), actionCollection(), "msnSendNudge" ) ; m_actionNudge=new TDEAction( i18n( "Send Nudge" ), "bell", 0, this, TQT_SLOT(slotSendNudge() ), actionCollection(), "msnSendNudge" ) ;
#if MSN_WEBCAM #if MSN_WEBCAM
// Invite to receive webcam action // Invite to receive webcam action
m_actionWebcamReceive=new KAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive()), actionCollection(), "msnWebcamReceive" ) ; m_actionWebcamReceive=new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive()), actionCollection(), "msnWebcamReceive" ) ;
//Send webcam action //Send webcam action
m_actionWebcamSend=new KAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend()), actionCollection(), "msnWebcamSend" ) ; m_actionWebcamSend=new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend()), actionCollection(), "msnWebcamSend" ) ;
#endif #endif
new KAction( i18n( "Send File" ),"attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "msnSendFile" ); new TDEAction( i18n( "Send File" ),"attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "msnSendFile" );
MSNContact *c = static_cast<MSNContact*>( others.first() ); MSNContact *c = static_cast<MSNContact*>( others.first() );
(new KAction( i18n( "Request Display Picture" ), "image", 0, this, TQT_SLOT( slotRequestPicture() ), actionCollection(), "msnRequestDisplayPicture" ))->setEnabled(!c->object().isEmpty()); (new TDEAction( i18n( "Request Display Picture" ), "image", 0, this, TQT_SLOT( slotRequestPicture() ), actionCollection(), "msnRequestDisplayPicture" ))->setEnabled(!c->object().isEmpty());
if ( !c->object().isEmpty() ) if ( !c->object().isEmpty() )
{ {
@ -304,7 +304,7 @@ void MSNChatSession::slotMessageReceived( Kopete::Message &msg )
void MSNChatSession::slotActionInviteAboutToShow() void MSNChatSession::slotActionInviteAboutToShow()
{ {
// We can't simply insert KAction in this menu bebause we don't know when to delete them. // We can't simply insert TDEAction in this menu bebause we don't know when to delete them.
// items inserted with insert items are automatically deleted when we call clear // items inserted with insert items are automatically deleted when we call clear
m_inviteactions.setAutoDelete(true); m_inviteactions.setAutoDelete(true);
@ -318,13 +318,13 @@ void MSNChatSession::slotActionInviteAboutToShow()
{ {
if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() )
{ {
KAction *a=new KopeteContactAction( it.current(), this, TDEAction *a=new KopeteContactAction( it.current(), this,
TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite );
m_actionInvite->insert( a ); m_actionInvite->insert( a );
m_inviteactions.append( a ) ; m_inviteactions.append( a ) ;
} }
} }
KAction *b=new KAction( i18n ("Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); TDEAction *b=new TDEAction( i18n ("Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" );
m_actionInvite->insert( b ); m_actionInvite->insert( b );
m_inviteactions.append( b ) ; m_inviteactions.append( b ) ;
} }
@ -548,17 +548,17 @@ void MSNChatSession::slotDisplayPictureChanged()
int sz=22; int sz=22;
// get the size of the toolbar were the aciton is plugged. // get the size of the toolbar were the aciton is plugged.
// if you know a better way to get the toolbar, let me know // if you know a better way to get the toolbar, let me know
KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; TDEMainWindow *w= view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L;
if(w) if(w)
{ {
//We connected that in the constructor. we don't need to keep this slot active. //We connected that in the constructor. we don't need to keep this slot active.
disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) );
TQPtrListIterator<KToolBar> it=w->toolBarIterator() ; TQPtrListIterator<TDEToolBar> it=w->toolBarIterator() ;
KAction *imgAction=actionCollection()->action("msnDisplayPicture"); TDEAction *imgAction=actionCollection()->action("msnDisplayPicture");
if(imgAction) while(it) if(imgAction) while(it)
{ {
KToolBar *tb=*it; TDEToolBar *tb=*it;
if(imgAction->isPlugged(tb)) if(imgAction->isPlugged(tb))
{ {
sz=tb->iconSize(); sz=tb->iconSize();

@ -21,10 +21,10 @@
#include "kopetechatsession.h" #include "kopetechatsession.h"
class MSNSwitchBoardSocket; class MSNSwitchBoardSocket;
class KActionCollection; class TDEActionCollection;
class MSNInvitation; class MSNInvitation;
class MSNContact; class MSNContact;
class KActionMenu; class TDEActionMenu;
class TQLabel; class TQLabel;
@ -101,11 +101,11 @@ private:
MSNSwitchBoardSocket *m_chatService; MSNSwitchBoardSocket *m_chatService;
TQString otherString; TQString otherString;
KActionMenu *m_actionInvite; TDEActionMenu *m_actionInvite;
TQPtrList<KAction> m_inviteactions; TQPtrList<TDEAction> m_inviteactions;
KAction *m_actionNudge; TDEAction *m_actionNudge;
KAction *m_actionWebcamReceive; TDEAction *m_actionWebcamReceive;
KAction *m_actionWebcamSend; TDEAction *m_actionWebcamSend;
//Messages sent before the ending of the connection are queued //Messages sent before the ending of the connection are queued
TQValueList<Kopete::Message> m_messagesQueue; TQValueList<Kopete::Message> m_messagesQueue;

@ -125,30 +125,30 @@ Kopete::ChatSession *MSNContact::manager( Kopete::Contact::CanCreateFlags canCre
return manager; return manager;
} }
TQPtrList<KAction> *MSNContact::customContextMenuActions() TQPtrList<TDEAction> *MSNContact::customContextMenuActions()
{ {
TQPtrList<KAction> *m_actionCollection = new TQPtrList<KAction>; TQPtrList<TDEAction> *m_actionCollection = new TQPtrList<TDEAction>;
// Block/unblock Contact // Block/unblock Contact
TQString label = isBlocked() ? i18n( "Unblock User" ) : i18n( "Block User" ); TQString label = isBlocked() ? i18n( "Unblock User" ) : i18n( "Block User" );
if( !actionBlock ) if( !actionBlock )
{ {
actionBlock = new KAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlockUser() ), actionBlock = new TDEAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlockUser() ),
this, "actionBlock" ); this, "actionBlock" );
//show profile //show profile
actionShowProfile = new KAction( i18n("Show Profile") , 0, this, TQT_SLOT( slotShowProfile() ), actionShowProfile = new TDEAction( i18n("Show Profile") , 0, this, TQT_SLOT( slotShowProfile() ),
this, "actionShowProfile" ); this, "actionShowProfile" );
// Send mail (only available if it is an hotmail account) // Send mail (only available if it is an hotmail account)
actionSendMail = new KAction( i18n("Send Email...") , "mail_generic",0, this, TQT_SLOT( slotSendMail() ), actionSendMail = new TDEAction( i18n("Send Email...") , "mail_generic",0, this, TQT_SLOT( slotSendMail() ),
this, "actionSendMail" ); this, "actionSendMail" );
// Invite to receive webcam // Invite to receive webcam
actionWebcamReceive = new KAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive() ), this, "msnWebcamReceive" ) ; actionWebcamReceive = new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive() ), this, "msnWebcamReceive" ) ;
//Send webcam action //Send webcam action
actionWebcamSend = new KAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend() ), this, "msnWebcamSend" ) ; actionWebcamSend = new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend() ), this, "msnWebcamSend" ) ;
} }
else else
actionBlock->setText( label ); actionBlock->setText( label );

@ -34,8 +34,8 @@ class TQPixmap;
class TQTimer; class TQTimer;
class MSNChatSession; class MSNChatSession;
class KAction; class TDEAction;
class KActionCollection; class TDEActionCollection;
class KTempFile; class KTempFile;
namespace Kopete { class Protocol; } namespace Kopete { class Protocol; }
@ -97,7 +97,7 @@ public:
virtual bool isReachable(); virtual bool isReachable();
virtual TQPtrList<KAction> *customContextMenuActions(); virtual TQPtrList<TDEAction> *customContextMenuActions();
/** /**
* update the server group map * update the server group map
@ -176,11 +176,11 @@ private:
TQString m_phoneMobile; TQString m_phoneMobile;
KAction *actionBlock; TDEAction *actionBlock;
KAction *actionShowProfile; TDEAction *actionShowProfile;
KAction *actionSendMail; TDEAction *actionSendMail;
KAction *actionWebcamReceive; TDEAction *actionWebcamReceive;
KAction *actionWebcamSend; TDEAction *actionWebcamSend;
TQString m_obj; //the MSNObject TQString m_obj; //the MSNObject

@ -33,8 +33,8 @@
class TQImage; class TQImage;
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class MSNContact; class MSNContact;
class MSNAccount; class MSNAccount;

@ -294,12 +294,12 @@ TQString AIMAccount::sanitizedMessage( const TQString& message )
return doc.toString(); return doc.toString();
} }
KActionMenu* AIMAccount::actionMenu() TDEActionMenu* AIMAccount::actionMenu()
{ {
// kdDebug(14152) << k_funcinfo << accountId() << ": Called." << endl; // kdDebug(14152) << k_funcinfo << accountId() << ": Called." << endl;
// mActionMenu is managed by Kopete::Account. It is deleted when // mActionMenu is managed by Kopete::Account. It is deleted when
// it is no longer shown, so we can (safely) just make a new one here. // it is no longer shown, so we can (safely) just make a new one here.
KActionMenu *mActionMenu = new KActionMenu(accountId(), TDEActionMenu *mActionMenu = new TDEActionMenu(accountId(),
myself()->onlineStatus().iconFor( this ), this, "AIMAccount::mActionMenu"); myself()->onlineStatus().iconFor( this ), this, "AIMAccount::mActionMenu");
AIMProtocol *p = AIMProtocol::protocol(); AIMProtocol *p = AIMProtocol::protocol();
@ -308,30 +308,30 @@ KActionMenu* AIMAccount::actionMenu()
mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ),
i18n( "%2 <%1>" ).arg( accountId(), accountNick )); i18n( "%2 <%1>" ).arg( accountId(), accountNick ));
mActionMenu->insert( new KAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, mActionMenu->insert( new TDEAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this,
TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") ); TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") );
KAction* mActionAway = new Kopete::AwayAction(i18n("Away"), p->statusAway.iconFor( this ), 0, this, TDEAction* mActionAway = new Kopete::AwayAction(i18n("Away"), p->statusAway.iconFor( this ), 0, this,
TQT_SLOT(slotGoAway( const TQString & )), this, "AIMAccount::mActionNA" ); TQT_SLOT(slotGoAway( const TQString & )), this, "AIMAccount::mActionNA" );
mActionAway->setEnabled( isConnected() ); mActionAway->setEnabled( isConnected() );
mActionMenu->insert( mActionAway ); mActionMenu->insert( mActionAway );
KAction* mActionOffline = new KAction( i18n("Offline"), p->statusOffline.iconFor(this), 0, this, TDEAction* mActionOffline = new TDEAction( i18n("Offline"), p->statusOffline.iconFor(this), 0, this,
TQT_SLOT( slotGoOffline() ), mActionMenu, "AIMAccount::mActionOffline"); TQT_SLOT( slotGoOffline() ), mActionMenu, "AIMAccount::mActionOffline");
mActionMenu->insert( mActionOffline ); mActionMenu->insert( mActionOffline );
mActionMenu->popupMenu()->insertSeparator(); mActionMenu->popupMenu()->insertSeparator();
KAction* m_joinChatAction = new KAction( i18n( "Join Chat..." ), TQString(), 0, this, TDEAction* m_joinChatAction = new TDEAction( i18n( "Join Chat..." ), TQString(), 0, this,
TQT_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" ); TQT_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" );
mActionMenu->insert( new KToggleAction( i18n( "Set Visibility..." ), 0, 0, mActionMenu->insert( new TDEToggleAction( i18n( "Set Visibility..." ), 0, 0,
this, TQT_SLOT( slotSetVisiblility() ), this, this, TQT_SLOT( slotSetVisiblility() ), this,
"AIMAccount::mActionSetVisibility") ); "AIMAccount::mActionSetVisibility") );
mActionMenu->insert( m_joinChatAction ); mActionMenu->insert( m_joinChatAction );
KAction* m_editInfoAction = new KAction( i18n( "Edit User Info..." ), "identity", 0, TDEAction* m_editInfoAction = new TDEAction( i18n( "Edit User Info..." ), "identity", 0,
this, TQT_SLOT( slotEditInfo() ), mActionMenu, "actionEditInfo"); this, TQT_SLOT( slotEditInfo() ), mActionMenu, "actionEditInfo");
mActionMenu->insert( m_editInfoAction ); mActionMenu->insert( m_editInfoAction );

@ -42,7 +42,7 @@ class Group;
class ChatSession; class ChatSession;
} }
class KAction; class TDEAction;
class OscarContact; class OscarContact;
class AIMContact; class AIMContact;
class AIMAccount; class AIMAccount;
@ -91,7 +91,7 @@ public:
virtual ~AIMAccount(); virtual ~AIMAccount();
// Accessor method for the action menu // Accessor method for the action menu
virtual KActionMenu* actionMenu(); virtual TDEActionMenu* actionMenu();
void setAway(bool away, const TQString &awayReason = TQString() ); void setAway(bool away, const TQString &awayReason = TQString() );

@ -84,17 +84,17 @@ bool AIMContact::isReachable()
return true; return true;
} }
TQPtrList<KAction> *AIMContact::customContextMenuActions() TQPtrList<TDEAction> *AIMContact::customContextMenuActions()
{ {
TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>(); TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>();
if ( !m_warnUserAction ) if ( !m_warnUserAction )
{ {
m_warnUserAction = new KAction( i18n( "&Warn User" ), 0, this, TQT_SLOT( warnUser() ), this, "warnAction" ); m_warnUserAction = new TDEAction( i18n( "&Warn User" ), 0, this, TQT_SLOT( warnUser() ), this, "warnAction" );
} }
m_actionVisibleTo = new KToggleAction(i18n("Always &Visible To"), "", 0, m_actionVisibleTo = new TDEToggleAction(i18n("Always &Visible To"), "", 0,
this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo"); this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo");
m_actionInvisibleTo = new KToggleAction(i18n("Always &Invisible To"), "", 0, m_actionInvisibleTo = new TDEToggleAction(i18n("Always &Invisible To"), "", 0,
this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo");
bool on = account()->isConnected(); bool on = account()->isConnected();

@ -43,7 +43,7 @@ public:
virtual ~AIMContact(); virtual ~AIMContact();
bool isReachable(); bool isReachable();
TQPtrList<KAction> *customContextMenuActions(); TQPtrList<TDEAction> *customContextMenuActions();
const TQString &userProfile() { return mUserProfile; } const TQString &userProfile() { return mUserProfile; }
@ -95,9 +95,9 @@ private:
bool m_mobile; // Is this user mobile (i.e. do they have message forwarding on, or mobile AIM) bool m_mobile; // Is this user mobile (i.e. do they have message forwarding on, or mobile AIM)
TQDateTime m_lastAutoresponseTime; TQDateTime m_lastAutoresponseTime;
KAction* m_warnUserAction; TDEAction* m_warnUserAction;
KToggleAction *m_actionVisibleTo; TDEToggleAction *m_actionVisibleTo;
KToggleAction *m_actionInvisibleTo; TDEToggleAction *m_actionInvisibleTo;
}; };
#endif #endif
//kate: tab-width 4; indent-mode csands; //kate: tab-width 4; indent-mode csands;

@ -120,24 +120,24 @@ ICQ::Presence ICQAccount::presence()
} }
KActionMenu* ICQAccount::actionMenu() TDEActionMenu* ICQAccount::actionMenu()
{ {
KActionMenu* actionMenu = Kopete::Account::actionMenu(); TDEActionMenu* actionMenu = Kopete::Account::actionMenu();
actionMenu->popupMenu()->insertSeparator(); actionMenu->popupMenu()->insertSeparator();
KToggleAction* actionInvisible = TDEToggleAction* actionInvisible =
new KToggleAction( i18n( "In&visible" ), new TDEToggleAction( i18n( "In&visible" ),
ICQ::Presence( presence().type(), ICQ::Presence::Invisible ).toOnlineStatus().iconFor( this ), ICQ::Presence( presence().type(), ICQ::Presence::Invisible ).toOnlineStatus().iconFor( this ),
0, this, TQT_SLOT( slotToggleInvisible() ), this ); 0, this, TQT_SLOT( slotToggleInvisible() ), this );
actionInvisible->setChecked( presence().visibility() == ICQ::Presence::Invisible ); actionInvisible->setChecked( presence().visibility() == ICQ::Presence::Invisible );
actionMenu->insert( actionInvisible ); actionMenu->insert( actionInvisible );
actionMenu->popupMenu()->insertSeparator(); actionMenu->popupMenu()->insertSeparator();
actionMenu->insert( new KToggleAction( i18n( "Set Visibility..." ), 0, 0, actionMenu->insert( new TDEToggleAction( i18n( "Set Visibility..." ), 0, 0,
this, TQT_SLOT( slotSetVisiblility() ), this, this, TQT_SLOT( slotSetVisiblility() ), this,
"ICQAccount::mActionSetVisibility") ); "ICQAccount::mActionSetVisibility") );
//actionMenu->insert( new KToggleAction( i18n( "Send &SMS..." ), 0, 0, this, TQT_SLOT( slotSendSMS() ), this, "ICQAccount::mActionSendSMS") ); //actionMenu->insert( new TDEToggleAction( i18n( "Send &SMS..." ), 0, 0, this, TQT_SLOT( slotSendSMS() ), this, "ICQAccount::mActionSendSMS") );
return actionMenu; return actionMenu;
} }

@ -25,7 +25,7 @@
#include "icqpresence.h" #include "icqpresence.h"
#include "oscartypeclasses.h" #include "oscartypeclasses.h"
class KAction; class TDEAction;
namespace Kopete { class AwayAction; } namespace Kopete { class AwayAction; }
class ICQProtocol; class ICQProtocol;
class ICQAccount; class ICQAccount;
@ -57,7 +57,7 @@ public:
ICQProtocol *protocol(); ICQProtocol *protocol();
// Accessor method for the action menu // Accessor method for the action menu
virtual KActionMenu* actionMenu(); virtual TDEActionMenu* actionMenu();
/** Reimplementation from Kopete::Account */ /** Reimplementation from Kopete::Account */
void setOnlineStatus( const Kopete::OnlineStatus&, const TQString& ); void setOnlineStatus( const Kopete::OnlineStatus&, const TQString& );

@ -649,9 +649,9 @@ bool ICQContact::isReachable()
return account()->isConnected(); return account()->isConnected();
} }
TQPtrList<KAction> *ICQContact::customContextMenuActions() TQPtrList<TDEAction> *ICQContact::customContextMenuActions()
{ {
TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>(); TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>();
/* /*
TQString awTxt; TQString awTxt;
TQString awIcn; TQString awIcn;
@ -684,12 +684,12 @@ TQPtrList<KAction> *ICQContact::customContextMenuActions()
if(actionReadAwayMessage==0) if(actionReadAwayMessage==0)
{ {
actionReadAwayMessage = new KAction(awTxt, awIcn, 0, actionReadAwayMessage = new TDEAction(awTxt, awIcn, 0,
this, TQT_SLOT(slotReadAwayMessage()), this, "actionReadAwayMessage"); this, TQT_SLOT(slotReadAwayMessage()), this, "actionReadAwayMessage");
*/ */
actionRequestAuth = new KAction(i18n("&Request Authorization"), "mail_reply", 0, actionRequestAuth = new TDEAction(i18n("&Request Authorization"), "mail_reply", 0,
this, TQT_SLOT(slotRequestAuth()), this, "actionRequestAuth"); this, TQT_SLOT(slotRequestAuth()), this, "actionRequestAuth");
actionSendAuth = new KAction(i18n("&Grant Authorization"), "mail_forward", 0, actionSendAuth = new TDEAction(i18n("&Grant Authorization"), "mail_forward", 0,
this, TQT_SLOT(slotSendAuth()), this, "actionSendAuth"); this, TQT_SLOT(slotSendAuth()), this, "actionSendAuth");
/* /*
} }
@ -700,11 +700,11 @@ TQPtrList<KAction> *ICQContact::customContextMenuActions()
} }
*/ */
m_actionIgnore = new KToggleAction(i18n("&Ignore"), "", 0, m_actionIgnore = new TDEToggleAction(i18n("&Ignore"), "", 0,
this, TQT_SLOT(slotIgnore()), this, "actionIgnore"); this, TQT_SLOT(slotIgnore()), this, "actionIgnore");
m_actionVisibleTo = new KToggleAction(i18n("Always &Visible To"), "", 0, m_actionVisibleTo = new TDEToggleAction(i18n("Always &Visible To"), "", 0,
this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo"); this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo");
m_actionInvisibleTo = new KToggleAction(i18n("Always &Invisible To"), "", 0, m_actionInvisibleTo = new TDEToggleAction(i18n("Always &Invisible To"), "", 0,
this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo");
bool on = account()->isConnected(); bool on = account()->isConnected();
@ -716,7 +716,7 @@ TQPtrList<KAction> *ICQContact::customContextMenuActions()
actionSendAuth->setEnabled(on); actionSendAuth->setEnabled(on);
m_selectEncoding = new KAction( i18n( "Select Encoding..." ), "charset", 0, m_selectEncoding = new TDEAction( i18n( "Select Encoding..." ), "charset", 0,
this, TQT_SLOT( changeContactEncoding() ), this, "changeEncoding" ); this, TQT_SLOT( changeContactEncoding() ), this, "changeEncoding" );
/* /*

@ -23,8 +23,8 @@
#include "userdetails.h" #include "userdetails.h"
class OscarEncodingSelectionDialog; class OscarEncodingSelectionDialog;
class KAction; class TDEAction;
class KToggleAction; class TDEToggleAction;
namespace Kopete { class ChatSession; } namespace Kopete { class ChatSession; }
namespace Kopete { class OnlineStatus; } namespace Kopete { class OnlineStatus; }
class ICQProtocol; class ICQProtocol;
@ -60,7 +60,7 @@ public:
* Returns a set of custom menu items for * Returns a set of custom menu items for
* the context menu * the context menu
*/ */
virtual TQPtrList<KAction> *customContextMenuActions(); virtual TQPtrList<TDEAction> *customContextMenuActions();
/** Return whether or not this contact is reachable. */ /** Return whether or not this contact is reachable. */
virtual bool isReachable(); virtual bool isReachable();
@ -96,15 +96,15 @@ private:
ICQUserInfoWidget* m_infoWidget; ICQUserInfoWidget* m_infoWidget;
/* /*
ICQReadAway *awayMessageDialog; ICQReadAway *awayMessageDialog;
KAction *actionReadAwayMessage; TDEAction *actionReadAwayMessage;
*/ */
KAction *actionRequestAuth; TDEAction *actionRequestAuth;
KAction *actionSendAuth; TDEAction *actionSendAuth;
KAction *m_selectEncoding; TDEAction *m_selectEncoding;
KToggleAction *m_actionIgnore; TDEToggleAction *m_actionIgnore;
KToggleAction *m_actionVisibleTo; TDEToggleAction *m_actionVisibleTo;
KToggleAction *m_actionInvisibleTo; TDEToggleAction *m_actionInvisibleTo;
/* /*
bool mInvisible; bool mInvisible;

@ -355,7 +355,7 @@
</grid> </grid>
</widget> </widget>
</widget> </widget>
<widget class="KListView" row="1" column="0" rowspan="7" colspan="1"> <widget class="TDEListView" row="1" column="0" rowspan="7" colspan="1">
<column> <column>
<property name="text"> <property name="text">
<string>UIN</string> <string>UIN</string>

@ -73,7 +73,7 @@ public:
/** /**
* Accessor method for the action menu * Accessor method for the action menu
*/ */
virtual KActionMenu* actionMenu() = 0; virtual TDEActionMenu* actionMenu() = 0;
/** Set the server address */ /** Set the server address */
void setServerAddress( const TQString& server ); void setServerAddress( const TQString& server );

@ -35,7 +35,7 @@ class OnlineStatus;
class OscarAccount; class OscarAccount;
class TQTimer; class TQTimer;
class TQTextCodec; class TQTextCodec;
class KToggleAction; class TDEToggleAction;
/** /**
* Contact for oscar protocol * Contact for oscar protocol

@ -28,7 +28,7 @@ class OnlineStatus;
class OscarAccount; class OscarAccount;
class TQTimer; class TQTimer;
class KToggleAction; class TDEToggleAction;
/** /**
* myself() contact for oscar protocol * myself() contact for oscar protocol

@ -178,9 +178,9 @@ bool SMSAccount::createContact( const TQString &contactId,
return false; return false;
} }
KActionMenu* SMSAccount::actionMenu() TDEActionMenu* SMSAccount::actionMenu()
{ {
KActionMenu *theActionMenu = Kopete::Account::actionMenu(); TDEActionMenu *theActionMenu = Kopete::Account::actionMenu();
return theActionMenu; return theActionMenu;
} }

@ -19,7 +19,7 @@
#include "kopeteaccount.h" #include "kopeteaccount.h"
class KActionMenu; class TDEActionMenu;
class SMSProtocol; class SMSProtocol;
class SMSContact; class SMSContact;
class SMSService; class SMSService;
@ -36,7 +36,7 @@ public:
SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name = 0L ); SMSAccount( SMSProtocol *parent, const TQString &accountID, const char *name = 0L );
~SMSAccount(); ~SMSAccount();
virtual KActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar virtual TDEActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar
virtual void setAway( bool away, const TQString & ); virtual void setAway( bool away, const TQString & );

@ -119,11 +119,11 @@ void SMSContact::setPhoneNumber( const TQString phoneNumber )
new SMSContact(account(), phoneNumber, nickName(), metaContact()); new SMSContact(account(), phoneNumber, nickName(), metaContact());
} }
TQPtrList<KAction>* SMSContact::customContextMenuActions() TQPtrList<TDEAction>* SMSContact::customContextMenuActions()
{ {
TQPtrList<KAction> *m_actionCollection = new TQPtrList<KAction>(); TQPtrList<TDEAction> *m_actionCollection = new TQPtrList<TDEAction>();
if( !m_actionPrefs ) if( !m_actionPrefs )
m_actionPrefs = new KAction(i18n("&Contact Settings"), 0, this, TQT_SLOT(userPrefs()), this, "userPrefs"); m_actionPrefs = new TDEAction(i18n("&Contact Settings"), 0, this, TQT_SLOT(userPrefs()), this, "userPrefs");
m_actionCollection->append( m_actionPrefs ); m_actionCollection->append( m_actionPrefs );

@ -26,8 +26,8 @@ class SMSAccount;
namespace Kopete { class ChatSession; } namespace Kopete { class ChatSession; }
namespace Kopete { class MetaContact; } namespace Kopete { class MetaContact; }
class KActionCollection; class TDEActionCollection;
class KAction; class TDEAction;
class SMSContact : public Kopete::Contact class SMSContact : public Kopete::Contact
{ {
@ -37,7 +37,7 @@ public:
SMSContact( Kopete::Account* _account, const TQString &phoneNumber, SMSContact( Kopete::Account* _account, const TQString &phoneNumber,
const TQString &displayName, Kopete::MetaContact *parent ); const TQString &displayName, Kopete::MetaContact *parent );
TQPtrList<KAction>* customContextMenuActions(); TQPtrList<TDEAction>* customContextMenuActions();
const TQString &phoneNumber(); const TQString &phoneNumber();
void setPhoneNumber( const TQString phoneNumber ); void setPhoneNumber( const TQString phoneNumber );
@ -62,7 +62,7 @@ private slots:
void slotChatSessionDestroyed(); void slotChatSessionDestroyed();
private: private:
KAction* m_actionPrefs; TDEAction* m_actionPrefs;
TQString m_phoneNumber; TQString m_phoneNumber;

@ -28,8 +28,8 @@
#include "kopeteonlinestatus.h" #include "kopeteonlinestatus.h"
#include "kopetecontact.h" #include "kopetecontact.h"
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
namespace Kopete { class Contact; } namespace Kopete { class Contact; }
namespace Kopete { class MetaContact; } namespace Kopete { class MetaContact; }

@ -43,15 +43,15 @@ TestbedAccount::~TestbedAccount()
delete m_server; delete m_server;
} }
KActionMenu* TestbedAccount::actionMenu() TDEActionMenu* TestbedAccount::actionMenu()
{ {
KActionMenu *mActionMenu = Kopete::Account::actionMenu(); TDEActionMenu *mActionMenu = Kopete::Account::actionMenu();
mActionMenu->popupMenu()->insertSeparator(); mActionMenu->popupMenu()->insertSeparator();
KAction *action; TDEAction *action;
action = new KAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQT_SLOT (slotShowVideo ()), this, "actionShowVideo"); action = new TDEAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQT_SLOT (slotShowVideo ()), this, "actionShowVideo");
mActionMenu->insert(action); mActionMenu->insert(action);
action->setEnabled( isConnected() ); action->setEnabled( isConnected() );

@ -20,7 +20,7 @@
#include <kopeteaccount.h> #include <kopeteaccount.h>
#include "testbedwebcamdialog.h" #include "testbedwebcamdialog.h"
class KActionMenu; class TDEActionMenu;
namespace Kopete { class Contact; } namespace Kopete { class Contact; }
namespace Kopete { class MetaContact; } namespace Kopete { class MetaContact; }
@ -42,7 +42,7 @@ public:
/** /**
* Construct the context menu used for the status bar icon * Construct the context menu used for the status bar icon
*/ */
virtual KActionMenu* actionMenu(); virtual TDEActionMenu* actionMenu();
/** /**
* Creates a protocol specific Kopete::Contact subclass and adds it to the supplie * Creates a protocol specific Kopete::Contact subclass and adds it to the supplie
@ -85,19 +85,19 @@ protected:
protected slots: protected slots:
/** /**
* Change the account's status. Called by KActions and internally. * Change the account's status. Called by TDEActions and internally.
*/ */
void slotGoOnline(); void slotGoOnline();
/** /**
* Change the account's status. Called by KActions and internally. * Change the account's status. Called by TDEActions and internally.
*/ */
void slotGoAway(); void slotGoAway();
/** /**
* Change the account's status. Called by KActions and internally. * Change the account's status. Called by TDEActions and internally.
*/ */
void slotGoOffline(); void slotGoOffline();
/** /**
* Show webcam. Called by KActions and internally. * Show webcam. Called by TDEActions and internally.
*/ */
void slotShowVideo(); void slotShowVideo();

@ -82,11 +82,11 @@ Kopete::ChatSession* TestbedContact::manager( CanCreateFlags )
} }
TQPtrList<KAction> *TestbedContact::customContextMenuActions() //OBSOLETE TQPtrList<TDEAction> *TestbedContact::customContextMenuActions() //OBSOLETE
{ {
//FIXME!!! this function is obsolete, we should use XMLGUI instead //FIXME!!! this function is obsolete, we should use XMLGUI instead
/*m_actionCollection = new KActionCollection( this, "userColl" ); /*m_actionCollection = new TDEActionCollection( this, "userColl" );
m_actionPrefs = new KAction(i18n( "&Contact Settings" ), 0, this, m_actionPrefs = new TDEAction(i18n( "&Contact Settings" ), 0, this,
TQT_SLOT( showContactSettings( )), m_actionCollection, "contactSettings" ); TQT_SLOT( showContactSettings( )), m_actionCollection, "contactSettings" );
return m_actionCollection;*/ return m_actionCollection;*/

@ -21,8 +21,8 @@
#include "kopetecontact.h" #include "kopetecontact.h"
#include "kopetemessage.h" #include "kopetemessage.h"
class KAction; class TDEAction;
class KActionCollection; class TDEActionCollection;
namespace Kopete { class Account; } namespace Kopete { class Account; }
namespace Kopete { class ChatSession; } namespace Kopete { class ChatSession; }
namespace Kopete { class MetaContact; } namespace Kopete { class MetaContact; }
@ -56,7 +56,7 @@ public:
/** /**
* Return the actions for this contact * Return the actions for this contact
*/ */
virtual TQPtrList<KAction> *customContextMenuActions(); virtual TQPtrList<TDEAction> *customContextMenuActions();
/** /**
* Returns a Kopete::ChatSession associated with this contact * Returns a Kopete::ChatSession associated with this contact
*/ */
@ -88,9 +88,9 @@ protected slots:
protected: protected:
Kopete::ChatSession* m_msgManager; Kopete::ChatSession* m_msgManager;
KActionCollection* m_actionCollection; TDEActionCollection* m_actionCollection;
TestbedContactType m_type; TestbedContactType m_type;
KAction* m_actionPrefs; TDEAction* m_actionPrefs;
}; };
#endif #endif

@ -32,7 +32,7 @@
// Local Includes // Local Includes
#include "wpaccount.h" #include "wpaccount.h"
class KPopupMenu; class TDEPopupMenu;
WPAccount::WPAccount(WPProtocol *parent, const TQString &accountID, const char *name) WPAccount::WPAccount(WPProtocol *parent, const TQString &accountID, const char *name)
: Kopete::Account(parent, accountID, name) : Kopete::Account(parent, accountID, name)
@ -153,23 +153,23 @@ void WPAccount::setAway(bool status, const TQString &awayMessage)
myself()->setOnlineStatus(status ? mProtocol->WPAway : mProtocol->WPOnline); myself()->setOnlineStatus(status ? mProtocol->WPAway : mProtocol->WPOnline);
} }
KActionMenu* WPAccount::actionMenu() TDEActionMenu* WPAccount::actionMenu()
{ {
kdDebug(14170) << "WPAccount::actionMenu()" << endl; kdDebug(14170) << "WPAccount::actionMenu()" << endl;
/// How to remove an action from Kopete::Account::actionMenu()? GF /// How to remove an action from Kopete::Account::actionMenu()? GF
KActionMenu *theActionMenu = new KActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this); TDEActionMenu *theActionMenu = new TDEActionMenu(accountId() , myself()->onlineStatus().iconFor(this), this);
theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId())); theActionMenu->popupMenu()->insertTitle(myself()->onlineStatus().iconFor(this), i18n("WinPopup (%1)").arg(accountId()));
if (mProtocol) if (mProtocol)
{ {
KAction *goOnline = new KAction("Online", TQIconSet(mProtocol->WPOnline.iconFor(this)), 0, TDEAction *goOnline = new TDEAction("Online", TQIconSet(mProtocol->WPOnline.iconFor(this)), 0,
this, TQT_SLOT(connect()), theActionMenu, "actionGoAvailable"); this, TQT_SLOT(connect()), theActionMenu, "actionGoAvailable");
goOnline->setEnabled(isConnected() && isAway()); goOnline->setEnabled(isConnected() && isAway());
theActionMenu->insert(goOnline); theActionMenu->insert(goOnline);
KAction *goAway = new KAction("Away", TQIconSet(mProtocol->WPAway.iconFor(this)), 0, TDEAction *goAway = new TDEAction("Away", TQIconSet(mProtocol->WPAway.iconFor(this)), 0,
this, TQT_SLOT(goAway()), theActionMenu, "actionGoAway"); this, TQT_SLOT(goAway()), theActionMenu, "actionGoAway");
goAway->setEnabled(isConnected() && !isAway()); goAway->setEnabled(isConnected() && !isAway());
theActionMenu->insert(goAway); theActionMenu->insert(goAway);
@ -177,7 +177,7 @@ KActionMenu* WPAccount::actionMenu()
/// One can not really go offline manually - appears online as long as samba server is running. GF /// One can not really go offline manually - appears online as long as samba server is running. GF
theActionMenu->popupMenu()->insertSeparator(); theActionMenu->popupMenu()->insertSeparator();
theActionMenu->insert(new KAction(i18n("Properties"), 0, theActionMenu->insert(new TDEAction(i18n("Properties"), 0,
this, TQT_SLOT(editAccount()), theActionMenu, "actionAccountProperties")); this, TQT_SLOT(editAccount()), theActionMenu, "actionAccountProperties"));
} }

@ -36,9 +36,9 @@
#include "wpcontact.h" #include "wpcontact.h"
#include "wpaddcontact.h" #include "wpaddcontact.h"
class KPopupMenu; class TDEPopupMenu;
class KActionMenu; class TDEActionMenu;
class KAction; class TDEAction;
class WPProtocol; class WPProtocol;
class KopeteWinPopup; class KopeteWinPopup;
@ -55,7 +55,7 @@ public:
WPAccount(WPProtocol *parent, const TQString& accountID, const char *name = 0); WPAccount(WPProtocol *parent, const TQString& accountID, const char *name = 0);
~WPAccount(); ~WPAccount();
virtual KActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar virtual TDEActionMenu* actionMenu(); // Per-protocol actions for the systray and the status bar
virtual void setAway(bool status, const TQString &); // Set user away virtual void setAway(bool status, const TQString &); // Set user away
public slots: public slots:

@ -55,9 +55,9 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons
checkStatus.start(1000, false); checkStatus.start(1000, false);
} }
TQPtrList<KAction> * WPContact::customContextMenuActions() TQPtrList<TDEAction> * WPContact::customContextMenuActions()
{ {
//myActionCollection = new KActionCollection(parent); //myActionCollection = new TDEActionCollection(parent);
return 0; return 0;
} }

@ -42,8 +42,8 @@
class TQTimer; class TQTimer;
class TQListView; class TQListView;
class TQListViewItem; class TQListViewItem;
class KPopupMenu; class TDEPopupMenu;
class KAction; class TDEAction;
namespace Kopete { class MetaContact; } namespace Kopete { class MetaContact; }
class WPContact: public Kopete::Contact class WPContact: public Kopete::Contact
@ -56,7 +56,7 @@ public:
// virtual bool isOnline() const; // virtual bool isOnline() const;
virtual bool isReachable(); virtual bool isReachable();
virtual TQPtrList<KAction> *customContextMenuActions(); virtual TQPtrList<TDEAction> *customContextMenuActions();
virtual Kopete::ChatSession *manager(Kopete::Contact::CanCreateFlags = Kopete::Contact::CannotCreate); virtual Kopete::ChatSession *manager(Kopete::Contact::CanCreateFlags = Kopete::Contact::CannotCreate);
virtual void serialize(TQMap<TQString, TQString> &serializedData, TQMap<TQString, TQString> &addressBookData); virtual void serialize(TQMap<TQString, TQString> &serializedData, TQMap<TQString, TQString> &addressBookData);
@ -74,7 +74,7 @@ private:
bool myWasConnected; // true if protocol connected at last check bool myWasConnected; // true if protocol connected at last check
TQTimer checkStatus; // checks the status of this contact every second or so TQTimer checkStatus; // checks the status of this contact every second or so
// KActionCollection *myActionCollection; // TDEActionCollection *myActionCollection;
// holds all the protocol specific actions (not many!) // holds all the protocol specific actions (not many!)
Kopete::ChatSession *m_manager; Kopete::ChatSession *m_manager;
// holds the two message managers - one for email and one for chat // holds the two message managers - one for email and one for chat

@ -40,7 +40,7 @@
#include "wpaccount.h" #include "wpaccount.h"
#include "wpcontact.h" #include "wpcontact.h"
class KPopupMenu; class TDEPopupMenu;
WPProtocol *WPProtocol::sProtocol = 0; WPProtocol *WPProtocol::sProtocol = 0;

@ -36,9 +36,9 @@
#include "wpaddcontact.h" #include "wpaddcontact.h"
namespace Kopete { class Account; } namespace Kopete { class Account; }
class KPopupMenu; class TDEPopupMenu;
class KActionMenu; class TDEActionMenu;
class KAction; class TDEAction;
class WPContact; class WPContact;
class WPAccount; class WPAccount;

@ -81,23 +81,23 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con
m_chatChatSession = 0; m_chatChatSession = 0;
// FIXME // FIXME
//m_openInboxAction = new KAction( KIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this ); //m_openInboxAction = new TDEAction( KIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this );
//, "m_openInboxAction" ); //, "m_openInboxAction" );
//TQObject::connect(m_openInboxAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenInbox() ) ); //TQObject::connect(m_openInboxAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenInbox() ) );
//m_openYABAction = new KAction( KIcon("x-office-address-book"), i18n( "Open &Address book..." ), this ); //m_openYABAction = new TDEAction( KIcon("x-office-address-book"), i18n( "Open &Address book..." ), this );
//, "m_openYABAction" ); //, "m_openYABAction" );
//TQObject::connect(m_openYABAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenYAB() ) ); //TQObject::connect(m_openYABAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenYAB() ) );
//m_editOwnYABEntry = new KAction( KIcon("document-properties"), i18n( "&Edit my contact details..."), this ); //m_editOwnYABEntry = new TDEAction( KIcon("document-properties"), i18n( "&Edit my contact details..."), this );
//, "m_editOwnYABEntry" ); //, "m_editOwnYABEntry" );
//TQObject::connect(m_editOwnYABEntry, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotEditOwnYABEntry() ) ); //TQObject::connect(m_editOwnYABEntry, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotEditOwnYABEntry() ) );
//m_joinChatAction = new KAction( KIcon("im-chat-room-join"), i18n( "&Join chat room..."), this ); //m_joinChatAction = new TDEAction( KIcon("im-chat-room-join"), i18n( "&Join chat room..."), this );
//, "m_joinChatAction" ); //, "m_joinChatAction" );
//TQObject::connect(m_joinChatAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotJoinChatRoom() ) ); //TQObject::connect(m_joinChatAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotJoinChatRoom() ) );
m_openInboxAction = new KAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" );
m_openYABAction = new KAction( i18n( "Open &Addressbook..." ), "contents", 0, this, TQT_SLOT( slotOpenYAB() ), this, "m_openYABAction" ); m_openYABAction = new TDEAction( i18n( "Open &Addressbook..." ), "contents", 0, this, TQT_SLOT( slotOpenYAB() ), this, "m_openYABAction" );
m_editOwnYABEntry = new KAction( i18n( "&Edit my contact details..."), "contents", 0, this, TQT_SLOT( slotEditOwnYABEntry() ), this, "m_editOwnYABEntry" ); m_editOwnYABEntry = new TDEAction( i18n( "&Edit my contact details..."), "contents", 0, this, TQT_SLOT( slotEditOwnYABEntry() ), this, "m_editOwnYABEntry" );
m_joinChatAction = new KAction( i18n( "&Join chat room..."), "contents", 0, this, TQT_SLOT( slotJoinChatRoom() ), this, "m_joinChatAction"); m_joinChatAction = new TDEAction( i18n( "&Join chat room..."), "contents", 0, this, TQT_SLOT( slotJoinChatRoom() ), this, "m_joinChatAction");
YahooContact* _myself=new YahooContact( this, accountId.lower(), accountId, Kopete::ContactList::self()->myself() ); YahooContact* _myself=new YahooContact( this, accountId.lower(), accountId, Kopete::ContactList::self()->myself() );
setMyself( _myself ); setMyself( _myself );
@ -634,13 +634,13 @@ void YahooAccount::slotGoOffline()
static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline ); static_cast<YahooContact *>( myself() )->setOnlineStatus( m_protocol->Offline );
} }
KActionMenu* YahooAccount::actionMenu() TDEActionMenu* YahooAccount::actionMenu()
{ {
kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl;
// FIXME (to check) // FIXME (to check)
//Kopete::Account::fillActionMenu( actionMenu ); //Kopete::Account::fillActionMenu( actionMenu );
KActionMenu *theActionMenu = Kopete::Account::actionMenu(); TDEActionMenu *theActionMenu = Kopete::Account::actionMenu();
// FIXME: (to check) // FIXME: (to check)
//actionMenu->addSeparator(); //actionMenu->addSeparator();

@ -38,8 +38,8 @@
#include "yahootypes.h" #include "yahootypes.h"
class TQColor; class TQColor;
class KAction; class TDEAction;
class KActionMenu; class TDEActionMenu;
class YahooContact; class YahooContact;
class YahooAccount; class YahooAccount;
class YahooProtocol; class YahooProtocol;
@ -78,7 +78,7 @@ public:
*/ */
YahooContact *contact(const TQString &id); YahooContact *contact(const TQString &id);
virtual KActionMenu* actionMenu(); virtual TDEActionMenu* actionMenu();
/** /**
* Sets the yahoo away status * Sets the yahoo away status
@ -292,10 +292,10 @@ private:
YahooWebcam *m_webcam; YahooWebcam *m_webcam;
KAction *m_openInboxAction; // Menu item openInbox TDEAction *m_openInboxAction; // Menu item openInbox
KAction *m_openYABAction; // Menu item openYahooAddressbook TDEAction *m_openYABAction; // Menu item openYahooAddressbook
KAction *m_editOwnYABEntry; // Menu item editOwnYABEntry TDEAction *m_editOwnYABEntry; // Menu item editOwnYABEntry
KAction *m_joinChatAction; // Menu item joinChatAction TDEAction *m_joinChatAction; // Menu item joinChatAction
Client *m_session; // The Connection object Client *m_session; // The Connection object
}; };

@ -53,11 +53,11 @@ YahooChatSession::YahooChatSession( Kopete::Protocol *protocol, const Kopete::Co
setInstance(protocol->instance()); setInstance(protocol->instance());
// Add Actions // Add Actions
new KAction( i18n( "Buzz Contact" ), TQIconSet(BarIcon("bell")), "Ctrl+G", this, TQT_SLOT( slotBuzzContact() ), actionCollection(), "yahooBuzz" ) ; new TDEAction( i18n( "Buzz Contact" ), TQIconSet(BarIcon("bell")), "Ctrl+G", this, TQT_SLOT( slotBuzzContact() ), actionCollection(), "yahooBuzz" ) ;
new KAction( i18n( "Show User Info" ), TQIconSet(BarIcon("idea")), 0, this, TQT_SLOT( slotUserInfo() ), actionCollection(), "yahooShowInfo" ) ; new TDEAction( i18n( "Show User Info" ), TQIconSet(BarIcon("idea")), 0, this, TQT_SLOT( slotUserInfo() ), actionCollection(), "yahooShowInfo" ) ;
new KAction( i18n( "Request Webcam" ), TQIconSet(BarIcon("webcamreceive")), 0, this, TQT_SLOT( slotRequestWebcam() ), actionCollection(), "yahooRequestWebcam" ) ; new TDEAction( i18n( "Request Webcam" ), TQIconSet(BarIcon("webcamreceive")), 0, this, TQT_SLOT( slotRequestWebcam() ), actionCollection(), "yahooRequestWebcam" ) ;
new KAction( i18n( "Invite to view your Webcam" ), TQIconSet(BarIcon("webcamsend")), 0, this, TQT_SLOT( slotInviteWebcam() ), actionCollection(), "yahooSendWebcam" ) ; new TDEAction( i18n( "Invite to view your Webcam" ), TQIconSet(BarIcon("webcamsend")), 0, this, TQT_SLOT( slotInviteWebcam() ), actionCollection(), "yahooSendWebcam" ) ;
new KAction( i18n( "Send File" ), TQIconSet(BarIcon("attach")), 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "yahooSendFile" ); new TDEAction( i18n( "Send File" ), TQIconSet(BarIcon("attach")), 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "yahooSendFile" );
YahooContact *c = static_cast<YahooContact*>( others.first() ); YahooContact *c = static_cast<YahooContact*>( others.first() );
connect( c, TQT_SIGNAL( displayPictureChanged() ), this, TQT_SLOT( slotDisplayPictureChanged() ) ); connect( c, TQT_SIGNAL( displayPictureChanged() ), this, TQT_SLOT( slotDisplayPictureChanged() ) );
@ -127,17 +127,17 @@ void YahooChatSession::slotDisplayPictureChanged()
int sz=22; int sz=22;
// get the size of the toolbar were the aciton is plugged. // get the size of the toolbar were the aciton is plugged.
// if you know a better way to get the toolbar, let me know // if you know a better way to get the toolbar, let me know
KMainWindow *w= view(false) ? dynamic_cast<KMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L; TDEMainWindow *w= view(false) ? dynamic_cast<TDEMainWindow*>( view(false)->mainWidget()->topLevelWidget() ) : 0L;
if(w) if(w)
{ {
//We connected that in the constructor. we don't need to keep this slot active. //We connected that in the constructor. we don't need to keep this slot active.
disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) );
TQPtrListIterator<KToolBar> it=w->toolBarIterator() ; TQPtrListIterator<TDEToolBar> it=w->toolBarIterator() ;
KAction *imgAction=actionCollection()->action("yahooDisplayPicture"); TDEAction *imgAction=actionCollection()->action("yahooDisplayPicture");
if(imgAction) while(it) if(imgAction) while(it)
{ {
KToolBar *tb=*it; TDEToolBar *tb=*it;
if(imgAction->isPlugged(tb)) if(imgAction->isPlugged(tb))
{ {
sz=tb->iconSize(); sz=tb->iconSize();

@ -18,9 +18,9 @@
#include "kopetechatsession.h" #include "kopetechatsession.h"
class KActionCollection; class TDEActionCollection;
class YahooContact; class YahooContact;
class KActionMenu; class TDEActionMenu;
class TQLabel; class TQLabel;

@ -47,7 +47,7 @@ YahooConferenceChatSession::YahooConferenceChatSession( const TQString & yahooRo
m_yahooRoom = yahooRoom; m_yahooRoom = yahooRoom;
m_actionInvite = new KAction( i18n( "&Invite others" ), "kontact_contacts", this, TQT_SLOT( slotInviteOthers() ), actionCollection(), "yahooInvite"); m_actionInvite = new TDEAction( i18n( "&Invite others" ), "kontact_contacts", this, TQT_SLOT( slotInviteOthers() ), actionCollection(), "yahooInvite");
setXMLFile("yahooconferenceui.rc"); setXMLFile("yahooconferenceui.rc");
} }

@ -21,10 +21,10 @@
#include "kopetechatsession.h" #include "kopetechatsession.h"
class KActionCollection; class TDEActionCollection;
class YahooContact; class YahooContact;
class YahooAccount; class YahooAccount;
class KActionMenu; class TDEActionMenu;
/** /**
* @author Duncan Mac-Vicar Prett * @author Duncan Mac-Vicar Prett
@ -50,7 +50,7 @@ protected slots:
private: private:
TQString m_yahooRoom; TQString m_yahooRoom;
KAction *m_actionInvite; TDEAction *m_actionInvite;
}; };
#endif #endif

@ -361,12 +361,12 @@ void YahooContact::slotChatSessionDestroyed()
m_sessionActive = false; m_sessionActive = false;
} }
TQPtrList<KAction> *YahooContact::customContextMenuActions() TQPtrList<TDEAction> *YahooContact::customContextMenuActions()
{ {
TQPtrList<KAction> *actionCollection = new TQPtrList<KAction>(); TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>();
if ( !m_webcamAction ) if ( !m_webcamAction )
{ {
m_webcamAction = new KAction( i18n( "View &Webcam" ), "webcamreceive", KShortcut(), m_webcamAction = new TDEAction( i18n( "View &Webcam" ), "webcamreceive", TDEShortcut(),
this, TQT_SLOT( requestWebcam() ), this, "view_webcam" ); this, TQT_SLOT( requestWebcam() ), this, "view_webcam" );
} }
if ( isReachable() ) if ( isReachable() )
@ -377,7 +377,7 @@ TQPtrList<KAction> *YahooContact::customContextMenuActions()
if( !m_inviteWebcamAction ) if( !m_inviteWebcamAction )
{ {
m_inviteWebcamAction = new KAction( i18n( "Invite to view your Webcam" ), "webcamsend", KShortcut(), m_inviteWebcamAction = new TDEAction( i18n( "Invite to view your Webcam" ), "webcamsend", TDEShortcut(),
this, TQT_SLOT( inviteWebcam() ), this, "invite_webcam" ); this, TQT_SLOT( inviteWebcam() ), this, "invite_webcam" );
} }
if ( isReachable() ) if ( isReachable() )
@ -388,7 +388,7 @@ TQPtrList<KAction> *YahooContact::customContextMenuActions()
if ( !m_buzzAction ) if ( !m_buzzAction )
{ {
m_buzzAction = new KAction( i18n( "&Buzz Contact" ), "bell", KShortcut(), this, TQT_SLOT( buzzContact() ), this, "buzz_contact"); m_buzzAction = new TDEAction( i18n( "&Buzz Contact" ), "bell", TDEShortcut(), this, TQT_SLOT( buzzContact() ), this, "buzz_contact");
} }
if ( isReachable() ) if ( isReachable() )
m_buzzAction->setEnabled( true ); m_buzzAction->setEnabled( true );
@ -398,7 +398,7 @@ TQPtrList<KAction> *YahooContact::customContextMenuActions()
if ( !m_stealthAction ) if ( !m_stealthAction )
{ {
m_stealthAction = new KAction( i18n( "&Stealth Setting" ), "yahoo_stealthed", KShortcut(), this, TQT_SLOT( stealthContact() ), this, "stealth_contact"); m_stealthAction = new TDEAction( i18n( "&Stealth Setting" ), "yahoo_stealthed", TDEShortcut(), this, TQT_SLOT( stealthContact() ), this, "stealth_contact");
} }
if ( isReachable() ) if ( isReachable() )
m_stealthAction->setEnabled( true ); m_stealthAction->setEnabled( true );
@ -408,7 +408,7 @@ TQPtrList<KAction> *YahooContact::customContextMenuActions()
if ( !m_inviteConferenceAction ) if ( !m_inviteConferenceAction )
{ {
m_inviteConferenceAction = new KAction( i18n( "&Invite to Conference" ), "kontact_contacts", KShortcut(), this, TQT_SLOT( inviteConference() ), this, "invite_conference"); m_inviteConferenceAction = new TDEAction( i18n( "&Invite to Conference" ), "kontact_contacts", TDEShortcut(), this, TQT_SLOT( inviteConference() ), this, "invite_conference");
} }
if ( isReachable() ) if ( isReachable() )
m_inviteConferenceAction->setEnabled( true ); m_inviteConferenceAction->setEnabled( true );
@ -418,7 +418,7 @@ TQPtrList<KAction> *YahooContact::customContextMenuActions()
if ( !m_profileAction ) if ( !m_profileAction )
{ {
m_profileAction = new KAction( i18n( "&View Yahoo Profile" ), "kontact_notes", KShortcut(), this, TQT_SLOT( slotUserProfile() ), this, "profile_contact"); m_profileAction = new TDEAction( i18n( "&View Yahoo Profile" ), "kontact_notes", TDEShortcut(), this, TQT_SLOT( slotUserProfile() ), this, "profile_contact");
} }
m_profileAction->setEnabled( true ); m_profileAction->setEnabled( true );
actionCollection->append( m_profileAction ); actionCollection->append( m_profileAction );

@ -24,7 +24,7 @@
/* Kopete Includes */ /* Kopete Includes */
#include "kopetecontact.h" #include "kopetecontact.h"
class KAction; class TDEAction;
class KTempFile; class KTempFile;
namespace Kopete { class ChatSession; } namespace Kopete { class ChatSession; }
@ -49,7 +49,7 @@ public:
/** Base Class Reimplementations **/ /** Base Class Reimplementations **/
virtual bool isOnline() const; virtual bool isOnline() const;
virtual bool isReachable(); virtual bool isReachable();
virtual TQPtrList<KAction> *customContextMenuActions(); virtual TQPtrList<TDEAction> *customContextMenuActions();
virtual Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags canCreate= Kopete::Contact::CanCreate ); virtual Kopete::ChatSession *manager( Kopete::Contact::CanCreateFlags canCreate= Kopete::Contact::CanCreate );
virtual void serialize( TQMap<TQString, TQString> &serializedData, TQMap<TQString, TQString> &addressBookData ); virtual void serialize( TQMap<TQString, TQString> &serializedData, TQMap<TQString, TQString> &addressBookData );
@ -128,12 +128,12 @@ private:
bool m_receivingWebcam; bool m_receivingWebcam;
bool m_sessionActive; bool m_sessionActive;
KAction* m_stealthAction; TDEAction* m_stealthAction;
KAction* m_profileAction; TDEAction* m_profileAction;
KAction* m_webcamAction; TDEAction* m_webcamAction;
KAction* m_inviteWebcamAction; TDEAction* m_inviteWebcamAction;
KAction* m_buzzAction; TDEAction* m_buzzAction;
KAction* m_inviteConferenceAction; TDEAction* m_inviteConferenceAction;
}; };
#endif #endif

@ -31,9 +31,9 @@
#include "kopetecontactproperty.h" #include "kopetecontactproperty.h"
class YahooContact; class YahooContact;
class KPopupMenu; class TDEPopupMenu;
class KActionMenu; class TDEActionMenu;
class KAction; class TDEAction;
namespace Kopete { class MetaContact; } namespace Kopete { class MetaContact; }
namespace Kopete { class Message; } namespace Kopete { class Message; }
class YahooPreferences; class YahooPreferences;

@ -37,7 +37,7 @@ namespace KPF
TQWidget * parent, TQWidget * parent,
const char * name const char * name
) )
: KMainWindow(parent, name) : TDEMainWindow(parent, name)
{ {
setCaption(i18n("Monitoring %1 - kpf").arg(server->root())); setCaption(i18n("Monitoring %1 - kpf").arg(server->root()));
@ -46,7 +46,7 @@ namespace KPF
setCentralWidget(monitor_); setCentralWidget(monitor_);
killAction_ = killAction_ =
new KAction new TDEAction
( (
i18n("&Cancel Selected Transfers"), i18n("&Cancel Selected Transfers"),
"stop", "stop",

@ -26,7 +26,7 @@
#include <kmainwindow.h> #include <kmainwindow.h>
class KAction; class TDEAction;
namespace KPF namespace KPF
{ {
@ -39,7 +39,7 @@ namespace KPF
* A wrapper window is used to avoid forcing ActiveMonitor to be * A wrapper window is used to avoid forcing ActiveMonitor to be
* toplevel, so it can be used elsewhere if desired. * toplevel, so it can be used elsewhere if desired.
*/ */
class ActiveMonitorWindow : public KMainWindow class ActiveMonitorWindow : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -96,7 +96,7 @@ namespace KPF
ActiveMonitor * monitor_; ActiveMonitor * monitor_;
KAction * killAction_; TDEAction * killAction_;
}; };
} // End namespace KPF } // End namespace KPF

@ -64,7 +64,7 @@ namespace KPF
TQString popupTitle(i18n("kpf - %1").arg(server_->root())); TQString popupTitle(i18n("kpf - %1").arg(server_->root()));
popup_ = new KPopupMenu(this); popup_ = new TDEPopupMenu(this);
popup_->insertTitle popup_->insertTitle
(SmallIcon("kpf"), popupTitle, Title, Title); (SmallIcon("kpf"), popupTitle, Title, Title);

@ -27,7 +27,7 @@
#include <tqptrlist.h> #include <tqptrlist.h>
#include <tqwidget.h> #include <tqwidget.h>
class KPopupMenu; class TDEPopupMenu;
namespace KPF namespace KPF
{ {
@ -159,7 +159,7 @@ namespace KPF
SingleServerConfigDialog * configDialog_; SingleServerConfigDialog * configDialog_;
ActiveMonitorWindow * monitorWindow_; ActiveMonitorWindow * monitorWindow_;
BandwidthGraph * graph_; BandwidthGraph * graph_;
KPopupMenu * popup_; TDEPopupMenu * popup_;
}; };
} }

@ -42,7 +42,7 @@ namespace KPF
TQWidget * parent, TQWidget * parent,
const char * name const char * name
) )
: KListView(parent, name) : TDEListView(parent, name)
{ {
d = new Private; d = new Private;
d->pathToMakeVisible = pathToMakeVisible; d->pathToMakeVisible = pathToMakeVisible;

@ -31,7 +31,7 @@ namespace KPF
/** /**
* Allows the user to choose a directory, with some restrictions. * Allows the user to choose a directory, with some restrictions.
*/ */
class DirSelectWidget : public KListView class DirSelectWidget : public TDEListView
{ {
Q_OBJECT Q_OBJECT

@ -60,7 +60,7 @@ private:
int toggleID; int toggleID;
PPPStats *stats; PPPStats *stats;
KPopupMenu *popup_m; TDEPopupMenu *popup_m;
TQPixmap dock_none_pixmap; TQPixmap dock_none_pixmap;
TQPixmap dock_left_pixmap; TQPixmap dock_left_pixmap;

@ -46,7 +46,7 @@ static KCmdLineOptions option[] =
}; };
TopWidget::TopWidget() : KMainWindow(0, "") { TopWidget::TopWidget() : TDEMainWindow(0, "") {
// Check command line args for "-kppp" // Check command line args for "-kppp"
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();

@ -26,7 +26,7 @@
#include <kmenubar.h> #include <kmenubar.h>
#include "monthly.h" #include "monthly.h"
class TopWidget : public KMainWindow { class TopWidget : public TDEMainWindow {
Q_OBJECT Q_OBJECT
public: public:

@ -172,7 +172,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) :
{ {
tl = 0; tl = 0;
lv = new KListView(this); lv = new TDEListView(this);
lv->addColumn(i18n("Connection")); lv->addColumn(i18n("Connection"));
lv->addColumn(i18n("Day")); lv->addColumn(i18n("Day"));
lv->addColumn(i18n("From")); lv->addColumn(i18n("From"));
@ -198,7 +198,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) :
selectionItem = 0L; selectionItem = 0L;
connect(lv, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); connect(lv, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged()));
lv2 = new KListView(this); lv2 = new TDEListView(this);
lv2->addColumn(i18n("Connection")); lv2->addColumn(i18n("Connection"));
lv2->addColumn(i18n("Duration")); lv2->addColumn(i18n("Duration"));
lv2->addColumn(i18n("Costs")); lv2->addColumn(i18n("Costs"));

@ -32,7 +32,7 @@
#include <kbuttonbox.h> #include <kbuttonbox.h>
class KListView; class TDEListView;
class TQComboBox; class TQComboBox;
class LogListItem; class LogListItem;
@ -68,8 +68,8 @@ private:
TQComboBox *cboConnections; TQComboBox *cboConnections;
KButtonBox *bbox; KButtonBox *bbox;
KListView *lv; TDEListView *lv;
KListView *lv2; TDEListView *lv2;
LogListItem* selectionItem; LogListItem* selectionItem;
TQLabel *title; TQLabel *title;
TQPushButton *next, *prev, *today, *exportBttn; TQPushButton *next, *prev, *today, *exportBttn;

@ -100,7 +100,7 @@ MiniTerm::~MiniTerm() {
void MiniTerm::setupToolbar() { void MiniTerm::setupToolbar() {
toolbar = new KToolBar( this ); toolbar = new TDEToolBar( this );
toolbar->insertButton("exit", 0, toolbar->insertButton("exit", 0,
TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
@ -114,7 +114,7 @@ void MiniTerm::setupToolbar() {
TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SIGNAL(clicked()), TQT_TQOBJECT(this),
TQT_SLOT(help()), TRUE, i18n("Help")); TQT_SLOT(help()), TRUE, i18n("Help"));
toolbar->setBarPos( KToolBar::Top ); toolbar->setBarPos( TDEToolBar::Top );
toolbar->setMovingEnabled(false); toolbar->setMovingEnabled(false);
toolbar->updateRects(true); toolbar->updateRects(true);
} }

@ -38,7 +38,7 @@ class KHelpMenu;
class TQTimer; class TQTimer;
class TQMenuBar; class TQMenuBar;
class KToolBar; class TDEToolBar;
class KHelpMenu; class KHelpMenu;
class TQPushButton; class TQPushButton;
class TQLabel; class TQLabel;
@ -84,7 +84,7 @@ protected:
TQTimer *inittimer; TQTimer *inittimer;
TQMenuBar * menubar; TQMenuBar * menubar;
KToolBar * toolbar; TDEToolBar * toolbar;
TQPopupMenu * m_file; TQPopupMenu * m_file;
TQPopupMenu * m_edit; TQPopupMenu * m_edit;
TQPopupMenu * m_options; TQPopupMenu * m_options;

@ -19,7 +19,7 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<widget class="KListView" row="0" column="0" rowspan="1" colspan="3"> <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="3">
<column> <column>
<property name="text"> <property name="text">
<string>Host</string> <string>Host</string>

@ -71,7 +71,7 @@ void HostProfiles::load()
while ( it != hplist.end() ) while ( it != hplist.end() )
{ {
HostPref *hp = *it; HostPref *hp = *it;
new KListViewItem( hostListView, hp->host(), hp->type(), new TDEListViewItem( hostListView, hp->host(), hp->type(),
hp->prefDescription() ); hp->prefDescription() );
++it; ++it;
} }

@ -386,7 +386,7 @@ TQSize KRDC::sizeHint()
} }
TQPopupMenu *KRDC::createPopupMenu(TQWidget *parent) const { TQPopupMenu *KRDC::createPopupMenu(TQWidget *parent) const {
KPopupMenu *pu = new KPopupMenu(parent); TDEPopupMenu *pu = new TDEPopupMenu(parent);
pu->insertItem(i18n("View Only"), this, TQT_SLOT(viewOnlyToggled()), 0, VIEW_ONLY_ID); pu->insertItem(i18n("View Only"), this, TQT_SLOT(viewOnlyToggled()), 0, VIEW_ONLY_ID);
pu->setCheckable(true); pu->setCheckable(true);
pu->setItemChecked(VIEW_ONLY_ID, m_view->viewOnly()); pu->setItemChecked(VIEW_ONLY_ID, m_view->viewOnly());
@ -467,7 +467,7 @@ void KRDC::switchToFullscreen(bool scaling)
connect(m_fsToolbar, TQT_SIGNAL(mouseEnter()), TQT_SLOT(showFullscreenToolbar())); connect(m_fsToolbar, TQT_SIGNAL(mouseEnter()), TQT_SLOT(showFullscreenToolbar()));
connect(m_fsToolbar, TQT_SIGNAL(mouseLeave()), TQT_SLOT(hideFullscreenToolbarDelayed())); connect(m_fsToolbar, TQT_SIGNAL(mouseLeave()), TQT_SLOT(hideFullscreenToolbarDelayed()));
KToolBar *t = new KToolBar(m_fsToolbar); TDEToolBar *t = new TDEToolBar(m_fsToolbar);
m_fsToolbarWidget = t; m_fsToolbarWidget = t;
t->setIconSize(KIcon::Panel); t->setIconSize(KIcon::Panel);
@ -475,14 +475,14 @@ void KRDC::switchToFullscreen(bool scaling)
pinIconSet.setPixmap(m_pinup, TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::On); pinIconSet.setPixmap(m_pinup, TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::On);
pinIconSet.setPixmap(m_pindown, TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::Off); pinIconSet.setPixmap(m_pindown, TQIconSet::Automatic, TQIconSet::Normal, TQIconSet::Off);
t->insertButton("pinup", FS_AUTOHIDE_ID); t->insertButton("pinup", FS_AUTOHIDE_ID);
KToolBarButton *pinButton = t->getButton(FS_AUTOHIDE_ID); TDEToolBarButton *pinButton = t->getButton(FS_AUTOHIDE_ID);
pinButton->setIconSet(pinIconSet); pinButton->setIconSet(pinIconSet);
TQToolTip::add(pinButton, i18n("Autohide on/off")); TQToolTip::add(pinButton, i18n("Autohide on/off"));
t->setToggle(FS_AUTOHIDE_ID); t->setToggle(FS_AUTOHIDE_ID);
t->addConnection(FS_AUTOHIDE_ID, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(setFsToolbarAutoHide(bool))); t->addConnection(FS_AUTOHIDE_ID, TQT_SIGNAL(toggled(bool)), TQT_TQOBJECT(this), TQT_SLOT(setFsToolbarAutoHide(bool)));
t->insertButton("window_nofullscreen", FS_FULLSCREEN_ID); t->insertButton("window_nofullscreen", FS_FULLSCREEN_ID);
KToolBarButton *fullscreenButton = t->getButton(FS_FULLSCREEN_ID); TDEToolBarButton *fullscreenButton = t->getButton(FS_FULLSCREEN_ID);
TQToolTip::add(fullscreenButton, i18n("Fullscreen")); TQToolTip::add(fullscreenButton, i18n("Fullscreen"));
t->setToggle(FS_FULLSCREEN_ID); t->setToggle(FS_FULLSCREEN_ID);
t->setButton(FS_FULLSCREEN_ID, true); t->setButton(FS_FULLSCREEN_ID, true);
@ -490,7 +490,7 @@ void KRDC::switchToFullscreen(bool scaling)
m_popup = createPopupMenu(t); m_popup = createPopupMenu(t);
t->insertButton("configure", FS_ADVANCED_ID, m_popup, true, i18n("Advanced options")); t->insertButton("configure", FS_ADVANCED_ID, m_popup, true, i18n("Advanced options"));
KToolBarButton *advancedButton = t->getButton(FS_ADVANCED_ID); TDEToolBarButton *advancedButton = t->getButton(FS_ADVANCED_ID);
TQToolTip::add(advancedButton, i18n("Advanced options")); TQToolTip::add(advancedButton, i18n("Advanced options"));
TQLabel *hostLabel = new TQLabel(t); TQLabel *hostLabel = new TQLabel(t);
@ -502,7 +502,7 @@ void KRDC::switchToFullscreen(bool scaling)
if (scalingPossible) { if (scalingPossible) {
t->insertButton("viewmagfit", FS_SCALE_ID); t->insertButton("viewmagfit", FS_SCALE_ID);
KToolBarButton *scaleButton = t->getButton(FS_SCALE_ID); TDEToolBarButton *scaleButton = t->getButton(FS_SCALE_ID);
TQToolTip::add(scaleButton, i18n("Scale view")); TQToolTip::add(scaleButton, i18n("Scale view"));
t->setToggle(FS_SCALE_ID); t->setToggle(FS_SCALE_ID);
t->setButton(FS_SCALE_ID, scaling); t->setButton(FS_SCALE_ID, scaling);
@ -510,12 +510,12 @@ void KRDC::switchToFullscreen(bool scaling)
} }
t->insertButton("iconify", FS_ICONIFY_ID); t->insertButton("iconify", FS_ICONIFY_ID);
KToolBarButton *iconifyButton = t->getButton(FS_ICONIFY_ID); TDEToolBarButton *iconifyButton = t->getButton(FS_ICONIFY_ID);
TQToolTip::add(iconifyButton, i18n("Minimize")); TQToolTip::add(iconifyButton, i18n("Minimize"));
t->addConnection(FS_ICONIFY_ID, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(iconify())); t->addConnection(FS_ICONIFY_ID, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(iconify()));
t->insertButton("close", FS_CLOSE_ID); t->insertButton("close", FS_CLOSE_ID);
KToolBarButton *closeButton = t->getButton(FS_CLOSE_ID); TDEToolBarButton *closeButton = t->getButton(FS_CLOSE_ID);
TQToolTip::add(closeButton, i18n("Close")); TQToolTip::add(closeButton, i18n("Close"));
t->addConnection(FS_CLOSE_ID, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(quit())); t->addConnection(FS_CLOSE_ID, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(quit()));
@ -577,12 +577,12 @@ void KRDC::switchToNormal(bool scaling)
m_dockArea = new TQDockArea(Qt::Horizontal, TQDockArea::Normal, this); m_dockArea = new TQDockArea(Qt::Horizontal, TQDockArea::Normal, this);
m_dockArea->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, m_dockArea->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding,
TQSizePolicy::Fixed)); TQSizePolicy::Fixed));
KToolBar *t = new KToolBar(m_dockArea); TDEToolBar *t = new TDEToolBar(m_dockArea);
m_toolbar = t; m_toolbar = t;
t->setIconText(KToolBar::IconTextRight); t->setIconText(TDEToolBar::IconTextRight);
connect(t, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), TQT_SLOT(toolbarChanged())); connect(t, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), TQT_SLOT(toolbarChanged()));
t->insertButton("window_fullscreen", 0, true, i18n("Fullscreen")); t->insertButton("window_fullscreen", 0, true, i18n("Fullscreen"));
KToolBarButton *fullscreenButton = t->getButton(0); TDEToolBarButton *fullscreenButton = t->getButton(0);
TQToolTip::add(fullscreenButton, i18n("Fullscreen")); TQToolTip::add(fullscreenButton, i18n("Fullscreen"));
TQWhatsThis::add(fullscreenButton, i18n("Switches to full screen. If the remote desktop has a different screen resolution, Remote Desktop Connection will automatically switch to the nearest resolution.")); TQWhatsThis::add(fullscreenButton, i18n("Switches to full screen. If the remote desktop has a different screen resolution, Remote Desktop Connection will automatically switch to the nearest resolution."));
t->setToggle(0); t->setToggle(0);
@ -591,7 +591,7 @@ void KRDC::switchToNormal(bool scaling)
if (m_view->supportsScaling()) { if (m_view->supportsScaling()) {
t->insertButton("viewmagfit", 1, true, i18n("Scale")); t->insertButton("viewmagfit", 1, true, i18n("Scale"));
KToolBarButton *scaleButton = t->getButton(1); TDEToolBarButton *scaleButton = t->getButton(1);
TQToolTip::add(scaleButton, i18n("Scale view")); TQToolTip::add(scaleButton, i18n("Scale view"));
TQWhatsThis::add(scaleButton, i18n("This option scales the remote screen to fit your window size.")); TQWhatsThis::add(scaleButton, i18n("This option scales the remote screen to fit your window size."));
t->setToggle(1); t->setToggle(1);
@ -600,7 +600,7 @@ void KRDC::switchToNormal(bool scaling)
} }
t->insertButton("key_enter", 2, true, i18n("Special Keys")); t->insertButton("key_enter", 2, true, i18n("Special Keys"));
KToolBarButton *skButton = t->getButton(2); TDEToolBarButton *skButton = t->getButton(2);
TQToolTip::add(skButton, i18n("Enter special keys.")); TQToolTip::add(skButton, i18n("Enter special keys."));
TQWhatsThis::add(skButton, i18n("This option allows you to send special key combinations like Ctrl-Alt-Del to the remote host.")); TQWhatsThis::add(skButton, i18n("This option allows you to send special key combinations like Ctrl-Alt-Del to the remote host."));
t->addConnection(2, TQT_SIGNAL(clicked()), TQT_TQOBJECT(m_keyCaptureDialog), TQT_SLOT(execute())); t->addConnection(2, TQT_SIGNAL(clicked()), TQT_TQOBJECT(m_keyCaptureDialog), TQT_SLOT(execute()));
@ -612,7 +612,7 @@ void KRDC::switchToNormal(bool scaling)
m_popup = createPopupMenu(t); m_popup = createPopupMenu(t);
t->insertButton("configure", 3, m_popup, true, i18n("Advanced")); t->insertButton("configure", 3, m_popup, true, i18n("Advanced"));
KToolBarButton *advancedButton = t->getButton(3); TDEToolBarButton *advancedButton = t->getButton(3);
TQToolTip::add(advancedButton, i18n("Advanced options")); TQToolTip::add(advancedButton, i18n("Advanced options"));
if (m_layout) if (m_layout)

@ -34,7 +34,7 @@
#include "keycapturedialog.h" #include "keycapturedialog.h"
class TQPixmap; class TQPixmap;
class KToolBar; class TDEToolBar;
class TQPopupMenu; class TQPopupMenu;
class TQDockArea; class TQDockArea;
@ -76,7 +76,7 @@ private:
TQWidget *m_fsToolbarWidget; // qt designer widget for fs toolbar TQWidget *m_fsToolbarWidget; // qt designer widget for fs toolbar
// (invalid in normal mode) // (invalid in normal mode)
TQPixmap m_pinup, m_pindown; // fs toolbar imaged for autohide button TQPixmap m_pinup, m_pindown; // fs toolbar imaged for autohide button
KToolBar *m_toolbar; // toolbar in normal mode (0 in fs mode) TDEToolBar *m_toolbar; // toolbar in normal mode (0 in fs mode)
TQDockArea *m_dockArea; // dock area for toolbar in normal mode (0 in fs mode) TQDockArea *m_dockArea; // dock area for toolbar in normal mode (0 in fs mode)
TQPopupMenu *m_popup; // advanced options popup (0 in fs mode) TQPopupMenu *m_popup; // advanced options popup (0 in fs mode)
TQDesktopWidget m_desktopWidget; TQDesktopWidget m_desktopWidget;

@ -236,7 +236,7 @@ Remote Desktop Connection only supports systems that use VNC.</string>
<string>An administrator can configure the network to have several scopes. If this is the case, you can select the scope to scan here.</string> <string>An administrator can configure the network to have several scopes. If this is the case, you can select the scope to scan here.</string>
</property> </property>
</widget> </widget>
<widget class="KListView" row="1" column="0" rowspan="1" colspan="7"> <widget class="TDEListView" row="1" column="0" rowspan="1" colspan="7">
<column> <column>
<property name="text"> <property name="text">
<string>Name</string> <string>Name</string>

@ -34,14 +34,14 @@
static const TQString DEFAULT_SCOPE = "default"; static const TQString DEFAULT_SCOPE = "default";
class UrlListViewItem : public KListViewItem class UrlListViewItem : public TDEListViewItem
{ {
public: public:
UrlListViewItem( TQListView *v, const TQString &url, const TQString &host, UrlListViewItem( TQListView *v, const TQString &url, const TQString &host,
const TQString &protocol, const TQString &type, const TQString &userid, const TQString &protocol, const TQString &type, const TQString &userid,
const TQString &fullname, const TQString &desc, const TQString &fullname, const TQString &desc,
const TQString &serviceid ) const TQString &serviceid )
: KListViewItem( v, host, i18n( "unknown" ), host, protocol ), : TDEListViewItem( v, host, i18n( "unknown" ), host, protocol ),
m_url( url ), m_serviceid( serviceid ) m_url( url ), m_serviceid( serviceid )
{ {
if ( !type.isNull() ) if ( !type.isNull() )

@ -217,7 +217,7 @@ void Configuration::saveToDialogs() {
while (it != invitationList.end()) { while (it != invitationList.end()) {
Invitation &inv = *(it++); Invitation &inv = *(it++);
if (!inv.getViewItem()) if (!inv.getViewItem())
inv.setViewItem(new KListViewItem(invMngDlg.listView, inv.setViewItem(new TDEListViewItem(invMngDlg.listView,
inv.creationTime().toString(Qt::LocalDate), inv.creationTime().toString(Qt::LocalDate),
inv.expirationTime().toString(Qt::LocalDate))); inv.expirationTime().toString(Qt::LocalDate)));
} }
@ -372,7 +372,7 @@ void Configuration::invMngDlgDeleteOnePressed() {
TQValueList<Invitation>::iterator it = invitationList.begin(); TQValueList<Invitation>::iterator it = invitationList.begin();
while (it != invitationList.end()) { while (it != invitationList.end()) {
Invitation &ix = (*it); Invitation &ix = (*it);
KListViewItem *iv = ix.getViewItem(); TDEListViewItem *iv = ix.getViewItem();
if (iv && iv->isSelected()) if (iv && iv->isSelected())
it = invitationList.remove(it); it = invitationList.remove(it);
else else

@ -114,12 +114,12 @@ bool Invitation::isValid() const {
return m_expirationTime > TQDateTime::currentDateTime(); return m_expirationTime > TQDateTime::currentDateTime();
} }
void Invitation::setViewItem(KListViewItem *i) { void Invitation::setViewItem(TDEListViewItem *i) {
if (m_viewItem) if (m_viewItem)
delete m_viewItem; delete m_viewItem;
m_viewItem = i; m_viewItem = i;
} }
KListViewItem *Invitation::getViewItem() const{ TDEListViewItem *Invitation::getViewItem() const{
return m_viewItem; return m_viewItem;
} }

@ -43,15 +43,15 @@ public:
TQDateTime creationTime() const; TQDateTime creationTime() const;
bool isValid() const; bool isValid() const;
void setViewItem(KListViewItem*); void setViewItem(TDEListViewItem*);
KListViewItem* getViewItem() const; TDEListViewItem* getViewItem() const;
void save(TDEConfig *config, int num) const; void save(TDEConfig *config, int num) const;
private: private:
TQString m_password; TQString m_password;
TQDateTime m_creationTime; TQDateTime m_creationTime;
TQDateTime m_expirationTime; TQDateTime m_expirationTime;
KListViewItem *m_viewItem; TDEListViewItem *m_viewItem;
}; };
#endif #endif

@ -62,7 +62,7 @@
</size> </size>
</property> </property>
</spacer> </spacer>
<widget class="KListView" row="0" column="0" rowspan="5" colspan="1"> <widget class="TDEListView" row="0" column="0" rowspan="5" colspan="1">
<column> <column>
<property name="text"> <property name="text">
<string>Created</string> <string>Created</string>

@ -60,14 +60,14 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) :
setPixmap(trayIconClosed); setPixmap(trayIconClosed);
TQToolTip::add(this, i18n("Desktop Sharing - connecting")); TQToolTip::add(this, i18n("Desktop Sharing - connecting"));
manageInvitationsAction = new KAction(i18n("Manage &Invitations"), TQString(), manageInvitationsAction = new TDEAction(i18n("Manage &Invitations"), TQString(),
0, TQT_TQOBJECT(this), TQT_SIGNAL(showManageInvitations()), 0, TQT_TQOBJECT(this), TQT_SIGNAL(showManageInvitations()),
&actionCollection); &actionCollection);
manageInvitationsAction->plug(contextMenu()); manageInvitationsAction->plug(contextMenu());
contextMenu()->insertSeparator(); contextMenu()->insertSeparator();
enableControlAction = new KToggleAction(i18n("Enable Remote Control")); enableControlAction = new TDEToggleAction(i18n("Enable Remote Control"));
enableControlAction->setCheckedState(i18n("Disable Remote Control")); enableControlAction->setCheckedState(i18n("Disable Remote Control"));
enableControlAction->plug(contextMenu()); enableControlAction->plug(contextMenu());
enableControlAction->setEnabled(false); enableControlAction->setEnabled(false);

@ -79,10 +79,10 @@ private:
KPixmap trayIconClosed; KPixmap trayIconClosed;
Configuration *configuration; Configuration *configuration;
KDialog* aboutDialog; KDialog* aboutDialog;
KActionCollection actionCollection; TDEActionCollection actionCollection;
KAction* manageInvitationsAction; TDEAction* manageInvitationsAction;
KAction* aboutAction; TDEAction* aboutAction;
KToggleAction* enableControlAction; TDEToggleAction* enableControlAction;
bool quitting; bool quitting;
private slots: private slots:

@ -22,7 +22,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>Auto Connect List</string> <string>Auto Connect List</string>

@ -4,7 +4,7 @@ PageFont::PageFont( TQWidget *parent, const char *name ) :
TQWidget( parent, name) TQWidget( parent, name)
{ {
layout = new TQHBoxLayout(this); layout = new TQHBoxLayout(this);
fontchooser = new KFontChooser(this); fontchooser = new TDEFontChooser(this);
layout->addWidget(fontchooser); layout->addWidget(fontchooser);
connect(fontchooser,TQT_SIGNAL(fontSelected ( const TQFont&)), this, TQT_SLOT(update())); connect(fontchooser,TQT_SIGNAL(fontSelected ( const TQFont&)), this, TQT_SLOT(update()));
} }

@ -56,7 +56,7 @@ class PageFont : public TQWidget
void modified(); void modified();
private: private:
KFontChooser* fontchooser; /** The font choosing widget from kdelib */ TDEFontChooser* fontchooser; /** The font choosing widget from kdelib */
TQHBoxLayout* layout; TQHBoxLayout* layout;
}; };

@ -424,8 +424,8 @@ void KSTicker::mousePressEvent( TQMouseEvent *e)
} }
void KSTicker::fontSelector() void KSTicker::fontSelector()
{ {
int result = KFontDialog::getFont( ourFont, true ); int result = TDEFontDialog::getFont( ourFont, true );
if ( result == KFontDialog::Accepted ) { if ( result == TDEFontDialog::Accepted ) {
updateFont(ourFont); updateFont(ourFont);
} }
} }

@ -309,9 +309,9 @@ bool aHistLineEdit::processKeyEvent( TQKeyEvent *e )
bool eat = false; bool eat = false;
// kdDebug(5008) << "Key: " << KShortcut( KKey( e ) ).toString() << " StdAccel: " << KStdAccel::paste().toString() << endl; // kdDebug(5008) << "Key: " << TDEShortcut( KKey( e ) ).toString() << " StdAccel: " << TDEStdAccel::paste().toString() << endl;
if ( KStdAccel::paste().contains(KKey( e ))) { if ( TDEStdAccel::paste().contains(KKey( e ))) {
e->ignore(); e->ignore();
eat = true; eat = true;
} }

@ -26,7 +26,7 @@ chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name)
: TQWidget(parent, name), : TQWidget(parent, name),
m_proc(proc) m_proc(proc)
{ {
Popupmenu = new KPopupMenu( this ); Popupmenu = new TDEPopupMenu( this );
Popupmenu->insertTitle(i18n("Channel Modes")); Popupmenu->insertTitle(i18n("Channel Modes"));
toggleMenu[0] = Popupmenu->insertItem(i18n("i (invite-only)"), this, TQT_SLOT(invite())); toggleMenu[0] = Popupmenu->insertItem(i18n("i (invite-only)"), this, TQT_SLOT(invite()));
toggleMenu[1] = Popupmenu->insertItem(i18n("l (limited users)"), this, TQT_SLOT(limited())); toggleMenu[1] = Popupmenu->insertItem(i18n("l (limited users)"), this, TQT_SLOT(limited()));

@ -9,7 +9,7 @@
class TQHBoxLayout; class TQHBoxLayout;
class TQVBoxLayout; class TQVBoxLayout;
class KPopupMenu; class TDEPopupMenu;
class chanbuttonsDialog; class chanbuttonsDialog;
class KIntSpinBox; class KIntSpinBox;
class TQLineEdit; class TQLineEdit;
@ -53,7 +53,7 @@ class chanButtons : public TQWidget
TQPushButton *moderateButton; TQPushButton *moderateButton;
TQPushButton *outsideButton; TQPushButton *outsideButton;
TQPushButton *menuButton; TQPushButton *menuButton;
KPopupMenu *Popupmenu; TDEPopupMenu *Popupmenu;
chanbuttonsDialog *chanDialog; chanbuttonsDialog *chanDialog;
KSircProcess *m_proc; KSircProcess *m_proc;
}; };

@ -22,8 +22,8 @@
#define COL_CPS 4 #define COL_CPS 4
#define COL_PER 5 #define COL_PER 5
dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) dccItem::dccItem( TDEListView *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size )
: TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type) : TQObject(), TDEListViewItem(parent), m_who(who), m_file(file), m_type(type)
{ {
m_percent = 0; m_percent = 0;
m_status = status; m_status = status;
@ -43,8 +43,8 @@ dccItem::dccItem( KListView *parent, dccManager *manager, enum dccType type, con
} }
dccItem::dccItem( KListViewItem *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size ) dccItem::dccItem( TDEListViewItem *parent, dccManager *manager, enum dccType type, const TQString &file, const TQString& who, enum dccStatus status, unsigned int size )
: TQObject(), KListViewItem(parent), m_who(who), m_file(file), m_type(type) : TQObject(), TDEListViewItem(parent), m_who(who), m_file(file), m_type(type)
{ {
m_percent = 0; m_percent = 0;
m_status = status; m_status = status;
@ -175,7 +175,7 @@ void dccItem::doRename()
void dccItem::okRename(int col) void dccItem::okRename(int col)
{ {
KListViewItem::okRename(col); TDEListViewItem::okRename(col);
if(type() == dccGet){ if(type() == dccGet){
TQString oldfile = m_file; TQString oldfile = m_file;
changeFilename(text(COL_FILE)); changeFilename(text(COL_FILE));
@ -193,7 +193,7 @@ void dccItem::okRename(int col)
void dccItem::cancelRename(int col) void dccItem::cancelRename(int col)
{ {
KListViewItem::cancelRename(col); TDEListViewItem::cancelRename(col);
if(type() == dccChat){ if(type() == dccChat){
setWhoPostfix(m_post); setWhoPostfix(m_post);
} }
@ -203,9 +203,9 @@ dccManager::dccManager( TQWidget *parent, const char *name ) : dccManagerbase( p
{ {
dccNewDialog = 0x0; dccNewDialog = 0x0;
m_getit = new KListViewItem(klvBox, i18n("Get")); m_getit = new TDEListViewItem(klvBox, i18n("Get"));
m_sendit = new KListViewItem(klvBox, i18n("Send")); m_sendit = new TDEListViewItem(klvBox, i18n("Send"));
m_chatit = new KListViewItem(klvBox, i18n("Chat")); m_chatit = new TDEListViewItem(klvBox, i18n("Chat"));
m_getit->setOpen(true); m_getit->setOpen(true);
m_sendit->setOpen(true); m_sendit->setOpen(true);

@ -23,7 +23,7 @@ class TQSignal;
class TQObject; class TQObject;
class dccItem : public TQObject, class dccItem : public TQObject,
public KListViewItem public TDEListViewItem
{ {
Q_OBJECT Q_OBJECT
@ -47,8 +47,8 @@ public:
dccSend dccSend
}; };
dccItem( KListView *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size ); dccItem( TDEListView *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size );
dccItem( KListViewItem *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size ); dccItem( TDEListViewItem *, dccManager *, enum dccType, const TQString &file, const TQString &who, enum dccStatus, unsigned int size );
virtual ~dccItem(); virtual ~dccItem();
void changeStatus(enum dccStatus); void changeStatus(enum dccStatus);
@ -130,9 +130,9 @@ protected slots:
private: private:
KListViewItem *m_getit; TDEListViewItem *m_getit;
KListViewItem *m_sendit; TDEListViewItem *m_sendit;
KListViewItem *m_chatit; TDEListViewItem *m_chatit;
dccNew *dccNewDialog; dccNew *dccNewDialog;
}; };

@ -25,7 +25,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>Who</string> <string>Who</string>

@ -16,7 +16,7 @@ extern DisplayMgr *displayMgr;
#define DTL_WINDOW_ID 10 #define DTL_WINDOW_ID 10
dccTopLevel::dccTopLevel(TQWidget *parent, const char *name) dccTopLevel::dccTopLevel(TQWidget *parent, const char *name)
: KMainWindow(parent, name, TQt::WDestructiveClose) : TDEMainWindow(parent, name, TQt::WDestructiveClose)
{ {
m_mgr = new dccManager(this, TQCString(TQT_TQOBJECT(this)->name()) + "_dccManager"); m_mgr = new dccManager(this, TQCString(TQT_TQOBJECT(this)->name()) + "_dccManager");
// m_mgr->show(); // m_mgr->show();
@ -25,7 +25,7 @@ dccTopLevel::dccTopLevel(TQWidget *parent, const char *name)
connect(m_mgr, TQT_SIGNAL(changed(bool, TQString)), this, TQT_SIGNAL(changed(bool, TQString))); connect(m_mgr, TQT_SIGNAL(changed(bool, TQString)), this, TQT_SIGNAL(changed(bool, TQString)));
TQPopupMenu *win = new TQPopupMenu(this, TQCString(TQT_TQOBJECT(this)->name()) + "_popup_window"); TQPopupMenu *win = new TQPopupMenu(this, TQCString(TQT_TQOBJECT(this)->name()) + "_popup_window");
KAction *act = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() ); TDEAction *act = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection() );
act->plug(win); act->plug(win);
menuBar()->insertItem(i18n("&File"), win, DTL_WINDOW_ID, -1); menuBar()->insertItem(i18n("&File"), win, DTL_WINDOW_ID, -1);

@ -7,7 +7,7 @@
class dccManager; class dccManager;
class dccTopLevel : public KMainWindow class dccTopLevel : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT

@ -38,8 +38,8 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show )
KSircTopLevel *t = static_cast<KSircTopLevel *>(w); KSircTopLevel *t = static_cast<KSircTopLevel *>(w);
connect(m_topLevel->tabWidget(), TQT_SIGNAL(currentChanged(TQWidget *)), t, TQT_SLOT(focusChange(TQWidget *))); connect(m_topLevel->tabWidget(), TQT_SIGNAL(currentChanged(TQWidget *)), t, TQT_SLOT(focusChange(TQWidget *)));
} }
if(w->inherits("KMainWindow")){ if(w->inherits("TDEMainWindow")){
KMainWindow *t = static_cast<KMainWindow *>(w); TDEMainWindow *t = static_cast<TDEMainWindow *>(w);
TQMenuBar *cmenu = t->menuBar(); TQMenuBar *cmenu = t->menuBar();
if(cmenu){ if(cmenu){
@ -60,11 +60,11 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show )
TQPopupMenu *sm = new TQPopupMenu(t, "settings" ); TQPopupMenu *sm = new TQPopupMenu(t, "settings" );
KToggleAction *showmenu = KStdAction::showMenubar( 0, 0, t->actionCollection() ); TDEToggleAction *showmenu = KStdAction::showMenubar( 0, 0, t->actionCollection() );
showmenu->plug( sm ); showmenu->plug( sm );
connect( showmenu, TQT_SIGNAL(toggled(bool)), cmenu, TQT_SLOT(setShown(bool)) ); connect( showmenu, TQT_SIGNAL(toggled(bool)), cmenu, TQT_SLOT(setShown(bool)) );
KSelectAction *selectTabbar = new KSelectAction(i18n("&Tab Bar"), 0, this, "tabbar" ); TDESelectAction *selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this, "tabbar" );
TQStringList tabbaritems; TQStringList tabbaritems;
tabbaritems << i18n("&Top") << i18n("&Bottom"); tabbaritems << i18n("&Top") << i18n("&Bottom");
selectTabbar->setItems(tabbaritems); selectTabbar->setItems(tabbaritems);
@ -72,7 +72,7 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show )
selectTabbar->plug( sm ); selectTabbar->plug( sm );
connect( selectTabbar, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setTabPosition(int)) ); connect( selectTabbar, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setTabPosition(int)) );
KToggleAction *showfull = KStdAction::fullScreen( 0, 0, t->actionCollection(), t ); TDEToggleAction *showfull = KStdAction::fullScreen( 0, 0, t->actionCollection(), t );
showfull->plug( sm ); showfull->plug( sm );
connect( showfull, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setFullScreen(bool)) ); connect( showfull, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setFullScreen(bool)) );
@ -185,7 +185,7 @@ void DisplayMgrMDI::reparentReq()
kdDebug(5008) << "Kapp says no widget has focus!" << endl; kdDebug(5008) << "Kapp says no widget has focus!" << endl;
o = TQT_TQWIDGET(kapp->activeWindow()); o = TQT_TQWIDGET(kapp->activeWindow());
if(o->inherits("KMainWindow") == false) if(o->inherits("TDEMainWindow") == false)
return; return;
s = o; s = o;
@ -199,7 +199,7 @@ void DisplayMgrMDI::reparentReq()
while(s->parentWidget()){ while(s->parentWidget()){
kdDebug(5008) << "Got a: " << s->className() << endl; kdDebug(5008) << "Got a: " << s->className() << endl;
s = s->parentWidget(); s = s->parentWidget();
if(s->inherits("KMainWindow")) if(s->inherits("TDEMainWindow"))
break; break;
} }
@ -208,7 +208,7 @@ void DisplayMgrMDI::reparentReq()
// TQWidget *s = m_topLevel->tabWidget()->currentPage(); can't do this since you can never reattach // TQWidget *s = m_topLevel->tabWidget()->currentPage(); can't do this since you can never reattach
if(s){ if(s){
KMainWindow *kst = static_cast<KMainWindow *>(s); TDEMainWindow *kst = static_cast<TDEMainWindow *>(s);
kdDebug(5008) << "Top is: " << kst->name("none give") <<endl; kdDebug(5008) << "Top is: " << kst->name("none give") <<endl;
TQMenuData *tmenu = kst->menuBar(); TQMenuData *tmenu = kst->menuBar();
@ -238,7 +238,7 @@ MDITopLevel *DisplayMgrMDI::topLevel()
m_topLevel = new MDITopLevel(0x0, "MDITopLevel"); m_topLevel = new MDITopLevel(0x0, "MDITopLevel");
m_topLevel->show(); m_topLevel->show();
KAccel *a = new KAccel( m_topLevel ); TDEAccel *a = new TDEAccel( m_topLevel );
a->insert( "cycle left", i18n("Cycle left"), TQString(), ALT+Key_Left, ALT+Key_Left, this, TQT_SLOT(slotCycleTabsLeft()) ); a->insert( "cycle left", i18n("Cycle left"), TQString(), ALT+Key_Left, ALT+Key_Left, this, TQT_SLOT(slotCycleTabsLeft()) );
a->insert( "cycle right", i18n("Cycle right"), TQString(), ALT+Key_Right, ALT+Key_Right, this, TQT_SLOT(slotCycleTabsRight()) ); a->insert( "cycle right", i18n("Cycle right"), TQString(), ALT+Key_Right, ALT+Key_Right, this, TQT_SLOT(slotCycleTabsRight()) );
} }

@ -59,7 +59,7 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren
{ {
m_nicks.setAutoDelete(true); m_nicks.setAutoDelete(true);
KPopupMenu *pop = contextMenu(); TDEPopupMenu *pop = contextMenu();
pop->setName("dockServerController_menu_pop"); pop->setName("dockServerController_menu_pop");
#ifndef NDEBUG #ifndef NDEBUG
@ -116,7 +116,7 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren
ALT+CTRL+Key_Down, KKey::QtWIN+CTRL+Key_Down, TQT_TQOBJECT(this), ALT+CTRL+Key_Down, KKey::QtWIN+CTRL+Key_Down, TQT_TQOBJECT(this),
TQT_SLOT(blinkClear())); TQT_SLOT(blinkClear()));
// mainPop = new KPopupMenu(this, "dockServerController_main_pop"); // mainPop = new TDEPopupMenu(this, "dockServerController_main_pop");
// mainPop->setTitle(i18n("KSirc Dock Menu")); // mainPop->setTitle(i18n("KSirc Dock Menu"));
} }
@ -160,7 +160,7 @@ void dockServerController::createMainPopup()
if(mainPop) if(mainPop)
delete mainPop; delete mainPop;
mainPop = new KPopupMenu(this, "dockservercontrller_main_pop"); mainPop = new TDEPopupMenu(this, "dockservercontrller_main_pop");
connect(mainPop, TQT_SIGNAL(activated(int)), connect(mainPop, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(mainActivated(int))); this, TQT_SLOT(mainActivated(int)));
connect(mainPop, TQT_SIGNAL(aboutToShow()), connect(mainPop, TQT_SIGNAL(aboutToShow()),
@ -171,7 +171,7 @@ void dockServerController::createMainPopup()
TQDictIterator<dscNickInfo> it( m_nicks ); TQDictIterator<dscNickInfo> it( m_nicks );
for( ; it.current(); ++it){ for( ; it.current(); ++it){
KPopupMenu *sub = new KPopupMenu(mainPop); TDEPopupMenu *sub = new TDEPopupMenu(mainPop);
if(it.current()->status() == dscNickInfo::isOnline){ if(it.current()->status() == dscNickInfo::isOnline){
sub->insertItem(i18n("Came Online: ") + it.current()->online().toString("hh:mm")); sub->insertItem(i18n("Came Online: ") + it.current()->online().toString("hh:mm"));
if( ! it.current()->offline().isNull() ){ if( ! it.current()->offline().isNull() ){

@ -13,7 +13,7 @@ class TQPopupMenu;
class TQWidget; class TQWidget;
class servercontroller; class servercontroller;
class TQMouseEvent; class TQMouseEvent;
class KPopupMenu; class TDEPopupMenu;
class TQTimer; class TQTimer;
class dscNickInfo class dscNickInfo
@ -89,7 +89,7 @@ private:
void raiseWindow(TQString server, TQString name); void raiseWindow(TQString server, TQString name);
TQDict<dscNickInfo> m_nicks; TQDict<dscNickInfo> m_nicks;
servercontroller *m_sc; servercontroller *m_sc;
KPopupMenu *mainPop; TDEPopupMenu *mainPop;
TQString m_last_nick; TQString m_last_nick;
TQString m_last_server; TQString m_last_server;

@ -98,7 +98,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char ** argv )
servercontroller *sc = new servercontroller(0, "servercontroller"); servercontroller *sc = new servercontroller(0, "servercontroller");
app.setMainWidget(sc); app.setMainWidget(sc);
if (KMainWindow::canBeRestored(1)) if (TDEMainWindow::canBeRestored(1))
{ {
sc->restore(1, false ); sc->restore(1, false );
} }

@ -282,7 +282,7 @@ void KSircView::anchorClicked(const TQMouseEvent *ev, const TQString &url)
static const int copyLinkLocationID = 1; static const int copyLinkLocationID = 1;
// Adding a nice contextmenu // Adding a nice contextmenu
KPopupMenu* menu = new KPopupMenu( this ); TDEPopupMenu* menu = new TDEPopupMenu( this );
menu->insertTitle( i18n( "URL" ) ); menu->insertTitle( i18n( "URL" ) );
menu->insertItem( i18n("Open URL"), openURLID ); menu->insertItem( i18n("Open URL"), openURLID );
menu->insertItem( i18n("Copy Link Address"), copyLinkLocationID ); menu->insertItem( i18n("Copy Link Address"), copyLinkLocationID );

@ -30,7 +30,7 @@ void KSTabWidget::mousePressEvent(TQMouseEvent *e)
} }
MDITopLevel::MDITopLevel(TQWidget *parent, const char *name) MDITopLevel::MDITopLevel(TQWidget *parent, const char *name)
: KMainWindow(parent, name) : TDEMainWindow(parent, name)
{ {
m_closing = false; m_closing = false;
@ -53,7 +53,7 @@ MDITopLevel::MDITopLevel(TQWidget *parent, const char *name)
m_dirtyIcon = UserIcon( "star" ); m_dirtyIcon = UserIcon( "star" );
m_addressedIcon = UserIcon( "info" ); m_addressedIcon = UserIcon( "info" );
m_pop = new KPopupMenu(m_tab, ""); m_pop = new TDEPopupMenu(m_tab, "");
m_pop->insertItem( SmallIcon("fileclose"), i18n("Close"), this, TQT_SLOT( slotCloseLastWid() )); m_pop->insertItem( SmallIcon("fileclose"), i18n("Close"), this, TQT_SLOT( slotCloseLastWid() ));
} }
@ -161,7 +161,7 @@ void MDITopLevel::closeEvent( TQCloseEvent *ev )
delete (TQWidget *)w; delete (TQWidget *)w;
} }
KMainWindow::closeEvent( ev ); TDEMainWindow::closeEvent( ev );
m_closing = false; m_closing = false;
} }
@ -207,7 +207,7 @@ void MDITopLevel::slotMarkPageDirty( bool addressed )
{ {
// This is called when a line appeared in this channel. // This is called when a line appeared in this channel.
// addressed is true if it was addressed to the user // addressed is true if it was addressed to the user
KMainWindow *window = dynamic_cast<KMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) ); TDEMainWindow *window = dynamic_cast<TDEMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) );
if ( !window ) if ( !window )
return; return;
@ -225,7 +225,7 @@ void MDITopLevel::slotMarkPageDirty( bool addressed )
void MDITopLevel::slotChangeChannelName( const TQString &, const TQString &channelName ) void MDITopLevel::slotChangeChannelName( const TQString &, const TQString &channelName )
{ {
KMainWindow *window = dynamic_cast<KMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) ); TDEMainWindow *window = dynamic_cast<TDEMainWindow *>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME *>( sender() )) );
if ( !window ) if ( !window )
return; return;

@ -25,9 +25,9 @@ signals:
}; };
class TQLabel; class TQLabel;
class KPopupMenu; class TDEPopupMenu;
class MDITopLevel : public KMainWindow class MDITopLevel : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -65,7 +65,7 @@ private slots:
private: private:
KSTabWidget *m_tab; KSTabWidget *m_tab;
KPopupMenu *m_pop; TDEPopupMenu *m_pop;
TQWidget *m_last_pop_wid; TQWidget *m_last_pop_wid;
TQPtrList<TQWidget> m_tabWidgets; TQPtrList<TQWidget> m_tabWidgets;
TQPtrList<TQWidget> m_addressed; TQPtrList<TQWidget> m_addressed;

@ -117,7 +117,7 @@ DisplayMgr *displayMgr;
servercontroller *servercontroller::s_self = 0; servercontroller *servercontroller::s_self = 0;
servercontroller::servercontroller( TQWidget*, const char* name ) servercontroller::servercontroller( TQWidget*, const char* name )
: KMainWindow( 0, name ) : TDEMainWindow( 0, name )
{ {
we_are_exiting = false; we_are_exiting = false;
m_notificationCount = 0; m_notificationCount = 0;
@ -625,7 +625,7 @@ void servercontroller::readGlobalProperties(TDEConfig *ksc)
// ksc == K Session Config // ksc == K Session Config
// KMainWindow silently disables our menubar, when we quit in a docked // TDEMainWindow silently disables our menubar, when we quit in a docked
// state, so we have to force showing it here. // state, so we have to force showing it here.
menuBar()->show(); menuBar()->show();
@ -754,7 +754,7 @@ void servercontroller::closeEvent( TQCloseEvent *e )
{ {
we_are_exiting = true; we_are_exiting = true;
saveSessionConfig(); saveSessionConfig();
KMainWindow::closeEvent( e ); TDEMainWindow::closeEvent( e );
} }
void servercontroller::WindowSelected(TQListViewItem *item) void servercontroller::WindowSelected(TQListViewItem *item)
@ -953,7 +953,7 @@ scInside::scInside ( TQWidget * parent, const char * name, WFlags
asfont.setBold(TRUE); asfont.setBold(TRUE);
ASConn->setFont(asfont); ASConn->setFont(asfont);
ConnectionTree = new KListView(this, "connectiontree"); ConnectionTree = new TDEListView(this, "connectiontree");
ConnectionTree->addColumn(TQString()); ConnectionTree->addColumn(TQString());
ConnectionTree->setRootIsDecorated( true ); ConnectionTree->setRootIsDecorated( true );
ConnectionTree->setSorting( 0 ); ConnectionTree->setSorting( 0 );

@ -77,12 +77,12 @@ class scInside : TQFrame
virtual void resizeEvent ( TQResizeEvent * ); virtual void resizeEvent ( TQResizeEvent * );
private: private:
KListView *ConnectionTree; TDEListView *ConnectionTree;
TQLabel *ASConn; TQLabel *ASConn;
}; };
class servercontroller : public KMainWindow class servercontroller : public TDEMainWindow
{ {
Q_OBJECT Q_OBJECT
@ -216,7 +216,7 @@ private:
// La raison d'etre. We don't run ConnectionTree ourselves, but // La raison d'etre. We don't run ConnectionTree ourselves, but
// we get it from our helper class scInside. // we get it from our helper class scInside.
KListView *ConnectionTree; TDEListView *ConnectionTree;
scInside *sci; scInside *sci;

@ -107,7 +107,7 @@ KSircTopLevel::initColors()
} }
KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInfo, const char * name) KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInfo, const char * name)
: KMainWindow(0, name, 0/*no WDestructiveClose !*/), : TDEMainWindow(0, name, 0/*no WDestructiveClose !*/),
UnicodeMessageReceiver(_proc), UnicodeMessageReceiver(_proc),
lastBeep( TQTime::currentTime() ), lastBeep( TQTime::currentTime() ),
m_channelInfo(channelInfo) m_channelInfo(channelInfo)
@ -115,7 +115,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
{ {
// prevent us from being quitted when closing a channel-window. Only // prevent us from being quitted when closing a channel-window. Only
// closing the servercontroller shall quit. // closing the servercontroller shall quit.
// KMainWindow will deref() us in closeEvent // TDEMainWindow will deref() us in closeEvent
kapp->ref(); kapp->ref();
@ -155,7 +155,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
file = new TQPopupMenu(this, TQCString(TQT_TQOBJECT(this)->name()) + "_popup_file"); file = new TQPopupMenu(this, TQCString(TQT_TQOBJECT(this)->name()) + "_popup_file");
file->setCheckable(true); file->setCheckable(true);
KAction *act = KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection() ); TDEAction *act = KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection() );
act->plug( file ); act->plug( file );
file->insertItem(i18n("New Ser&ver..."), servercontroller::self(), TQT_SLOT(new_connection()), Key_F2); file->insertItem(i18n("New Ser&ver..."), servercontroller::self(), TQT_SLOT(new_connection()), Key_F2);
file->insertSeparator(); file->insertSeparator();
@ -172,7 +172,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf
beepitem = file->insertItem(i18n("N&otify on Change"), this, TQT_SLOT(toggleBeep()), CTRL + Key_P); beepitem = file->insertItem(i18n("N&otify on Change"), this, TQT_SLOT(toggleBeep()), CTRL + Key_P);
file->setItemChecked(beepitem, ksopts->chan(m_channelInfo).beepOnMsg); file->setItemChecked(beepitem, ksopts->chan(m_channelInfo).beepOnMsg);
encodingAction = new KSelectAction( i18n( "&Encoding" ), 0, TQT_TQOBJECT(this) ); encodingAction = new TDESelectAction( i18n( "&Encoding" ), 0, TQT_TQOBJECT(this) );
connect( encodingAction, TQT_SIGNAL( activated() ), this, TQT_SLOT( setEncoding() ) ); connect( encodingAction, TQT_SIGNAL( activated() ), this, TQT_SLOT( setEncoding() ) );
TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames();
@ -683,7 +683,7 @@ void KSircTopLevel::insertText()
void KSircTopLevel::show() void KSircTopLevel::show()
{ {
KMainWindow::show(); TDEMainWindow::show();
linee->setFocus(); linee->setFocus();
mainw->scrollToBottom(true); mainw->scrollToBottom(true);
} }
@ -1199,7 +1199,7 @@ void KSircTopLevel::newWindow()
void KSircTopLevel::closeEvent(TQCloseEvent *e) void KSircTopLevel::closeEvent(TQCloseEvent *e)
{ {
KMainWindow::closeEvent( e ); TDEMainWindow::closeEvent( e );
e->accept(); e->accept();
//Let's not part the channel till we are acutally delete. //Let's not part the channel till we are acutally delete.
@ -1654,7 +1654,7 @@ bool KSircTopLevel::event( TQEvent *e)
TQTimer::singleShot(750, this, TQT_SLOT(initColors())); TQTimer::singleShot(750, this, TQT_SLOT(initColors()));
initColors(); initColors();
} }
return KMainWindow::event(e); return TDEMainWindow::event(e);
} }
void KSircTopLevel::saveCurrLog() void KSircTopLevel::saveCurrLog()

@ -20,14 +20,14 @@ class UserControlMenu;
class ChannelParser; class ChannelParser;
class charSelector; class charSelector;
class LogFile; class LogFile;
class KSelectAction; class TDESelectAction;
class TQLabel; class TQLabel;
class TQVBox; class TQVBox;
class TQListBoxItem; class TQListBoxItem;
class TQPopupMenu; class TQPopupMenu;
class KSircTopLevel : public KMainWindow, class KSircTopLevel : public TDEMainWindow,
public UnicodeMessageReceiver public UnicodeMessageReceiver
{ {
Q_OBJECT Q_OBJECT
@ -521,7 +521,7 @@ private:
LogFile *logFile; LogFile *logFile;
KSelectAction *encodingAction; TDESelectAction *encodingAction;
static TQStringList cmd_menu; static TQStringList cmd_menu;

@ -66,7 +66,7 @@ TQStringList APs;
bool useAlternateStrengthCalc; bool useAlternateStrengthCalc;
KWiFiManagerApp::KWiFiManagerApp (TQWidget *, const char *name): KWiFiManagerApp::KWiFiManagerApp (TQWidget *, const char *name):
DCOPObject("dcop_interface"), KMainWindow (0, name), device(0), m_shuttingDown(false), m_iconSize( 22 ) DCOPObject("dcop_interface"), TDEMainWindow (0, name), device(0), m_shuttingDown(false), m_iconSize( 22 )
{ {
statistik = 0; statistik = 0;
disablePower = 0; disablePower = 0;
@ -304,43 +304,43 @@ KWiFiManagerApp::initActions ()
TDEConfig* config = kapp->config(); TDEConfig* config = kapp->config();
if (config->hasGroup("General")) if (config->hasGroup("General"))
config->setGroup("General"); config->setGroup("General");
fileDisableRadio = new KToggleAction (i18n ("&Disable Radio"), 0, TQT_TQOBJECT(this), fileDisableRadio = new TDEToggleAction (i18n ("&Disable Radio"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotDisableRadio ()), actionCollection (), "disable_radio"); TQT_SLOT (slotDisableRadio ()), actionCollection (), "disable_radio");
fileDisableRadio->setChecked( false ); fileDisableRadio->setChecked( false );
settingsUseAlternateCalc = settingsUseAlternateCalc =
new KToggleAction (i18n ("&Use Alternate Strength Calculation"), 0, TQT_TQOBJECT(this), new TDEToggleAction (i18n ("&Use Alternate Strength Calculation"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotToggleStrengthCalc ()), actionCollection (), "use_alt_calculation"); TQT_SLOT (slotToggleStrengthCalc ()), actionCollection (), "use_alt_calculation");
settingsUseAlternateCalc->setChecked( config->readBoolEntry("useAlternateStrengthCalculation") ); settingsUseAlternateCalc->setChecked( config->readBoolEntry("useAlternateStrengthCalculation") );
slotToggleStrengthCalc(); //set to value saved by TDEConfig slotToggleStrengthCalc(); //set to value saved by TDEConfig
settingsShowStatsNoise = settingsShowStatsNoise =
new KToggleAction (i18n ("Show &Noise Graph in Statistics Window"), 0, TQT_TQOBJECT(this), new TDEToggleAction (i18n ("Show &Noise Graph in Statistics Window"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotShowStatsNoise ()), actionCollection (), "show_stats_noise"); TQT_SLOT (slotShowStatsNoise ()), actionCollection (), "show_stats_noise");
settingsShowStatsNoise->setChecked( config->readBoolEntry("showStatsNoise") ); settingsShowStatsNoise->setChecked( config->readBoolEntry("showStatsNoise") );
slotShowStatsNoise(); //set to value saved by TDEConfig slotShowStatsNoise(); //set to value saved by TDEConfig
settingsShowStrengthNumber = new KToggleAction (i18n ("&Show Strength Number in System Tray"), 0, TQT_TQOBJECT(this), settingsShowStrengthNumber = new TDEToggleAction (i18n ("&Show Strength Number in System Tray"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray"); TQT_SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray");
settingsShowStrengthNumber->setChecked( config->readBoolEntry("showStrengthNumberInTray") ); settingsShowStrengthNumber->setChecked( config->readBoolEntry("showStrengthNumberInTray") );
slotToggleShowStrengthNumber (); //set to value saved by TDEConfig slotToggleShowStrengthNumber (); //set to value saved by TDEConfig
KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotFileQuit ()), actionCollection ()); KStdAction::quit (TQT_TQOBJECT(this), TQT_SLOT (slotFileQuit ()), actionCollection ());
new KAction (i18n ("Configuration &Editor..."), 0, TQT_TQOBJECT(this), new TDEAction (i18n ("Configuration &Editor..."), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotStartConfigEditor ()), actionCollection (), "configuration_editor"); TQT_SLOT (slotStartConfigEditor ()), actionCollection (), "configuration_editor");
new KAction (i18n ("Connection &Statistics"), 0, TQT_TQOBJECT(this), new TDEAction (i18n ("Connection &Statistics"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotStartStatViewer ()), actionCollection (), "connection_statistics"); TQT_SLOT (slotStartStatViewer ()), actionCollection (), "connection_statistics");
settingsAcousticScanning = new KToggleAction (i18n ("&Acoustic Scanning"), 0, TQT_TQOBJECT(this), settingsAcousticScanning = new TDEToggleAction (i18n ("&Acoustic Scanning"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotToggleTric ()), TQT_SLOT (slotToggleTric ()),
actionCollection (), "acoustic_scanning"); actionCollection (), "acoustic_scanning");
settingsAcousticScanning->setChecked( config->readBoolEntry("acousticScanning") ); settingsAcousticScanning->setChecked( config->readBoolEntry("acousticScanning") );
#ifdef WITHOUT_ARTS #ifdef WITHOUT_ARTS
settingsAcousticScanning->setEnabled( false); settingsAcousticScanning->setEnabled( false);
#endif #endif
settingsStayInSystrayOnClose = new KToggleAction (i18n ("Stay in System &Tray on Close"), 0, TQT_TQOBJECT(this), settingsStayInSystrayOnClose = new TDEToggleAction (i18n ("Stay in System &Tray on Close"), 0, TQT_TQOBJECT(this),
TQT_SLOT (slotToggleStayInSystray()), TQT_SLOT (slotToggleStayInSystray()),
actionCollection (), "stay_in_systray_on_close"); actionCollection (), "stay_in_systray_on_close");
settingsStayInSystrayOnClose->setChecked( config->readBoolEntry("stayInSystrayOnClose") ); settingsStayInSystrayOnClose->setChecked( config->readBoolEntry("stayInSystrayOnClose") );

@ -32,7 +32,7 @@ class TQStringList;
// include files for KDE // include files for KDE
#include <kmainwindow.h> #include <kmainwindow.h>
class KSystemTray; class KSystemTray;
class KToggleAction; class TDEToggleAction;
class TDEProcess; class TDEProcess;
// application specific includes // application specific includes
@ -77,7 +77,7 @@ struct configuration_data
packetmode packet[5]; packetmode packet[5];
}; };
class KWiFiManagerApp:public KMainWindow, virtual public dcop_interface class KWiFiManagerApp:public TDEMainWindow, virtual public dcop_interface
{ {
Q_OBJECT Q_OBJECT
@ -122,12 +122,12 @@ private:
NetworkScanning* scanwidget; NetworkScanning* scanwidget;
TQWidget *view; TQWidget *view;
Statistics *statistik; Statistics *statistik;
KToggleAction *fileDisableRadio; TDEToggleAction *fileDisableRadio;
KToggleAction *settingsUseAlternateCalc; TDEToggleAction *settingsUseAlternateCalc;
KToggleAction *settingsStayInSystrayOnClose; TDEToggleAction *settingsStayInSystrayOnClose;
KToggleAction *settingsAcousticScanning; TDEToggleAction *settingsAcousticScanning;
KToggleAction *settingsShowStatsNoise; TDEToggleAction *settingsShowStatsNoise;
KToggleAction *settingsShowStrengthNumber; TDEToggleAction *settingsShowStrengthNumber;
KSystemTray *trayicon; KSystemTray *trayicon;
void init_whois_db (); void init_whois_db ();
TQTimer *tricorder_trigger, *counter; TQTimer *tricorder_trigger, *counter;

Loading…
Cancel
Save