diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/ui/kvi_selectors.cpp | 38 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_selectors.h | 8 | ||||
| -rw-r--r-- | src/modules/options/optw_servers.cpp | 120 | ||||
| -rw-r--r-- | src/modules/options/optw_servers.h | 10 | ||||
| -rw-r--r-- | src/modules/spaste/controller.cpp | 8 | ||||
| -rw-r--r-- | src/modules/spaste/libkvispaste.cpp | 12 |
6 files changed, 98 insertions, 98 deletions
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index 22f14430b..b742a3a48 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -410,7 +410,7 @@ KviStringListSelector::~KviStringListSelector() void KviStringListSelector::itemSelectionChanged() { - + //unsigned int uCount = m_pListWidget->count(); bool bSomeSelected ; if (m_pListWidget->selectedItems().count()) bSomeSelected = true; @@ -603,16 +603,16 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString & m_pUFore = uFore; m_pUBack = uBack; - + m_uBack = *uBack; m_uFore = *uFore; setButtonPalette(); setEnabled(bEnabled); - + m_pContextPopup = new KviTalPopupMenu(this); - + m_pForePopup = new KviTalPopupMenu(this); connect(m_pForePopup,SIGNAL(activated(int)),this,SLOT(foreSelected(int))); int i; @@ -659,7 +659,7 @@ void KviMircTextColorSelector::setEnabled(bool bEnabled) void KviMircTextColorSelector::setButtonPalette() { QPalette pal; - + if(m_uBack > KVI_MIRCCOLOR_MAX_BACKGROUND) { if(m_uBack != KVI_TRANSPARENT)m_uBack = KVI_TRANSPARENT; @@ -669,7 +669,7 @@ void KviMircTextColorSelector::setButtonPalette() } if(m_uFore > KVI_MIRCCOLOR_MAX_FOREGROUND)m_uFore = KVI_MIRCCOLOR_MAX_FOREGROUND; - + pal.setColor(QPalette::ButtonText,KVI_OPTION_MIRCCOLOR(m_uFore)); pal.setColor(QPalette::Text,KVI_OPTION_MIRCCOLOR(m_uFore)); @@ -727,7 +727,7 @@ KviChanTreeViewItem::KviChanTreeViewItem(KviTalTreeWidget* pList,QString szChan, setText(1,mask); } -KviCahnnelListSelector::KviCahnnelListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled) +KviChannelListSelector::KviChannelListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled) : KviTalVBox(par), KviSelectorInterface() { m_pLabel = new QLabel(txt,this); @@ -739,24 +739,24 @@ KviCahnnelListSelector::KviCahnnelListSelector(QWidget * par,const QString & txt columnLabels.append(__tr2qs("Channel password")); m_pTreeWidget->setHeaderLabels(columnLabels); KviTalHBox* pEditsHBox = new KviTalHBox(this); - + m_pChanLineEdit = new QLineEdit(pEditsHBox); connect(m_pChanLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(textChanged(const QString &))); connect(m_pChanLineEdit,SIGNAL(returnPressed()),this,SLOT(addClicked())); - + m_pPassLineEdit = new QLineEdit(pEditsHBox); m_pPassLineEdit->setEchoMode(QLineEdit::Password); connect(m_pPassLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(textChanged(const QString &))); connect(m_pPassLineEdit,SIGNAL(returnPressed()),this,SLOT(addClicked())); - - + + KviTalHBox * hBox = new KviTalHBox(this); m_pAddButton = new QPushButton(__tr2qs("A&dd"),hBox); connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked())); m_pRemoveButton = new QPushButton(__tr2qs("Re&move"),hBox); connect(m_pRemoveButton,SIGNAL(clicked()),this,SLOT(removeClicked())); m_pOption = pOption; - + for ( QStringList::Iterator it = pOption->begin(); it != pOption->end(); ++it ) { new KviChanTreeViewItem(m_pTreeWidget,(*it).section(':',0,0),(*it).section(':',1)); } @@ -769,11 +769,11 @@ KviCahnnelListSelector::KviCahnnelListSelector(QWidget * par,const QString & txt setEnabled(bEnabled); } -KviCahnnelListSelector::~KviCahnnelListSelector() +KviChannelListSelector::~KviChannelListSelector() { } -void KviCahnnelListSelector::commit() +void KviChannelListSelector::commit() { m_pOption->clear(); register KviChanTreeViewItem* pItem; @@ -789,7 +789,7 @@ void KviCahnnelListSelector::commit() } } -void KviCahnnelListSelector::setEnabled(bool bEnabled) +void KviChannelListSelector::setEnabled(bool bEnabled) { m_pLabel->setEnabled(bEnabled); m_pTreeWidget->setEnabled(bEnabled); @@ -799,16 +799,16 @@ void KviCahnnelListSelector::setEnabled(bool bEnabled) m_pRemoveButton->setEnabled(bEnabled); } -void KviCahnnelListSelector::textChanged(const QString &str) +void KviChannelListSelector::textChanged(const QString &str) { m_pAddButton->setEnabled(!m_pChanLineEdit->text().isEmpty()); } -void KviCahnnelListSelector::selectionChanged() +void KviChannelListSelector::selectionChanged() { } -void KviCahnnelListSelector::addClicked() +void KviChannelListSelector::addClicked() { if(!m_pChanLineEdit->text().isEmpty()) { @@ -818,7 +818,7 @@ void KviCahnnelListSelector::addClicked() } } -void KviCahnnelListSelector::removeClicked() +void KviChannelListSelector::removeClicked() { KviPointerList<KviTalTreeWidgetItem> lst; QList<QTreeWidgetItem *> items=m_pTreeWidget->selectedItems () ; diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h index 1b0ab177f..b03cb4398 100644 --- a/src/kvirc/ui/kvi_selectors.h +++ b/src/kvirc/ui/kvi_selectors.h @@ -333,16 +333,16 @@ private: public: KviChanTreeViewItem(KviTalTreeWidget* pList,QString szChan,QString szPass); ~KviChanTreeViewItem() {}; - + const QString& pass() { return m_szPass; } }; -class KVIRC_API KviCahnnelListSelector : public KviTalVBox, public KviSelectorInterface +class KVIRC_API KviChannelListSelector : public KviTalVBox, public KviSelectorInterface { Q_OBJECT public: - KviCahnnelListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled); - ~KviCahnnelListSelector(); + KviChannelListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled); + ~KviChannelListSelector(); private: QLabel * m_pLabel; KviTalTreeWidget * m_pTreeWidget; diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 08f4fe2e0..cbd83f47b 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -73,25 +73,25 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n setObjectName("network_details"); m_pOnConnectEditor=0; m_pOnLoginEditor=0; - + m_pUserEditor=0; m_pPassEditor=0; m_pNickEditor=0; m_pRealEditor=0; m_pDescEditor=0; - + m_pEncodingEditor=0; - + m_pAutoConnectCheck=0; - + m_pNickServTreeWidget=0; m_pNickServCheck=0; m_pAddRuleButton=0; m_pDelRuleButton=0; m_pEditRuleButton=0; - + m_pChannelListSelector=0; - + QGridLayout * g = new QGridLayout(this); setWindowTitle(__tr2qs_ctx("Network Details","options")); @@ -200,7 +200,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n if(n->autoJoinChannelList()) m_lstChannels = *(n->autoJoinChannelList()); - m_pChannelListSelector = new KviCahnnelListSelector(tab, + m_pChannelListSelector = new KviChannelListSelector(tab, __tr2qs_ctx("Channels to join automatically upon connect:","options"),&m_lstChannels,true); KviTalToolTip::add(m_pChannelListSelector,__tr2qs_ctx("<center>Here you can set a list of channels to be joined automatically " \ @@ -214,7 +214,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n // after connect execute tab = new QWidget(tw); gl = new QGridLayout(tab); - + m_pOnConnectEditor = KviScriptEditor::createInstance(tab); gl->addWidget(m_pOnConnectEditor,0,0); m_pOnConnectEditor->setText(n->onConnectCommand()); @@ -223,9 +223,9 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n "<b>Important:</b> Enter commands <b>without</b> a preceding slash (e.g. <tt>quote pass secret</tt> instead of <tt>/quote pass secret</tt>).<br>"\ "KVIrc will first send the USER command, then eventually PASS and NICK and then execute this " \ "command sequence.</center>","options")); - + tw->addTab(tab,__tr2qs_ctx("On Connect","options")); - + // after login execute tab = new QWidget(tw); @@ -234,32 +234,32 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n m_pOnLoginEditor = KviScriptEditor::createInstance(tab); gl->addWidget(m_pOnLoginEditor,0,0); m_pOnLoginEditor->setText(n->onLoginCommand()); - + m_pOnLoginEditor->setMinimumHeight(150); - + KviTalToolTip::add(m_pOnLoginEditor, __tr2qs_ctx("<center>The following commands will be executed after a successful login to a server in this network.<br>" \ "<b>Important:</b> Enter commands <b>without</b> a preceding slash (e.g. <tt>quote privatelog</tt> instead of <tt>/quote privatelog</tt>).<br>" "This is useful for automatically opening queries, setting variables, etc.</center>","options")); - + tw->addTab(tab,__tr2qs_ctx("On Login","options")); // nick serv rules - + tab = new QWidget(tw); gl = new QGridLayout(tab); - + KviNickServRuleSet * rs = n->nickServRuleSet(); bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false; - + m_pNickServCheck = new KviStyledCheckBox(__tr2qs_ctx("Enable NickServ Identification","options"),tab); gl->addWidget(m_pNickServCheck,0,0,1,3); // gl->addMultiCellWidget(m_pNickServCheck,0,0,0,2); KviTalToolTip::add(m_pNickServCheck, __tr2qs_ctx("This check enables the automatic identification with NickServ","options")); m_pNickServCheck->setChecked(bNickServEnabled); - + m_pNickServTreeWidget = new KviTalTreeWidget(tab); m_pNickServTreeWidget->setSelectionMode(QAbstractItemView::SingleSelection); m_pNickServTreeWidget->setAllColumnsShowFocus(true); @@ -280,22 +280,22 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n "if used improperly. Make sure that you fully understand the NickServ authentication protocol.<br>" \ "In other words, be sure to know what you're doing.<br>" \ "Also note that the password that you provide is stored as <b>PLAIN TEXT</b>.</center>","options")); - + m_pAddRuleButton = new QPushButton(__tr2qs_ctx("Add Rule","options"),tab); connect(m_pAddRuleButton,SIGNAL(clicked()),this,SLOT(addNickServRule())); gl->addWidget(m_pAddRuleButton,2,0); - - + + m_pEditRuleButton = new QPushButton(__tr2qs_ctx("Edit Rule","options"),tab); connect(m_pEditRuleButton,SIGNAL(clicked()),this,SLOT(editNickServRule())); gl->addWidget(m_pEditRuleButton,2,1); - + m_pDelRuleButton = new QPushButton(__tr2qs_ctx("Delete Rule","options"),tab); connect(m_pDelRuleButton,SIGNAL(clicked()),this,SLOT(delNickServRule())); gl->addWidget(m_pDelRuleButton,2,2); - + connect(m_pNickServCheck,SIGNAL(toggled(bool)),this,SLOT(enableDisableNickServControls())); - + if(rs && rs->rules()) { KviPointerList<KviNickServRule> * ll = rs->rules(); @@ -304,11 +304,11 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n (void)new KviTalTreeWidgetItem(m_pNickServTreeWidget,rule->registeredNick(),rule->nickServMask(),rule->messageRegexp(),rule->identifyCommand()); } } - + enableDisableNickServControls(); - + gl->setRowStretch(1,1); - + tw->addTab(tab,__tr2qs_ctx("NickServ","options")); QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this); @@ -497,7 +497,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) "for the network that this server belongs to, and if that is empty the default \"real name\" (specified in the \"Identity\" settings) will be used.</center>","options")); gbox = new KviTalGroupBox(Qt::Horizontal,__tr2qs_ctx("User Mode","options"),tab); gl->addWidget(gbox,1,0); - + m_pUseDefaultInitUMode = new KviStyledCheckBox(__tr2qs_ctx("Use default user mode","options"),gbox); KviTalToolTip::add(m_pUseDefaultInitUMode,__tr2qs_ctx("<center>If this is enabled, the global initial <b>user mode</b> (configured from"\ " the identity dialog) will be used. If disabled, you can configure an initial user mode for this server","options")); @@ -505,15 +505,15 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) KviStr szDefUMode = KVI_OPTION_STRING(KviOption_stringDefaultUserMode); m_pUseDefaultInitUMode->setChecked(!bHasUmode); connect(m_pUseDefaultInitUMode,SIGNAL(toggled(bool)),this,SLOT(useDefaultInitUModeToggled(bool))); - + m_pIMode = new KviStyledCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox); m_pIMode->setEnabled(bHasUmode); m_pIMode->setChecked(bHasUmode ? s->initUMode().contains('i',Qt::CaseInsensitive) : szDefUMode.contains('i',Qt::CaseInsensitive)); - + m_pSMode = new KviStyledCheckBox(__tr2qs_ctx("Server notices (+s)","options"),gbox); m_pSMode->setEnabled(bHasUmode); m_pSMode->setChecked(bHasUmode ? s->initUMode().contains('s',Qt::CaseInsensitive) : szDefUMode.contains('s',Qt::CaseInsensitive)); - + m_pWMode = new KviStyledCheckBox(__tr2qs_ctx("Wallops (+w)","options"),gbox); m_pWMode->setEnabled(bHasUmode); m_pWMode->setChecked(bHasUmode ? s->initUMode().contains('w',Qt::CaseInsensitive) : szDefUMode.contains('w',Qt::CaseInsensitive)); @@ -527,13 +527,13 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) tw->addTab(tab,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WHO)),__tr2qs_ctx("Identity","options")); // Connection tab - + tab = new QWidget(tw); gl = new QGridLayout(tab); - + l = new QLabel(__tr2qs_ctx("Port:","options"),tab); gl->addWidget(l,0,0); - + m_pPortEditor = new QLineEdit(tab); gl->addWidget(m_pPortEditor,0,1); @@ -558,7 +558,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) #else m_pIpEditor->setAddressType(KviIpEditor::IpV4); #endif - + if(!m_pIpEditor->setAddress(s->m_szIp)) { #ifdef COMPILE_IPV6_SUPPORT @@ -567,7 +567,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) m_pIpEditor->setAddress("0.0.0.0"); #endif } - + m_pCacheIpCheck = new KviStyledCheckBox(__tr2qs_ctx("Cache IP address","options"),tab); gl->addWidget(m_pCacheIpCheck,2,0,1,2); // gl->addMultiCellWidget(m_pCacheIpCheck,2,2,0,1); @@ -602,15 +602,15 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) m_pUseSSLCheck->setEnabled(false); #endif m_pUseSSLCheck->setChecked(s->useSSL()); - - + + m_pUseAutoConnect = new KviStyledCheckBox(__tr2qs_ctx("Connect to this server at startup","options"),tab); m_pUseAutoConnect->setChecked(s->autoConnect()); - + gl->addWidget(m_pUseAutoConnect,5,0,1,2); // gl->addMultiCellWidget(m_pUseAutoConnect,5,5,0,1); KviTalToolTip::add(m_pUseAutoConnect,__tr2qs_ctx("<center>This option will cause KVIrc to connect to the IRC server when it is started.</center>","options")); - + l = new QLabel(__tr2qs_ctx("Encoding:","options"),tab); gl->addWidget(l,6,0); m_pEncodingEditor = new QComboBox(tab); @@ -663,11 +663,11 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) if(!s->linkFilter().isEmpty()) { //m_pLinkFilterEditor->setCurrentText(s->linkFilter()); - int i = m_pLinkFilterEditor->findText(s->linkFilter());
- if (i != -1)
- m_pLinkFilterEditor->setCurrentIndex(i);
- else
- m_pLinkFilterEditor->setEditText(s->linkFilter());
+ int i = m_pLinkFilterEditor->findText(s->linkFilter()); + if (i != -1) + m_pLinkFilterEditor->setCurrentIndex(i); + else + m_pLinkFilterEditor->setEditText(s->linkFilter()); } else m_pLinkFilterEditor->setCurrentIndex(0); @@ -695,10 +695,10 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) KviTalToolTip::add(m_pProxyEditor,__tr2qs_ctx("<center>This is the <b>proxy</b> that KVIrc will use to connect to thos server.\n" \ "If this field is set in \"Default\" KVirc will use global proxy settings, if it is set in \"Direct connection\" " \ "KVirc will connect to this server without proxy. You can define new proxy server in global options' \"Proxy servers\" menu.</center>","options")); - + m_pProxyEditor->addItem(__tr2qs_ctx("Default","options")); - m_pProxyEditor->addItem(__tr2qs_ctx("Direct connection","options")); - + m_pProxyEditor->addItem(__tr2qs_ctx("Direct connection","options")); + KviPointerList<KviProxy> * proxylist = g_pProxyDataBase->proxyList(); for(KviProxy * p = proxylist->first();p;p = proxylist->next()) { @@ -723,7 +723,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) if(s->autoJoinChannelList()) m_lstChannels = *(s->autoJoinChannelList()); - m_pChannelListSelector = new KviCahnnelListSelector(tab, + m_pChannelListSelector = new KviChannelListSelector(tab, __tr2qs_ctx("Channels to join automatically upon connect:","options"),&m_lstChannels,true); KviTalToolTip::add(m_pChannelListSelector,__tr2qs_ctx("<center>Here you can set a list of channels to be joined automatically " \ "after a connection to this server has been established. To add a channel, type its name in the " \ @@ -781,7 +781,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) g->setColumnStretch(1,1); tw->setMinimumWidth(390); - + setHeaderLabelText(); } @@ -822,7 +822,7 @@ void KviServerDetailsWidget::setHeaderLabelText() num.setNum(uPort); szTmp += num; szTmp += "</b></font>"; - + m_pHeaderLabel->setText(szTmp); } @@ -862,7 +862,7 @@ void KviServerDetailsWidget::fillData(KviIrcServer * s) } s->setInitUMode(szUMode.ptr()); } - + QString tmp = m_pPortEditor->text(); bool bOk; kvi_u32_t uPort = tmp.toUInt(&bOk); @@ -877,7 +877,7 @@ void KviServerDetailsWidget::fillData(KviIrcServer * s) if(m_pIpEditor) { KviStr tmpAddr = m_pIpEditor->address(); - + if(!m_pIpEditor->hasEmptyFields()) { #ifdef COMPILE_IPV6_SUPPORT @@ -1015,7 +1015,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) this,SLOT(customContextMenuRequested(const QPoint &))); connect(m_pTreeWidget,SIGNAL(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *)), this,SLOT(currentItemChanged(KviTalTreeWidgetItem *,KviTalTreeWidgetItem *))); - + connect(m_pTreeWidget,SIGNAL(itemDoubleClicked(KviTalTreeWidgetItem*, int )), this,SLOT(itemDoubleClicked(KviTalTreeWidgetItem*, int ))); @@ -1077,7 +1077,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent) QFrame * lll = new QFrame(vbox); vbox->setStretchFactor(lll,100); - + KviTalGroupBox *gbox = addGroupBox(0,1,1,1,Qt::Vertical,__tr2qs_ctx("Active Configuration","options")); m_pSrvNetLabel = new QLabel(__tr2qs_ctx("Server:","options"),gbox); @@ -1167,7 +1167,7 @@ void KviServerOptionsWidget::recentServersPopupClicked(int id) data.cutFromLast(':'); data.replaceAll("/",""); // we should have a full server name now , with no port - + KviStr port = m_pRecentPopup->text(id); port.cutToLast(':'); bool bOk; @@ -1209,7 +1209,7 @@ void KviServerOptionsWidget::recentServersPopupClicked(int id) } } } - + // fallback to the server with the wrong port if(pFoundNet) { @@ -1286,7 +1286,7 @@ void KviServerOptionsWidget::currentItemChanged(KviTalTreeWidgetItem *it,KviTalT } else { m_pRemoveButton->setEnabled(false); m_pCopyServerButton->setEnabled(true); - + m_pConnectCurrent->setEnabled(false); m_pSrvNetLabel->setEnabled(false); m_pSrvNetEdit->setEnabled(false); @@ -1336,7 +1336,7 @@ void KviServerOptionsWidget::commit() r = g_pIrcServerDataBase->insertNetwork(net); } if(network == m_pLastEditedItem)g_pIrcServerDataBase->setCurrentNetwork(net->name()); - + KviServerOptionsTreeWidgetItem * ch; for (int j=0;j<network->childCount();j++) { @@ -1365,7 +1365,7 @@ void KviServerOptionsWidget::commit() } //ch = (KviServerOptionsTreeWidgetItem *)ch->nextSibling(); } - + } // it = (KviServerOptionsTreeWidgetItem *)it->nextSibling(); //} @@ -1599,7 +1599,7 @@ void KviServerOptionsWidget::removeCurrent() KviServerOptionsTreeWidgetItem * KviServerOptionsWidget::findNetItem(const QString &netname) { - + KviServerOptionsTreeWidgetItem * it;// = (KviServerOptionsTreeWidgetItem *)m_pTreeWidget->firstChild(); //while(it) for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++) diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h index e3c133537..25dd4670d 100644 --- a/src/modules/options/optw_servers.h +++ b/src/modules/options/optw_servers.h @@ -81,9 +81,9 @@ protected: QLineEdit * m_pDescEditor; QComboBox * m_pEncodingEditor; - + KviStyledCheckBox * m_pAutoConnectCheck; - + KviTalTreeWidget * m_pNickServTreeWidget; KviStyledCheckBox * m_pNickServCheck; QPushButton * m_pAddRuleButton; @@ -91,7 +91,7 @@ protected: QPushButton * m_pEditRuleButton; QStringList m_lstChannels; - KviCahnnelListSelector * m_pChannelListSelector; + KviChannelListSelector * m_pChannelListSelector; public: void fillData(KviIrcNetwork * d); protected slots: @@ -131,8 +131,8 @@ protected: KviStyledCheckBox * m_pUseIPV6Check; QLineEdit * m_pPortEditor; QStringList m_lstChannels; - KviCahnnelListSelector * m_pChannelListSelector; - + KviChannelListSelector * m_pChannelListSelector; + QComboBox * m_pProxyEditor; protected slots: void useDefaultInitUModeToggled(bool); diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp index 15a054697..ae0871004 100644 --- a/src/modules/spaste/controller.cpp +++ b/src/modules/spaste/controller.cpp @@ -1,8 +1,8 @@ // File : controller.cpp -// Creation date : Thu Apr 30 2002 17:13:12 GMT by Juanjo Álvarez +// Creation date : Thu Apr 30 2002 17:13:12 GMT by Juanjo �lvarez // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002 Juanjo Álvarez (juanjux@yahoo.es) +// Copyright (C) 2002 Juanjo �lvarez (juanjux@yahoo.es) // Copyright (C) 2002 Szymon Stefanek (kvirc@tin.it) // // This program is FREE software. You can redistribute it and/or @@ -93,9 +93,9 @@ void SPasteController::pasteFile(void) void SPasteController::pasteClipboard(void) { - if(m_clipBuffIterator != m_pClipBuff->end()) + if(m_clipBuffIterator != m_pClipBuff->end()) { - if((!g_pApp->windowExists(m_pWindow)) || m_pWindow->console()->isNotConnected() ) + if(!g_pApp->windowExists(m_pWindow)) delete this; else { if((*m_clipBuffIterator).isEmpty())(*m_clipBuffIterator) = QChar(KVI_TEXT_RESET); diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp index fc6a76c0c..d6281399d 100644 --- a/src/modules/spaste/libkvispaste.cpp +++ b/src/modules/spaste/libkvispaste.cpp @@ -100,8 +100,8 @@ static bool spaste_kvs_cmd_file(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_END(c) KviWindow * window = spaste_kvs_find_window(szWindow,c); - if( (!window) || window->console()->isNotConnected())return false; - + if(!window)return false; + // FIXME //if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile.toAscii()))) if(szFile.isEmpty() || (!KviFileUtils::fileExists(szFile))) @@ -158,8 +158,8 @@ static bool spaste_kvs_cmd_clipboard(KviKvsModuleCommandCall * c) KVSM_PARAMETER("window",KVS_PT_STRING,KVS_PF_OPTIONAL,szWindow) KVSM_PARAMETERS_END(c) KviWindow * window = spaste_kvs_find_window(szWindow,c); - if( (!window) || window->console()->isNotConnected())return false; - + if(!window)return false; + SPasteController * controller = spaste_find_controller(window); if(!controller)controller = new SPasteController(window,++ctrlId); controller->pasteClipboardInit(); @@ -227,7 +227,7 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c) } } else { //Delete the spaste with the given id - while( (item = it.current()) != 0) + while( (item = it.current()) != 0) { ++it; if(item->getId() == iId)delete item; @@ -307,7 +307,7 @@ static bool spaste_kvs_cmd_setdelay(KviKvsModuleCommandCall * c) return true; } -//------------------------------------------------- +//------------------------------------------------- static bool spaste_module_init(KviModule * m) { g_pControllerList = new KviPointerList<SPasteController>; |
