diff options
| -rw-r--r-- | acinclude.m4 | 26 | ||||
| -rw-r--r-- | src/dolphin.cpp | 2 | ||||
| -rw-r--r-- | src/dolphindetailsview.cpp | 2 | ||||
| -rw-r--r-- | src/dolphinview.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index e346c7e..4638ceb 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2003,20 +2003,20 @@ cat > conftest.$ac_ext <<EOF #include <kapp.h> int main() { - printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); - printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); - printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); - printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); - printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); - printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); - printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); - printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); - printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); - printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); + printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data()); + printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data()); + printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data()); + printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data()); + printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data()); + printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data()); + printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data()); + printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data()); + printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data()); + printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data()); printf("kde_wallpaperdir=\\"%s\\"\n", - KApplication::kde_wallpaperdir().data()); - printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); - printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); + TDEApplication::kde_wallpaperdir().data()); + printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data()); + printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data()); printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n"); diff --git a/src/dolphin.cpp b/src/dolphin.cpp index a278231..00cc57a 100644 --- a/src/dolphin.cpp +++ b/src/dolphin.cpp @@ -104,7 +104,7 @@ void Dolphin::setActiveView(DolphinView* view) void Dolphin::dropURLs(const KURL::List& urls, const KURL& destination) { - const ButtonState keyboardState = KApplication::keyboardMouseState(); + const ButtonState keyboardState = TDEApplication::keyboardMouseState(); const bool shiftPressed = (keyboardState & ShiftButton) > 0; const bool controlPressed = (keyboardState & ControlButton) > 0; diff --git a/src/dolphindetailsview.cpp b/src/dolphindetailsview.cpp index db5016e..c24ed4c 100644 --- a/src/dolphindetailsview.cpp +++ b/src/dolphindetailsview.cpp @@ -379,7 +379,7 @@ void DolphinDetailsView::contentsMousePressEvent(TQMouseEvent* event) KFileDetailView::contentsMousePressEvent(event); } else if (event->button() == Qt::LeftButton) { - const ButtonState keyboardState = KApplication::keyboardMouseState(); + const ButtonState keyboardState = TDEApplication::keyboardMouseState(); const bool isSelectionActive = (keyboardState & ShiftButton) || (keyboardState & ControlButton); if (!isSelectionActive) { diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp index 05e0d53..67db2ee 100644 --- a/src/dolphinview.cpp +++ b/src/dolphinview.cpp @@ -645,7 +645,7 @@ void DolphinView::slotURLChanged(const KURL& url) void DolphinView::triggerIconsViewItem(TQIconViewItem* item) { - const ButtonState keyboardState = KApplication::keyboardMouseState(); + const ButtonState keyboardState = TDEApplication::keyboardMouseState(); const bool isSelectionActive = ((keyboardState & ShiftButton) > 0) || ((keyboardState & ControlButton) > 0); if ((item != 0) && !isSelectionActive) { diff --git a/src/main.cpp b/src/main.cpp index 9c56f86..0fbac4f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -56,7 +56,7 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); - KApplication app; + TDEApplication app; Dolphin& mainWin = Dolphin::mainWin(); mainWin.show(); |