diff options
| author | Gerald Combs <gerald@wireshark.org> | 2019-12-17 13:32:43 -0800 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2019-12-18 04:31:03 +0000 |
| commit | d614ade782b9381573e1770e0d172db0decb56a5 (patch) | |
| tree | db46cd01e2d58ca1ec3f0a7ad08b12a07fb84b39 /ui | |
| parent | c656affc346d61d7d606f5a55d006c2f5863c3b4 (diff) | |
De-camel-ize "Wireshark" in a few places.
The _wslua_main struct / WireShark class appears to have never been
used, so remove it.
Change-Id: Id80fb2c2065accedf632ea4cc467d566d10870de
Reviewed-on: https://code.wireshark.org/review/35480
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/models/profile_model.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/utils/wireshark_zip_helper.cpp | 8 | ||||
| -rw-r--r-- | ui/qt/utils/wireshark_zip_helper.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ui/qt/models/profile_model.cpp b/ui/qt/models/profile_model.cpp index 337668c5ea..1e40afa23b 100644 --- a/ui/qt/models/profile_model.cpp +++ b/ui/qt/models/profile_model.cpp @@ -1076,7 +1076,7 @@ bool ProfileModel::exportProfiles(QString filename, QModelIndexList items, QStri return false; } - if (WireSharkZipHelper::zip(filename, files, gchar_free_to_qstring(get_profiles_dir()) + QDir::separator()) ) + if (WiresharkZipHelper::zip(filename, files, gchar_free_to_qstring(get_profiles_dir()) + QDir::separator()) ) return true; return false; @@ -1113,7 +1113,7 @@ int ProfileModel::importProfilesFromZip(QString filename, int * skippedCnt, QStr int cnt = 0; if (dir.isValid()) { - WireSharkZipHelper::unzip(filename, dir.path(), &ProfileModel::acceptFile, &ProfileModel::cleanName); + WiresharkZipHelper::unzip(filename, dir.path(), &ProfileModel::acceptFile, &ProfileModel::cleanName); cnt = importProfilesFromDir(dir.path(), skippedCnt, true, result); } diff --git a/ui/qt/utils/wireshark_zip_helper.cpp b/ui/qt/utils/wireshark_zip_helper.cpp index a32204d820..c6b49efc89 100644 --- a/ui/qt/utils/wireshark_zip_helper.cpp +++ b/ui/qt/utils/wireshark_zip_helper.cpp @@ -32,7 +32,7 @@ #include <QDateTime> #include <QMap> -bool WireSharkZipHelper::unzip(QString zipFile, QString directory, bool (*fileCheck)(QString, int), QString (*cleanName)(QString)) +bool WiresharkZipHelper::unzip(QString zipFile, QString directory, bool (*fileCheck)(QString, int), QString (*cleanName)(QString)) { unzFile uf = Q_NULLPTR; QFileInfo fi(zipFile); @@ -176,7 +176,7 @@ unsigned long qDateToDosDate(QDateTime time) return dosDate << 16 | dosTime; } -void WireSharkZipHelper::addFileToZip(zipFile zf, QString filepath, QString fileInZip) +void WiresharkZipHelper::addFileToZip(zipFile zf, QString filepath, QString fileInZip) { QFileInfo fi(filepath); zip_fileinfo zi; @@ -217,7 +217,7 @@ void WireSharkZipHelper::addFileToZip(zipFile zf, QString filepath, QString file zipCloseFileInZip(zf); } -bool WireSharkZipHelper::zip(QString fileName, QStringList files, QString relativeTo) +bool WiresharkZipHelper::zip(QString fileName, QStringList files, QString relativeTo) { QFileInfo fi(fileName); @@ -237,7 +237,7 @@ bool WireSharkZipHelper::zip(QString fileName, QStringList files, QString relati while (fileInZip.length() > 0 && fileInZip.startsWith(QDir::separator())) fileInZip = fileInZip.right(fileInZip.length() - 1); - WireSharkZipHelper::addFileToZip(zf, sf.absoluteFilePath(), fileInZip); + WiresharkZipHelper::addFileToZip(zf, sf.absoluteFilePath(), fileInZip); } diff --git a/ui/qt/utils/wireshark_zip_helper.h b/ui/qt/utils/wireshark_zip_helper.h index 57e8751e16..54960ef7da 100644 --- a/ui/qt/utils/wireshark_zip_helper.h +++ b/ui/qt/utils/wireshark_zip_helper.h @@ -20,7 +20,7 @@ #include "minizip/zip.h" -class WireSharkZipHelper +class WiresharkZipHelper { public: static bool zip(QString zipFile, QStringList files, QString relativeTo = QString()); |