#include "resourcefile_p.h"
-#include <utils/qtcassert.h>
-
#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
#include <QtCore/QDir>
} else {
p = m_prefix_list[idx];
}
- QTC_ASSERT(p, return false);
+ Q_ASSERT(p);
QDomElement felt = relt.firstChildElement(QLatin1String("file"));
for (; !felt.isNull(); felt = felt.nextSiblingElement(QLatin1String("file"))) {
QStringList ResourceFile::fileList(int pref_idx) const
{
QStringList result;
- QTC_ASSERT(pref_idx >= 0 && pref_idx < m_prefix_list.count(), return result);
+ Q_ASSERT(pref_idx >= 0 && pref_idx < m_prefix_list.count());
const FileList &abs_file_list = m_prefix_list.at(pref_idx)->file_list;
foreach (const File *abs_file, abs_file_list)
result.append(relativePath(abs_file->name));
void ResourceFile::addFile(int prefix_idx, const QString &file, int file_idx)
{
Prefix * const p = m_prefix_list[prefix_idx];
- QTC_ASSERT(p, return);
+ Q_ASSERT(p);
FileList &files = p->file_list;
- QTC_ASSERT(file_idx >= -1 && file_idx <= files.size(), return);
+ Q_ASSERT(file_idx >= -1 && file_idx <= files.size());
if (file_idx == -1)
file_idx = files.size();
files.insert(file_idx, new File(p, absolutePath(file)));
if (indexOfPrefix(fixed_prefix) != -1)
return;
- QTC_ASSERT(prefix_idx >= -1 && prefix_idx <= m_prefix_list.size(), return);
+ Q_ASSERT(prefix_idx >= -1 && prefix_idx <= m_prefix_list.size());
if (prefix_idx == -1)
prefix_idx = m_prefix_list.size();
m_prefix_list.insert(prefix_idx, new Prefix(fixed_prefix));
void ResourceFile::removePrefix(int prefix_idx)
{
- QTC_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count(), return);
+ Q_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count());
Prefix * const p = m_prefix_list.at(prefix_idx);
delete p;
m_prefix_list.removeAt(prefix_idx);
void ResourceFile::removeFile(int prefix_idx, int file_idx)
{
- QTC_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count(), return);
+ Q_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count());
FileList &fileList = m_prefix_list[prefix_idx]->file_list;
- QTC_ASSERT(file_idx >= 0 && file_idx < fileList.count(), return);
+ Q_ASSERT(file_idx >= 0 && file_idx < fileList.count());
delete fileList.at(file_idx);
fileList.removeAt(file_idx);
}
void ResourceFile::replacePrefix(int prefix_idx, const QString &prefix)
{
- QTC_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count(), return);
+ Q_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count());
m_prefix_list[prefix_idx]->name = fixPrefix(prefix);
}
void ResourceFile::replaceLang(int prefix_idx, const QString &lang)
{
- QTC_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count(), return);
+ Q_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count());
m_prefix_list[prefix_idx]->lang = lang;
}
void ResourceFile::replaceAlias(int prefix_idx, int file_idx, const QString &alias)
{
- QTC_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count(), return);
+ Q_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count());
FileList &fileList = m_prefix_list.at(prefix_idx)->file_list;
- QTC_ASSERT(file_idx >= 0 && file_idx < fileList.count(), return);
+ Q_ASSERT(file_idx >= 0 && file_idx < fileList.count());
fileList[file_idx]->alias = alias;
}
void ResourceFile::replaceFile(int pref_idx, int file_idx, const QString &file)
{
- QTC_ASSERT(pref_idx >= 0 && pref_idx < m_prefix_list.count(), return);
+ Q_ASSERT(pref_idx >= 0 && pref_idx < m_prefix_list.count());
FileList &fileList = m_prefix_list.at(pref_idx)->file_list;
- QTC_ASSERT(file_idx >= 0 && file_idx < fileList.count(), return);
+ Q_ASSERT(file_idx >= 0 && file_idx < fileList.count());
fileList[file_idx]->name = file;
}
int ResourceFile::indexOfFile(int pref_idx, const QString &file) const
{
- QTC_ASSERT(pref_idx >= 0 && pref_idx < m_prefix_list.count(), return -1);
+ Q_ASSERT(pref_idx >= 0 && pref_idx < m_prefix_list.count());
Prefix * const p = m_prefix_list.at(pref_idx);
File equalFile(p, absolutePath(file));
return p->file_list.indexOf(&equalFile);
return false;
if (file.isEmpty())
return true;
- QTC_ASSERT(pref_idx >= 0 && pref_idx < m_prefix_list.count(), return false);
+ Q_ASSERT(pref_idx >= 0 && pref_idx < m_prefix_list.count());
Prefix * const p = m_prefix_list.at(pref_idx);
- QTC_ASSERT(p, return false);
+ Q_ASSERT(p);
File equalFile(p, absolutePath(file));
return p->file_list.contains(&equalFile);
}
bool ResourceFile::contains(int pref_idx, const QString &file) const
{
- QTC_ASSERT(pref_idx >= 0 && pref_idx < m_prefix_list.count(), return false);
+ Q_ASSERT(pref_idx >= 0 && pref_idx < m_prefix_list.count());
Prefix * const p = m_prefix_list.at(pref_idx);
File equalFile(p, absolutePath(file));
return p->file_list.contains(&equalFile);
QString ResourceFile::prefix(int idx) const
{
- QTC_ASSERT((idx >= 0) && (idx < m_prefix_list.count()), return QString());
+ Q_ASSERT((idx >= 0) && (idx < m_prefix_list.count()));
return m_prefix_list.at(idx)->name;
}
QString ResourceFile::lang(int idx) const
{
- QTC_ASSERT(idx >= 0 && idx < m_prefix_list.count(), return QString());
+ Q_ASSERT(idx >= 0 && idx < m_prefix_list.count());
return m_prefix_list.at(idx)->lang;
}
int ResourceFile::fileCount(int prefix_idx) const
{
- QTC_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count(), return 0);
+ Q_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count());
return m_prefix_list.at(prefix_idx)->file_list.size();
}
QString ResourceFile::file(int prefix_idx, int file_idx) const
{
- QTC_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count(), return QString());
+ Q_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count());
FileList &fileList = m_prefix_list.at(prefix_idx)->file_list;
- QTC_ASSERT(file_idx >= 0 && file_idx < fileList.count(), return QString());
+ Q_ASSERT(file_idx >= 0 && file_idx < fileList.count());
return fileList.at(file_idx)->name;
}
QString ResourceFile::alias(int prefix_idx, int file_idx) const
{
- QTC_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count(), return QString());
+ Q_ASSERT(prefix_idx >= 0 && prefix_idx < m_prefix_list.count());
FileList &fileList = m_prefix_list.at(prefix_idx)->file_list;
- QTC_ASSERT(file_idx >= 0 && file_idx < fileList.count(), return QString());
+ Q_ASSERT(file_idx >= 0 && file_idx < fileList.count());
return fileList.at(file_idx)->alias;
}
void * ResourceFile::prefixPointer(int prefixIndex) const
{
- QTC_ASSERT(prefixIndex >= 0 && prefixIndex < m_prefix_list.count(), return 0);
+ Q_ASSERT(prefixIndex >= 0 && prefixIndex < m_prefix_list.count());
return m_prefix_list.at(prefixIndex);
}
void * ResourceFile::filePointer(int prefixIndex, int fileIndex) const
{
- QTC_ASSERT(prefixIndex >= 0 && prefixIndex < m_prefix_list.count(), return 0);
+ Q_ASSERT(prefixIndex >= 0 && prefixIndex < m_prefix_list.count());
FileList &fileList = m_prefix_list.at(prefixIndex)->file_list;
- QTC_ASSERT(fileIndex >= 0 && fileIndex < fileList.count(), return 0);
+ Q_ASSERT(fileIndex >= 0 && fileIndex < fileList.count());
return fileList.at(fileIndex);
}
// File node
Node * const node = reinterpret_cast<Node *>(pip);
Prefix * const prefix = node->prefix();
- QTC_ASSERT(prefix, return QModelIndex());
+ Q_ASSERT(prefix);
if (row < 0 || row >= prefix->file_list.count())
return QModelIndex();
const int prefixIndex = m_resource_file.prefixPointerIndex(prefix);
return QModelIndex();
internalPointer = m_resource_file.prefixPointer(row);
}
- QTC_ASSERT(internalPointer, return QModelIndex());
+ Q_ASSERT(internalPointer);
return createIndex(row, 0, internalPointer);
}
return QModelIndex();
Node * const node = reinterpret_cast<Node *>(internalPointer);
Prefix * const prefix = node->prefix();
- QTC_ASSERT(prefix, return QModelIndex());
+ Q_ASSERT(prefix);
bool const isFileNode = (prefix != node);
if (isFileNode) {
const int row = m_resource_file.prefixPointerIndex(prefix);
- QTC_ASSERT(row >= 0, return QModelIndex());
+ Q_ASSERT(row >= 0);
return createIndex(row, 0, prefix);
} else {
return QModelIndex();
void * const internalPointer = parent.internalPointer();
Node * const node = reinterpret_cast<Node *>(internalPointer);
Prefix * const prefix = node->prefix();
- QTC_ASSERT(prefix, return 0);
+ Q_ASSERT(prefix);
bool const isFileNode = (prefix != node);
if (isFileNode) {
Node * const node = reinterpret_cast<Node *>(internalPointer);
Prefix const * const prefix = node->prefix();
File const * const file = node->file();
- QTC_ASSERT(prefix, return QVariant());
+ Q_ASSERT(prefix);
bool const isFileNode = (prefix != node);
QVariant result;
appendParenthesized(lang, stringRes);
} else {
// File node
- QTC_ASSERT(file, return result);
+ Q_ASSERT(file);
stringRes = QFileInfo(file->name).fileName();
const QString alias = file->alias;
if (!alias.isEmpty())
case Qt::DecorationRole:
if (isFileNode) {
// File node
- QTC_ASSERT(file, return result);
+ Q_ASSERT(file);
const QString path = m_resource_file.absolutePath(file->name);
if (iconFileExtension(path)) {
const QIcon icon(path);
case Qt::ToolTipRole:
if (isFileNode) {
// File node
- QTC_ASSERT(file, return result);
+ Q_ASSERT(file);
QString conv_file = m_resource_file.relativePath(file->name);
QString stringRes = conv_file.replace(QDir::separator(), QLatin1Char('/'));
const QString &alias_file = file->alias;
void * const internalPointer = index.internalPointer();
Node * const node = reinterpret_cast<Node *>(internalPointer);
Prefix * const p = node->prefix();
- QTC_ASSERT(p, return);
+ Q_ASSERT(p);
bool const isFileNode = (p != node);
if (isFileNode) {
File *const f = node->file();
- QTC_ASSERT(f, return);
+ Q_ASSERT(f);
if (!f->alias.isEmpty())
file = f->alias;
else
#include "undocommands_p.h"
-#include <utils/qtcassert.h>
-
#include <QtCore/QDebug>
#include <QtGui/QAction>
EntryBackup * ResourceView::removeEntry(const QModelIndex &index)
{
- QTC_ASSERT(m_qrcModel, return 0);
+ Q_ASSERT(m_qrcModel);
return m_qrcModel->removeEntry(index);
}
void ResourceView::addFiles(int prefixIndex, const QStringList &fileNames, int cursorFile,
int &firstFile, int &lastFile)
{
- QTC_ASSERT(m_qrcModel, return);
+ Q_ASSERT(m_qrcModel);
m_qrcModel->addFiles(prefixIndex, fileNames, cursorFile, firstFile, lastFile);
// Expand prefix node
void ResourceView::removeFiles(int prefixIndex, int firstFileIndex, int lastFileIndex)
{
- QTC_ASSERT(prefixIndex >= 0 && prefixIndex < m_qrcModel->rowCount(QModelIndex()), return);
+ Q_ASSERT(prefixIndex >= 0 && prefixIndex < m_qrcModel->rowCount(QModelIndex()));
const QModelIndex prefixModelIndex = m_qrcModel->index(prefixIndex, 0, QModelIndex());
- QTC_ASSERT(prefixModelIndex != QModelIndex(), return);
- QTC_ASSERT(firstFileIndex >= 0 && firstFileIndex < m_qrcModel->rowCount(prefixModelIndex), return);
- QTC_ASSERT(lastFileIndex >= 0 && lastFileIndex < m_qrcModel->rowCount(prefixModelIndex), return);
+ Q_ASSERT(prefixModelIndex != QModelIndex());
+ Q_ASSERT(firstFileIndex >= 0 && firstFileIndex < m_qrcModel->rowCount(prefixModelIndex));
+ Q_ASSERT(lastFileIndex >= 0 && lastFileIndex < m_qrcModel->rowCount(prefixModelIndex));
for (int i = lastFileIndex; i >= firstFileIndex; i--) {
const QModelIndex index = m_qrcModel->index(i, 0, prefixModelIndex);
case AliasProperty: return currentAlias();
case PrefixProperty: return currentPrefix();
case LanguageProperty: return currentLanguage();
- default: QTC_ASSERT(false, /**/); return QString(); // Kill warning
+ default: Q_ASSERT(false); return QString(); // Kill warning
}
}
case AliasProperty: m_qrcModel->changeAlias(nodeIndex, value); return;
case PrefixProperty: m_qrcModel->changePrefix(nodeIndex, value); return;
case LanguageProperty: m_qrcModel->changeLang(nodeIndex, value); return;
- default: QTC_ASSERT(false, /**/);
+ default: Q_ASSERT(false);
}
}