Skip to content

Commit 26deab5

Browse files
authored
fix: include mocs in top-level namespace (#5)
1 parent 030710a commit 26deab5

18 files changed

+36
-35
lines changed

src/core/irc.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,6 @@ QDebug operator<<(QDebug debug, Irc::SortMethod method)
239239
}
240240
#endif // QT_NO_DEBUG_STREAM
241241

242-
#include "moc_irc.cpp"
243-
244242
IRC_END_NAMESPACE
243+
244+
#include "moc_irc.cpp"

src/core/irccommand.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -926,6 +926,6 @@ QDebug operator<<(QDebug debug, const IrcCommand* command)
926926
}
927927
#endif // QT_NO_DEBUG_STREAM
928928

929-
#include "moc_irccommand.cpp"
930-
931929
IRC_END_NAMESPACE
930+
931+
#include "moc_irccommand.cpp"

src/core/ircconnection.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1754,6 +1754,6 @@ QDebug operator<<(QDebug debug, const IrcConnection* connection)
17541754
}
17551755
#endif // QT_NO_DEBUG_STREAM
17561756

1757-
#include "moc_ircconnection.cpp"
1758-
17591757
IRC_END_NAMESPACE
1758+
1759+
#include "moc_ircconnection.cpp"

src/core/ircmessage.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -2367,6 +2367,6 @@ QDebug operator<<(QDebug debug, const IrcMessage* message)
23672367
}
23682368
#endif // QT_NO_DEBUG_STREAM
23692369

2370-
#include "moc_ircmessage.cpp"
2371-
23722370
IRC_END_NAMESPACE
2371+
2372+
#include "moc_ircmessage.cpp"

src/core/ircmessagecomposer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,6 @@ void IrcMessageComposer::replaceParam(int index, const QString& param)
256256
}
257257
#endif // IRC_DOXYGEN
258258

259-
#include "moc_ircmessagecomposer_p.cpp"
260-
261259
IRC_END_NAMESPACE
260+
261+
#include "moc_ircmessagecomposer_p.cpp"

src/core/ircnetwork.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,6 @@ QDebug operator<<(QDebug debug, const IrcNetwork* network)
774774
}
775775
#endif // QT_NO_DEBUG_STREAM
776776

777-
#include "moc_ircnetwork.cpp"
778-
779777
IRC_END_NAMESPACE
778+
779+
#include "moc_ircnetwork.cpp"

src/core/ircprotocol.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,6 @@ void IrcProtocol::setActiveCapabilities(const QSet<QString>& capabilities)
587587
priv->setActiveCapabilities(capabilities);
588588
}
589589

590-
#include "moc_ircprotocol.cpp"
591-
592590
IRC_END_NAMESPACE
591+
592+
#include "moc_ircprotocol.cpp"

src/model/ircbuffer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,6 @@ QDebug operator<<(QDebug debug, const IrcBuffer* buffer)
642642
}
643643
#endif // QT_NO_DEBUG_STREAM
644644

645-
#include "moc_ircbuffer.cpp"
646-
647645
IRC_END_NAMESPACE
646+
647+
#include "moc_ircbuffer.cpp"

src/model/ircbuffermodel.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,8 @@ bool IrcBufferModel::restoreState(const QByteArray& state, int version)
14211421
return true;
14221422
}
14231423

1424+
IRC_END_NAMESPACE
1425+
14241426
#include "moc_ircbuffermodel.cpp"
14251427
#include "moc_ircbuffermodel_p.cpp"
14261428

1427-
IRC_END_NAMESPACE

src/model/ircchannel.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,6 @@ QDebug operator<<(QDebug debug, const IrcChannel* channel)
669669
}
670670
#endif // QT_NO_DEBUG_STREAM
671671

672-
#include "moc_ircchannel.cpp"
673-
674672
IRC_END_NAMESPACE
673+
674+
#include "moc_ircchannel.cpp"

src/model/ircuser.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,6 @@ QDebug operator<<(QDebug debug, const IrcUser* user)
273273
}
274274
#endif // QT_NO_DEBUG_STREAM
275275

276-
#include "moc_ircuser.cpp"
277-
278276
IRC_END_NAMESPACE
277+
278+
#include "moc_ircuser.cpp"

src/model/ircusermodel.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,6 @@ bool IrcUserModel::lessThan(IrcUser* one, IrcUser* another, Irc::SortMethod meth
761761
return n1.compare(n2, Qt::CaseInsensitive) < 0;
762762
}
763763

764-
#include "moc_ircusermodel.cpp"
765-
766764
IRC_END_NAMESPACE
765+
766+
#include "moc_ircusermodel.cpp"

src/util/irccommandparser.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,6 @@ void IrcCommandParser::reset()
599599
setTarget(QString());
600600
}
601601

602-
#include "moc_irccommandparser.cpp"
603-
604602
IRC_END_NAMESPACE
603+
604+
#include "moc_irccommandparser.cpp"

src/util/irccommandqueue.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ void IrcCommandQueue::flush()
244244
d->_irc_sendBatch(true);
245245
}
246246

247+
IRC_END_NAMESPACE
248+
247249
#include "moc_irccommandqueue.cpp"
248250
#include "moc_irccommandqueue_p.cpp"
249-
250-
IRC_END_NAMESPACE

src/util/irccompleter.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,6 @@ void IrcCompleter::reset()
407407
d->completions.clear();
408408
}
409409

410-
#include "moc_irccompleter.cpp"
411-
412410
IRC_END_NAMESPACE
411+
412+
#include "moc_irccompleter.cpp"

src/util/irclagtimer.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ void IrcLagTimer::setInterval(int seconds)
244244
}
245245
}
246246

247+
IRC_END_NAMESPACE
248+
247249
#include "moc_irclagtimer.cpp"
248250
#include "moc_irclagtimer_p.cpp"
249-
250-
IRC_END_NAMESPACE

src/util/ircpalette.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,6 @@ void IrcPalette::setColorName(int color, const QString& name)
523523
d->colors.insert(color, name);
524524
}
525525

526-
#include "moc_ircpalette.cpp"
527-
528526
IRC_END_NAMESPACE
527+
528+
#include "moc_ircpalette.cpp"

src/util/irctextformat.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,6 @@ void IrcTextFormat::parse(const QString& text)
530530
d->parse(text, &d->plainText, &d->html, &d->urls);
531531
}
532532

533-
#include "moc_irctextformat.cpp"
534-
535533
IRC_END_NAMESPACE
534+
535+
#include "moc_irctextformat.cpp"

0 commit comments

Comments
 (0)