X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fsigsession.h;h=9359176c784ac5ebbd633741e4d4eb9782dde19b;hb=7db87de3cf2079f49ad395fba3a0b16f2b0f8ce5;hp=d1f11ea9682767131757758139437468f6752140;hpb=bb3030b34e44733036acdfe5b4d4ec0705146831;p=pulseview.git

diff --git a/pv/sigsession.h b/pv/sigsession.h
index d1f11ea9..9359176c 100644
--- a/pv/sigsession.h
+++ b/pv/sigsession.h
@@ -115,27 +115,12 @@ private:
 
 	void update_signals(std::shared_ptr<device::DevInst> dev_inst);
 
-	std::shared_ptr<view::Signal> signal_from_probe(
-		const sr_channel *probe) const;
+	std::shared_ptr<view::Signal> signal_from_channel(
+		const sr_channel *channel) const;
 
 	void read_sample_rate(const sr_dev_inst *const sdi);
 
 private:
-	/**
-	 * Attempts to autodetect the format. Failing that
-	 * @param filename The filename of the input file.
-	 * @return A pointer to the 'struct sr_input_format' that should be
-	 * 	used, or NULL if no input format was selected or
-	 * 	auto-detected.
-	 */
-	static sr_input_format* determine_input_file_format(
-		const std::string &filename);
-
-	static sr_input* load_input_file_format(
-		const std::string &filename,
-		std::function<void (const QString)> error_handler,
-		sr_input_format *format = NULL);
-
 	void sample_thread_proc(std::shared_ptr<device::DevInst> dev_inst,
 		std::function<void (const QString)> error_handler);
 
@@ -180,7 +165,7 @@ private:
 
 	std::thread _sampling_thread;
 
-signals:
+Q_SIGNALS:
 	void capture_state_changed(int state);
 
 	void signals_changed();