diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-19 18:46:43 -0600 |
| commit | d41050ea3f6904e5156d35f664346b816b9e4d12 (patch) | |
| tree | 7b3ff517432a631adc61a2a93080dc3bacfab604 /kcontrol/kfontinst | |
| parent | c16d0f2191af1e4810391dbd1a06d7713fb38666 (diff) | |
| download | tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.tar.gz tdebase-d41050ea3f6904e5156d35f664346b816b9e4d12.zip | |
Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kfontinst')
| -rw-r--r-- | kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/kfontinst/viewpart/FontViewerApp.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index c60934624..c225187fd 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -93,10 +93,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) about->addAuthor("Craig Drummond", I18N_NOOP("Developer and maintainer"), "craig@kde.org"); setAboutData(about); - const char *appName=KCmdLineArgs::appName(); + const char *appName=TDECmdLineArgs::appName(); itsEmbeddedAdmin=Misc::root() && (NULL==appName || strcmp("kcontrol", appName) && - KCmdLineArgs::parsedArgs()->isSet("embed")); + TDECmdLineArgs::parsedArgs()->isSet("embed")); itsStatusLabel = new TQLabel(this); itsStatusLabel->setFrameShape(TQFrame::Panel); diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp index 09617ade8..acfd96178 100644 --- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp @@ -54,7 +54,7 @@ CFontViewerAppMainWindow::CFontViewerAppMainWindow() itsPreview=(KParts::ReadOnlyPart *)factory->create(TQT_TQOBJECT(this), "fontvier", "KParts::ReadOnlyPart"); - KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); + TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); KURL openURL; if(args->count() > 0) @@ -118,8 +118,8 @@ static KAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP( int main(int argc, char **argv) { - KCmdLineArgs::init(argc, argv, &aboutData); - KCmdLineArgs::addCmdLineOptions(options); + TDECmdLineArgs::init(argc, argv, &aboutData); + TDECmdLineArgs::addCmdLineOptions(options); KFI::CFontViewerApp::addCmdLineOptions(); KFI::CFontViewerApp app; |