提交: 2846eade2601e92d34d40c603988a14dcb7634ac - xinput_calibrator (git)

A generic touchscreen calibration program for X.Org

Commit MetaInfo

• 修订版: 2846eade2601e92d34d40c603988a14dcb7634ac (tree)
• 时间: 2013-01-23 02:34:11
• 作者: Andreas Müller <schnitzeltony@goog...>
• Commiter: Andreas Müller

Log Message

Make all Calibrator* destructors virtual to fix warning

warning was:

main_x11.cpp: In function 'int main(int, char**)':
main_x11.cpp:42:12: warning: deleting object of abstract class type 'Calibrator' which has non-virtual destructor will cause undefined behaviour [-Wdelete-non-virtual-dtor]calibrator/Usbtouchscreen.cpp: In member function 'void CalibratorUsbtouchscreen::read_int_parameter(const char*, int&)':

Signed-off-by: Andreas Müller <[e-mail]>

更改概述

• modified: src/calibrator.hh
• modified: src/calibrator/Evdev.hpp
• modified: src/calibrator/Usbtouchscreen.hpp

差异

--- a/src/calibrator.hh
+++ b/src/calibrator.hh
@@ -148,7 +148,7 @@ public:
                const bool use_timeout=1,
                const char* output_filename = 0);
 
-    ~Calibrator() {}
+    virtual ~Calibrator() {}
 
     /// set the doubleclick treshold
     void set_threshold_doubleclick(int t)

--- a/src/calibrator/Evdev.hpp
+++ b/src/calibrator/Evdev.hpp
@@ -60,7 +60,7 @@ public:
                     const char* geometry=0,
                     const bool use_timeout=false,
                     const char* output_filename = 0);
-    ~CalibratorEvdev();
+    virtual ~CalibratorEvdev();
 
     /// calculate and apply the calibration
     virtual bool finish(int width, int height);

--- a/src/calibrator/Usbtouchscreen.hpp
+++ b/src/calibrator/Usbtouchscreen.hpp
@@ -36,7 +36,7 @@ public:
          const int thr_misclick=0, const int thr_doubleclick=0,
         const OutputType output_type=OUTYPE_AUTO, const char* geometry=0,
         const bool use_timeout=false, const char* output_filename = 0);
-    ~CalibratorUsbtouchscreen();
+    virtual ~CalibratorUsbtouchscreen();
 
     virtual bool finish_data(const XYinfo new_axys);