summaryrefslogtreecommitdiffstats
path: root/src/app
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:53:34 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-19 23:53:34 -0600
commit666bfdd491ff517207cf008a3b4e412b51015651 (patch)
tree5630f00ab4dbd891ef1cc5a1eb3e350b188a74d0 /src/app
parentd088a3cec7282afe34b731d1abf44fada42d9cad (diff)
downloadfilelight-666bfdd491ff517207cf008a3b4e412b51015651.tar.gz
filelight-666bfdd491ff517207cf008a3b4e412b51015651.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'src/app')
-rw-r--r--src/app/main.cpp2
-rw-r--r--src/app/mainWindow.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 11107cd..b315cc9 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -37,7 +37,7 @@ int main( int argc, char *argv[] )
TDECmdLineArgs::init( argc, argv, &about );
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app;
+ TDEApplication app;
if (!app.isRestored()) {
MainWindow *mw = new MainWindow();
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index b95dcd8..4302891 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -92,7 +92,7 @@ MainWindow::setupActions() //singleton function
new KAction( i18n( "Scan &Root Directory" ), "folder_red", 0, TQT_TQOBJECT(this), TQT_SLOT(slotScanRootDirectory()), ac, "scan_root" );
new KAction( i18n( "Rescan" ), "reload", KStdAccel::reload(), TQT_TQOBJECT(m_part), TQT_SLOT(rescan()), ac, "scan_rescan" );
new KAction( i18n( "Stop" ), "stop", TQt::Key_Escape, TQT_TQOBJECT(this), TQT_SLOT(slotAbortScan()), ac, "scan_stop" );
- new KAction( i18n( "Clear Location Bar" ), KApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(m_combo), TQT_SLOT(clearEdit()), ac, "clear_location" );
+ new KAction( i18n( "Clear Location Bar" ), TDEApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(m_combo), TQT_SLOT(clearEdit()), ac, "clear_location" );
new KAction( i18n( "Go" ), "key_enter", 0, TQT_TQOBJECT(m_combo), TQT_SIGNAL(returnPressed()), ac, "go" );
KWidgetAction *combo = new KWidgetAction( m_combo, i18n( "Location Bar" ), 0, 0, 0, ac, "location_bar" );