summaryrefslogtreecommitdiffstats
path: root/kmrml/kmrml/mrml.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:18:35 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:18:35 -0600
commitf71394031a5e1c3b315081a98000f242b461ca8c (patch)
tree54081035a0fdae2cadbf9d7df74a9a4e4cd46925 /kmrml/kmrml/mrml.cpp
parente5ce3b4175f2e72788b49b9ed46c722784218dad (diff)
downloadtdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.tar.gz
tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmrml/kmrml/mrml.cpp')
-rw-r--r--kmrml/kmrml/mrml.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kmrml/kmrml/mrml.cpp b/kmrml/kmrml/mrml.cpp
index 3a6f6721..ab4cfcfc 100644
--- a/kmrml/kmrml/mrml.cpp
+++ b/kmrml/kmrml/mrml.cpp
@@ -39,7 +39,7 @@ extern "C" {
KDE_EXPORT int kdemain( int argc, char **argv )
{
KLocale::setMainCatalogue("tdelibs");
- KInstance instance( "kio_mrml" );
+ TDEInstance instance( "kio_mrml" );
KGlobal::locale()->insertCatalogue( "kmrml" );
kdDebug() << "Starting MRML " << getpid() << endl;