also compile with merged files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18244 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/QListings.cpp b/src/frontends/qt4/QListings.cpp
index 7df97e187098df2caa7e5225e479bd5c01313038..6b3d5c045793b5176cea1b00f2f978931c1f80dd 100644 (file)
--- a/src/frontends/qt4/QListings.cpp
+++ b/src/frontends/qt4/QListings.cpp
@@ -88,10 +88,10 @@ void QListingsDialog::validate_listings_params()
 //
 /////////////////////////////////////////////////////////////////////
 
-typedef QController<ControlListings, QView<QListingsDialog> > wrap_base_class;
+typedef QController<ControlListings, QView<QListingsDialog> > listings_wrap_base_class;
 
 QListings::QListings(Dialog & parent)
-       : wrap_base_class(parent, _("Program Listings Settings"))
+       : listings_wrap_base_class(parent, _("Program Listings Settings"))
 {
 }