summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Bauer <[email protected]>2017-11-17 20:08:34 +0100
committerWolfgang Bauer <[email protected]>2017-11-17 20:08:34 +0100
commit93870f22352f086b90f3ce27bd26d31eaf2036ef (patch)
tree4ffb71b1a6db85010d47a225d7cc86a557645f50
parent136bd66c18bf1c85f91e2fd9d9a6636670161271 (diff)
Rename slot DataSourceFactory::open()
On some (32bit) systems, open may be #define'd to open64 when the moc file is generated, which breaks the compilation. Renaming the slot to slotOpen() should avoid this problem. BUG: 386948
-rw-r--r--core/datasourcefactory.cpp4
-rw-r--r--core/datasourcefactory.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/datasourcefactory.cpp b/core/datasourcefactory.cpp
index f5e199b..1e77e11 100644
--- a/core/datasourcefactory.cpp
+++ b/core/datasourcefactory.cpp
@@ -221,7 +221,7 @@ void DataSourceFactory::start()
if (checkLocalFile()) {
if (!m_putJob) {
m_putJob = KIO::open(m_dest, QIODevice::WriteOnly | QIODevice::ReadOnly);
- connect(m_putJob, SIGNAL(open(KIO::Job*)), this, SLOT(open(KIO::Job*)));
+ connect(m_putJob, SIGNAL(open(KIO::Job*)), this, SLOT(slotOpen(KIO::Job*)));
connect(m_putJob, SIGNAL(destroyed(QObject*)), this, SLOT(slotPutJobDestroyed(QObject*)));
m_startTried = true;
return;
@@ -305,7 +305,7 @@ void DataSourceFactory::slotRemovedFile()
}
}
-void DataSourceFactory::open(KIO::Job *job)
+void DataSourceFactory::slotOpen(KIO::Job *job)
{
Q_UNUSED(job)
qCDebug(KGET_DEBUG) << "File opened" << this;
diff --git a/core/datasourcefactory.h b/core/datasourcefactory.h
index f293630..bbb93fc 100644
--- a/core/datasourcefactory.h
+++ b/core/datasourcefactory.h
@@ -209,7 +209,7 @@ class KGET_EXPORT DataSourceFactory : public QObject
void slotOffset(KIO::Job *job, KIO::filesize_t offset);
void slotDataWritten(KIO::Job *job, KIO::filesize_t offset);
void slotPercent(KJob *job, ulong percent);
- void open(KIO::Job *job);
+ void slotOpen(KIO::Job *job);
void speedChanged();
/**
* Kills the putjob and starts the moving of files