Changeset View
Changeset View
Standalone View
Standalone View
uploadjob.cpp
Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Line(s) | 81 | { | |||
---|---|---|---|---|---|
98 | } | 98 | } | ||
99 | 99 | | |||
100 | KDevelop::ProjectBaseItem* item = m_uploadProjectModel->item(m_uploadIndex); | 100 | KDevelop::ProjectBaseItem* item = m_uploadProjectModel->item(m_uploadIndex); | ||
101 | 101 | | |||
102 | Qt::CheckState checked = static_cast<Qt::CheckState>(m_uploadProjectModel | 102 | Qt::CheckState checked = static_cast<Qt::CheckState>(m_uploadProjectModel | ||
103 | ->data(m_uploadIndex, Qt::CheckStateRole).toInt()); | 103 | ->data(m_uploadIndex, Qt::CheckStateRole).toInt()); | ||
104 | 104 | | |||
105 | KDevelop::Path url; | 105 | KDevelop::Path url; | ||
106 | QUrl localUrl = m_uploadProjectModel->currentProfileLocalUrl().adjusted(QUrl::StripTrailingSlash); | ||||
107 | | ||||
108 | KDevelop::Path localPath = KDevelop::Path(localUrl.path()); | ||||
106 | 109 | | |||
107 | if (item->folder()) { | 110 | if (item->folder()) { | ||
108 | url = item->folder()->path(); | 111 | url = item->folder()->path(); | ||
109 | } else if (item->file()) { | 112 | } else if (item->file()) { | ||
110 | url = item->file()->path(); | 113 | url = item->file()->path(); | ||
111 | } | 114 | } | ||
112 | 115 | | |||
113 | QString relativeUrl(m_project->path().relativePath(url)); | 116 | if(localPath.path().isEmpty()) { | ||
117 | localPath = m_project->path(); | ||||
118 | } | ||||
119 | | ||||
120 | QString relativeUrl(localPath.relativePath(url)); | ||||
114 | 121 | | |||
115 | if (isQuickUpload() && checked == Qt::Unchecked) { | 122 | if (isQuickUpload() && checked == Qt::Unchecked) { | ||
116 | appendLog(i18n("File was not modified for %1: %2", | 123 | appendLog(i18n("File was not modified for %1: %2", | ||
117 | m_uploadProjectModel->currentProfileName(), | 124 | m_uploadProjectModel->currentProfileName(), | ||
118 | relativeUrl)); | 125 | relativeUrl)); | ||
119 | } | 126 | } | ||
120 | 127 | | |||
121 | if (!(item->file() || item->folder()) || checked == Qt::Unchecked) { | 128 | if (!(item->file() || item->folder()) || checked == Qt::Unchecked) { | ||
▲ Show 20 Lines • Show All 145 Lines • Show Last 20 Lines |