diff options
author | Michele Calgaro <[email protected]> | 2023-12-28 21:14:35 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2023-12-28 21:14:35 +0900 |
commit | 5474253d12e9cd6acaad98bbbf3df731f4eb2abb (patch) | |
tree | 6fa5e9025e666c9b9be471c684744e9084eb973f | |
parent | 2a9b7e7d4476b83c207ecfef75d1ca979794e098 (diff) | |
download | kasablanca-5474253d12e9cd6acaad98bbbf3df731f4eb2abb.tar.gz kasablanca-5474253d12e9cd6acaad98bbbf3df731f4eb2abb.zip |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r-- | src/bookmarkdialog.cpp | 22 | ||||
-rw-r--r-- | src/customconnectdialog.cpp | 2 | ||||
-rw-r--r-- | src/ftpsession.cpp | 52 | ||||
-rw-r--r-- | src/kasablanca.cpp | 108 | ||||
-rw-r--r-- | src/kbtaskview.cpp | 4 |
5 files changed, 94 insertions, 94 deletions
diff --git a/src/bookmarkdialog.cpp b/src/bookmarkdialog.cpp index 0422dd2..1be5006 100644 --- a/src/bookmarkdialog.cpp +++ b/src/bookmarkdialog.cpp @@ -59,17 +59,17 @@ BookmarkDialog::BookmarkDialog(TQWidget *parent, const char *name) for (list<KbSiteInfo>::iterator i = m_bookmarklist.begin(); i != end_bookmarks; i++) after = new KbBookmarkItem(mp_dialog->BookmarkListView, after, &(*i)); - connect(mp_dialog->NameEdit, SIGNAL(textChanged(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); - connect(mp_dialog->InfoEdit, SIGNAL(textChanged(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); - connect(mp_dialog->UserEdit, SIGNAL(textChanged(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); - connect(mp_dialog->PassEdit, SIGNAL(textChanged(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); - connect(mp_dialog->DefaultDirectoryEdit, SIGNAL(textChanged(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); - connect(mp_dialog->EncryptionComboBox, SIGNAL(activated(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); - connect(mp_dialog->ModeComboBox, SIGNAL(activated(const TQString&)), SLOT(SLOT_TextChanged(const TQString&))); - connect(mp_dialog->AlternativeFxpCheckBox, SIGNAL(clicked()), SLOT(SLOT_StateChanged())); - connect(mp_dialog->CorrectPasvCheckBox, SIGNAL(clicked()), SLOT(SLOT_StateChanged())); + connect(mp_dialog->NameEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->InfoEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->UserEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->PassEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->DefaultDirectoryEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->EncryptionComboBox, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->ModeComboBox, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(SLOT_TextChanged(const TQString&))); + connect(mp_dialog->AlternativeFxpCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(SLOT_StateChanged())); + connect(mp_dialog->CorrectPasvCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(SLOT_StateChanged())); - connect(mp_dialog->BookmarkListView, SIGNAL(selectionChanged()), SLOT(SLOT_SelectionChanged())); + connect(mp_dialog->BookmarkListView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(SLOT_SelectionChanged())); m_newitemselected = false; @@ -78,7 +78,7 @@ BookmarkDialog::BookmarkDialog(TQWidget *parent, const char *name) TQAction *deleteShortcut = new TQAction( TQPixmap(), "&Delete", Key_Delete, this, "delete" ); - connect( deleteShortcut, SIGNAL( activated() ) , this, SLOT( slotUser2() ) ); + connect( deleteShortcut, TQ_SIGNAL( activated() ) , this, TQ_SLOT( slotUser2() ) ); } BookmarkDialog::~BookmarkDialog() diff --git a/src/customconnectdialog.cpp b/src/customconnectdialog.cpp index 8fb2e3c..67896d0 100644 --- a/src/customconnectdialog.cpp +++ b/src/customconnectdialog.cpp @@ -33,7 +33,7 @@ CustomConnectDialog::CustomConnectDialog(TQWidget *parent, const char *name ) : mp_dialog = new KasablancaCustomConnectDialog(this); setMainWidget(mp_dialog); - connect(mp_dialog->AnonymousCheckBox, SIGNAL(toggled(bool)), SLOT(SLOT_AnonymousToggled(bool))); + connect(mp_dialog->AnonymousCheckBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(SLOT_AnonymousToggled(bool))); } CustomConnectDialog::~CustomConnectDialog() diff --git a/src/ftpsession.cpp b/src/ftpsession.cpp index 8de2e86..98b7f4c 100644 --- a/src/ftpsession.cpp +++ b/src/ftpsession.cpp @@ -73,29 +73,29 @@ FtpSession::FtpSession(TQObject *parent, const char *name) m_iconencrypted = TDEGlobal::iconLoader()->loadIconSet("encrypted",TDEIcon::Small).pixmap(TQIconSet::Small,TQIconSet::Normal); m_iconunencrypted = TDEGlobal::iconLoader()->loadIconSet("encrypted",TDEIcon::Small).pixmap(TQIconSet::Small,TQIconSet::Disabled); - connect(mp_eventhandler, SIGNAL(ftp_log(TQString, bool)), SLOT(SLOT_Log(TQString, bool))); - connect(mp_eventhandler, SIGNAL(ftp_connect(bool)), SLOT(SLOT_Connect(bool))); - connect(mp_eventhandler, SIGNAL(ftp_login(bool)), SLOT(SLOT_Login(bool))); - connect(mp_eventhandler, SIGNAL(ftp_xfered(off64_t, bool)), SLOT(SLOT_Xfered(off64_t, bool))); - connect(mp_eventhandler, SIGNAL(ftp_quit(bool)), SLOT(SLOT_Misc(bool))); - connect(mp_eventhandler, SIGNAL(ftp_chdir(bool)), SLOT(SLOT_Misc(bool))); - connect(mp_eventhandler, SIGNAL(ftp_raw(bool)), SLOT(SLOT_Misc(bool))); - connect(mp_eventhandler, SIGNAL(ftp_get(bool)), SLOT(SLOT_Misc(bool))); - connect(mp_eventhandler, SIGNAL(ftp_put(bool)), SLOT(SLOT_Misc(bool))); - connect(mp_eventhandler, SIGNAL(ftp_fxp(bool)), SLOT(SLOT_Misc(bool))); - connect(mp_eventhandler, SIGNAL(ftp_rm(bool)), SLOT(SLOT_Misc(bool))); - connect(mp_eventhandler, SIGNAL(ftp_authtls(bool)), SLOT(SLOT_AuthTls(bool))); - connect(mp_eventhandler, SIGNAL(ftp_misc(bool)), SLOT(SLOT_Misc(bool))); - connect(mp_eventhandler, SIGNAL(ftp_mkdir(bool)), SLOT(SLOT_Misc(bool))); - connect(mp_eventhandler, SIGNAL(ftp_rename(bool)), SLOT(SLOT_Misc(bool))); - connect(mp_eventhandler, SIGNAL(ftp_pwd(bool, TQString)), SLOT(SLOT_Pwd(bool, TQString))); - connect(mp_eventhandler, SIGNAL(ftp_dir(bool, list<KbFileInfo*>, list<KbFileInfo*>)), - SLOT(SLOT_Dir(bool, list<KbFileInfo*>, list<KbFileInfo*>))); - connect(mp_eventhandler, SIGNAL(ftp_encryptdata(bool)), SLOT(SLOT_EncryptData(bool))); - connect(mp_eventhandler, SIGNAL(ftp_finished()), SLOT(SLOT_Finish())); - connect(mp_eventhandler, SIGNAL(ftp_connectionlost()), SLOT(SLOT_ConnectionLost())); - connect(mp_eventhandler, SIGNAL(ftp_transfer(bool)), SLOT(SLOT_Transfer(bool))); - connect(mp_eventhandler, SIGNAL(ftp_scandir(bool, KbDirInfo*)), SLOT(SLOT_Scandir(bool, KbDirInfo*))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_log(TQString, bool)), TQ_SLOT(SLOT_Log(TQString, bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_connect(bool)), TQ_SLOT(SLOT_Connect(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_login(bool)), TQ_SLOT(SLOT_Login(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_xfered(off64_t, bool)), TQ_SLOT(SLOT_Xfered(off64_t, bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_quit(bool)), TQ_SLOT(SLOT_Misc(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_chdir(bool)), TQ_SLOT(SLOT_Misc(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_raw(bool)), TQ_SLOT(SLOT_Misc(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_get(bool)), TQ_SLOT(SLOT_Misc(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_put(bool)), TQ_SLOT(SLOT_Misc(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_fxp(bool)), TQ_SLOT(SLOT_Misc(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_rm(bool)), TQ_SLOT(SLOT_Misc(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_authtls(bool)), TQ_SLOT(SLOT_AuthTls(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_misc(bool)), TQ_SLOT(SLOT_Misc(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_mkdir(bool)), TQ_SLOT(SLOT_Misc(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_rename(bool)), TQ_SLOT(SLOT_Misc(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_pwd(bool, TQString)), TQ_SLOT(SLOT_Pwd(bool, TQString))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_dir(bool, list<KbFileInfo*>, list<KbFileInfo*>)), + TQ_SLOT(SLOT_Dir(bool, list<KbFileInfo*>, list<KbFileInfo*>))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_encryptdata(bool)), TQ_SLOT(SLOT_EncryptData(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_finished()), TQ_SLOT(SLOT_Finish())); + connect(mp_eventhandler, TQ_SIGNAL(ftp_connectionlost()), TQ_SLOT(SLOT_ConnectionLost())); + connect(mp_eventhandler, TQ_SIGNAL(ftp_transfer(bool)), TQ_SLOT(SLOT_Transfer(bool))); + connect(mp_eventhandler, TQ_SIGNAL(ftp_scandir(bool, KbDirInfo*)), TQ_SLOT(SLOT_Scandir(bool, KbDirInfo*))); } FtpSession::~FtpSession() @@ -105,7 +105,7 @@ FtpSession::~FtpSession() void FtpSession::SetCmdLine(KLineEdit* cmdline) { TDECompletion *comp = cmdline->completionObject(); - connect(cmdline, SIGNAL(returnPressed(const TQString&)), comp, SLOT(addItem(const TQString&))); + connect(cmdline, TQ_SIGNAL(returnPressed(const TQString&)), comp, TQ_SLOT(addItem(const TQString&))); cmdline->setCompletionMode(TDEGlobalSettings::CompletionAuto); mp_cmdline = cmdline; } @@ -113,7 +113,7 @@ void FtpSession::SetCmdLine(KLineEdit* cmdline) void FtpSession::SetCwdLine(KLineEdit* cwdline) { TDECompletion *comp = cwdline->completionObject(); - connect(cwdline, SIGNAL(returnPressed(const TQString&)), comp, SLOT(addItem(const TQString&))); + connect(cwdline, TQ_SIGNAL(returnPressed(const TQString&)), comp, TQ_SLOT(addItem(const TQString&))); cwdline->setCompletionMode(TDEGlobalSettings::CompletionAuto); mp_cwdline = cwdline; } @@ -380,7 +380,7 @@ void FtpSession::SLOT_CmdLine() TDEProcess* p = new TDEProcess(); p->setWorkingDirectory(m_localworkingdir.absPath()); *p << TQStringList::split(" ", mp_cmdline->text()); - connect(p, SIGNAL(processExited(TDEProcess*)), SLOT(SLOT_LocalProcessExited(TDEProcess*))); + connect(p, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(SLOT_LocalProcessExited(TDEProcess*))); if (p->start() == TRUE) mp_cmdline->setText(""); } } diff --git a/src/kasablanca.cpp b/src/kasablanca.cpp index 687c7f6..3cd29c7 100644 --- a/src/kasablanca.cpp +++ b/src/kasablanca.cpp @@ -98,9 +98,9 @@ Kasablanca::Kasablanca() : TDEMainWindow( 0, "Kasablanca" ), mp_view(new Kasabla //if (!InitBookmarks() != 1) KMessageBox::error(0, i18n("Could not open Kasablanca bookmark xml.")); - connect(mp_view->BrowserB, SIGNAL(selectionChanged()), SLOT(SLOT_SelectionChanged())); - connect(mp_view->BrowserA, SIGNAL(selectionChanged()), SLOT(SLOT_SelectionChanged())); - connect(mp_view->TaskView, SIGNAL(selectionChanged()), SLOT(SLOT_SelectionChanged())); + connect(mp_view->BrowserB, TQ_SIGNAL(selectionChanged()), TQ_SLOT(SLOT_SelectionChanged())); + connect(mp_view->BrowserA, TQ_SIGNAL(selectionChanged()), TQ_SLOT(SLOT_SelectionChanged())); + connect(mp_view->TaskView, TQ_SIGNAL(selectionChanged()), TQ_SLOT(SLOT_SelectionChanged())); mp_session_a->SetLogWindow(mp_view->LogWindowA); mp_session_a->SetBrowser(mp_view->BrowserA); @@ -115,11 +115,11 @@ Kasablanca::Kasablanca() : TDEMainWindow( 0, "Kasablanca" ), mp_view(new Kasabla mp_session_a->SetRclickMenu(&m_rclickmenu_a); mp_session_a->SetSessionList(mp_sessionlist); - connect(mp_view->RefreshButtonA, SIGNAL(clicked()), mp_session_a, SLOT(SLOT_RefreshButton())); - connect(mp_view->ConnectButtonA, SIGNAL(clicked()), mp_session_a, SLOT(SLOT_ConnectButton())); - connect(mp_view->TransferButtonA, SIGNAL(clicked()), mp_session_a, SLOT(SLOT_TransferButton())); - connect(mp_view->CwdLineA, SIGNAL(returnPressed()), mp_session_a, SLOT(SLOT_CwdLine())); - connect(mp_view->CommandLineA, SIGNAL(returnPressed()), mp_session_a, SLOT(SLOT_CmdLine())); + connect(mp_view->RefreshButtonA, TQ_SIGNAL(clicked()), mp_session_a, TQ_SLOT(SLOT_RefreshButton())); + connect(mp_view->ConnectButtonA, TQ_SIGNAL(clicked()), mp_session_a, TQ_SLOT(SLOT_ConnectButton())); + connect(mp_view->TransferButtonA, TQ_SIGNAL(clicked()), mp_session_a, TQ_SLOT(SLOT_TransferButton())); + connect(mp_view->CwdLineA, TQ_SIGNAL(returnPressed()), mp_session_a, TQ_SLOT(SLOT_CwdLine())); + connect(mp_view->CommandLineA, TQ_SIGNAL(returnPressed()), mp_session_a, TQ_SLOT(SLOT_CmdLine())); mp_session_b->SetLogWindow(mp_view->LogWindowB); mp_session_b->SetBrowser(mp_view->BrowserB); @@ -134,26 +134,26 @@ Kasablanca::Kasablanca() : TDEMainWindow( 0, "Kasablanca" ), mp_view(new Kasabla mp_session_b->SetRclickMenu(&m_rclickmenu_b); mp_session_b->SetSessionList(mp_sessionlist); - connect(mp_view->RefreshButtonB, SIGNAL(clicked()), mp_session_b, SLOT(SLOT_RefreshButton())); - connect(mp_view->ConnectButtonB, SIGNAL(clicked()), mp_session_b, SLOT(SLOT_ConnectButton())); - connect(mp_view->TransferButtonB, SIGNAL(clicked()), mp_session_b, SLOT(SLOT_TransferButton())); - connect(mp_view->CwdLineB, SIGNAL(returnPressed()), mp_session_b, SLOT(SLOT_CwdLine())); - connect(mp_view->CommandLineB, SIGNAL(returnPressed()), mp_session_b, SLOT(SLOT_CmdLine())); - connect(mp_session_a, SIGNAL(gui_update()), SLOT(SLOT_SelectionChanged())); - connect(mp_session_b, SIGNAL(gui_update()), SLOT(SLOT_SelectionChanged())); - connect(mp_session_a, SIGNAL(gui_queueitems(KbDirInfo*, FtpSession*, FtpSession*, bool)), - SLOT(SLOT_QueueItems(KbDirInfo*, FtpSession*, FtpSession*, bool))); - connect(mp_session_b, SIGNAL(gui_queueitems(KbDirInfo*, FtpSession*, FtpSession*, bool)), - SLOT(SLOT_QueueItems(KbDirInfo*, FtpSession*, FtpSession*, bool))); - connect(mp_session_a, SIGNAL(gui_succeedtransfer(TQListViewItem*)), SLOT(SLOT_NextTransfer(TQListViewItem*))); - connect(mp_session_b, SIGNAL(gui_succeedtransfer(TQListViewItem*)), SLOT(SLOT_NextTransfer(TQListViewItem*))); - connect(mp_session_a, SIGNAL(gui_clearqueue(FtpSession*)), SLOT(SLOT_ClearQueue(FtpSession*))); - connect(mp_session_b, SIGNAL(gui_clearqueue(FtpSession*)), SLOT(SLOT_ClearQueue(FtpSession*))); + connect(mp_view->RefreshButtonB, TQ_SIGNAL(clicked()), mp_session_b, TQ_SLOT(SLOT_RefreshButton())); + connect(mp_view->ConnectButtonB, TQ_SIGNAL(clicked()), mp_session_b, TQ_SLOT(SLOT_ConnectButton())); + connect(mp_view->TransferButtonB, TQ_SIGNAL(clicked()), mp_session_b, TQ_SLOT(SLOT_TransferButton())); + connect(mp_view->CwdLineB, TQ_SIGNAL(returnPressed()), mp_session_b, TQ_SLOT(SLOT_CwdLine())); + connect(mp_view->CommandLineB, TQ_SIGNAL(returnPressed()), mp_session_b, TQ_SLOT(SLOT_CmdLine())); + connect(mp_session_a, TQ_SIGNAL(gui_update()), TQ_SLOT(SLOT_SelectionChanged())); + connect(mp_session_b, TQ_SIGNAL(gui_update()), TQ_SLOT(SLOT_SelectionChanged())); + connect(mp_session_a, TQ_SIGNAL(gui_queueitems(KbDirInfo*, FtpSession*, FtpSession*, bool)), + TQ_SLOT(SLOT_QueueItems(KbDirInfo*, FtpSession*, FtpSession*, bool))); + connect(mp_session_b, TQ_SIGNAL(gui_queueitems(KbDirInfo*, FtpSession*, FtpSession*, bool)), + TQ_SLOT(SLOT_QueueItems(KbDirInfo*, FtpSession*, FtpSession*, bool))); + connect(mp_session_a, TQ_SIGNAL(gui_succeedtransfer(TQListViewItem*)), TQ_SLOT(SLOT_NextTransfer(TQListViewItem*))); + connect(mp_session_b, TQ_SIGNAL(gui_succeedtransfer(TQListViewItem*)), TQ_SLOT(SLOT_NextTransfer(TQListViewItem*))); + connect(mp_session_a, TQ_SIGNAL(gui_clearqueue(FtpSession*)), TQ_SLOT(SLOT_ClearQueue(FtpSession*))); + connect(mp_session_b, TQ_SIGNAL(gui_clearqueue(FtpSession*)), TQ_SLOT(SLOT_ClearQueue(FtpSession*))); TQAction *deleteShortcut = new TQAction( TQPixmap(), "&Delete", Key_Delete, this, "delete" ); - connect(deleteShortcut, SIGNAL(activated()), this, SLOT(SLOT_SkipTasks())); + connect(deleteShortcut, TQ_SIGNAL(activated()), this, TQ_SLOT(SLOT_SkipTasks())); mp_session_a->Disconnect(); mp_session_b->Disconnect(); @@ -210,26 +210,26 @@ void Kasablanca::saveSettings() void Kasablanca::setupActions() { - KStdAction::quit(kapp, SLOT(quit()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(quit()), actionCollection()); - //m_toolbarAction = KStdAction::showToolbar(this, SLOT(optionsShowToolbar()), actionCollection()); - m_statusbarAction = KStdAction::showStatusbar(this, SLOT(optionsShowStatusbar()), actionCollection()); + //m_toolbarAction = KStdAction::showToolbar(this, TQ_SLOT(optionsShowToolbar()), actionCollection()); + m_statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(optionsShowStatusbar()), actionCollection()); - KStdAction::keyBindings(this, SLOT(optionsConfigureKeys()), actionCollection()); - //KStdAction::configureToolbars(this, SLOT(optionsConfigureToolbars()), actionCollection()); - KStdAction::preferences(this, SLOT(optionsPreferences()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + //KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); /* // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, - this, SLOT(optionsPreferences()), + this, TQ_SLOT(optionsPreferences()), actionCollection(), "custom_action"); */ - new TDEAction(i18n("Edit"), CTRL+Key_E, this, SLOT(SLOT_EditBookmarks()), actionCollection(), "edit bookmarks action"); + new TDEAction(i18n("Edit"), CTRL+Key_E, this, TQ_SLOT(SLOT_EditBookmarks()), actionCollection(), "edit bookmarks action"); - new TDEAction(i18n("Import"), CTRL+Key_I, this, SLOT(SLOT_ImportBookmarks()), actionCollection(), "import bookmarks action"); + new TDEAction(i18n("Import"), CTRL+Key_I, this, TQ_SLOT(SLOT_ImportBookmarks()), actionCollection(), "import bookmarks action"); createGUI(); } @@ -284,7 +284,7 @@ void Kasablanca::optionsPreferences() dialog->addPage(general, i18n("General"), "kasablanca"); dialog->addPage(colors, i18n("Colors"), "colors"); dialog->addPage(ui, i18n("User Interface"), "winprops"); - connect(dialog, SIGNAL(settingsChanged()), this, SLOT(applyConfig())); + connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(applyConfig())); dialog->show(); } @@ -348,25 +348,25 @@ void Kasablanca::setupMenu() m_rclickmenu_t.insertSeparator(); m_rclickmenu_t.insertItem(i18n("Skip Item(s)"), Skip); - connect(&m_rclickmenu_a, SIGNAL(activated(int)), mp_session_a, SLOT(SLOT_ActionMenu(int))); - connect(&m_bookmarksmenu_a, SIGNAL(activated(int)), mp_session_a, SLOT(SLOT_ConnectMenu(int))); - connect(mp_view->BrowserA, SIGNAL(doubleClicked(TQListViewItem*)), mp_session_a, SLOT(SLOT_ItemClicked(TQListViewItem*))); - connect(mp_view->BrowserA, SIGNAL(rightButtonPressed(TQListViewItem *, const TQPoint &, int)), - mp_session_a, SLOT(SLOT_ItemRClicked(TQListViewItem *, const TQPoint &, int))); - connect(mp_view->BrowserA->header(), SIGNAL (clicked(int)), mp_session_a, SLOT (SLOT_HeaderClicked(int))); - - connect(&m_rclickmenu_b, SIGNAL(activated(int)), mp_session_b, SLOT(SLOT_ActionMenu(int))); - connect(&m_bookmarksmenu_b, SIGNAL(activated(int)), mp_session_b, SLOT(SLOT_ConnectMenu(int))); - connect(mp_view->BrowserB, SIGNAL(doubleClicked(TQListViewItem*)), mp_session_b, SLOT(SLOT_ItemClicked(TQListViewItem*))); - connect(mp_view->BrowserB, SIGNAL(rightButtonPressed(TQListViewItem *, const TQPoint &, int)), - mp_session_b, SLOT(SLOT_ItemRClicked(TQListViewItem *, const TQPoint &, int))); - connect(mp_view->BrowserB->header(), SIGNAL(clicked(int)), mp_session_b, SLOT(SLOT_HeaderClicked(int))); - - connect( mp_view->TaskView, SIGNAL (rightButtonPressed( TQListViewItem *, const TQPoint &, int )), this, - SLOT (SLOT_ItemRightClickedT(TQListViewItem *, const TQPoint &, int ))); - - m_rclickmenu_t.connectItem(Start, this, SLOT(SLOT_ProcessQueue())); - m_rclickmenu_t.connectItem(Skip, this, SLOT(SLOT_SkipTasks())); + connect(&m_rclickmenu_a, TQ_SIGNAL(activated(int)), mp_session_a, TQ_SLOT(SLOT_ActionMenu(int))); + connect(&m_bookmarksmenu_a, TQ_SIGNAL(activated(int)), mp_session_a, TQ_SLOT(SLOT_ConnectMenu(int))); + connect(mp_view->BrowserA, TQ_SIGNAL(doubleClicked(TQListViewItem*)), mp_session_a, TQ_SLOT(SLOT_ItemClicked(TQListViewItem*))); + connect(mp_view->BrowserA, TQ_SIGNAL(rightButtonPressed(TQListViewItem *, const TQPoint &, int)), + mp_session_a, TQ_SLOT(SLOT_ItemRClicked(TQListViewItem *, const TQPoint &, int))); + connect(mp_view->BrowserA->header(), TQ_SIGNAL (clicked(int)), mp_session_a, TQ_SLOT (SLOT_HeaderClicked(int))); + + connect(&m_rclickmenu_b, TQ_SIGNAL(activated(int)), mp_session_b, TQ_SLOT(SLOT_ActionMenu(int))); + connect(&m_bookmarksmenu_b, TQ_SIGNAL(activated(int)), mp_session_b, TQ_SLOT(SLOT_ConnectMenu(int))); + connect(mp_view->BrowserB, TQ_SIGNAL(doubleClicked(TQListViewItem*)), mp_session_b, TQ_SLOT(SLOT_ItemClicked(TQListViewItem*))); + connect(mp_view->BrowserB, TQ_SIGNAL(rightButtonPressed(TQListViewItem *, const TQPoint &, int)), + mp_session_b, TQ_SLOT(SLOT_ItemRClicked(TQListViewItem *, const TQPoint &, int))); + connect(mp_view->BrowserB->header(), TQ_SIGNAL(clicked(int)), mp_session_b, TQ_SLOT(SLOT_HeaderClicked(int))); + + connect( mp_view->TaskView, TQ_SIGNAL (rightButtonPressed( TQListViewItem *, const TQPoint &, int )), this, + TQ_SLOT (SLOT_ItemRightClickedT(TQListViewItem *, const TQPoint &, int ))); + + m_rclickmenu_t.connectItem(Start, this, TQ_SLOT(SLOT_ProcessQueue())); + m_rclickmenu_t.connectItem(Skip, this, TQ_SLOT(SLOT_SkipTasks())); } void Kasablanca::setupStatusBar() @@ -585,7 +585,7 @@ void Kasablanca::QueueFinished() { TDEProcess* p = new TDEProcess(); *p << TQStringList::split(" ", m_onqueuefinished); - connect(p, SIGNAL(processExited(TDEProcess*)), SLOT(SLOT_LocalProcessExited(TDEProcess*))); + connect(p, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(SLOT_LocalProcessExited(TDEProcess*))); p->start(); } if (KbConfig::systrayIsEnabled()) KPassivePopup::message("Transfer is finished.", mp_systemtray); diff --git a/src/kbtaskview.cpp b/src/kbtaskview.cpp index 9b00adf..6c92e94 100644 --- a/src/kbtaskview.cpp +++ b/src/kbtaskview.cpp @@ -34,8 +34,8 @@ KbTaskView::KbTaskView(TQWidget *parent, const char *name) setDragEnabled(true); setAcceptDrops(true); - //connect(this, SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - // this, SLOT(SLOT_DoubleClicked(TQListViewItem*, const TQPoint&, int))); + //connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + // this, TQ_SLOT(SLOT_DoubleClicked(TQListViewItem*, const TQPoint&, int))); } KbTaskView::~KbTaskView() |