TDE
/
konversation
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/konversation
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove various '#define' strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit fd448ab789)
r14.1.x
Michele Calgaro 12 months ago
parent 0b3b096221
commit 9f9819b2be
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
6 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File

6
konversation/src/dccchat.cpp
Unescape View File

@ -129,9 +129,9 @@ void DccChat::listenForPartner()
// Set up server socket // Set up server socket
TQString failedReason; TQString failedReason;
if ( Preferences::dccSpecificChatPorts() ) if ( Preferences::dccSpecificChatPorts() )
m_listenSocket = DccCommon::createServerSocketAndListen( TQT_TQOBJECT(this), &failedReason, Preferences::dccChatPortsFirst(), Preferences::dccChatPortsLast() ); m_listenSocket = DccCommon::createServerSocketAndListen( this, &failedReason, Preferences::dccChatPortsFirst(), Preferences::dccChatPortsLast() );
else else
m_listenSocket = DccCommon::createServerSocketAndListen( TQT_TQOBJECT(this), &failedReason ); m_listenSocket = DccCommon::createServerSocketAndListen( this, &failedReason );
if ( !m_listenSocket ) if ( !m_listenSocket )
{ {
getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Could not open a socket for listening: %1" ).arg( failedReason ) ); getTextView()->appendServerMessage( i18n( "DCC" ), i18n( "Could not open a socket for listening: %1" ).arg( failedReason ) );
@ -161,7 +161,7 @@ void DccChat::connectToPartner()
m_sourceLine->setText( i18n( "%1 = nickname, %2 = IP, %3 = port", "DCC chat with %1 on %2:%3." ).arg( m_partnerNick ).arg( host ).arg( m_partnerPort ) ); m_sourceLine->setText( i18n( "%1 = nickname, %2 = IP, %3 = port", "DCC chat with %1 on %2:%3." ).arg( m_partnerNick ).arg( host ).arg( m_partnerPort ) );
m_dccSocket = new KNetwork::KStreamSocket( m_partnerHost, TQString::number( m_partnerPort ), TQT_TQOBJECT(this) ); m_dccSocket = new KNetwork::KStreamSocket( m_partnerHost, TQString::number( m_partnerPort ), this );
m_dccSocket->setBlocking(false); m_dccSocket->setBlocking(false);
m_dccSocket->setFamily(KNetwork::KResolver::InetFamily); m_dccSocket->setFamily(KNetwork::KResolver::InetFamily);

2
konversation/src/ircview.cpp
Unescape View File

@ -96,7 +96,7 @@ IRCView::IRCView(TQWidget* parent, Server* newServer) : KTextBrowser(parent)
setFocusPolicy(TQWidget::ClickFocus); setFocusPolicy(TQWidget::ClickFocus);
// set basic style sheet for <p> to make paragraph spacing possible // set basic style sheet for <p> to make paragraph spacing possible
TQStyleSheet* sheet=new TQStyleSheet(TQT_TQOBJECT(this),"ircview_style_sheet"); TQStyleSheet* sheet=new TQStyleSheet(this,"ircview_style_sheet");
new TQStyleSheetItem(sheet,"p"); new TQStyleSheetItem(sheet,"p");
setStyleSheet(sheet); setStyleSheet(sheet);

2
konversation/src/konsolepanel.cpp
Unescape View File

@ -25,7 +25,7 @@ KonsolePanel::KonsolePanel(TQWidget *p) : ChatWindow( p ), k_part (0)
KLibFactory *fact = KLibLoader::self()->factory("libkonsolepart"); KLibFactory *fact = KLibLoader::self()->factory("libkonsolepart");
if (!fact) return; if (!fact) return;
k_part = (KParts::ReadOnlyPart *) fact->create(TQT_TQOBJECT(this)); k_part = (KParts::ReadOnlyPart *) fact->create(this);
if (!k_part) return; if (!k_part) return;
k_part->widget()->setFocusPolicy(TQWidget::WheelFocus); k_part->widget()->setFocusPolicy(TQWidget::WheelFocus);

8
konversation/src/konversationapplication.cpp
Unescape View File

@ -81,9 +81,9 @@ int KonversationApplication::newInstance()
{ {
connect(this, TQT_SIGNAL(shutDown()), this, TQT_SLOT(prepareShutdown())); connect(this, TQT_SIGNAL(shutDown()), this, TQT_SLOT(prepareShutdown()));
m_connectionManager = new ConnectionManager(TQT_TQOBJECT(this)); m_connectionManager = new ConnectionManager(this);
m_awayManager = new AwayManager(TQT_TQOBJECT(this)); m_awayManager = new AwayManager(this);
connect(m_connectionManager, TQT_SIGNAL(identityOnline(int)), m_awayManager, TQT_SLOT(identityOnline(int))); connect(m_connectionManager, TQT_SIGNAL(identityOnline(int)), m_awayManager, TQT_SLOT(identityOnline(int)));
connect(m_connectionManager, TQT_SIGNAL(identityOffline(int)), m_awayManager, TQT_SLOT(identityOffline(int))); connect(m_connectionManager, TQT_SIGNAL(identityOffline(int)), m_awayManager, TQT_SLOT(identityOffline(int)));
@ -91,13 +91,13 @@ int KonversationApplication::newInstance()
connect(m_connectionManager, TQT_SIGNAL(connectionChangedAwayState(bool)), m_awayManager, TQT_SLOT(updateGlobalAwayAction(bool))); connect(m_connectionManager, TQT_SIGNAL(connectionChangedAwayState(bool)), m_awayManager, TQT_SLOT(updateGlobalAwayAction(bool)));
// an instance of DccTransferManager needs to be created before GUI class instances' creation. // an instance of DccTransferManager needs to be created before GUI class instances' creation.
m_dccTransferManager = new DccTransferManager(TQT_TQOBJECT(this)); m_dccTransferManager = new DccTransferManager(this);
// make sure all vars are initialized properly // make sure all vars are initialized properly
quickConnectDialog = 0; quickConnectDialog = 0;
// Sound object used to play sound... // Sound object used to play sound...
m_sound = new Konversation::Sound(TQT_TQOBJECT(this)); m_sound = new Konversation::Sound(this);
// initialize OSD display here, so we can read the Preferences::properly // initialize OSD display here, so we can read the Preferences::properly
osd = new OSDWidget( "Konversation" ); osd = new OSDWidget( "Konversation" );

40
konversation/src/konversationmainwindow.cpp
Unescape View File

@ -71,8 +71,8 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
setCentralWidget(m_viewContainer->getWidget()); setCentralWidget(m_viewContainer->getWidget());
//used for event compression. See header file for resetHasDirtySettings() //used for event compression. See header file for resetHasDirtySettings()
connect(KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()), TQT_TQOBJECT(this), TQT_SLOT(resetHasDirtySettings())); connect(KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(resetHasDirtySettings()));
connect(KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateTrayIcon())); connect(KonversationApplication::instance(), TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(updateTrayIcon()));
// Set up view container // Set up view container
@ -82,14 +82,14 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
m_viewContainer, TQT_SLOT(updateViews(const Konversation::ServerGroupSettings*))); m_viewContainer, TQT_SLOT(updateViews(const Konversation::ServerGroupSettings*)));
connect(m_viewContainer, TQT_SIGNAL(autoJoinToggled(const Konversation::ServerGroupSettings*)), connect(m_viewContainer, TQT_SIGNAL(autoJoinToggled(const Konversation::ServerGroupSettings*)),
KonversationApplication::instance(), TQT_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*))); KonversationApplication::instance(), TQT_SIGNAL(serverGroupsChanged(const Konversation::ServerGroupSettings*)));
connect(m_viewContainer, TQT_SIGNAL(setWindowCaption(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(setCaption(const TQString&))); connect(m_viewContainer, TQT_SIGNAL(setWindowCaption(const TQString&)), this, TQT_SLOT(setCaption(const TQString&)));
connect(KonversationApplication::instance()->getConnectionManager(), connect(KonversationApplication::instance()->getConnectionManager(),
TQT_SIGNAL(connectionChangedState(Server*, Konversation::ConnectionState)), TQT_SIGNAL(connectionChangedState(Server*, Konversation::ConnectionState)),
m_viewContainer, TQT_SLOT(connectionStateChanged(Server*, Konversation::ConnectionState))); m_viewContainer, TQT_SLOT(connectionStateChanged(Server*, Konversation::ConnectionState)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(triggerRememberLine()), m_viewContainer, TQT_SLOT(insertRememberLine())); connect(this, TQT_SIGNAL(triggerRememberLine()), m_viewContainer, TQT_SLOT(insertRememberLine()));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(triggerRememberLines(Server*)), m_viewContainer, TQT_SLOT(insertRememberLines(Server*))); connect(this, TQT_SIGNAL(triggerRememberLines(Server*)), m_viewContainer, TQT_SLOT(insertRememberLines(Server*)));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(cancelRememberLine()), m_viewContainer, TQT_SLOT(cancelRememberLine())); connect(this, TQT_SIGNAL(cancelRememberLine()), m_viewContainer, TQT_SLOT(cancelRememberLine()));
connect(TQT_TQOBJECT(this), TQT_SIGNAL(insertMarkerLine()), m_viewContainer, TQT_SLOT(insertMarkerLine())); connect(this, TQT_SIGNAL(insertMarkerLine()), m_viewContainer, TQT_SLOT(insertMarkerLine()));
// Set up status bar // Set up status bar
m_statusBar = new KonversationStatusBar(this); m_statusBar = new KonversationStatusBar(this);
@ -115,25 +115,25 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
// Actions // Actions
KStdAction::quit(TQT_TQOBJECT(this),TQT_SLOT(quitProgram()),actionCollection()); KStdAction::quit(this,TQT_SLOT(quitProgram()),actionCollection());
hideMenuBarAction = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(toggleMenubar()), actionCollection()); hideMenuBarAction = KStdAction::showMenubar(this, TQT_SLOT(toggleMenubar()), actionCollection());
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbar()), actionCollection()); KStdAction::configureToolbars(this, TQT_SLOT(configureToolbar()), actionCollection());
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(openKeyBindings()), actionCollection()); KStdAction::keyBindings(this, TQT_SLOT(openKeyBindings()), actionCollection());
TDEAction *preferencesAction = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(openPrefsDialog()), actionCollection()); TDEAction *preferencesAction = KStdAction::preferences(this, TQT_SLOT(openPrefsDialog()), actionCollection());
#ifdef USE_KNOTIFY // options_configure_notifications #ifdef USE_KNOTIFY // options_configure_notifications
TDEAction *configureNotificationsAction = KStdAction::configureNotifications(TQT_TQOBJECT(this),TQT_SLOT(openNotifications()), actionCollection()); TDEAction *configureNotificationsAction = KStdAction::configureNotifications(this,TQT_SLOT(openNotifications()), actionCollection());
#endif #endif
TDEAction* action; TDEAction* action;
(new TDEAction(i18n("&Server List..."), "server", TDEShortcut("F2"), TQT_TQOBJECT(this), TQT_SLOT(openServerList()), (new TDEAction(i18n("&Server List..."), "server", TDEShortcut("F2"), this, TQT_SLOT(openServerList()),
actionCollection(), "open_server_list"))->setToolTip(i18n("Manage networks and servers")); actionCollection(), "open_server_list"))->setToolTip(i18n("Manage networks and servers"));
(new TDEAction(i18n("Quick &Connect..."), "connect_creating", TDEShortcut("F7"), TQT_TQOBJECT(this), TQT_SLOT(openQuickConnectDialog()), (new TDEAction(i18n("Quick &Connect..."), "connect_creating", TDEShortcut("F7"), this, TQT_SLOT(openQuickConnectDialog()),
actionCollection(), "quick_connect_dialog"))->setToolTip(i18n("Type in the address of a new IRC server to connect to")); actionCollection(), "quick_connect_dialog"))->setToolTip(i18n("Type in the address of a new IRC server to connect to"));
action = new TDEAction(i18n("&Reconnect"), "connect_creating", 0, m_viewContainer, TQT_SLOT(reconnectFrontServer()), actionCollection(), "reconnect_server"); action = new TDEAction(i18n("&Reconnect"), "connect_creating", 0, m_viewContainer, TQT_SLOT(reconnectFrontServer()), actionCollection(), "reconnect_server");
@ -144,7 +144,7 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
action->setEnabled(false); action->setEnabled(false);
action->setToolTip(i18n("Disconnect from the current server.")); action->setToolTip(i18n("Disconnect from the current server."));
(new TDEAction(i18n("&Identities..."), "identity", TDEShortcut("F8"), TQT_TQOBJECT(this), TQT_SLOT(openIdentitiesDialog()), (new TDEAction(i18n("&Identities..."), "identity", TDEShortcut("F8"), this, TQT_SLOT(openIdentitiesDialog()),
actionCollection(), "identities_dialog"))->setToolTip(i18n("Manage your nick, away and other identity settings")); actionCollection(), "identities_dialog"))->setToolTip(i18n("Manage your nick, away and other identity settings"));
new TDEToggleAction(i18n("&Watched Nicks Online"), "kontact_contacts", TDEShortcut("F4"), m_viewContainer, TQT_SLOT(openNicksOnlinePanel()), actionCollection(), "open_nicksonline_window"); new TDEToggleAction(i18n("&Watched Nicks Online"), "kontact_contacts", TDEShortcut("F4"), m_viewContainer, TQT_SLOT(openNicksOnlinePanel()), actionCollection(), "open_nicksonline_window");
@ -241,7 +241,7 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
selectAction->setEnabled(false); selectAction->setEnabled(false);
connect(selectAction, TQT_SIGNAL(activated(int)), m_viewContainer, TQT_SLOT(changeViewCharset(int))); connect(selectAction, TQT_SIGNAL(activated(int)), m_viewContainer, TQT_SLOT(changeViewCharset(int)));
TQSignalMapper* tabSelectionMapper = new TQSignalMapper(TQT_TQOBJECT(this)); TQSignalMapper* tabSelectionMapper = new TQSignalMapper(this);
connect(tabSelectionMapper, TQT_SIGNAL(mapped(int)), m_viewContainer, TQT_SLOT(goToView(int))); connect(tabSelectionMapper, TQT_SIGNAL(mapped(int)), m_viewContainer, TQT_SLOT(goToView(int)));
for (uint i = 1; i <= 10; ++i) for (uint i = 1; i <= 10; ++i)
@ -296,9 +296,9 @@ KonversationMainWindow::KonversationMainWindow() : TDEMainWindow(0,"main_window"
// set up system tray // set up system tray
m_trayIcon = new Konversation::TrayIcon(this); m_trayIcon = new Konversation::TrayIcon(this);
connect(TQT_TQOBJECT(this), TQT_SIGNAL(endNotification()), m_trayIcon, TQT_SLOT(endNotification())); connect(this, TQT_SIGNAL(endNotification()), m_trayIcon, TQT_SLOT(endNotification()));
connect(KonversationApplication::instance(), TQT_SIGNAL(iconChanged(int)), m_trayIcon, TQT_SLOT(updateAppearance())); connect(KonversationApplication::instance(), TQT_SIGNAL(iconChanged(int)), m_trayIcon, TQT_SLOT(updateAppearance()));
connect(m_trayIcon, TQT_SIGNAL(quitSelected()), TQT_TQOBJECT(this), TQT_SLOT(quitProgram())); connect(m_trayIcon, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitProgram()));
TDEPopupMenu *trayMenu = m_trayIcon->contextMenu(); TDEPopupMenu *trayMenu = m_trayIcon->contextMenu();
#ifdef USE_KNOTIFY #ifdef USE_KNOTIFY
configureNotificationsAction->plug(trayMenu); configureNotificationsAction->plug(trayMenu);
@ -528,7 +528,7 @@ void KonversationMainWindow::openPrefsDialog()
m_settingsDialog = new KonviSettingsDialog(this); m_settingsDialog = new KonviSettingsDialog(this);
//User edited the configuration - update your local copies of the //User edited the configuration - update your local copies of the
//configuration data //configuration data
connect(m_settingsDialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(settingsChangedSlot())); connect(m_settingsDialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChangedSlot()));
} }
m_settingsDialog->show(); m_settingsDialog->show();
} }

6
konversation/src/logfilereader.cpp
Unescape View File

@ -45,7 +45,7 @@ LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow
TQDockArea* toolBarDock = new TQDockArea(TQt::Horizontal,TQDockArea::Normal,this,"logfile_toolbar_dock"); TQDockArea* toolBarDock = new TQDockArea(TQt::Horizontal,TQDockArea::Normal,this,"logfile_toolbar_dock");
toolBar = new TDEToolBar(toolBarDock,"logfile_toolbar",true,true); toolBar = new TDEToolBar(toolBarDock,"logfile_toolbar",true,true);
toolBar->insertButton("document-save-as",0,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(saveLog()),true,i18n("Save As...")); toolBar->insertButton("document-save-as",0,TQT_SIGNAL(clicked()),this,TQT_SLOT(saveLog()),true,i18n("Save As..."));
new TQLabel(i18n("Show last:"),toolBar,"logfile_size_label"); new TQLabel(i18n("Show last:"),toolBar,"logfile_size_label");
sizeSpin = new TQSpinBox(10,1000,10,toolBar,"logfile_size_spinbox"); sizeSpin = new TQSpinBox(10,1000,10,toolBar,"logfile_size_spinbox");
@ -54,8 +54,8 @@ LogfileReader::LogfileReader(TQWidget* parent, const TQString& log) : ChatWindow
sizeSpin->setSuffix(i18n(" KB")); sizeSpin->setSuffix(i18n(" KB"));
sizeSpin->installEventFilter(this); sizeSpin->installEventFilter(this);
toolBar->insertButton("reload",0,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(updateView()),true,i18n("Reload")); toolBar->insertButton("reload",0,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateView()),true,i18n("Reload"));
toolBar->insertButton("edit-delete",0,TQT_SIGNAL(clicked()),TQT_TQOBJECT(this),TQT_SLOT(clearLog()),true,i18n("Clear Logfile")); toolBar->insertButton("edit-delete",0,TQT_SIGNAL(clicked()),this,TQT_SLOT(clearLog()),true,i18n("Clear Logfile"));
IRCViewBox* ircBox = new IRCViewBox(this, 0); IRCViewBox* ircBox = new IRCViewBox(this, 0);
setTextView(ircBox->ircView()); setTextView(ircBox->ircView());

Write Preview
Loading…
Cancel
Save