diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:03 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:14:03 -0600 |
commit | 9c9412b30c54468adc9e506cc76c5d113fbf5056 (patch) | |
tree | 68a0c0d5bc770fc58596b8c5624cdf33d8625027 /kget | |
parent | 2e53bd0b77676f879fad7baeecea5879bf496a7d (diff) | |
download | tdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.tar.gz tdenetwork-9c9412b30c54468adc9e506cc76c5d113fbf5056.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'kget')
-rw-r--r-- | kget/dlgIndividual.cpp | 8 | ||||
-rw-r--r-- | kget/dlgIndividual.h | 4 | ||||
-rw-r--r-- | kget/dlgsystembase.ui | 2 | ||||
-rw-r--r-- | kget/dockindividual.cpp | 2 | ||||
-rw-r--r-- | kget/dockindividual.h | 4 | ||||
-rw-r--r-- | kget/docking.cpp | 4 | ||||
-rw-r--r-- | kget/docking.h | 8 | ||||
-rw-r--r-- | kget/droptarget.cpp | 4 | ||||
-rw-r--r-- | kget/droptarget.h | 12 | ||||
-rw-r--r-- | kget/kget_plug_in/kget_linkview.cpp | 12 | ||||
-rw-r--r-- | kget/kget_plug_in/kget_linkview.h | 4 | ||||
-rw-r--r-- | kget/kget_plug_in/kget_plug_in.cpp | 8 | ||||
-rw-r--r-- | kget/kget_plug_in/kget_plug_in.h | 2 | ||||
-rw-r--r-- | kget/kmainwidget.cpp | 198 | ||||
-rw-r--r-- | kget/kmainwidget.h | 42 | ||||
-rw-r--r-- | kget/main.cpp | 6 | ||||
-rw-r--r-- | kget/transfer.cpp | 20 | ||||
-rw-r--r-- | kget/transfer.h | 12 | ||||
-rw-r--r-- | kget/transferlist.cpp | 2 | ||||
-rw-r--r-- | kget/transferlist.h | 2 |
20 files changed, 178 insertions, 178 deletions
diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp index 5acd3b7a..9c70962b 100644 --- a/kget/dlgIndividual.cpp +++ b/kget/dlgIndividual.cpp @@ -63,7 +63,7 @@ DlgIndividual::DlgIndividual(Transfer * _item) // 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() ); @@ -101,9 +101,9 @@ DlgIndividual::DlgIndividual(Transfer * _item) topLayout->addWidget(speedLabel); // setup toolbar - KToolBar *toolBar = new KToolBar(this); - toolBar->setIconText(KToolBar::IconOnly); - toolBar->setBarPos(KToolBar::Bottom); + TDEToolBar *toolBar = new TDEToolBar(this); + toolBar->setIconText(TDEToolBar::IconOnly); + toolBar->setBarPos(TDEToolBar::Bottom); toolBar->setMovingEnabled(false); toolBar->setFlat(true); diff --git a/kget/dlgIndividual.h b/kget/dlgIndividual.h index 399e548b..7415997b 100644 --- a/kget/dlgIndividual.h +++ b/kget/dlgIndividual.h @@ -42,7 +42,7 @@ class TQTextEdit; class TQCheckBox; class KPushButton; class KProgress; -class KToggleAction; +class TDEToggleAction; class KDateTimeWidget; class DockIndividual; @@ -95,7 +95,7 @@ protected: KPushButton * pbAdvanced ; TQTabWidget * panelAdvanced; - KToggleAction * m_paDock; + TDEToggleAction * m_paDock; TQDateTime qdt; KDateTimeWidget *spins; diff --git a/kget/dlgsystembase.ui b/kget/dlgsystembase.ui index 03fa75fe..a64575f7 100644 --- a/kget/dlgsystembase.ui +++ b/kget/dlgsystembase.ui @@ -46,7 +46,7 @@ <string>Font:</string> </property> </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"> <cstring>le_font</cstring> </property> diff --git a/kget/dockindividual.cpp b/kget/dockindividual.cpp index e8f02645..76ed5753 100644 --- a/kget/dockindividual.cpp +++ b/kget/dockindividual.cpp @@ -93,7 +93,7 @@ void DockIndividual::setTip(const TQString & _tip) #include "dockindividual.moc" /** No descriptions */ -void DockIndividual::contextMenuAboutToShow ( KPopupMenu* menu ) +void DockIndividual::contextMenuAboutToShow ( TDEPopupMenu* menu ) { menu->removeItemAt (3); } diff --git a/kget/dockindividual.h b/kget/dockindividual.h index 4a9131b1..d1bdf7d1 100644 --- a/kget/dockindividual.h +++ b/kget/dockindividual.h @@ -31,7 +31,7 @@ #include <ksystemtray.h> #include "common.h" -class KPopupMenu; +class TDEPopupMenu; class DockIndividual : public KSystemTray { Q_OBJECT @@ -43,7 +43,7 @@ public: void setTip(const TQString &); void setValue(int value); /** No descriptions */ - virtual void contextMenuAboutToShow ( KPopupMenu* menu ); + virtual void contextMenuAboutToShow ( TDEPopupMenu* menu ); }; #endif diff --git a/kget/docking.cpp b/kget/docking.cpp index b13e04a5..e0e70f86 100644 --- a/kget/docking.cpp +++ b/kget/docking.cpp @@ -38,14 +38,14 @@ #include "docking.h" -DockWidget::DockWidget(KMainWidget * _parent):KSystemTray(_parent) +DockWidget::DockWidget(TDEMainWidget * _parent):KSystemTray(_parent) { parent = _parent; setPixmap( loadIcon( "kget_dock" )); // popup menu for right mouse button - KPopupMenu *popupMenu = contextMenu(); + TDEPopupMenu *popupMenu = contextMenu(); parent->action("paste_transfer")->plug(popupMenu); parent->action("drop_target")->plug(popupMenu); parent->action("konqueror_integration")->plug(popupMenu); diff --git a/kget/docking.h b/kget/docking.h index 8c00cb32..82bfad23 100644 --- a/kget/docking.h +++ b/kget/docking.h @@ -35,8 +35,8 @@ #include <ksystemtray.h> -class KPopupMenu; -class KMainWidget; +class TDEPopupMenu; +class TDEMainWidget; class DynamicTip : public TQToolTip { @@ -58,7 +58,7 @@ class DockWidget:public KSystemTray public: - DockWidget(KMainWidget * parent); + DockWidget(TDEMainWidget * parent); ~DockWidget(); /** No descriptions */ void updateToolTip( const TQString& ); @@ -75,7 +75,7 @@ protected: void dropEvent(TQDropEvent *); private: - KMainWidget *parent; + TDEMainWidget *parent; DynamicTip * dtip; }; diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp index c731938a..44bb1ef1 100644 --- a/kget/droptarget.cpp +++ b/kget/droptarget.cpp @@ -50,7 +50,7 @@ #include "settings.h" #include "droptarget.h" -DropTarget::DropTarget(KMainWindow * mainWin):TQWidget() +DropTarget::DropTarget(TDEMainWindow * mainWin):TQWidget() { int x = ksettings.dropPosition.x(); int y = ksettings.dropPosition.y(); @@ -85,7 +85,7 @@ DropTarget::DropTarget(KMainWindow * mainWin):TQWidget() setBackgroundPixmap( bgnd ); // popup menu for right mouse button - popupMenu = new KPopupMenu(); + popupMenu = new TDEPopupMenu(); popupMenu->insertTitle(kapp->caption()); popupMenu->setCheckable(true); diff --git a/kget/droptarget.h b/kget/droptarget.h index 0b5eddda..3c4ebe46 100644 --- a/kget/droptarget.h +++ b/kget/droptarget.h @@ -31,9 +31,9 @@ #include <tqbitmap.h> #include <tqdragobject.h> -class KPopupMenu; -class KMainWidget; -class KMainWindow; +class TDEPopupMenu; +class TDEMainWidget; +class TDEMainWindow; class DropTarget:public TQWidget { @@ -41,7 +41,7 @@ class DropTarget:public TQWidget public: - DropTarget(KMainWindow *); + DropTarget(TDEMainWindow *); ~DropTarget(); void updateStickyState(); @@ -64,8 +64,8 @@ private slots: void toggleMinimizeRestore(); private: - KPopupMenu * popupMenu; - KMainWidget *parent; + TDEPopupMenu * popupMenu; + TDEMainWidget *parent; bool b_sticky; diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp index fccb2130..8a5f69cc 100644 --- a/kget/kget_plug_in/kget_linkview.cpp +++ b/kget/kget_plug_in/kget_linkview.cpp @@ -38,16 +38,16 @@ LinkViewItem::LinkViewItem( TQListView *parent, const LinkItem *lnk ) /////////////////////////////////////////////////////////////////// KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) - : KMainWindow( parent, name ) + : TDEMainWindow( parent, name ) { setPlainCaption( i18n( "KGet" ) ); - KAction* actionDownload = new KAction( i18n("Download Selected Files"), + TDEAction* actionDownload = new TDEAction( i18n("Download Selected Files"), "kget", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT( slotStartLeech() ), actionCollection(), "startDownload" ); - KAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), + TDEAction* actionSelectAll = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), actionCollection() ); m_links.setAutoDelete( true ); @@ -59,7 +59,7 @@ KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) TQVBoxLayout *layout = new TQVBoxLayout( mainWidget ); setCentralWidget( mainWidget ); - m_view = new KListView( mainWidget, "listview" ); + m_view = new TDEListView( mainWidget, "listview" ); m_view->setSelectionMode( TQListView::Extended ); m_view->addColumn( i18n("File Name") ); m_view->addColumn( i18n("Description") ); @@ -67,14 +67,14 @@ KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) m_view->addColumn( i18n("Location (URL)") ); 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( m_view ); // setting a fixed (not floating) toolbar toolBar()->setMovingEnabled( false ); // setting Text next to Icons - toolBar()->setIconText( KToolBar::IconTextRight ); + toolBar()->setIconText( TDEToolBar::IconTextRight ); } KGetLinkView::~KGetLinkView() diff --git a/kget/kget_plug_in/kget_linkview.h b/kget/kget_plug_in/kget_linkview.h index 74af3765..ab39541f 100644 --- a/kget/kget_plug_in/kget_linkview.h +++ b/kget/kget_plug_in/kget_linkview.h @@ -24,7 +24,7 @@ public: }; -class KGetLinkView : public KMainWindow +class KGetLinkView : public TDEMainWindow { Q_OBJECT @@ -48,7 +48,7 @@ private: TQPtrList<LinkItem> m_links; - KListView *m_view; + TDEListView *m_view; }; diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp index c8e5ccf2..b40f50dd 100644 --- a/kget/kget_plug_in/kget_plug_in.cpp +++ b/kget/kget_plug_in/kget_plug_in.cpp @@ -49,19 +49,19 @@ KGet_plug_in::KGet_plug_in( TQObject* parent, const char* name ) { TQPixmap pix = TDEGlobal::iconLoader()->loadIcon("kget", KIcon::MainToolbar); - KActionMenu *menu = new KActionMenu( i18n("Download Manager"), pix, + TDEActionMenu *menu = new TDEActionMenu( i18n("Download Manager"), pix, actionCollection(), "kget_menu" ); menu->setDelayed( false ); connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( showPopup() )); - m_paToggleDropTarget=new KToggleAction(i18n("Show Drop Target"), - KShortcut(), + m_paToggleDropTarget=new TDEToggleAction(i18n("Show Drop Target"), + TDEShortcut(), this, TQT_SLOT(slotShowDrop()), actionCollection(), "show_drop" ); 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() ), actionCollection(), "show_links"); menu->insert( action ); diff --git a/kget/kget_plug_in/kget_plug_in.h b/kget/kget_plug_in/kget_plug_in.h index 25dd4c65..10a0d205 100644 --- a/kget/kget_plug_in/kget_plug_in.h +++ b/kget/kget_plug_in/kget_plug_in.h @@ -30,7 +30,7 @@ class KGet_plug_in : public KParts::Plugin public: KGet_plug_in( TQObject* parent = 0, const char* name = 0 ); - KToggleAction *m_paToggleDropTarget ; + TDEToggleAction *m_paToggleDropTarget ; DCOPClient* p_dcopServer; virtual ~KGet_plug_in(); diff --git a/kget/kmainwidget.cpp b/kget/kmainwidget.cpp index 382faa20..4e852c66 100644 --- a/kget/kmainwidget.cpp +++ b/kget/kmainwidget.cpp @@ -99,7 +99,7 @@ struct KURLPair KURL src; }; -KMainWidget *kmain = 0L; +TDEMainWidget *kmain = 0L; #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" ), - KMainWindow(0, "kget mainwindow",0), + TDEMainWindow(0, "kget mainwindow",0), prefDlg( 0 ), kdock( 0 ) { #ifdef _DEBUG @@ -273,7 +273,7 @@ KMainWidget::KMainWidget(bool bStartDocked) } -KMainWidget::~KMainWidget() +TDEMainWidget::~TDEMainWidget() { #ifdef _DEBUG 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 sDebugIn <<" message= "<< message << endl; @@ -309,7 +309,7 @@ void KMainWidget::log(const TQString & message, bool statusbar) } -void KMainWidget::slotSaveYourself() +void TDEMainWidget::slotSaveYourself() { #ifdef _DEBUG sDebugIn << endl; @@ -324,7 +324,7 @@ void KMainWidget::slotSaveYourself() } -void KMainWidget::setupGUI() +void TDEMainWidget::setupGUI() { #ifdef _DEBUG sDebugIn << endl; @@ -335,7 +335,7 @@ void KMainWidget::setupGUI() myTransferList->setSorting(-1); setListFont(); - KActionCollection *coll = actionCollection(); + TDEActionCollection *coll = actionCollection(); connect(myTransferList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateActions())); 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_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_paImportTransfers = new KAction(i18n("&Import Transfer List..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportTransfers()), coll, "import_transfers"); + m_paExportTransfers = new TDEAction(i18n("&Export Transfer List..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportTransfers()), coll, "export_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"); // transfer actions - m_paCopy = new KAction(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_paCopy = new TDEAction(i18n("&Copy URL to Clipboard"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCopyToClipboard()), coll, "copy_url"); + 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 sDebug << "Loading pics" << endl; #endif - m_paResume = new KAction(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_paDelete = new KAction(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_paResume = new TDEAction(i18n("&Resume"),"tool_resume", 0, TQT_TQOBJECT(this), TQT_SLOT(slotResumeCurrent()), coll, "resume"); + m_paPause = new TDEAction(i18n("&Pause"),"tool_pause", 0, TQT_TQOBJECT(this), TQT_SLOT(slotPauseCurrent()), coll, "pause"); + m_paDelete = new TDEAction(i18n("&Delete"),"editdelete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotDeleteCurrent()), coll, "delete"); + 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_paTimer = new KRadioAction(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_paQueue = new TDERadioAction(i18n("&Queue"),"tool_queue", 0, TQT_TQOBJECT(this), TQT_SLOT(slotQueueCurrent()), coll, "queue"); + m_paTimer = new TDERadioAction(i18n("&Timer"),"tool_timer", 0, TQT_TQOBJECT(this), TQT_SLOT(slotTimerCurrent()), coll, "timer"); + m_paDelay = new TDERadioAction(i18n("De&lay"),"tool_delay", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDelayCurrent()), coll, "delay"); m_paQueue->setExclusiveGroup("TransferMode"); m_paTimer->setExclusiveGroup("TransferMode"); m_paDelay->setExclusiveGroup("TransferMode"); // options actions - m_paUseAnimation = new KToggleAction(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_paUseLastDir = new KToggleAction(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_paAutoShutdown = new KToggleAction(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_paAutoPaste = new KToggleAction(i18n("Auto-Pas&te Mode"),"tool_clipboard", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoPaste()), coll, "auto_paste"); + m_paUseAnimation = new TDEToggleAction(i18n("Use &Animation"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAnimation()), coll, "toggle_animation"); + m_paExpertMode = new TDEToggleAction(i18n("&Expert Mode"),"tool_expert", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleExpertMode()), coll, "expert_mode"); + 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 TDEToggleAction(i18n("Auto-&Disconnect Mode"),"tool_disconnect", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoDisconnect()), coll, "auto_disconnect"); + m_paAutoShutdown = new TDEToggleAction(i18n("Auto-S&hutdown Mode"), "tool_shutdown", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleAutoShutdown()), coll, "auto_shutdown"); + m_paOfflineMode = new TDEToggleAction(i18n("&Offline Mode"),"tool_offline_mode_off", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleOfflineMode()), coll, "offline_mode"); + 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); @@ -397,10 +397,10 @@ void KMainWidget::setupGUI() // view actions 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_paDropTarget = new KAction(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_paDropTarget = new TDEAction(i18n("Show Drop &Target"),"tool_drop_target", 0, TQT_TQOBJECT(this), TQT_SLOT(slotToggleDropTarget()), coll, "drop_target"); + 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) { 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 sDebugIn << endl; @@ -502,7 +502,7 @@ void KMainWidget::setupWhatsThis() } -void KMainWidget::slotConfigureToolbars() +void TDEMainWidget::slotConfigureToolbars() { #ifdef _DEBUG sDebugIn << endl; @@ -519,7 +519,7 @@ void KMainWidget::slotConfigureToolbars() } -void KMainWidget::slotNewToolbarConfig() +void TDEMainWidget::slotNewToolbarConfig() { #ifdef _DEBUG sDebugIn << endl; @@ -534,7 +534,7 @@ void KMainWidget::slotNewToolbarConfig() } -void KMainWidget::slotImportTextFile() +void TDEMainWidget::slotImportTextFile() { #ifdef _DEBUG sDebugIn << endl; @@ -567,7 +567,7 @@ void KMainWidget::slotImportTextFile() } -void KMainWidget::slotImportTransfers() +void TDEMainWidget::slotImportTransfers() { #ifdef _DEBUG 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 sDebugIn << endl; @@ -601,7 +601,7 @@ void KMainWidget::readTransfers(bool ask_for_name) #endif } -void KMainWidget::readTransfersEx(const KURL & file) +void TDEMainWidget::readTransfersEx(const KURL & file) { #ifdef _DEBUG sDebugIn << endl; @@ -629,7 +629,7 @@ void KMainWidget::readTransfersEx(const KURL & file) } -void KMainWidget::slotExportTransfers() +void TDEMainWidget::slotExportTransfers() { #ifdef _DEBUG sDebugIn << endl; @@ -642,7 +642,7 @@ void KMainWidget::slotExportTransfers() #endif } -void KMainWidget::writeTransfers(bool ask_for_name) +void TDEMainWidget::writeTransfers(bool ask_for_name) { #ifdef _DEBUG sDebugIn << endl; @@ -680,7 +680,7 @@ void KMainWidget::writeTransfers(bool ask_for_name) } -void KMainWidget::writeLog() +void TDEMainWidget::writeLog() { #ifdef _DEBUG sDebugIn << "Writing log to file : " << logFileName.ascii() << endl; @@ -695,7 +695,7 @@ void KMainWidget::writeLog() } -void KMainWidget::slotQuit() +void TDEMainWidget::slotQuit() { #ifdef _DEBUG sDebugIn << endl; @@ -730,7 +730,7 @@ void KMainWidget::slotQuit() } -void KMainWidget::slotResumeCurrent() +void TDEMainWidget::slotResumeCurrent() { #ifdef _DEBUG sDebugIn << endl; @@ -750,7 +750,7 @@ void KMainWidget::slotResumeCurrent() } -void KMainWidget::slotPauseCurrent() +void TDEMainWidget::slotPauseCurrent() { #ifdef _DEBUG sDebugIn << endl; @@ -775,7 +775,7 @@ void KMainWidget::slotPauseCurrent() -void KMainWidget::slotRestartCurrent() +void TDEMainWidget::slotRestartCurrent() { #ifdef _DEBUG sDebugIn << endl; @@ -795,7 +795,7 @@ void KMainWidget::slotRestartCurrent() } -void KMainWidget::slotDeleteCurrent() +void TDEMainWidget::slotDeleteCurrent() { #ifdef _DEBUG sDebugIn << endl; @@ -867,7 +867,7 @@ void KMainWidget::slotDeleteCurrent() } -void KMainWidget::stopAll() +void TDEMainWidget::stopAll() { #ifdef _DEBUG sDebugIn << endl; @@ -890,7 +890,7 @@ void KMainWidget::stopAll() } -void KMainWidget::slotQueueCurrent() +void TDEMainWidget::slotQueueCurrent() { #ifdef _DEBUG sDebugIn << endl; @@ -913,7 +913,7 @@ void KMainWidget::slotQueueCurrent() } -void KMainWidget::slotTimerCurrent() +void TDEMainWidget::slotTimerCurrent() { #ifdef _DEBUG sDebugIn << endl; @@ -933,7 +933,7 @@ void KMainWidget::slotTimerCurrent() } -void KMainWidget::slotDelayCurrent() +void TDEMainWidget::slotDelayCurrent() { #ifdef _DEBUG sDebugIn << endl; @@ -951,7 +951,7 @@ void KMainWidget::slotDelayCurrent() } -void KMainWidget::slotOpenTransfer() +void TDEMainWidget::slotOpenTransfer() { #ifdef _DEBUG sDebugIn << endl; @@ -991,7 +991,7 @@ void KMainWidget::slotOpenTransfer() -void KMainWidget::slotCheckClipboard() +void TDEMainWidget::slotCheckClipboard() { #ifdef _DEBUG //sDebugIn << endl; @@ -1018,7 +1018,7 @@ void KMainWidget::slotCheckClipboard() } -void KMainWidget::slotPasteTransfer() +void TDEMainWidget::slotPasteTransfer() { #ifdef _DEBUG sDebugIn << endl; @@ -1054,7 +1054,7 @@ void KMainWidget::slotPasteTransfer() // destFile must be a filename, not a directory! And it will be deleted, if // 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 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; @@ -1327,7 +1327,7 @@ void KMainWidget::addTransfers( const KURL::List& src, const TQString& destDir ) checkQueue(); } -void KMainWidget::addTransfer(const TQString& src) +void TDEMainWidget::addTransfer(const TQString& src) { #ifdef _DEBUG sDebugIn << endl; @@ -1345,7 +1345,7 @@ void KMainWidget::addTransfer(const TQString& src) } -void KMainWidget::checkQueue() +void TDEMainWidget::checkQueue() { #ifdef _DEBUG sDebugIn << endl; @@ -1406,7 +1406,7 @@ void KMainWidget::checkQueue() } -void KMainWidget::slotAnimTimeout() +void TDEMainWidget::slotAnimTimeout() { #ifdef _DEBUG //sDebugIn << endl; @@ -1432,7 +1432,7 @@ void KMainWidget::slotAnimTimeout() } -void KMainWidget::slotTransferTimeout() +void TDEMainWidget::slotTransferTimeout() { #ifdef _DEBUG //sDebugIn << endl; @@ -1465,7 +1465,7 @@ void KMainWidget::slotTransferTimeout() } -void KMainWidget::slotAutosaveTimeout() +void TDEMainWidget::slotAutosaveTimeout() { #ifdef _DEBUG //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 //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 //sDebugIn << endl; @@ -1565,7 +1565,7 @@ void KMainWidget::dragEnterEvent(TQDragEnterEvent * event) } -void KMainWidget::dropEvent(TQDropEvent * event) +void TDEMainWidget::dropEvent(TQDropEvent * event) { #ifdef _DEBUG //sDebugIn << endl; @@ -1583,7 +1583,7 @@ void KMainWidget::dropEvent(TQDropEvent * event) } -void KMainWidget::slotCopyToClipboard() +void TDEMainWidget::slotCopyToClipboard() { #ifdef _DEBUG //sDebugIn << endl; @@ -1605,7 +1605,7 @@ void KMainWidget::slotCopyToClipboard() } -void KMainWidget::slotMoveToBegin() +void TDEMainWidget::slotMoveToBegin() { #ifdef _DEBUG sDebugIn << endl; @@ -1620,7 +1620,7 @@ void KMainWidget::slotMoveToBegin() } -void KMainWidget::slotMoveToEnd() +void TDEMainWidget::slotMoveToEnd() { #ifdef _DEBUG sDebugIn << endl; @@ -1634,7 +1634,7 @@ void KMainWidget::slotMoveToEnd() } -void KMainWidget::slotOpenIndividual() +void TDEMainWidget::slotOpenIndividual() { #ifdef _DEBUG sDebugIn << endl; @@ -1650,7 +1650,7 @@ void KMainWidget::slotOpenIndividual() #endif } -bool KMainWidget::queryClose() +bool TDEMainWidget::queryClose() { if( kapp->sessionSaving()) return true; @@ -1658,7 +1658,7 @@ bool KMainWidget::queryClose() return false; } -void KMainWidget::setAutoSave() +void TDEMainWidget::setAutoSave() { #ifdef _DEBUG sDebugIn << endl; @@ -1676,7 +1676,7 @@ void KMainWidget::setAutoSave() -void KMainWidget::setAutoDisconnect() +void TDEMainWidget::setAutoDisconnect() { #ifdef _DEBUG sDebugIn << endl; @@ -1690,7 +1690,7 @@ void KMainWidget::setAutoDisconnect() #endif } -void KMainWidget::slotPreferences() +void TDEMainWidget::slotPreferences() { #ifdef _DEBUG sDebugIn << endl; @@ -1706,12 +1706,12 @@ void KMainWidget::slotPreferences() #endif } -void KMainWidget::slotConfigureNotifications() +void TDEMainWidget::slotConfigureNotifications() { KNotifyDialog::configure(this); } -void KMainWidget::slotToggleLogWindow() +void TDEMainWidget::slotToggleLogWindow() { #ifdef _DEBUG sDebugIn << endl; @@ -1729,7 +1729,7 @@ void KMainWidget::slotToggleLogWindow() } -void KMainWidget::slotToggleAnimation() +void TDEMainWidget::slotToggleAnimation() { #ifdef _DEBUG sDebugIn << endl; @@ -1751,7 +1751,7 @@ void KMainWidget::slotToggleAnimation() #endif } -void KMainWidget::slotToggleOfflineMode() +void TDEMainWidget::slotToggleOfflineMode() { #ifdef _DEBUG sDebugIn "ksettings.b_offlineMode = " << ksettings.b_offlineMode << endl; @@ -1781,7 +1781,7 @@ void KMainWidget::slotToggleOfflineMode() } -void KMainWidget::slotToggleExpertMode() +void TDEMainWidget::slotToggleExpertMode() { #ifdef _DEBUG sDebugIn << endl; @@ -1802,7 +1802,7 @@ void KMainWidget::slotToggleExpertMode() } -void KMainWidget::slotToggleUseLastDir() +void TDEMainWidget::slotToggleUseLastDir() { #ifdef _DEBUG sDebugIn << endl; @@ -1822,7 +1822,7 @@ void KMainWidget::slotToggleUseLastDir() } -void KMainWidget::slotToggleAutoDisconnect() +void TDEMainWidget::slotToggleAutoDisconnect() { #ifdef _DEBUG sDebugIn << endl; @@ -1843,7 +1843,7 @@ void KMainWidget::slotToggleAutoDisconnect() } -void KMainWidget::slotToggleAutoShutdown() +void TDEMainWidget::slotToggleAutoShutdown() { #ifdef _DEBUG sDebugIn << endl; @@ -1866,7 +1866,7 @@ void KMainWidget::slotToggleAutoShutdown() } -void KMainWidget::slotToggleAutoPaste() +void TDEMainWidget::slotToggleAutoPaste() { #ifdef _DEBUG sDebugIn << endl; @@ -1889,7 +1889,7 @@ void KMainWidget::slotToggleAutoPaste() } -void KMainWidget::slotToggleDropTarget() +void TDEMainWidget::slotToggleDropTarget() { #ifdef _DEBUG sDebugIn << endl; @@ -1913,7 +1913,7 @@ void KMainWidget::slotToggleDropTarget() } -void KMainWidget::slotKonquerorIntegration() +void TDEMainWidget::slotKonquerorIntegration() { #ifdef _DEBUG sDebugIn << endl; @@ -1940,7 +1940,7 @@ void KMainWidget::slotKonquerorIntegration() } -void KMainWidget::slotPopupMenu(Transfer * item) +void TDEMainWidget::slotPopupMenu(Transfer * item) { #ifdef _DEBUG sDebugIn << endl; @@ -1963,7 +1963,7 @@ void KMainWidget::slotPopupMenu(Transfer * item) } -void KMainWidget::setListFont() +void TDEMainWidget::setListFont() { #ifdef _DEBUG sDebugIn << endl; @@ -1976,7 +1976,7 @@ void KMainWidget::setListFont() #endif } -void KMainWidget::slotUpdateActions() +void TDEMainWidget::slotUpdateActions() { #ifdef _DEBUG sDebugIn << endl; @@ -2137,7 +2137,7 @@ void KMainWidget::slotUpdateActions() } -void KMainWidget::updateStatusBar() +void TDEMainWidget::updateStatusBar() { #ifdef _DEBUG //sDebugIn << endl; @@ -2201,7 +2201,7 @@ void KMainWidget::updateStatusBar() } -void KMainWidget::onlineDisconnect() +void TDEMainWidget::onlineDisconnect() { #ifdef _DEBUG sDebugIn << endl; @@ -2229,7 +2229,7 @@ void KMainWidget::onlineDisconnect() } -void KMainWidget::slotCheckConnection() +void TDEMainWidget::slotCheckConnection() { #ifdef _DEBUG //sDebugIn << endl; @@ -2255,7 +2255,7 @@ void KMainWidget::slotCheckConnection() } -void KMainWidget::checkOnline() +void TDEMainWidget::checkOnline() { #ifdef _DEBUG //sDebugIn << endl; @@ -2351,7 +2351,7 @@ static int sockets_open() /** No descriptions */ -void KMainWidget::customEvent(TQCustomEvent * _e) +void TDEMainWidget::customEvent(TQCustomEvent * _e) { #ifdef _DEBUG //sDebugIn << endl; @@ -2433,7 +2433,7 @@ void KMainWidget::customEvent(TQCustomEvent * _e) #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 ) TQString destDir = ksettings.lastDirectory; @@ -2456,7 +2456,7 @@ TQString KMainWidget::getSaveDirectoryFor( const TQString& filename ) const return destDir; } -bool KMainWidget::sanityChecksSuccessful( const KURL& url ) +bool TDEMainWidget::sanityChecksSuccessful( const KURL& url ) { if (!url.isValid() || !KProtocolInfo::supportsReading( url ) ) { @@ -2508,12 +2508,12 @@ bool KMainWidget::sanityChecksSuccessful( const KURL& url ) return true; } -bool KMainWidget::isDropTargetVisible() const +bool TDEMainWidget::isDropTargetVisible() const { return m_showDropTarget; } -void KMainWidget::setDropTargetVisible( bool setVisible ) +void TDEMainWidget::setDropTargetVisible( bool setVisible ) { 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 ) slotToggleOfflineMode(); } -bool KMainWidget::isOfflineMode() const +bool TDEMainWidget::isOfflineMode() const { return ksettings.b_offlineMode; } -void KMainWidget::activateDropTarget() +void TDEMainWidget::activateDropTarget() { setDropTargetVisible( true ); } -void KMainWidget::slotShowMenubar() +void TDEMainWidget::slotShowMenubar() { if(m_menubarAction->isChecked()) menuBar()->show(); diff --git a/kget/kmainwidget.h b/kget/kmainwidget.h index efbcf318..cd2ce92d 100644 --- a/kget/kmainwidget.h +++ b/kget/kmainwidget.h @@ -35,9 +35,9 @@ #include "kget_iface.h" -class KAction; -//class KToggleAction; -class KRadioAction; +class TDEAction; +//class TDEToggleAction; +class TDERadioAction; class DockWidget; class DropTarget; @@ -49,7 +49,7 @@ class TransferList; class Settings; -class KMainWidget:public KMainWindow, virtual public KGetIface +class TDEMainWidget:public TDEMainWindow, virtual public KGetIface { Q_OBJECT @@ -59,8 +59,8 @@ public: enum StatusbarFields { ID_TOTAL_TRANSFERS = 1, ID_TOTAL_FILES, ID_TOTAL_SIZE, ID_TOTAL_TIME , ID_TOTAL_SPEED }; - KMainWidget(bool bShowMain = false); - ~KMainWidget(); + TDEMainWidget(bool bShowMain = false); + ~TDEMainWidget(); void addTransfer( const TQString& src ); void addTransferEx( const KURL& url, @@ -82,10 +82,10 @@ public: friend class Settings; // Actions - KToggleAction *m_paShowLog; - KToggleAction *m_menubarAction; - KAction *m_paPreferences; - KAction *m_paQuit; + TDEToggleAction *m_paShowLog; + TDEToggleAction *m_menubarAction; + TDEAction *m_paPreferences; + TDEAction *m_paQuit; bool b_viewLogWindow; void readTransfersEx(const KURL & url); @@ -210,24 +210,24 @@ private: int _sock; // Actions - KAction *m_paOpenTransfer, *m_paPasteTransfer, *m_paExportTransfers, *m_paImportTransfers; - KAction *m_paImportText; + TDEAction *m_paOpenTransfer, *m_paPasteTransfer, *m_paExportTransfers, *m_paImportTransfers; + TDEAction *m_paImportText; - KAction *m_paMoveToBegin, *m_paMoveToEnd, *m_paCopy, *m_paIndividual; - KAction *m_paResume, *m_paPause, *m_paDelete, *m_paRestart; - KRadioAction *m_paQueue, *m_paTimer, *m_paDelay; + TDEAction *m_paMoveToBegin, *m_paMoveToEnd, *m_paCopy, *m_paIndividual; + TDEAction *m_paResume, *m_paPause, *m_paDelete, *m_paRestart; + TDERadioAction *m_paQueue, *m_paTimer, *m_paDelay; - KToggleAction *m_paUseAnimation; - KToggleAction *m_paExpertMode, *m_paUseLastDir, *m_paOfflineMode; - KToggleAction *m_paAutoDisconnect, *m_paAutoShutdown, *m_paAutoPaste; + TDEToggleAction *m_paUseAnimation; + TDEToggleAction *m_paExpertMode, *m_paUseLastDir, *m_paOfflineMode; + TDEToggleAction *m_paAutoDisconnect, *m_paAutoShutdown, *m_paAutoPaste; - KAction *m_paDropTarget; - KAction *m_paKonquerorIntegration; + TDEAction *m_paDropTarget; + TDEAction *m_paKonquerorIntegration; bool m_showDropTarget; }; -extern KMainWidget *kmain; +extern TDEMainWidget *kmain; extern DropTarget *kdrop; #endif // _KMAINWIDGET_H_ diff --git a/kget/main.cpp b/kget/main.cpp index 27b8634b..ea6ab350 100644 --- a/kget/main.cpp +++ b/kget/main.cpp @@ -101,7 +101,7 @@ static void cleanup(void) class KGetApp : public KUniqueApplication { private: - KMainWidget *kmainwidget; + TDEMainWidget *kmainwidget; public: KGetApp() : KUniqueApplication() @@ -141,9 +141,9 @@ public: if (kmainwidget==0) { if(args->count()>0) - kmainwidget=new KMainWidget(true); + kmainwidget=new TDEMainWidget(true); else - kmainwidget=new KMainWidget(); + kmainwidget=new TDEMainWidget(); setMainWidget(kmain); } diff --git a/kget/transfer.cpp b/kget/transfer.cpp index 477183f3..e9631091 100644 --- a/kget/transfer.cpp +++ b/kget/transfer.cpp @@ -55,7 +55,7 @@ extern Settings ksettings; Transfer::Transfer(TransferList * _view, const KURL & _src, const KURL & _dest, const uint _id) : TQObject( _view ), - KListViewItem(_view), + TDEListViewItem(_view), dlgIndividual( 0 ) { 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) : TQObject( _view ), - KListViewItem(_view, (TQListViewItem *) after), + TDEListViewItem(_view, (TQListViewItem *) after), src(_src), dest(_dest), view(_view), 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 &))); // 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_paTimer->setExclusiveGroup("TransferMode"); @@ -144,7 +144,7 @@ Transfer::init(const uint _id) // 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 diff --git a/kget/transfer.h b/kget/transfer.h index f147f011..2673faf7 100644 --- a/kget/transfer.h +++ b/kget/transfer.h @@ -41,8 +41,8 @@ class TQTimer; class KSimpleConfig; -class KAction; -class KRadioAction; +class TDEAction; +class TDERadioAction; @@ -50,7 +50,7 @@ class DlgIndividual; class TransferList; -class Transfer:public TQObject, public KListViewItem +class Transfer:public TQObject, public TDEListViewItem { Q_OBJECT @@ -146,9 +146,9 @@ public: // actions - KAction *m_paResume, *m_paPause, *m_paDelete, *m_paRestart; - //KAction *m_paDock; - KRadioAction *m_paQueue, *m_paTimer, *m_paDelay; + TDEAction *m_paResume, *m_paPause, *m_paDelete, *m_paRestart; + //TDEAction *m_paDock; + TDERadioAction *m_paQueue, *m_paTimer, *m_paDelay; public: void slotExecPause(); diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index 768460d1..16d2f4d6 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -53,7 +53,7 @@ static int defaultColumnWidth[] = { TransferList::TransferList(TQWidget * parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { // enable selection of more than one item setSelectionMode( TQListView::Extended ); diff --git a/kget/transferlist.h b/kget/transferlist.h index 8b4772cf..3ffa22ac 100644 --- a/kget/transferlist.h +++ b/kget/transferlist.h @@ -54,7 +54,7 @@ public: }; -class TransferList:public KListView +class TransferList:public TDEListView { Q_OBJECT |