Rename a number of classes to enhance compatibility with KDE4

pull/2/head
Timothy Pearson 12 years ago
parent c657df4df5
commit 0fec53a48e

@ -3332,7 +3332,7 @@ listed here, please let me know.
2001-04-28 Martin Junius <mj@m-j-s.net> 2001-04-28 Martin Junius <mj@m-j-s.net>
* kpilot/kpilot.cc * kpilot/kpilot.cc
(initMenu): use KToggleAction and setExclusiveGroup for view menu. (initMenu): use TDEToggleAction and setExclusiveGroup for view menu.
(addComponentPage): same here for the other components. (addComponentPage): same here for the other components.
(initMenu): setChecked for view_kpilot action. (initMenu): setChecked for view_kpilot action.
@ -3550,7 +3550,7 @@ indicate when the fix or change was committed.
* Removed some null-conduit comments from the KNotes conduit. [26-2] * Removed some null-conduit comments from the KNotes conduit. [26-2]
* Removed some #include <getopt.h> for Solaris. Cleaned up other * Removed some #include <getopt.h> for Solaris. Cleaned up other
includes as well, just a little. [26-2] includes as well, just a little. [26-2]
* Started a change to KActions. [ 1-3] * Started a change to TDEActions. [ 1-3]
* Added a new FileInstaller for use in the daemon and the widget. [ 1-3] * Added a new FileInstaller for use in the daemon and the widget. [ 1-3]
It's currently only used by the widget. It's currently only used by the widget.
* Added listItems.{h,cc} in response to bug #21392; changed address * Added listItems.{h,cc} in response to bug #21392; changed address

@ -144,7 +144,7 @@ ConduitTip::~ConduitTip()
// implement our own check list items so we can detect if a given item was checked/unchecked. We need // implement our own check list items so we can detect if a given item was checked/unchecked. We need
// this to prevent the modified signal if one only wants to display a conduit's config widget. Currently, // this to prevent the modified signal if one only wants to display a conduit's config widget. Currently,
// KListView doesn't provide any signal that indicates that the checked state of a checklist item was changed. // TDEListView doesn't provide any signal that indicates that the checked state of a checklist item was changed.
class KPilotCheckListItem : public TQCheckListItem class KPilotCheckListItem : public TQCheckListItem
{ {
public: public:

@ -64,7 +64,7 @@ DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) :
fDeleteButton = new TQPushButton( i18n( "&Delete..." ), this, "pushButton3" ); fDeleteButton = new TQPushButton( i18n( "&Delete..." ), this, "pushButton3" );
g->addWidget( fDeleteButton, 2, 2 ); g->addWidget( fDeleteButton, 2, 2 );
fEventList = new KListView( this, "kListView1" ); fEventList = new TDEListView( this, "kListView1" );
fEventList->addColumn( i18n( "Time" ) ); fEventList->addColumn( i18n( "Time" ) );
fEventList->addColumn( i18n( "Al" ) ); fEventList->addColumn( i18n( "Al" ) );
fEventList->addColumn( i18n( "Rec" ) ); fEventList->addColumn( i18n( "Rec" ) );
@ -72,7 +72,7 @@ DatebookWidget::DatebookWidget(TQWidget *parent, const TQString &dbpath) :
// fEventList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, fEventList->sizePolicy().hasHeightForWidth() ) ); // fEventList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, fEventList->sizePolicy().hasHeightForWidth() ) );
fEventList->setAllColumnsShowFocus( TRUE ); fEventList->setAllColumnsShowFocus( TRUE );
fEventList->setShowSortIndicator( TRUE ); fEventList->setShowSortIndicator( TRUE );
fEventList->setResizeMode( KListView::/*LastColumn*/AllColumns ); fEventList->setResizeMode( TDEListView::/*LastColumn*/AllColumns );
fEventList->setFullWidth( TRUE ); fEventList->setFullWidth( TRUE );
// fEventList->setAlternateBackground( TQColor( 221, 146, 240 ) ); // fEventList->setAlternateBackground( TQColor( 221, 146, 240 ) );
g->addMultiCellWidget(fEventList, 0, 2, 3, 3); g->addMultiCellWidget(fEventList, 0, 2, 3, 3);

@ -34,7 +34,7 @@
class KDatePicker; class KDatePicker;
class TQPushButton; class TQPushButton;
class KListView; class TDEListView;
class DatebookWidget : public PilotComponent class DatebookWidget : public PilotComponent
{ {
@ -60,7 +60,7 @@ private:
TQPushButton*fAddButton; TQPushButton*fAddButton;
TQPushButton*fEditButton; TQPushButton*fEditButton;
TQPushButton*fDeleteButton; TQPushButton*fDeleteButton;
KListView*fEventList; TDEListView*fEventList;
}; };

@ -17,7 +17,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>Database</string> <string>Database</string>

@ -77,7 +77,7 @@ void GenericDBWidget::setupWidget()
{ {
TQGridLayout *g = new TQGridLayout( this, 1, 1, SPACING); TQGridLayout *g = new TQGridLayout( this, 1, 1, SPACING);
fDBList = new KListBox( this ); fDBList = new TDEListBox( this );
g->addWidget( fDBList, 0, 0 ); g->addWidget( fDBList, 0, 0 );
fDBType = new KComboBox( FALSE, this ); fDBType = new KComboBox( FALSE, this );
g->addWidget( fDBType, 1, 0 ); g->addWidget( fDBType, 1, 0 );
@ -96,13 +96,13 @@ void GenericDBWidget::setupWidget()
g1->addWidget( fAppInfoButton, 2, 0 ); g1->addWidget( fAppInfoButton, 2, 0 );
TQGridLayout *g2 = new TQGridLayout( 0, 1, 1); TQGridLayout *g2 = new TQGridLayout( 0, 1, 1);
fRecordList = new KListView( this ); fRecordList = new TDEListView( this );
g2->addMultiCellWidget( fRecordList, 0, 0, 0, 2 ); g2->addMultiCellWidget( fRecordList, 0, 0, 0, 2 );
fRecordList->addColumn(i18n("Rec. Nr.")); fRecordList->addColumn(i18n("Rec. Nr."));
fRecordList->addColumn(i18n("Length")); fRecordList->addColumn(i18n("Length"));
fRecordList->addColumn(i18n("Record ID")); fRecordList->addColumn(i18n("Record ID"));
fRecordList->setAllColumnsShowFocus(true); fRecordList->setAllColumnsShowFocus(true);
fRecordList->setResizeMode( KListView::LastColumn ); fRecordList->setResizeMode( TDEListView::LastColumn );
fRecordList->setFullWidth( TRUE ); fRecordList->setFullWidth( TRUE );
fRecordList->setItemsMovable( FALSE ); fRecordList->setItemsMovable( FALSE );

@ -32,13 +32,13 @@
#include "pilotComponent.h" #include "pilotComponent.h"
class KListBox; class TDEListBox;
class KTextEdit; class KTextEdit;
class KPushButton; class KPushButton;
class KComboBox; class KComboBox;
class PilotLocalDatabase; class PilotLocalDatabase;
class PilotRecord; class PilotRecord;
class KListView; class TDEListView;
class GenericDBWidget : public PilotComponent class GenericDBWidget : public PilotComponent
{ {
@ -71,11 +71,11 @@ protected slots:
void writeRecord(PilotRecord*r); void writeRecord(PilotRecord*r);
private: private:
KListBox*fDBList; TDEListBox*fDBList;
KComboBox*fDBType; KComboBox*fDBType;
KTextEdit*fDBInfo; KTextEdit*fDBInfo;
KPushButton*fDBInfoButton, *fAppInfoButton; KPushButton*fDBInfoButton, *fAppInfoButton;
KListView*fRecordList; TDEListView*fRecordList;
KPushButton*fAddRecord, *fEditRecord, *fDeleteRecord; KPushButton*fAddRecord, *fEditRecord, *fDeleteRecord;
enum eDBType { enum eDBType {

@ -97,7 +97,7 @@ public:
KPilotInstaller::KPilotInstaller() : KPilotInstaller::KPilotInstaller() :
DCOPObject("KPilotIface"), DCOPObject("KPilotIface"),
KMainWindow(0), TDEMainWindow(0),
fDaemonStub(new PilotDaemonDCOP_stub("kpilotDaemon", fDaemonStub(new PilotDaemonDCOP_stub("kpilotDaemon",
"KPilotDaemonIface")), "KPilotDaemonIface")),
fP(new KPilotPrivate), fP(new KPilotPrivate),
@ -508,11 +508,11 @@ void KPilotInstaller::initMenu()
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
KAction *a; TDEAction *a;
KActionMenu *syncPopup; TDEActionMenu *syncPopup;
syncPopup = new KActionMenu(i18n("HotSync"), CSL1("kpilot"), syncPopup = new TDEActionMenu(i18n("HotSync"), CSL1("kpilot"),
actionCollection(), "popup_hotsync"); actionCollection(), "popup_hotsync");
syncPopup->setToolTip(i18n("Select the kind of HotSync to perform next.")); syncPopup->setToolTip(i18n("Select the kind of HotSync to perform next."));
syncPopup->setWhatsThis(i18n("Select the kind of HotSync to perform next. " syncPopup->setWhatsThis(i18n("Select the kind of HotSync to perform next. "
@ -522,7 +522,7 @@ void KPilotInstaller::initMenu()
TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested())); TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested()));
// File actions, keep this list synced with kpilotui.rc and pilotDaemon.cc // File actions, keep this list synced with kpilotui.rc and pilotDaemon.cc
a = new KAction(i18n("&HotSync"), CSL1("hotsync"), 0, a = new TDEAction(i18n("&HotSync"), CSL1("hotsync"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotHotSyncRequested()),
actionCollection(), "file_hotsync"); actionCollection(), "file_hotsync");
a->setToolTip(i18n("Next HotSync will be normal HotSync.")); a->setToolTip(i18n("Next HotSync will be normal HotSync."));
@ -530,7 +530,7 @@ void KPilotInstaller::initMenu()
"should be a normal HotSync.")); "should be a normal HotSync."));
syncPopup->insert(a); syncPopup->insert(a);
a = new KAction(i18n("Full&Sync"), CSL1("fullsync"), 0, a = new TDEAction(i18n("Full&Sync"), CSL1("fullsync"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotFullSyncRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotFullSyncRequested()),
actionCollection(), "file_fullsync"); actionCollection(), "file_fullsync");
a->setToolTip(i18n("Next HotSync will be a FullSync.")); a->setToolTip(i18n("Next HotSync will be a FullSync."));
@ -538,7 +538,7 @@ void KPilotInstaller::initMenu()
"should be a FullSync (check data on both sides).")); "should be a FullSync (check data on both sides)."));
syncPopup->insert(a); syncPopup->insert(a);
a = new KAction(i18n("&Backup"), CSL1("backup"), 0, a = new TDEAction(i18n("&Backup"), CSL1("backup"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotBackupRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotBackupRequested()),
actionCollection(), "file_backup"); actionCollection(), "file_backup");
a->setToolTip(i18n("Next HotSync will be backup.")); a->setToolTip(i18n("Next HotSync will be backup."));
@ -546,7 +546,7 @@ void KPilotInstaller::initMenu()
"should back up the Handheld to the PC.")); "should back up the Handheld to the PC."));
syncPopup->insert(a); syncPopup->insert(a);
a = new KAction(i18n("&Restore"), CSL1("restore"), 0, a = new TDEAction(i18n("&Restore"), CSL1("restore"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotRestoreRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotRestoreRequested()),
actionCollection(), "file_restore"); actionCollection(), "file_restore");
a->setToolTip(i18n("Next HotSync will be restore.")); a->setToolTip(i18n("Next HotSync will be restore."));
@ -554,7 +554,7 @@ void KPilotInstaller::initMenu()
"should restore the Handheld from data on the PC.")); "should restore the Handheld from data on the PC."));
syncPopup->insert(a); syncPopup->insert(a);
a = new KAction(i18n("Copy Handheld to PC"), TQString(), 0, a = new TDEAction(i18n("Copy Handheld to PC"), TQString(), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotHHtoPCRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotHHtoPCRequested()),
actionCollection(), "file_HHtoPC"); actionCollection(), "file_HHtoPC");
a->setToolTip(i18n("Next HotSync will be backup.")); a->setToolTip(i18n("Next HotSync will be backup."));
@ -563,7 +563,7 @@ void KPilotInstaller::initMenu()
"overwriting entries on the PC.")); "overwriting entries on the PC."));
syncPopup->insert(a); syncPopup->insert(a);
a = new KAction(i18n("Copy PC to Handheld"), TQString(), 0, a = new TDEAction(i18n("Copy PC to Handheld"), TQString(), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotPCtoHHRequested()), TQT_TQOBJECT(this), TQT_SLOT(slotPCtoHHRequested()),
actionCollection(), "file_PCtoHH"); actionCollection(), "file_PCtoHH");
a->setToolTip(i18n("Next HotSync will copy PC to Handheld.")); a->setToolTip(i18n("Next HotSync will copy PC to Handheld."));
@ -574,7 +574,7 @@ void KPilotInstaller::initMenu()
#if 0 #if 0
a = new KAction(i18n("&List Only"),CSL1("listsync"),0, a = new TDEAction(i18n("&List Only"),CSL1("listsync"),0,
this,TQT_SLOT(slotTestSyncRequested()), this,TQT_SLOT(slotTestSyncRequested()),
actionCollection(), "file_list"); actionCollection(), "file_list");
a->setToolTip(i18n("Next HotSync will list databases.")); a->setToolTip(i18n("Next HotSync will list databases."));
@ -585,7 +585,7 @@ void KPilotInstaller::initMenu()
#endif #endif
a = new KAction(i18n("Rese&t Link"),CSL1("reload"), 0, a = new TDEAction(i18n("Rese&t Link"),CSL1("reload"), 0,
TQT_TQOBJECT(this), TQT_SLOT(slotResetLink()), TQT_TQOBJECT(this), TQT_SLOT(slotResetLink()),
actionCollection(),"file_reload"); actionCollection(),"file_reload");
a->setToolTip(i18n("Reset the device connection.")); a->setToolTip(i18n("Reset the device connection."));
@ -610,7 +610,7 @@ void KPilotInstaller::initMenu()
(void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), (void) KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()),
actionCollection()); actionCollection());
a = new KAction(i18n("Configuration &Wizard..."), CSL1("wizard"), 0, a = new TDEAction(i18n("Configuration &Wizard..."), CSL1("wizard"), 0,
TQT_TQOBJECT(this), TQT_SLOT(configureWizard()), TQT_TQOBJECT(this), TQT_SLOT(configureWizard()),
actionCollection(), "options_configure_wizard"); actionCollection(), "options_configure_wizard");
a->setWhatsThis(i18n("Configure KPilot using the configuration wizard.")); a->setWhatsThis(i18n("Configure KPilot using the configuration wizard."));
@ -683,8 +683,8 @@ void KPilotInstaller::addComponentPage(PilotComponent * p,
strlcat(actionname, componentname, actionnameLength); strlcat(actionname, componentname, actionnameLength);
} }
KToggleAction *pt = TDEToggleAction *pt =
new KToggleAction(name, /* "kpilot" -- component icon, */ 0, new TDEToggleAction(name, /* "kpilot" -- component icon, */ 0,
TQT_TQOBJECT(p), TQT_SLOT(slotShowComponent()), TQT_TQOBJECT(p), TQT_SLOT(slotShowComponent()),
actionCollection(), actionname); actionCollection(), actionname);

@ -34,7 +34,7 @@
class TQPopupMenu; class TQPopupMenu;
class TQComboBox; class TQComboBox;
class KAction; class TDEAction;
class KProgress; class KProgress;
class KJanusWidget; class KJanusWidget;
@ -47,7 +47,7 @@ class LogWidget;
class KPilotInstaller : public KMainWindow, public KPilotDCOP class KPilotInstaller : public TDEMainWindow, public KPilotDCOP
{ {
Q_OBJECT Q_OBJECT

@ -2,7 +2,7 @@
** **
** Copyright (C) 2000-2001 by Adriaan de Groot ** Copyright (C) 2000-2001 by Adriaan de Groot
** **
** This file defines a specialization of KListView that can ** This file defines a specialization of TDEListView that can
** be used to sort some fixed set of object into some fixed ** be used to sort some fixed set of object into some fixed
** set of categories. ** set of categories.
*/ */
@ -38,7 +38,7 @@
ListCategorizer::ListCategorizer(TQWidget * parent, ListCategorizer::ListCategorizer(TQWidget * parent,
const char *name) : const char *name) :
KListView(parent, name), TDEListView(parent, name),
fStartOpen(false) fStartOpen(false)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
@ -49,7 +49,7 @@ ListCategorizer::ListCategorizer(const TQStringList & i,
bool startOpen, bool startOpen,
TQWidget * parent, TQWidget * parent,
const char *name) : const char *name) :
KListView(parent, name), TDEListView(parent, name),
fStartOpen(startOpen) fStartOpen(startOpen)
{ {
FUNCTIONSETUP; FUNCTIONSETUP;
@ -139,7 +139,7 @@ void ListCategorizer::setupWidget()
if (!p || !p->parent()) if (!p || !p->parent())
return; return;
KListView::startDrag(); TDEListView::startDrag();
} }
TQStringList ListCategorizer::listSiblings(const TQListViewItem * p, int column) const TQStringList ListCategorizer::listSiblings(const TQListViewItem * p, int column) const

@ -8,7 +8,7 @@
*/ */
/** @file /** @file
** This is a specialization of KListView to allow the user to ** This is a specialization of TDEListView to allow the user to
** DnD a fixed set of objects into a fixed set of categories ** DnD a fixed set of objects into a fixed set of categories
** (categories set at construction time). @em Deprecated, do not use. ** (categories set at construction time). @em Deprecated, do not use.
*/ */
@ -38,13 +38,13 @@
class TQStringList; class TQStringList;
/** /**
* This Widget extends KListView for a particular purpose: * This Widget extends TDEListView for a particular purpose:
* sorting some items into some bins. This can be useful * sorting some items into some bins. This can be useful
* for putting items in an enabled / disabled state, or * for putting items in an enabled / disabled state, or
* into categories, or configuring toolbars (putting * into categories, or configuring toolbars (putting
* icons onto toolbars). * icons onto toolbars).
* *
* You can use all of the standard KListView signals and * You can use all of the standard TDEListView signals and
* slots. You may in particular want to change the names * slots. You may in particular want to change the names
* of the columns, for example: * of the columns, for example:
* @code * @code
@ -61,7 +61,7 @@ class TQStringList;
* @version $Id$ * @version $Id$
*/ */
class ListCategorizer : public KListView class ListCategorizer : public TDEListView
{ {
Q_OBJECT Q_OBJECT
@ -189,7 +189,7 @@ protected:
private: private:
/** /**
* Call several KListView functions to set up useful * Call several TDEListView functions to set up useful
* behavior for this particular class. * behavior for this particular class.
*/ */
void setupWidget(); void setupWidget();

@ -121,7 +121,7 @@ PilotDaemonTray::PilotDaemonTray(PilotDaemon * p) :
{ {
case Qt::RightButton: case Qt::RightButton:
{ {
KPopupMenu *menu = contextMenu(); TDEPopupMenu *menu = contextMenu();
contextMenuAboutToShow(menu); contextMenuAboutToShow(menu);
menu->popup(e->globalPos()); menu->popup(e->globalPos());
} }
@ -152,7 +152,7 @@ void PilotDaemonTray::setupWidget()
slotShowNotListening(); slotShowNotListening();
TQTimer::singleShot(2000,this,TQT_SLOT(slotShowNormal())); TQTimer::singleShot(2000,this,TQT_SLOT(slotShowNormal()));
KPopupMenu *menu = contextMenu(); TDEPopupMenu *menu = contextMenu();
menuKPilotItem = menu->insertItem(i18n("Start &KPilot"), daemon, menuKPilotItem = menu->insertItem(i18n("Start &KPilot"), daemon,
TQT_SLOT(slotRunKPilot())); TQT_SLOT(slotRunKPilot()));
@ -160,7 +160,7 @@ void PilotDaemonTray::setupWidget()
daemon, TQT_SLOT(slotRunConfig())); daemon, TQT_SLOT(slotRunConfig()));
menu->insertSeparator(); menu->insertSeparator();
fSyncTypeMenu = new KPopupMenu(menu,"sync_type_menu"); fSyncTypeMenu = new TDEPopupMenu(menu,"sync_type_menu");
TQString once = i18n("Appended to names of sync types to indicate the sync will happen just one time"," (once)"); TQString once = i18n("Appended to names of sync types to indicate the sync will happen just one time"," (once)");
#define MI(a) fSyncTypeMenu->insertItem( \ #define MI(a) fSyncTypeMenu->insertItem( \
SyncAction::SyncMode::name(SyncAction::SyncMode::a) + once, \ SyncAction::SyncMode::name(SyncAction::SyncMode::a) + once, \

@ -224,7 +224,7 @@ void TodoWidget::setupWidget()
fListBox = new TodoListView(this); fListBox = new TodoListView(this);
fListBox->addColumn( i18n( "To-do Item" ) ); fListBox->addColumn( i18n( "To-do Item" ) );
fListBox->setAllColumnsShowFocus( TRUE ); fListBox->setAllColumnsShowFocus( TRUE );
fListBox->setResizeMode( KListView::LastColumn ); fListBox->setResizeMode( TDEListView::LastColumn );
fListBox->setFullWidth( TRUE ); fListBox->setFullWidth( TRUE );
fListBox->setItemsMovable( FALSE ); fListBox->setItemsMovable( FALSE );
fListBox->setItemsRenameable (TRUE); fListBox->setItemsRenameable (TRUE);

@ -38,12 +38,12 @@ class TQTextView;
#include "pilotTodoEntry.h" #include "pilotTodoEntry.h"
#include "listItems.h" #include "listItems.h"
class TodoListView : public KListView class TodoListView : public TDEListView
{ {
Q_OBJECT Q_OBJECT
public: public:
TodoListView(TQWidget * parent = 0, const char * name = 0 ):KListView(parent, name){}; TodoListView(TQWidget * parent = 0, const char * name = 0 ):TDEListView(parent, name){};
~TodoListView() {}; ~TodoListView() {};
signals: signals:
void itemChecked(TQCheckListItem*item); void itemChecked(TQCheckListItem*item);

Loading…
Cancel
Save