Changeset View
Changeset View
Standalone View
Standalone View
src/irc/channel.cpp
Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s) | 50 | { | |||
---|---|---|---|---|---|
52 | if( returnValue == 0) { | 52 | if( returnValue == 0) { | ||
53 | returnValue = QString::compare(nick1->getChannelNick()->loweredNickname(), | 53 | returnValue = QString::compare(nick1->getChannelNick()->loweredNickname(), | ||
54 | nick2->getChannelNick()->loweredNickname()); | 54 | nick2->getChannelNick()->loweredNickname()); | ||
55 | } | 55 | } | ||
56 | 56 | | |||
57 | return (returnValue < 0); | 57 | return (returnValue < 0); | ||
58 | } | 58 | } | ||
59 | 59 | | |||
60 | bool nickLessThan(const Nick* nick1, const Nick* nick2) | 60 | static bool nickLessThan(const Nick* nick1, const Nick* nick2) | ||
61 | { | 61 | { | ||
62 | return nick1->getChannelNick()->loweredNickname() < nick2->getChannelNick()->loweredNickname(); | 62 | return nick1->getChannelNick()->loweredNickname() < nick2->getChannelNick()->loweredNickname(); | ||
63 | } | 63 | } | ||
64 | 64 | | |||
65 | 65 | | |||
66 | using Konversation::ChannelOptionsDialog; | 66 | using Konversation::ChannelOptionsDialog; | ||
67 | 67 | | |||
68 | Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent) | 68 | Channel::Channel(QWidget* parent, const QString& _name) : ChatWindow(parent) | ||
69 | { | 69 | { | ||
70 | // init variables | 70 | // init variables | ||
71 | 71 | | |||
72 | //HACK I needed the channel name at time of setServer, but setName needs m_server.. | 72 | //HACK I needed the channel name at time of setServer, but setName needs m_server.. | ||
73 | // This effectively assigns the name twice, but none of the other logic has been moved or updated. | 73 | // This effectively assigns the name twice, but none of the other logic has been moved or updated. | ||
74 | name=_name; | 74 | name=_name; | ||
75 | m_ownChannelNick = 0; | 75 | m_ownChannelNick = nullptr; | ||
76 | m_optionsDialog = NULL; | 76 | m_optionsDialog = nullptr; | ||
77 | m_delayedSortTimer = 0; | 77 | m_delayedSortTimer = nullptr; | ||
78 | m_delayedSortTrigger = 0; | 78 | m_delayedSortTrigger = 0; | ||
79 | m_processedNicksCount = 0; | 79 | m_processedNicksCount = 0; | ||
80 | m_processedOpsCount = 0; | 80 | m_processedOpsCount = 0; | ||
81 | m_initialNamesReceived = false; | 81 | m_initialNamesReceived = false; | ||
82 | nicks = 0; | 82 | nicks = 0; | ||
83 | ops = 0; | 83 | ops = 0; | ||
84 | completionPosition = 0; | 84 | completionPosition = 0; | ||
85 | m_nicknameListViewTextChanged = 0; | 85 | m_nicknameListViewTextChanged = 0; | ||
▲ Show 20 Lines • Show All 126 Lines • ▼ Show 20 Line(s) | |||||
212 | nickListButtonsLayout->setSpacing(0); | 212 | nickListButtonsLayout->setSpacing(0); | ||
213 | nickListButtonsLayout->setMargin(0); | 213 | nickListButtonsLayout->setMargin(0); | ||
214 | 214 | | |||
215 | nicknameListView=new NickListView(nickListButtons, this); | 215 | nicknameListView=new NickListView(nickListButtons, this); | ||
216 | nickListButtons->layout()->addWidget(nicknameListView); | 216 | nickListButtons->layout()->addWidget(nicknameListView); | ||
217 | nicknameListView->installEventFilter(this); | 217 | nicknameListView->installEventFilter(this); | ||
218 | 218 | | |||
219 | // initialize buttons grid, will be set up in updateQuickButtons | 219 | // initialize buttons grid, will be set up in updateQuickButtons | ||
220 | m_buttonsGrid = 0; | 220 | m_buttonsGrid = nullptr; | ||
221 | 221 | | |||
222 | // The box holding the Nickname button and Channel input | 222 | // The box holding the Nickname button and Channel input | ||
223 | commandLineBox = new QFrame(this); | 223 | commandLineBox = new QFrame(this); | ||
224 | QHBoxLayout* commandLineLayout = new QHBoxLayout(commandLineBox); | 224 | QHBoxLayout* commandLineLayout = new QHBoxLayout(commandLineBox); | ||
225 | commandLineBox->setLayout(commandLineLayout); | 225 | commandLineBox->setLayout(commandLineLayout); | ||
226 | commandLineLayout->setMargin(0); | 226 | commandLineLayout->setMargin(0); | ||
227 | commandLineLayout->setSpacing(spacing()); | 227 | commandLineLayout->setSpacing(spacing()); | ||
228 | 228 | | |||
▲ Show 20 Lines • Show All 76 Lines • ▼ Show 20 Line(s) | |||||
305 | // every 5 minutes decrease everyone's activity by 1 unit | 305 | // every 5 minutes decrease everyone's activity by 1 unit | ||
306 | m_fadeActivityTimer.start(5*60*1000); | 306 | m_fadeActivityTimer.start(5*60*1000); | ||
307 | 307 | | |||
308 | connect(&m_fadeActivityTimer, SIGNAL(timeout()), this, SLOT(fadeActivity())); | 308 | connect(&m_fadeActivityTimer, SIGNAL(timeout()), this, SLOT(fadeActivity())); | ||
309 | 309 | | |||
310 | updateAppearance(); | 310 | updateAppearance(); | ||
311 | 311 | | |||
312 | #ifdef HAVE_QCA2 | 312 | #ifdef HAVE_QCA2 | ||
313 | m_cipher = 0; | 313 | m_cipher = nullptr; | ||
314 | #endif | 314 | #endif | ||
315 | 315 | | |||
316 | // Setup delayed sort timer | 316 | // Setup delayed sort timer | ||
317 | m_delayedSortTimer = new QTimer(this); | 317 | m_delayedSortTimer = new QTimer(this); | ||
318 | m_delayedSortTimer->setSingleShot(true); | 318 | m_delayedSortTimer->setSingleShot(true); | ||
319 | connect(m_delayedSortTimer, SIGNAL(timeout()), this, SLOT(delayedSortNickList())); | 319 | connect(m_delayedSortTimer, SIGNAL(timeout()), this, SLOT(delayedSortNickList())); | ||
320 | } | 320 | } | ||
321 | 321 | | |||
▲ Show 20 Lines • Show All 113 Lines • ▼ Show 20 Line(s) | |||||
435 | 435 | | |||
436 | ChannelNickPtr Channel::getChannelNick(const QString &ircnick) const | 436 | ChannelNickPtr Channel::getChannelNick(const QString &ircnick) const | ||
437 | { | 437 | { | ||
438 | return m_server->getChannelNick(getName(), ircnick); | 438 | return m_server->getChannelNick(getName(), ircnick); | ||
439 | } | 439 | } | ||
440 | 440 | | |||
441 | void Channel::purgeNicks() | 441 | void Channel::purgeNicks() | ||
442 | { | 442 | { | ||
443 | m_ownChannelNick = 0; | 443 | m_ownChannelNick = nullptr; | ||
444 | 444 | | |||
445 | // Purge nickname list | 445 | // Purge nickname list | ||
446 | qDeleteAll(nicknameList); | 446 | qDeleteAll(nicknameList); | ||
447 | nicknameList.clear(); | 447 | nicknameList.clear(); | ||
448 | m_nicknameNickHash.clear(); | 448 | m_nicknameNickHash.clear(); | ||
449 | 449 | | |||
450 | // Execute this otherwise it may crash trying to access | 450 | // Execute this otherwise it may crash trying to access | ||
451 | // deleted nicks | 451 | // deleted nicks | ||
▲ Show 20 Lines • Show All 487 Lines • ▼ Show 20 Line(s) | 931 | { | |||
939 | else | 939 | else | ||
940 | m_inputBar->setText(out, true); | 940 | m_inputBar->setText(out, true); | ||
941 | } | 941 | } | ||
942 | 942 | | |||
943 | void Channel::addNickname(ChannelNickPtr channelnick) | 943 | void Channel::addNickname(ChannelNickPtr channelnick) | ||
944 | { | 944 | { | ||
945 | QString nickname = channelnick->loweredNickname(); | 945 | QString nickname = channelnick->loweredNickname(); | ||
946 | 946 | | |||
947 | Nick* nick=0; | 947 | Nick* nick = nullptr; | ||
948 | 948 | | |||
949 | foreach (Nick* lookNick, nicknameList) | 949 | foreach (Nick* lookNick, nicknameList) | ||
950 | { | 950 | { | ||
951 | if(lookNick->getChannelNick()->loweredNickname() == nickname) | 951 | if(lookNick->getChannelNick()->loweredNickname() == nickname) | ||
952 | { | 952 | { | ||
953 | nick = lookNick; | 953 | nick = lookNick; | ||
954 | break; | 954 | break; | ||
955 | } | 955 | } | ||
956 | } | 956 | } | ||
957 | 957 | | |||
958 | if (nick == 0) | 958 | if (!nick) | ||
959 | { | 959 | { | ||
960 | fastAddNickname(channelnick); | 960 | fastAddNickname(channelnick); | ||
961 | 961 | | |||
962 | if(channelnick->isAnyTypeOfOp()) | 962 | if(channelnick->isAnyTypeOfOp()) | ||
963 | { | 963 | { | ||
964 | adjustOps(1); | 964 | adjustOps(1); | ||
965 | } | 965 | } | ||
966 | 966 | | |||
▲ Show 20 Lines • Show All 325 Lines • ▼ Show 20 Line(s) | 1271 | { | |||
1292 | } | 1292 | } | ||
1293 | 1293 | | |||
1294 | if(channelNick->isAnyTypeOfOp()) | 1294 | if(channelNick->isAnyTypeOfOp()) | ||
1295 | adjustOps(-1); | 1295 | adjustOps(-1); | ||
1296 | 1296 | | |||
1297 | adjustNicks(-1); | 1297 | adjustNicks(-1); | ||
1298 | Nick* nick = getNickByName(channelNick->loweredNickname()); | 1298 | Nick* nick = getNickByName(channelNick->loweredNickname()); | ||
1299 | 1299 | | |||
1300 | if(nick == 0) | 1300 | if(!nick) | ||
1301 | { | 1301 | { | ||
1302 | qWarning() << "Nickname " << channelNick->getNickname() << " not found!"<< endl; | 1302 | qWarning() << "Nickname " << channelNick->getNickname() << " not found!"<< endl; | ||
1303 | } | 1303 | } | ||
1304 | else | 1304 | else | ||
1305 | { | 1305 | { | ||
1306 | nicknameList.removeOne(nick); | 1306 | nicknameList.removeOne(nick); | ||
1307 | m_nicknameNickHash.remove(channelNick->loweredNickname()); | 1307 | m_nicknameNickHash.remove(channelNick->loweredNickname()); | ||
1308 | delete nick; | 1308 | delete nick; | ||
▲ Show 20 Lines • Show All 542 Lines • ▼ Show 20 Line(s) | 1846 | { | |||
1851 | { | 1851 | { | ||
1852 | if ((*it)[0] == QLatin1Char('k')) k = (*it); | 1852 | if ((*it)[0] == QLatin1Char('k')) k = (*it); | ||
1853 | } | 1853 | } | ||
1854 | 1854 | | |||
1855 | m_modeList.clear(); | 1855 | m_modeList.clear(); | ||
1856 | 1856 | | |||
1857 | if (!k.isEmpty()) m_modeList << k; | 1857 | if (!k.isEmpty()) m_modeList << k; | ||
1858 | 1858 | | |||
1859 | modeT->setOn(0); | 1859 | modeT->setOn(false); | ||
1860 | modeT->setDown(0); | 1860 | modeT->setDown(false); | ||
1861 | 1861 | | |||
1862 | modeN->setOn(0); | 1862 | modeN->setOn(false); | ||
1863 | modeN->setDown(0); | 1863 | modeN->setDown(false); | ||
1864 | 1864 | | |||
1865 | modeS->setOn(0); | 1865 | modeS->setOn(false); | ||
1866 | modeS->setDown(0); | 1866 | modeS->setDown(false); | ||
1867 | 1867 | | |||
1868 | modeI->setOn(0); | 1868 | modeI->setOn(false); | ||
1869 | modeI->setDown(0); | 1869 | modeI->setDown(false); | ||
1870 | 1870 | | |||
1871 | modeP->setOn(0); | 1871 | modeP->setOn(false); | ||
1872 | modeP->setDown(0); | 1872 | modeP->setDown(false); | ||
1873 | 1873 | | |||
1874 | modeM->setOn(0); | 1874 | modeM->setOn(false); | ||
1875 | modeM->setDown(0); | 1875 | modeM->setDown(false); | ||
1876 | 1876 | | |||
1877 | modeK->setOn(0); | 1877 | modeK->setOn(false); | ||
1878 | modeK->setDown(0); | 1878 | modeK->setDown(false); | ||
1879 | 1879 | | |||
1880 | modeL->setOn(0); | 1880 | modeL->setOn(false); | ||
1881 | modeL->setDown(0); | 1881 | modeL->setDown(false); | ||
1882 | 1882 | | |||
1883 | limit->clear(); | 1883 | limit->clear(); | ||
1884 | 1884 | | |||
1885 | emit modesChanged(); | 1885 | emit modesChanged(); | ||
1886 | } | 1886 | } | ||
1887 | 1887 | | |||
1888 | void Channel::updateModeWidgets(char mode, bool plus, const QString ¶meter) | 1888 | void Channel::updateModeWidgets(char mode, bool plus, const QString ¶meter) | ||
1889 | { | 1889 | { | ||
1890 | ModeButton* widget=0; | 1890 | ModeButton* widget = nullptr; | ||
1891 | 1891 | | |||
1892 | if(mode=='t') widget=modeT; | 1892 | if(mode=='t') widget=modeT; | ||
1893 | else if(mode=='n') widget=modeN; | 1893 | else if(mode=='n') widget=modeN; | ||
1894 | else if(mode=='s') widget=modeS; | 1894 | else if(mode=='s') widget=modeS; | ||
1895 | else if(mode=='i') widget=modeI; | 1895 | else if(mode=='i') widget=modeI; | ||
1896 | else if(mode=='p') widget=modeP; | 1896 | else if(mode=='p') widget=modeP; | ||
1897 | else if(mode=='m') widget=modeM; | 1897 | else if(mode=='m') widget=modeM; | ||
1898 | else if(mode=='k') widget=modeK; | 1898 | else if(mode=='k') widget=modeK; | ||
Show All 19 Lines | 1913 | { | |||
1918 | } | 1918 | } | ||
1919 | } | 1919 | } | ||
1920 | emit modesChanged(); | 1920 | emit modesChanged(); | ||
1921 | } | 1921 | } | ||
1922 | 1922 | | |||
1923 | void Channel::updateQuickButtons() | 1923 | void Channel::updateQuickButtons() | ||
1924 | { | 1924 | { | ||
1925 | delete m_buttonsGrid; | 1925 | delete m_buttonsGrid; | ||
1926 | m_buttonsGrid = 0; | 1926 | m_buttonsGrid = nullptr; | ||
1927 | 1927 | | |||
1928 | // the grid that holds the quick action buttons | 1928 | // the grid that holds the quick action buttons | ||
1929 | m_buttonsGrid = new QWidget (nickListButtons); //Q3Grid(2, nickListButtons); | 1929 | m_buttonsGrid = new QWidget (nickListButtons); //Q3Grid(2, nickListButtons); | ||
1930 | nickListButtons->layout()->addWidget(m_buttonsGrid); | 1930 | nickListButtons->layout()->addWidget(m_buttonsGrid); | ||
1931 | m_buttonsGrid->hide(); | 1931 | m_buttonsGrid->hide(); | ||
1932 | QGridLayout* layout = new QGridLayout (m_buttonsGrid); | 1932 | QGridLayout* layout = new QGridLayout (m_buttonsGrid); | ||
1933 | layout->setMargin(0); | 1933 | layout->setMargin(0); | ||
1934 | 1934 | | |||
▲ Show 20 Lines • Show All 969 Lines • Show Last 20 Lines |