summaryrefslogtreecommitdiffstats
path: root/kdejava/koala/test/kbase
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:51 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:17:51 -0600
commit95c43a0f38217a41c246b1b324c92cc2cba78e5e (patch)
treefe11835688057219e383ad91e286490e46f1eff4 /kdejava/koala/test/kbase
parent8a69eba2f0eddce05cf86e0df8aec6e9f473d485 (diff)
downloadtdebindings-95c43a0f38217a41c246b1b324c92cc2cba78e5e.tar.gz
tdebindings-95c43a0f38217a41c246b1b324c92cc2cba78e5e.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kdejava/koala/test/kbase')
-rw-r--r--kdejava/koala/test/kbase/KBase.java12
-rw-r--r--kdejava/koala/test/kbase/KBaseDoc.java2
2 files changed, 7 insertions, 7 deletions
diff --git a/kdejava/koala/test/kbase/KBase.java b/kdejava/koala/test/kbase/KBase.java
index ed584dcd..6401dd80 100644
--- a/kdejava/koala/test/kbase/KBase.java
+++ b/kdejava/koala/test/kbase/KBase.java
@@ -11,7 +11,7 @@ import org.kde.koala.*;
* KBase reimplements the methods that KMainWindow provides for main window handling and supports
* full session management as well as using KActions.
* @see KMainWindow
- * @see KApplication
+ * @see TDEApplication
* @see KConfig
*
* @author Source Framework Automatically Generated by KDevelop, (c) The KDevelop Team.
@@ -55,7 +55,7 @@ public class KBase extends KMainWindow
public KBase(TQWidget parent, String name)
{
super(parent, name, 0);
- KApplication kapp = KApplication.kApplication();
+ TDEApplication kapp = TDEApplication.kApplication();
config=kapp.config();
///////////////////////////////////////////////////////////////////
@@ -230,7 +230,7 @@ protected void readOptions()
}
/** saves the window properties for each open window during session end to the session config file, including saving the currently
- * opened file by a temporary filename provided by KApplication.
+ * opened file by a temporary filename provided by TDEApplication.
* @see KTMainWindow#saveProperties
*/
protected void saveProperties(KConfig _cfg)
@@ -245,7 +245,7 @@ protected void saveProperties(KConfig _cfg)
KURL url=doc.URL();
_cfg.writeEntry("filename", url.url());
_cfg.writeEntry("modified", doc.isModified());
- String tempname = KApplication.kApplication().tempSaveName(url.url());
+ String tempname = TDEApplication.kApplication().tempSaveName(url.url());
String tempurl= KURL.encode_string(tempname, 0);
KURL _url = new KURL(tempurl);
doc.saveDocument(_url);
@@ -265,7 +265,7 @@ protected void readProperties(KConfig _cfg)
if(modified)
{
boolean canRecover = false;
- String tempname = KApplication.kApplication().checkRecoverFile(filename, canRecover);
+ String tempname = TDEApplication.kApplication().checkRecoverFile(filename, canRecover);
KURL _url = new KURL(tempname);
if(canRecover)
@@ -561,7 +561,7 @@ public static void main(String[] cmdLineArgs)
KCmdLineArgs.init( cmdLineArgs, aboutData );
KCmdLineArgs.addCmdLineOptions( options ); // Add our own options.
- KApplication app = new KApplication();
+ TDEApplication app = new TDEApplication();
if (app.isRestored())
{
diff --git a/kdejava/koala/test/kbase/KBaseDoc.java b/kdejava/koala/test/kbase/KBaseDoc.java
index 3683c0b2..d253123b 100644
--- a/kdejava/koala/test/kbase/KBaseDoc.java
+++ b/kdejava/koala/test/kbase/KBaseDoc.java
@@ -6,7 +6,7 @@ import org.kde.koala.*;
/** KBaseDoc provides a document object for a document-view model.
*
* The KBaseDoc class provides a document object that can be used in conjunction with the classes JavaApiTestApp and KBaseView
- * to create a document-view model for standard KDE applications based on KApplication and KMainWindow. Thereby, the document object
+ * to create a document-view model for standard KDE applications based on TDEApplication and KMainWindow. Thereby, the document object
* is created by the JavaApiTestApp instance and contains the document structure with the according methods for manipulation of the document
* data by KBaseView objects. Also, KBaseDoc contains the methods for serialization of the document data from and to files.
*