summaryrefslogtreecommitdiffstats
path: root/khelpcenter
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /khelpcenter
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'khelpcenter')
-rw-r--r--khelpcenter/application.cpp2
-rw-r--r--khelpcenter/docentry.cpp2
-rw-r--r--khelpcenter/htmlsearch/index.cpp2
-rw-r--r--khelpcenter/khc_indexbuilder.cpp2
-rw-r--r--khelpcenter/navigator.cpp2
-rw-r--r--khelpcenter/testmetainfo.cpp2
6 files changed, 6 insertions, 6 deletions
diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp
index 89a664d1c..506a6eda5 100644
--- a/khelpcenter/application.cpp
+++ b/khelpcenter/application.cpp
@@ -76,7 +76,7 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
TDECmdLineArgs::init( argc, argv, &aboutData );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication::addCmdLineOptions();
+ TDEApplication::addCmdLineOptions();
KHC::Application app;
diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index 96e4ce500..5c08592bd 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -113,7 +113,7 @@ void DocEntry::setIdentifier( const TQString &identifier )
TQString DocEntry::identifier() const
{
- if ( mIdentifier.isEmpty() ) mIdentifier = KApplication::randomString( 15 );
+ if ( mIdentifier.isEmpty() ) mIdentifier = TDEApplication::randomString( 15 );
return mIdentifier;
}
diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp
index 77bf2d62d..eb73d11cd 100644
--- a/khelpcenter/htmlsearch/index.cpp
+++ b/khelpcenter/htmlsearch/index.cpp
@@ -23,7 +23,7 @@ int main(int argc, char *argv[])
TDECmdLineArgs::addCmdLineOptions( options );
KGlobal::locale()->setMainCatalogue("htmlsearch");
- KApplication app;
+ TDEApplication app;
HTMLSearch search;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp
index ca12b5b91..03a076651 100644
--- a/khelpcenter/khc_indexbuilder.cpp
+++ b/khelpcenter/khc_indexbuilder.cpp
@@ -183,7 +183,7 @@ int main( int argc, char **argv )
TDECmdLineArgs::addCmdLineOptions( options );
KUniqueApplication::addCmdLineOptions();
- KApplication app;
+ TDEApplication app;
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 17f76cdcd..c2179e702 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -100,7 +100,7 @@ Navigator::Navigator( View *view, TQWidget *parent, const char *name )
searchLayout->setMargin( 6 );
TQPushButton *clearButton = new TQPushButton( mSearchFrame );
- clearButton->setIconSet( KApplication::reverseLayout() ?
+ clearButton->setIconSet( TDEApplication::reverseLayout() ?
SmallIconSet( "clear_left" ) : SmallIconSet("locationbar_erase") );
searchLayout->addWidget( clearButton );
connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( clearSearch() ) );
diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp
index 13b0e1800..e5d204461 100644
--- a/khelpcenter/testmetainfo.cpp
+++ b/khelpcenter/testmetainfo.cpp
@@ -91,7 +91,7 @@ int main(int argc,char **argv)
KAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1");
TDECmdLineArgs::init(argc,argv,&aboutData);
- KApplication app;
+ TDEApplication app;
kdDebug() << "Scanning Meta Info" << endl;