X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=c71b5c2c5b4a2233f9e00a197011f1dde00fb5e6;hp=9a4994f0efe397853772af4ec0d7372386dacaec;hb=cd37744f0a2cd8ffe027892ddce5c7d6f4848ab0;hpb=176fd53453c51debbb963dee303e8853577aaac4 diff --git a/src/common/network.cpp b/src/common/network.cpp index 9a4994f0..c71b5c2c 100644 --- a/src/common/network.cpp +++ b/src/common/network.cpp @@ -17,12 +17,12 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include "network.h" - -#include #include #include +#include "network.h" +#include "quassel.h" + QTextCodec *Network::_defaultCodecForServer = 0; QTextCodec *Network::_defaultCodecForEncoding = 0; QTextCodec *Network::_defaultCodecForDecoding = 0; @@ -403,7 +403,7 @@ QByteArray Network::encodeServerString(const QString &string) const { QStringList Network::presetNetworks(bool onlyDefault) { // lazily find the file, make sure to not call one of the other preset functions first (they'll fail else) if(_networksIniPath.isNull()) { - _networksIniPath = findDataFilePath("networks.ini"); + _networksIniPath = Quassel::findDataFilePath("networks.ini"); if(_networksIniPath.isNull()) { _networksIniPath = ""; // now we won't check again, as it's not null anymore return QStringList();