From 95e28f5bcadbf0ac052c4f29d77b4ab5e6648d1b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:24:38 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- languages/java/app_templates/kappjava/app.java | 4 ++-- languages/java/app_templates/kappjava/app_client.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'languages/java/app_templates/kappjava') diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java index 2cb3e94a..b8a51016 100644 --- a/languages/java/app_templates/kappjava/app.java +++ b/languages/java/app_templates/kappjava/app.java @@ -76,7 +76,7 @@ public void load(KURL url) public void setupActions() { - KApplication kapp = KApplication.kApplication(); + TDEApplication kapp = TDEApplication.kApplication(); KStdAction.openNew(this, SLOT("fileNew()"), actionCollection()); KStdAction.open(this, SLOT("fileOpen()"), actionCollection()); KStdAction.save(this, SLOT("fileSave()"), actionCollection()); @@ -242,7 +242,7 @@ static void main(String[] cmdLineArgs) about.addAuthor( "%{AUTHOR}", null, "%{EMAIL}" ); KCmdLineArgs.init(cmdLineArgs, about); KCmdLineArgs.addCmdLineOptions(options); - KApplication app = new KApplication(); + TDEApplication app = new TDEApplication(); // see if we are starting with session management if (app.isRestored()) diff --git a/languages/java/app_templates/kappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java index 9ed90c8a..9648cfad 100644 --- a/languages/java/app_templates/kappjava/app_client.java +++ b/languages/java/app_templates/kappjava/app_client.java @@ -9,7 +9,7 @@ int main(int argc, char **argv) { - KApplication app(argc, argv, "%{APPNAMELC}_client", false); + TDEApplication app(argc, argv, "%{APPNAMELC}_client", false); // get our DCOP client and attach so that we may use it DCOPClient *client = app.dcopClient(); -- cgit v1.2.1