diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:24:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:24:38 -0600 |
| commit | 95e28f5bcadbf0ac052c4f29d77b4ab5e6648d1b (patch) | |
| tree | 4c22f2f3096672431df9180a0946c137012f3f2c /languages/java | |
| parent | bdeb717137b6fc8693198008ccb97f8213973416 (diff) | |
| download | tdevelop-95e28f5bcadbf0ac052c4f29d77b4ab5e6648d1b.tar.gz tdevelop-95e28f5bcadbf0ac052c4f29d77b4ab5e6648d1b.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'languages/java')
| -rw-r--r-- | languages/java/app_templates/kappjava/app.java | 4 | ||||
| -rw-r--r-- | languages/java/app_templates/kappjava/app_client.java | 2 | ||||
| -rw-r--r-- | languages/java/backgroundparser.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
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(); diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index b1f23ac3..86b193c8 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -269,7 +269,7 @@ Unit* BackgroundParser::parseFile( const TQString& fileName, bool readFromDisk ) if( m_fileList->contains(fileName) ){ kdDebug(9013) << "========================> FILE: " << fileName << " IN QUEUE <=============" << endl; } else { - KApplication::postEvent( m_javaSupport, new FileParsedEvent(fileName, unit->problems) ); + TDEApplication::postEvent( m_javaSupport, new FileParsedEvent(fileName, unit->problems) ); } m_currentFile = TQString(); |