aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-03-04 15:43:33 -0800
committerGerald Combs <gerald@wireshark.org>2015-03-05 20:17:29 +0000
commit8664de017f4c715aa088b27f09a87820cdaf13ed (patch)
tree2b709dea6585c96c86aed132dcc9766cd1598995 /ui
parent89270fbe0fd70fda8d27dc3195c00a92a48d675d (diff)
Qt: Constify a bunch of strings.
Change-Id: I601e429408fc042fc5b18a4750d40e260da47f43 Reviewed-on: https://code.wireshark.org/review/7535 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/byte_view_tab.cpp2
-rw-r--r--ui/qt/byte_view_tab.h2
-rw-r--r--ui/qt/byte_view_text.h2
-rw-r--r--ui/qt/capture_filter_combo.cpp4
-rw-r--r--ui/qt/capture_filter_combo.h2
-rw-r--r--ui/qt/capture_filter_edit.h4
-rw-r--r--ui/qt/display_filter_edit.h4
-rw-r--r--ui/qt/main_status_bar.cpp10
-rw-r--r--ui/qt/main_status_bar.h11
-rw-r--r--ui/qt/main_welcome.cpp4
-rw-r--r--ui/qt/main_welcome.h2
-rw-r--r--ui/qt/main_window.cpp23
-rw-r--r--ui/qt/proto_tree.h2
-rw-r--r--ui/qt/search_frame.h2
14 files changed, 37 insertions, 37 deletions
diff --git a/ui/qt/byte_view_tab.cpp b/ui/qt/byte_view_tab.cpp
index 3b2c138cfd..c7ba1a9f7a 100644
--- a/ui/qt/byte_view_tab.cpp
+++ b/ui/qt/byte_view_tab.cpp
@@ -43,7 +43,7 @@ void ByteViewTab::addTab(const char *name, tvbuff_t *tvb, proto_tree *tree, QTre
byte_view_text->setAccessibleName(name);
byte_view_text->setMonospaceFont(mono_font_);
connect(this, SIGNAL(monospaceFontChanged(QFont)), byte_view_text, SLOT(setMonospaceFont(QFont)));
- connect(byte_view_text, SIGNAL(byteFieldHovered(QString&)), this, SIGNAL(byteFieldHovered(QString&)));
+ connect(byte_view_text, SIGNAL(byteFieldHovered(const QString&)), this, SIGNAL(byteFieldHovered(const QString&)));
QTabWidget::addTab(byte_view_text, name);
}
diff --git a/ui/qt/byte_view_tab.h b/ui/qt/byte_view_tab.h
index ef8ef01e81..47151c7c11 100644
--- a/ui/qt/byte_view_tab.h
+++ b/ui/qt/byte_view_tab.h
@@ -54,7 +54,7 @@ protected:
signals:
void monospaceFontChanged(const QFont &mono_font);
- void byteFieldHovered(QString &);
+ void byteFieldHovered(const QString &);
public slots:
void protoTreeItemChanged(QTreeWidgetItem *current);
diff --git a/ui/qt/byte_view_text.h b/ui/qt/byte_view_text.h
index cbb7b0c372..5f416ac9d8 100644
--- a/ui/qt/byte_view_text.h
+++ b/ui/qt/byte_view_text.h
@@ -57,7 +57,7 @@ public:
void setFieldAppendixHighlight(int start, int end);
signals:
- void byteFieldHovered(QString &);
+ void byteFieldHovered(const QString &);
public slots:
void setMonospaceFont(const QFont &mono_font);
diff --git a/ui/qt/capture_filter_combo.cpp b/ui/qt/capture_filter_combo.cpp
index d990ce782a..b2040b3d7c 100644
--- a/ui/qt/capture_filter_combo.cpp
+++ b/ui/qt/capture_filter_combo.cpp
@@ -75,8 +75,8 @@ CaptureFilterCombo::CaptureFilterCombo(QWidget *parent) :
completer()->setCompletionMode(QCompleter::PopupCompletion);
connect(this, SIGNAL(interfacesChanged()), cf_edit_, SLOT(checkFilter()));
- connect(cf_edit_, SIGNAL(pushFilterSyntaxStatus(QString&)),
- this, SIGNAL(pushFilterSyntaxStatus(QString&)));
+ connect(cf_edit_, SIGNAL(pushFilterSyntaxStatus(const QString&)),
+ this, SIGNAL(pushFilterSyntaxStatus(const QString&)));
connect(cf_edit_, SIGNAL(popFilterSyntaxStatus()),
this, SIGNAL(popFilterSyntaxStatus()));
connect(cf_edit_, SIGNAL(captureFilterSyntaxChanged(bool)),
diff --git a/ui/qt/capture_filter_combo.h b/ui/qt/capture_filter_combo.h
index 918be0ec63..fd7b866c34 100644
--- a/ui/qt/capture_filter_combo.h
+++ b/ui/qt/capture_filter_combo.h
@@ -37,7 +37,7 @@ public:
signals:
void interfacesChanged();
- void pushFilterSyntaxStatus(QString&);
+ void pushFilterSyntaxStatus(const QString&);
void popFilterSyntaxStatus();
void captureFilterSyntaxChanged(bool valid);
void startCapture();
diff --git a/ui/qt/capture_filter_edit.h b/ui/qt/capture_filter_edit.h
index af4f2ecc62..58e26949bd 100644
--- a/ui/qt/capture_filter_edit.h
+++ b/ui/qt/capture_filter_edit.h
@@ -59,11 +59,11 @@ private:
CaptureFilterSyntaxWorker *syntax_worker_;
signals:
- void pushFilterSyntaxStatus(QString&);
+ void pushFilterSyntaxStatus(const QString&);
void popFilterSyntaxStatus();
void captureFilterSyntaxChanged(bool valid);
void startCapture();
- void addBookmark(QString filter);
+ void addBookmark(const QString filter);
};
diff --git a/ui/qt/display_filter_edit.h b/ui/qt/display_filter_edit.h
index 896b9da09d..74f373a09f 100644
--- a/ui/qt/display_filter_edit.h
+++ b/ui/qt/display_filter_edit.h
@@ -56,9 +56,9 @@ private:
QToolButton *apply_button_;
signals:
- void pushFilterSyntaxStatus(QString&);
+ void pushFilterSyntaxStatus(const QString&);
void popFilterSyntaxStatus();
- void pushFilterSyntaxWarning(QString&);
+ void pushFilterSyntaxWarning(const QString&);
void filterPackets(QString& new_filter, bool force);
void addBookmark(QString filter);
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index 881903bd2a..b879d52366 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -231,7 +231,7 @@ void MainStatusBar::setCaptureFile(capture_file *cf)
comment_label_.setEnabled(cap_file_ != NULL);
}
-void MainStatusBar::pushTemporaryStatus(QString &message) {
+void MainStatusBar::pushTemporaryStatus(const QString &message) {
info_status_.pushText(message, STATUS_CTX_TEMPORARY);
}
@@ -239,7 +239,7 @@ void MainStatusBar::popTemporaryStatus() {
info_status_.popText(STATUS_CTX_TEMPORARY);
}
-void MainStatusBar::pushFileStatus(QString &message, QString &messagetip ) {
+void MainStatusBar::pushFileStatus(const QString &message, const QString &messagetip ) {
info_status_.pushText(message, STATUS_CTX_FILE);
info_status_.setToolTip(messagetip);
expertUpdate();
@@ -250,7 +250,7 @@ void MainStatusBar::popFileStatus() {
info_status_.setToolTip("");
}
-void MainStatusBar::pushFieldStatus(QString &message) {
+void MainStatusBar::pushFieldStatus(const QString &message) {
if (message.isNull()) {
popFieldStatus();
} else {
@@ -262,7 +262,7 @@ void MainStatusBar::popFieldStatus() {
info_status_.popText(STATUS_CTX_FIELD);
}
-void MainStatusBar::pushByteStatus(QString &message)
+void MainStatusBar::pushByteStatus(const QString &message)
{
if (message.isNull()) {
popByteStatus();
@@ -276,7 +276,7 @@ void MainStatusBar::popByteStatus()
info_status_.popText(STATUS_CTX_BYTE);
}
-void MainStatusBar::pushFilterStatus(QString &message) {
+void MainStatusBar::pushFilterStatus(const QString &message) {
info_status_.pushText(message, STATUS_CTX_FILTER);
expertUpdate();
}
diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h
index d81eaf4737..339fd6b96f 100644
--- a/ui/qt/main_status_bar.h
+++ b/ui/qt/main_status_bar.h
@@ -59,18 +59,17 @@ private:
signals:
void editCaptureComment();
-
public slots:
void setCaptureFile(capture_file *cf);
- void pushTemporaryStatus(QString &message);
+ void pushTemporaryStatus(const QString &message);
void popTemporaryStatus();
- void pushFileStatus(QString &message, QString &messagetip);
+ void pushFileStatus(const QString &message, const QString &messagetip);
void popFileStatus();
- void pushFieldStatus(QString &message);
+ void pushFieldStatus(const QString &message);
void popFieldStatus();
- void pushByteStatus(QString &message);
+ void pushByteStatus(const QString &message);
void popByteStatus();
- void pushFilterStatus(QString &message);
+ void pushFilterStatus(const QString &message);
void popFilterStatus();
void pushProfileName();
void updateCaptureStatistics(capture_session * cap_session);
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp
index 6d71e6c365..0fd547bfbf 100644
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@@ -149,8 +149,8 @@ MainWelcome::MainWelcome(QWidget *parent) :
this, SLOT(interfaceDoubleClicked(QTreeWidgetItem*,int)));
connect(welcome_ui_->interfaceTree, SIGNAL(interfaceUpdated(const char*,bool)),
welcome_ui_->captureFilterComboBox, SIGNAL(interfacesChanged()));
- connect(welcome_ui_->captureFilterComboBox, SIGNAL(pushFilterSyntaxStatus(QString&)),
- this, SIGNAL(pushFilterSyntaxStatus(QString&)));
+ connect(welcome_ui_->captureFilterComboBox, SIGNAL(pushFilterSyntaxStatus(const QString&)),
+ this, SIGNAL(pushFilterSyntaxStatus(const QString&)));
connect(welcome_ui_->captureFilterComboBox, SIGNAL(popFilterSyntaxStatus()),
this, SIGNAL(popFilterSyntaxStatus()));
connect(welcome_ui_->captureFilterComboBox, SIGNAL(captureFilterSyntaxChanged(bool)),
diff --git a/ui/qt/main_welcome.h b/ui/qt/main_welcome.h
index 4af0170b0b..e9d1eb40ba 100644
--- a/ui/qt/main_welcome.h
+++ b/ui/qt/main_welcome.h
@@ -58,7 +58,7 @@ private:
signals:
void startCapture();
void recentFileActivated(QString& cfile);
- void pushFilterSyntaxStatus(QString&);
+ void pushFilterSyntaxStatus(const QString&);
void popFilterSyntaxStatus();
void captureFilterSyntaxChanged(bool valid);
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 025b1cb4cf..c87c057dd3 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -213,10 +213,11 @@ MainWindow::MainWindow(QWidget *parent) :
#endif
const DisplayFilterEdit *df_edit = dynamic_cast<DisplayFilterEdit *>(df_combo_box_->lineEdit());
- connect(df_edit, SIGNAL(pushFilterSyntaxStatus(QString&)), main_ui_->statusBar, SLOT(pushFilterStatus(QString&)));
+ connect(df_edit, SIGNAL(pushFilterSyntaxStatus(const QString&)),
+ main_ui_->statusBar, SLOT(pushFilterStatus(const QString&)));
connect(df_edit, SIGNAL(popFilterSyntaxStatus()), main_ui_->statusBar, SLOT(popFilterStatus()));
- connect(df_edit, SIGNAL(pushFilterSyntaxWarning(QString&)),
- main_ui_->statusBar, SLOT(pushTemporaryStatus(QString&)));
+ connect(df_edit, SIGNAL(pushFilterSyntaxWarning(const QString&)),
+ main_ui_->statusBar, SLOT(pushTemporaryStatus(const QString&)));
connect(df_edit, SIGNAL(filterPackets(QString&,bool)), this, SLOT(filterPackets(QString&,bool)));
connect(df_edit, SIGNAL(addBookmark(QString)), this, SLOT(addDisplayFilterButton(QString)));
connect(this, SIGNAL(displayFilterSuccess(bool)), df_edit, SLOT(displayFilterSuccess(bool)));
@@ -234,8 +235,8 @@ MainWindow::MainWindow(QWidget *parent) :
// https://bugreports.qt-project.org/browse/QTBUG-7174
main_ui_->searchFrame->hide();
- connect(main_ui_->searchFrame, SIGNAL(pushFilterSyntaxStatus(QString&)),
- main_ui_->statusBar, SLOT(pushTemporaryStatus(QString&)));
+ connect(main_ui_->searchFrame, SIGNAL(pushFilterSyntaxStatus(const QString&)),
+ main_ui_->statusBar, SLOT(pushTemporaryStatus(const QString&)));
main_ui_->columnEditorFrame->hide();
@@ -338,8 +339,8 @@ MainWindow::MainWindow(QWidget *parent) :
this, SLOT(startCapture()));
connect(main_welcome_, SIGNAL(recentFileActivated(QString&)),
this, SLOT(openCaptureFile(QString&)));
- connect(main_welcome_, SIGNAL(pushFilterSyntaxStatus(QString&)),
- main_ui_->statusBar, SLOT(pushFilterStatus(QString&)));
+ connect(main_welcome_, SIGNAL(pushFilterSyntaxStatus(const QString&)),
+ main_ui_->statusBar, SLOT(pushFilterStatus(const QString&)));
connect(main_welcome_, SIGNAL(popFilterSyntaxStatus()),
main_ui_->statusBar, SLOT(popFilterStatus()));
@@ -391,15 +392,15 @@ MainWindow::MainWindow(QWidget *parent) :
connect(packet_list_, SIGNAL(packetListScrolled(bool)),
main_ui_->actionGoAutoScroll, SLOT(setChecked(bool)));
- connect(proto_tree_, SIGNAL(protoItemSelected(QString&)),
- main_ui_->statusBar, SLOT(pushFieldStatus(QString&)));
+ connect(proto_tree_, SIGNAL(protoItemSelected(const QString&)),
+ main_ui_->statusBar, SLOT(pushFieldStatus(const QString&)));
connect(proto_tree_, SIGNAL(protoItemSelected(field_info *)),
this, SLOT(setMenusForSelectedTreeRow(field_info *)));
connect(proto_tree_, SIGNAL(openPacketInNewWindow(bool)),
this, SLOT(openPacketDialog(bool)));
- connect(byte_view_tab_, SIGNAL(byteFieldHovered(QString&)),
- main_ui_->statusBar, SLOT(pushByteStatus(QString&)));
+ connect(byte_view_tab_, SIGNAL(byteFieldHovered(const QString&)),
+ main_ui_->statusBar, SLOT(pushByteStatus(const QString&)));
connect(main_ui_->statusBar, SIGNAL(editCaptureComment()),
this, SLOT(on_actionStatisticsCaptureFileProperties_triggered()));
diff --git a/ui/qt/proto_tree.h b/ui/qt/proto_tree.h
index 8890cca27a..b883308b1b 100644
--- a/ui/qt/proto_tree.h
+++ b/ui/qt/proto_tree.h
@@ -49,7 +49,7 @@ private:
QFont mono_font_;
signals:
- void protoItemSelected(QString &);
+ void protoItemSelected(const QString &);
void protoItemSelected(field_info *);
void openPacketInNewWindow(bool);
void goToPacket(int);
diff --git a/ui/qt/search_frame.h b/ui/qt/search_frame.h
index 599209509b..3bc96a2f2c 100644
--- a/ui/qt/search_frame.h
+++ b/ui/qt/search_frame.h
@@ -48,7 +48,7 @@ public slots:
void findFrameWithFilter(QString &filter);
signals:
- void pushFilterSyntaxStatus(QString&);
+ void pushFilterSyntaxStatus(const QString&);
protected:
void keyPressEvent(QKeyEvent *event);