srd: rename public API functions to srd_thing_action format

diff --git a/decodersform.cpp b/decodersform.cpp
index 2dea88aa5461da696e831f59ad453daabae5e956..f09495f5946af0b3fcfdb46af6816436ff0a176a 100644 (file)
--- a/decodersform.cpp
+++ b/decodersform.cpp
@@ -40,7 +40,7 @@ DecodersForm::DecodersForm(QWidget *parent) :
 
        ui->setupUi(this);
 
-       for (ll = srd_list_decoders(), i = 0; ll; ll = ll->next, ++i) {
+       for (ll = srd_decoders_list(), i = 0; ll; ll = ll->next, ++i) {
                dec = (struct srd_decoder *)ll->data;
 
                /* Add the decoder to the list. */

diff --git a/main.cpp b/main.cpp
index 7afaa75abc7524c5a46032194652c0714b7c8f11..314603d477be563e908176d5bbe79a12abed1508 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
        /* The GUI wants to show a list of all PDs before use, so we
         * might as well load them now.
         */
-       srd_load_all_decoders();
+       srd_decoders_load_all();
 
        return a.exec();
 }

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ca8b075a09f1e2a4ae94226c2859108a6b420175..c05b57c3cfcf1730b48984fad5e589e35907ca04 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -246,7 +246,7 @@ void MainWindow::on_actionAbout_triggered()
        s.append("</table><p>");
 
        s.append("<b>" + tr("Supported protocol decoders:") + "</b><table>");
-       for (l = srd_list_decoders(); l; l = l->next) {
+       for (l = srd_decoders_list(); l; l = l->next) {
                dec = (struct srd_decoder *)l->data;
                s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
                         .arg(QString(dec->id))
@@ -840,7 +840,7 @@ void MainWindow::on_actionQUICK_HACK_PD_TEST_triggered()
                return;
        }
 
-       if (srd_inst_set_probes(di, pd_opthash) != SRD_OK) {
+       if (srd_inst_probes_set(di, pd_opthash) != SRD_OK) {
                ui->plainTextEdit->appendPlainText("ERROR: srd_instance_set_probes");
                return;
        }