summaryrefslogtreecommitdiffstats
path: root/src/app/mainwindow.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:51:46 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:51:46 -0600
commit896d42313d38e7e50de5832ab7b43995702dec46 (patch)
tree33fcbfa91adfd49ff99718ae2221e77156e75147 /src/app/mainwindow.cpp
parent74e623fc182edd840a296fdde1e1293872e2da32 (diff)
downloadgwenview-896d42313d38e7e50de5832ab7b43995702dec46.tar.gz
gwenview-896d42313d38e7e50de5832ab7b43995702dec46.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/app/mainwindow.cpp')
-rw-r--r--src/app/mainwindow.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 75a9d42..c159dd2 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -34,17 +34,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <kbookmarkmanager.h>
#include <kbookmarkmenu.h>
#include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kcursor.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <kdockwidget.h>
#include <kedittoolbar.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kglobal.h>
#include <khelpmenu.h>
#include <kiconloader.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <kkeydialog.h>
#include <klargefile.h>
#include <klistview.h>
@@ -1068,9 +1068,9 @@ void MainWindow::createObjectInteractions() {
TQT_TQOBJECT(this), TQT_SLOT(openFileViewControllerContextMenu(const TQPoint&, bool)) );
// Bookmarks
- TQString file = locate( "data", "kfile/bookmarks.xml" );
+ TQString file = locate( "data", "tdefile/bookmarks.xml" );
if (file.isEmpty()) {
- file = locateLocal( "data", "kfile/bookmarks.xml" );
+ file = locateLocal( "data", "tdefile/bookmarks.xml" );
}
KBookmarkManager* manager=KBookmarkManager::managerForFile(file,false);