aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/dcc/broker.cpp
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2010-12-27 05:02:48 +0000
committerGravatar Szymon Tomasz Stefanek2010-12-27 05:02:48 +0000
commit075bdcd93cf7882bad4cb027adf159f93674d6e5 (patch)
treeae06173bd9e8e2db71cced8a9ebad214607d7f9a /src/modules/dcc/broker.cpp
parentYet more renaming and cleanup (diff)
downloadKVIrc-075bdcd93cf7882bad4cb027adf159f93674d6e5.tar.gz
KVIrc-075bdcd93cf7882bad4cb027adf159f93674d6e5.tar.bz2
KVIrc-075bdcd93cf7882bad4cb027adf159f93674d6e5.zip
More renaming and cleanup
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5237 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc/broker.cpp')
-rw-r--r--src/modules/dcc/broker.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index d0934cc0f..5474729f0 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -38,21 +38,21 @@
#include "canvas.h"
#endif
-#include "kvi_app.h"
-#include "kvi_frame.h"
+#include "KviApplication.h"
+#include "KviMainWindow.h"
#include "KviLocale.h"
-#include "kvi_options.h"
-#include "kvi_console.h"
+#include "KviOptions.h"
+#include "KviConsoleWindow.h"
#include "KviFileUtils.h"
#include "kvi_out.h"
#include "KviMediaType.h"
-#include "kvi_ircconnection.h"
+#include "KviIrcConnection.h"
#include "KviSharedFilesManager.h"
#include <QFileInfo>
#include <QString>
-// kvi_app.cpp
+// KviApplication.cpp
extern KVIRC_API KviMediaManager * g_pMediaManager;
extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
@@ -655,7 +655,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc)
dcc->szLocalFileName = "";
- if(dcc->bIsIncomingAvatar)g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApp::Avatars);
+ if(dcc->bIsIncomingAvatar)g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApplication::Avatars);
else {
if(KVI_OPTION_BOOL(KviOption_boolUseIncomingDccMediaTypeSavePath))
@@ -685,7 +685,7 @@ void KviDccBroker::chooseSaveFileName(KviDccBox *box,KviDccDescriptor *dcc)
if(dcc->szLocalFileName.isEmpty())
{
- g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApp::Incoming);
+ g_pApp->getLocalKvircDirectory(dcc->szLocalFileName,KviApplication::Incoming);
if(KVI_OPTION_BOOL(KviOption_boolSortReceivedByDccFilesByNicks))
{
KviQString::ensureLastCharIs(dcc->szLocalFileName,KVI_PATH_SEPARATOR_CHAR);