YGGverse/Yoda
1
0
Fork 0
mirror of https://github.com/YGGverse/Yoda.git synced 2026-04-02 17:45:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

replace std constructions with glib

Browse source
This commit is contained in:
yggverse 2024-08-17 12:45:43 +03:00
parent a064778d68
commit cbf786ce4c
8 changed files with 60 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

50
src/app/browser/main/tab/page/navbar/request.cpp
View file

@ -1,7 +1,6 @@
#include "request.hpp"
using namespace app::browser::main::tab::page::navbar;
using namespace std;
// Construct
Request::Request()
@ -42,27 +41,27 @@ Request::Request()
Request::~Request() = default;
// Getters
string Request::get_scheme()
Glib::ustring Request::get_scheme()
{
return scheme;
}
string Request::get_host()
Glib::ustring Request::get_host()
{
return host;
}
string Request::get_port()
Glib::ustring Request::get_port()
{
return port;
}
string Request::get_path()
Glib::ustring Request::get_path()
{
return path;
}
string Request::get_query()
Glib::ustring Request::get_query()
{
return path;
}
@ -70,23 +69,30 @@ string Request::get_query()
// Private helpers
void Request::parse()
{
string subject = get_text();
smatch results;
static const regex pattern( // @TODO user:password@#fragment?
R"regex(^((\w+)?:\/\/)?([^:\/]+)?(:(\d+)?)?([^\?$]+)?(\?(.*)?)?)regex"
auto match = Glib::Regex::split_simple(
R"regex(^((\w+)?:\/\/)?([^:\/]+)?(:(\d+)?)?([^\?$]+)?(\?(.*)?)?)regex",
get_text()
);
regex_search(
subject,
results,
pattern
);
scheme = "";
host = "";
port = "";
path = "";
query = "";
scheme = results[2];
host = results[3];
port = results[5];
path = results[6];
query = results[8];
int index = 0;
for (const Glib::ustring & value : match)
{
switch (index)
{
case 2: scheme = value; break;
case 3: host = value; break;
case 5: port = value; break;
case 6: path = value; break;
case 8: query = value; break;
}
index++;
}
}

25
src/app/browser/main/tab/page/navbar/request.hpp
View file

@ -2,20 +2,19 @@
#define APP_BROWSER_MAIN_TAB_PAGE_NAVBAR_REQUEST_HPP
#include <glibmm/i18n.h>
#include <glibmm/regex.h>
#include <glibmm/ustring.h>
#include <gtkmm/entry.h>
#include <regex>
#include <string>
namespace app::browser::main::tab::page::navbar
{
class Request : public Gtk::Entry
{
std::string scheme,
host,
port,
path,
query;
Glib::ustring scheme,
host,
port,
path,
query;
void parse();
@ -25,11 +24,11 @@ namespace app::browser::main::tab::page::navbar
~Request();
std::string get_scheme();
std::string get_host();
std::string get_port();
std::string get_path();
std::string get_query();
Glib::ustring get_scheme();
Glib::ustring get_host();
Glib::ustring get_port();
Glib::ustring get_path();
Glib::ustring get_query();
};
}