Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove some qtg_ indirection functions #908

Merged
merged 17 commits into from
Feb 14, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge qtg_version_message into version_message
  • Loading branch information
lmoureaux committed Feb 14, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 24d56f1abb91aba54615034264cbbeafe2c8ea00
2 changes: 1 addition & 1 deletion client/gui-qt/chatline.cpp
Original file line number Diff line number Diff line change
@@ -725,7 +725,7 @@ void qtg_real_output_window_append(const QString &astring,
/**
Got version message from metaserver
*/
void qtg_version_message(const QString &vertext)
void version_message(const QString &vertext)
{
king()->set_status_bar(vertext);
}
3 changes: 2 additions & 1 deletion client/gui-qt/page_network.cpp
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
#include "fcintl.h"
// client
#include "chatline_common.h"
#include "chatline_g.h"
#include "client_main.h"
#include "clinet.h"
#include "connectdlg_common.h"
@@ -273,7 +274,7 @@ void page_network::update_server_list(enum server_scan_type sstype,
void server_scan_error(struct server_scan *scan, const char *message)
{
Q_UNUSED(scan)
qtg_version_message(message);
version_message(message);
qCritical("%s", message);
qobject_cast<page_network *>(king()->pages[PAGE_NETWORK])
->destroy_server_scans();
1 change: 0 additions & 1 deletion client/gui-qt/qtg_cxxside.cpp
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ void setup_gui_funcs()
{
struct gui_funcs *funcs = get_gui_funcs();

funcs->version_message = qtg_version_message;
funcs->real_output_window_append = qtg_real_output_window_append;

funcs->is_view_supported = qtg_is_view_supported;
1 change: 0 additions & 1 deletion client/gui-qt/qtg_cxxside.h
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ class QTcpSocket;

void setup_gui_funcs();

void qtg_version_message(const QString &vertext);
void qtg_real_output_window_append(const QString &astring,
const struct text_tag_list *tags,
int conn_id);
5 changes: 0 additions & 5 deletions client/gui_interface.cpp
Original file line number Diff line number Diff line change
@@ -40,11 +40,6 @@ static struct gui_funcs funcs;
*/
struct gui_funcs *get_gui_funcs() { return &funcs; }

/**
Call version_message callback
*/
void version_message(const char *vertext) { funcs.version_message(vertext); }

/**
Call real_output_window_append callback
*/
1 change: 0 additions & 1 deletion client/gui_interface.h
Original file line number Diff line number Diff line change
@@ -29,7 +29,6 @@ class QTcpSocket;
#include "tilespec.h"

struct gui_funcs {
void (*version_message)(const QString &vertext);
void (*real_output_window_append)(const QString &astring,
const struct text_tag_list *tags,
int conn_id);
2 changes: 1 addition & 1 deletion client/include/chatline_g.h
Original file line number Diff line number Diff line change
@@ -16,4 +16,4 @@

GUI_FUNC_PROTO(void, real_output_window_append, const QString &astring,
const struct text_tag_list *tags, int conn_id)
GUI_FUNC_PROTO(void, version_message, const char *vertext)
void version_message(const QString &vertext);